Import upstream version 0.4.1

25 files changed, 1753 insertions, 1786 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 534aa81..fd23190 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,7 +39,10 @@ libexec_PROGRAMS = indicator-sound-service$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/common-defs.h b/src/common-defs.h
index e3b4552..e554c11 100644
--- a/src/common-defs.h
+++ b/src/common-defs.h
@@ -34,16 +34,16 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE  "x-canonical-sound-menu-player-transport-state"
 
 #define DBUSMENU_METADATA_MENUITEM_TYPE  				"x-canonical-sound-menu-player-metadata-type"
-#define DBUSMENU_METADATA_MENUITEM_ARTIST  			"x-canonical-sound-menu-player-metadata-artist"
-#define DBUSMENU_METADATA_MENUITEM_TITLE  			"x-canonical-sound-menu-player-metadata-title"
-#define DBUSMENU_METADATA_MENUITEM_ALBUM   			"x-canonical-sound-menu-player-metadata-album"
-#define DBUSMENU_METADATA_MENUITEM_ARTURL  			"x-canonical-sound-menu-player-metadata-arturl"
+#define DBUSMENU_METADATA_MENUITEM_ARTIST  			"x-canonical-sound-menu-player-metadata-xesam:artist"
+#define DBUSMENU_METADATA_MENUITEM_TITLE  			"x-canonical-sound-menu-player-metadata-xesam:title"
+#define DBUSMENU_METADATA_MENUITEM_ALBUM   			"x-canonical-sound-menu-player-metadata-xesam:album"
+#define DBUSMENU_METADATA_MENUITEM_ARTURL  			"x-canonical-sound-menu-player-metadata-mpris:artUrl"
 
 #define DBUSMENU_TITLE_MENUITEM_TYPE          	"x-canonical-sound-menu-player-title-type"
 #define DBUSMENU_TITLE_MENUITEM_NAME       			"x-canonical-sound-menu-player-title-name"
 
 #define DBUSMENU_SCRUB_MENUITEM_TYPE						"x-canonical-sound-menu-player-scrub-type"
-#define DBUSMENU_SCRUB_MENUITEM_DURATION				"x-canonical-sound-menu-player-scrub-time"
+#define DBUSMENU_SCRUB_MENUITEM_DURATION				"x-canonical-sound-menu-player-scrub-mpris:length"
 #define DBUSMENU_SCRUB_MENUITEM_POSITION				"x-canonical-sound-menu-player-scrub-position"
 #define DBUSMENU_SCRUB_MENUITEM_PLAY_STATE			"x-canonical-sound-menu-player-scrub-play-state"
 
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 6f0af9e..5ea561f 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -119,7 +119,7 @@ void dbus_menu_manager_update_mute_ui(gboolean incoming_mute_value)
   b_all_muted = incoming_mute_value;
   dbusmenu_menuitem_property_set(mute_all_menuitem,
                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                 b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
+                                 b_all_muted == FALSE ? _("Mute") : _("Unmute"));
 }
 
 
@@ -190,7 +190,7 @@ static void rebuild_sound_menu(DbusmenuMenuitem *root, SoundServiceDbus *service
 {
   // Mute button
   mute_all_menuitem = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
+  dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, b_all_muted == FALSE ? _("Mute") : _("Unmute"));
   g_signal_connect(G_OBJECT(mute_all_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(set_global_mute_from_ui), NULL);
   dbusmenu_menuitem_property_set_bool(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, b_sink_available);
 
@@ -229,7 +229,7 @@ static void set_global_mute_from_ui()
   toggle_global_mute(b_all_muted);
   dbusmenu_menuitem_property_set(mute_all_menuitem,
                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                 b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
+                                 b_all_muted == FALSE ? _("Mute") : _("Unmute"));
 }
 
 
diff --git a/src/familiar-players-db.c b/src/familiar-players-db.c
index 4d2b452..ec0c16f 100644
--- a/src/familiar-players-db.c
+++ b/src/familiar-players-db.c
@@ -1,4 +1,4 @@
-/* familiar-players-db.c generated by valac 0.9.5, the Vala compiler
+/* familiar-players-db.c generated by valac 0.9.7, the Vala compiler
  * generated from familiar-players-db.vala, do not modify */
 
 /*
@@ -70,16 +70,16 @@ enum  {
 };
 #define FAMILIAR_PLAYERS_DB_GROUP_NAME "Seen Database"
 #define FAMILIAR_PLAYERS_DB_KEY_NAME "DesktopFiles"
+FamiliarPlayersDB* familiar_players_db_new (void);
+FamiliarPlayersDB* familiar_players_db_construct (GType object_type);
 static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self);
 static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self);
 static gboolean familiar_players_db_load_data_from_key_file (FamiliarPlayersDB* self);
-FamiliarPlayersDB* familiar_players_db_new (void);
-FamiliarPlayersDB* familiar_players_db_construct (GType object_type);
-static void _vala_array_add1 (char*** array, int* length, int* size, char* value);
 static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self);
+static void _vala_array_add1 (char*** array, int* length, int* size, char* value);
+void familiar_players_db_insert (FamiliarPlayersDB* self, const char* desktop);
 gboolean familiar_players_db_already_familiar (FamiliarPlayersDB* self, const char* desktop);
 static gboolean _familiar_players_db_write_db_gsource_func (gpointer self);
-void familiar_players_db_insert (FamiliarPlayersDB* self, const char* desktop);
 GeeSet* familiar_players_db_records (FamiliarPlayersDB* self);
 static void familiar_players_db_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -128,10 +128,9 @@ FamiliarPlayersDB* familiar_players_db_new (void) {
 
 static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 	gboolean result = FALSE;
-	GError * _inner_error_;
 	gboolean _result_;
+	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_inner_error_ = NULL;
 	_result_ = FALSE;
 	if (g_file_test (self->priv->file_name, G_FILE_TEST_EXISTS)) {
 		GKeyFile* _tmp0_;
@@ -190,9 +189,8 @@ static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 
 static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self) {
 	gboolean result = FALSE;
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_inner_error_ = NULL;
 	{
 		gboolean _tmp0_;
 		_tmp0_ = g_key_file_has_key (self->priv->key_file, FAMILIAR_PLAYERS_DB_GROUP_NAME, FAMILIAR_PLAYERS_DB_KEY_NAME, &_inner_error_);
@@ -236,13 +234,12 @@ static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self) {
 
 static gboolean familiar_players_db_load_data_from_key_file (FamiliarPlayersDB* self) {
 	gboolean result = FALSE;
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_inner_error_ = NULL;
 	{
-		char** _tmp1_;
-		gint _desktops_size_;
 		gint desktops_length1;
+		gint _desktops_size_;
+		char** _tmp1_;
 		gsize _tmp0_;
 		char** desktops;
 		desktops = (_tmp1_ = g_key_file_get_string_list (self->priv->key_file, FAMILIAR_PLAYERS_DB_GROUP_NAME, FAMILIAR_PLAYERS_DB_KEY_NAME, &_tmp0_, &_inner_error_), desktops_length1 = _tmp0_, _desktops_size_ = desktops_length1, _tmp1_);
@@ -307,17 +304,16 @@ static void _vala_array_add1 (char*** array, int* length, int* size, char* value
 
 static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 	gboolean result = FALSE;
-	GError * _inner_error_;
 	GKeyFile* keyfile;
-	char** _tmp1_;
-	gint _desktops_size_;
 	gint desktops_length1;
+	gint _desktops_size_;
+	char** _tmp1_;
 	char** _tmp0_ = NULL;
 	char** desktops;
 	gsize data_length = 0UL;
 	char* data;
+	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_inner_error_ = NULL;
 	keyfile = g_key_file_new ();
 	desktops = (_tmp1_ = (_tmp0_ = g_new0 (char*, 0 + 1), _tmp0_), desktops_length1 = 0, _desktops_size_ = desktops_length1, _tmp1_);
 	{
@@ -458,8 +454,8 @@ static char* bool_to_string (gboolean self) {
 
 gboolean familiar_players_db_already_familiar (FamiliarPlayersDB* self, const char* desktop) {
 	gboolean result = FALSE;
-	char* _tmp1_;
 	GeeSet* _tmp0_;
+	char* _tmp1_;
 	GeeSet* _tmp2_;
 	gboolean _tmp3_;
 	g_return_val_if_fail (self != NULL, FALSE);
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 3a7abe9..63ad72d 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -375,8 +375,6 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u
 
 			g_return_if_fail(IS_INDICATOR_SOUND(userdata));
 			
-      // Ensure we are in a coherent state with the service at start up.
-      // Preserve ordering!
     }
   }
   return;
@@ -464,12 +462,7 @@ tidy_up_hash()
 static void
 update_state(const gint state)
 {
-  /*    g_debug("update state beginning - previous_state = %i", previous_state);*/
-
   previous_state = current_state;
-
-  /*    g_debug("update state 3rd line - previous_state = %i", previous_state);*/
-
   current_state = state;
   gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state));
   indicator_image_helper_update(speaker_image, image_name);
@@ -479,7 +472,6 @@ update_state(const gint state)
 void
 determine_state_from_volume(gdouble volume_percent)
 {
-  /*    g_debug("determine_state_from_volume - previous_state = %i", previous_state);*/
   if (device_available == FALSE)
     return;
   gint state = previous_state;
diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c
index 662a9ea..311057e 100644
--- a/src/metadata-menu-item.c
+++ b/src/metadata-menu-item.c
@@ -1,4 +1,4 @@
-/* metadata-menu-item.c generated by valac 0.9.5, the Vala compiler
+/* metadata-menu-item.c generated by valac 0.9.7, the Vala compiler
  * generated from metadata-menu-item.vala, do not modify */
 
 /*
@@ -81,10 +81,10 @@ GType metadata_menuitem_get_type (void) G_GNUC_CONST;
 enum  {
 	METADATA_MENUITEM_DUMMY_PROPERTY
 };
-void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
-GeeHashSet* metadata_menuitem_attributes_format (void);
 MetadataMenuitem* metadata_menuitem_new (void);
 MetadataMenuitem* metadata_menuitem_construct (GType object_type);
+void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
+GeeHashSet* metadata_menuitem_attributes_format (void);
 
 
 
diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala
index 3818b1c..0bb4a85 100644
--- a/src/metadata-menu-item.vala
+++ b/src/metadata-menu-item.vala
@@ -29,6 +29,7 @@ public class MetadataMenuitem : PlayerItem
 		reset(attributes_format());
 	}
 
+	
 	public static HashSet<string> attributes_format()
 	{
 		HashSet<string> attrs = new HashSet<string>();		
@@ -39,4 +40,4 @@ public class MetadataMenuitem : PlayerItem
 		return attrs;
 	}
 		
-}
\ No newline at end of file
+}
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index aaf71e2..f600238 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -34,10 +34,13 @@ struct _MetadataWidgetPrivate
 {
 	GtkWidget* hbox;
 	GtkWidget* album_art;
-  gchar* 		 image_path;
+  GString*	 image_path;
+  GString*	 old_image_path;
 	GtkWidget* artist_label;
 	GtkWidget* piece_label;
 	GtkWidget* container_label;	
+	GdkColor   bevel_colour;
+	GdkColor   eight_note_colour;
 };
 
 #define METADATA_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), METADATA_WIDGET_TYPE, MetadataWidgetPrivate))
@@ -47,25 +50,28 @@ static void metadata_widget_class_init (MetadataWidgetClass *klass);
 static void metadata_widget_init       (MetadataWidget *self);
 static void metadata_widget_dispose    (GObject *object);
 static void metadata_widget_finalize   (GObject *object);
-static gboolean metadata_widget_expose_event(GtkWidget* widget, GdkEventExpose* event);
+static gboolean metadata_image_expose (GtkWidget *image, GdkEventExpose *event, gpointer user_data);
 
 // keyevent consumers
 static gboolean metadata_widget_button_press_event (GtkWidget *menuitem, 
                                   									GdkEventButton *event);
-static gboolean metadata_widget_button_release_event (GtkWidget *menuitem, 
-                                  										GdkEventButton *event);
 // Dbusmenuitem properties update callback
-static void metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property, 
-                                       GValue* value, gpointer userdata);
+static void metadata_widget_property_update (DbusmenuMenuitem* item,
+                                             gchar* property, 
+                                       			 GValue* value,
+                                             gpointer userdata);
 
-static void update_album_art(MetadataWidget* self);
-static void style_artist_text(MetadataWidget* self);
-static void style_title_text(MetadataWidget* self);
-static void style_album_text(MetadataWidget* self);
+static void metadata_widget_style_labels(MetadataWidget* self,
+                                         GtkLabel* label);
+
+void metadata_widget_set_style(GtkWidget* button, GtkStyle* style);
+static void image_set_from_pixbuf (GtkWidget  *widget,
+												           MetadataWidget* metadata,
+												           GdkPixbuf *source);
 
 
-G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM);
 
+G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM);
 
 
 static void
@@ -75,13 +81,11 @@ metadata_widget_class_init (MetadataWidgetClass *klass)
   GtkWidgetClass    *widget_class = GTK_WIDGET_CLASS (klass);
 
 	widget_class->button_press_event = metadata_widget_button_press_event;
-  widget_class->button_release_event = metadata_widget_button_release_event;
-	widget_class->expose_event = metadata_widget_expose_event;
+	
 	g_type_class_add_private (klass, sizeof (MetadataWidgetPrivate));
 
 	gobject_class->dispose = metadata_widget_dispose;
 	gobject_class->finalize = metadata_widget_finalize;
-
 }
 
 static void
@@ -98,49 +102,52 @@ metadata_widget_init (MetadataWidget *self)
 
 	// image
 	priv->album_art = gtk_image_new();
-	priv->image_path = g_strdup(dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_ARTURL));
-	update_album_art(self);	
-
+	priv->image_path = g_string_new(dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_ARTURL));
+	priv->old_image_path = g_string_new("");
+	g_debug("Metadata::At startup and image path = %s", priv->image_path->str);
+	
+  g_signal_connect(priv->album_art, "expose-event", 
+                   G_CALLBACK(metadata_image_expose),
+                   GTK_WIDGET(self));		
+	gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60); 
+	
 	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->album_art, FALSE, FALSE, 0);	
-
 	
 	GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+	
 	// artist
 	GtkWidget* artist;
 	artist = gtk_label_new(dbusmenu_menuitem_property_get(twin_item,
 	                                                      DBUSMENU_METADATA_MENUITEM_ARTIST));
-	
 	gtk_misc_set_alignment(GTK_MISC(artist), (gfloat)0, (gfloat)0);
+	gtk_misc_set_padding (GTK_MISC(artist), (gfloat)10, (gfloat)0);
 	gtk_label_set_width_chars(GTK_LABEL(artist), 15);	
 	gtk_label_set_ellipsize(GTK_LABEL(artist), PANGO_ELLIPSIZE_MIDDLE);	
+	metadata_widget_style_labels(self, GTK_LABEL(artist));
 	priv->artist_label = artist;
-	// Style it up.
-	style_artist_text(self);
 	
-	// piece
+	// title
 	GtkWidget* piece;
 	piece = gtk_label_new(dbusmenu_menuitem_property_get(twin_item,
 	                                                     DBUSMENU_METADATA_MENUITEM_TITLE));
 	gtk_misc_set_alignment(GTK_MISC(piece), (gfloat)0, (gfloat)0);
-	gtk_label_set_width_chars(GTK_LABEL(piece), 12);
+	gtk_misc_set_padding (GTK_MISC(piece), (gfloat)10, (gfloat)0);
+	gtk_label_set_width_chars(GTK_LABEL(piece), 15);
 	gtk_label_set_ellipsize(GTK_LABEL(piece), PANGO_ELLIPSIZE_MIDDLE);
+	metadata_widget_style_labels(self, GTK_LABEL(piece));
 	priv->piece_label =  piece;
-	// Style it up.
-	style_title_text(self);
 
 	// container
 	GtkWidget* container;
 	container = gtk_label_new(dbusmenu_menuitem_property_get(twin_item,
 	                                                         DBUSMENU_METADATA_MENUITEM_ALBUM));
 	gtk_misc_set_alignment(GTK_MISC(container), (gfloat)0, (gfloat)0);
+	gtk_misc_set_padding (GTK_MISC(container), (gfloat)10, (gfloat)0);	
 	gtk_label_set_width_chars(GTK_LABEL(container), 15);		
 	gtk_label_set_ellipsize(GTK_LABEL(container), PANGO_ELLIPSIZE_MIDDLE);	
+	metadata_widget_style_labels(self, GTK_LABEL(container));
 	priv->container_label = container;
-	// Style it up.
-	style_album_text(self);
 
-	// Pack in the right order
 	gtk_box_pack_start (GTK_BOX (vbox), priv->piece_label, FALSE, FALSE, 0);	
 	gtk_box_pack_start (GTK_BOX (vbox), priv->artist_label, FALSE, FALSE, 0);	
 	gtk_box_pack_start (GTK_BOX (vbox), priv->container_label, FALSE, FALSE, 0);	
@@ -150,19 +157,13 @@ metadata_widget_init (MetadataWidget *self)
 	g_signal_connect(G_OBJECT(twin_item), "property-changed", 
 	                 G_CALLBACK(metadata_widget_property_update), self);
 	gtk_widget_show_all (priv->hbox);
+
+  g_signal_connect(self, "style-set", G_CALLBACK(metadata_widget_set_style), GTK_WIDGET(self));		
+	
 	gtk_widget_set_size_request(GTK_WIDGET(self), 200, 60); 
   gtk_container_add (GTK_CONTAINER (self), hbox);	
 }
 
-static gboolean
-metadata_widget_expose_event(GtkWidget* widget, GdkEventExpose* event)
-{
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget);
-		
-	gtk_container_propagate_expose(GTK_CONTAINER(widget), priv->hbox, event); 
-	return TRUE;
-}
-
 static void
 metadata_widget_dispose (GObject *object)
 {
@@ -175,21 +176,110 @@ metadata_widget_finalize (GObject *object)
 	G_OBJECT_CLASS (metadata_widget_parent_class)->finalize (object);
 }
 
-/* Suppress/consume keyevents */
+/**
+ * We override the expose method to enable primitive drawing of the 
+ * empty album art image (and soon rounded rectangles on the album art)
+ */
 static gboolean
-metadata_widget_button_press_event (GtkWidget *menuitem, 
-                                  GdkEventButton *event)
+metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user_data)
 {
-	g_debug("MetadataWidget::menu_press_event");
+	g_return_val_if_fail(IS_METADATA_WIDGET(user_data), FALSE);
+	MetadataWidget* widget = METADATA_WIDGET(user_data);
+	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget);	
+	
+	if(priv->image_path->len > 0){
+		
+	  if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE){
+			GdkPixbuf* pixbuf;
+			pixbuf = gdk_pixbuf_new_from_file(priv->image_path->str, NULL);
+			g_debug("metadata_widget_expose, album art update -> pixbuf from %s",
+						  priv->image_path->str); 
+			pixbuf = gdk_pixbuf_scale_simple(pixbuf,60, 60, GDK_INTERP_BILINEAR);
+			image_set_from_pixbuf (metadata, widget, pixbuf);
+			g_string_erase(priv->old_image_path, 0, -1);
+			g_string_overwrite(priv->old_image_path, 0, priv->image_path->str); 
+
+			g_object_unref(pixbuf);			
+		}
+		return FALSE;				
+	}
+	
+	cairo_t *cr;	
+	cr = gdk_cairo_create (metadata->window);
+	GtkAllocation alloc;
+	gtk_widget_get_allocation (metadata, &alloc);
+		
+	cairo_rectangle (cr,
+                   alloc.x, alloc.y,
+                   alloc.width, alloc.height);
+	cairo_clip(cr);
+
+	cairo_move_to (cr, alloc.x , alloc.y);
+	cairo_line_to(cr, alloc.x + alloc.width,
+	              alloc.y);
+	cairo_line_to(cr, alloc.x + alloc.width,
+	              alloc.y + alloc.height);
+	cairo_line_to(cr, alloc.x, alloc.y + alloc.height);
+	cairo_line_to(cr, alloc.x, alloc.y);
+
+	cairo_close_path (cr);
+
+	cairo_set_source_rgba (cr, 123.0f / 255.0f, 123.0f / 255.0f, 120.0f / 255.0f, .8f);		
+	cairo_set_line_width (cr, 2.0);
+	
+	cairo_stroke (cr);						
+
+	// Draw the eight note
+	PangoLayout *layout;
+	PangoFontDescription *desc;
+	layout = pango_cairo_create_layout(cr);
+	PangoContext* pcontext = pango_cairo_create_context(cr); 
+	pango_cairo_context_set_resolution (pcontext, 96);
+
+	GString* string = g_string_new("");
+	gssize size = -1;
+	gunichar code = g_utf8_get_char_validated("\342\231\253", size);	
+	g_string_append_unichar (string, code);
+	
+	pango_layout_set_text(layout, string->str, -1);
+	desc = pango_font_description_from_string("Sans Bold 30");
+	pango_layout_set_font_description(layout, desc);
+	pango_font_description_free(desc);
+
+	cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.8);
+	pango_cairo_update_layout(cr, layout);
+	cairo_move_to (cr, alloc.x + alloc.width/6, alloc.y);	
+	pango_cairo_show_layout(cr, layout);
+
+	g_object_unref(layout);	
+	g_object_unref(pcontext);
+	g_string_free (string, TRUE);
+	cairo_destroy (cr);	
+	
 	return TRUE;
 }
 
+/* Suppress/consume keyevents */
 static gboolean
-metadata_widget_button_release_event (GtkWidget *menuitem, 
+metadata_widget_button_press_event (GtkWidget *menuitem, 
                                   GdkEventButton *event)
 {
-	g_debug("MetadataWidget::menu_release_event");
-	return TRUE;
+	GtkClipboard* board = gtk_clipboard_get (GDK_NONE);	
+	gchar* title = g_strdup(dbusmenu_menuitem_property_get(twin_item,
+	                                              DBUSMENU_METADATA_MENUITEM_TITLE));
+	gchar* artist = g_strdup(dbusmenu_menuitem_property_get(twin_item,
+	                                              DBUSMENU_METADATA_MENUITEM_ARTIST));
+	gchar* album = g_strdup(dbusmenu_menuitem_property_get(twin_item,
+	                                              DBUSMENU_METADATA_MENUITEM_ALBUM));
+	gchar* contents = g_strdup_printf("artist: %s \ntitle: %s \nalbum: %s", artist, title, album);
+	g_debug("contents to be copied will be : %s", contents);	
+	gtk_clipboard_set_text (board, contents, -1);
+	gtk_clipboard_store (board);
+	g_free(contents);
+	g_free(title);
+	g_free(artist);
+	g_free(album);
+	return FALSE;
 }
 
 // TODO: Manage empty/mangled music details <unknown artist> etc.
@@ -212,72 +302,192 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property,
 	
 	if(g_ascii_strcasecmp(DBUSMENU_METADATA_MENUITEM_ARTIST, property) == 0){  
 		gtk_label_set_text(GTK_LABEL(priv->artist_label), g_value_get_string(value));
-		style_artist_text(mitem);
+		metadata_widget_style_labels(mitem, GTK_LABEL(priv->artist_label));
 	}
 	else if(g_ascii_strcasecmp(DBUSMENU_METADATA_MENUITEM_TITLE, property) == 0){  
 		gtk_label_set_text(GTK_LABEL(priv->piece_label), g_value_get_string(value));		
-		style_title_text(mitem);
+		metadata_widget_style_labels(mitem, GTK_LABEL(priv->piece_label));
 	}	
 	else if(g_ascii_strcasecmp(DBUSMENU_METADATA_MENUITEM_ALBUM, property) == 0){  
 		gtk_label_set_text(GTK_LABEL(priv->container_label), g_value_get_string(value));
-		style_album_text(mitem);	
+		metadata_widget_style_labels(mitem, GTK_LABEL(priv->container_label));
 	}	
 	else if(g_ascii_strcasecmp(DBUSMENU_METADATA_MENUITEM_ARTURL, property) == 0){
-		if(priv->image_path != NULL){
-			g_free(priv->image_path);
-		}
-		priv->image_path = g_value_dup_string(value);
-		if(priv->image_path != NULL){
-			update_album_art(mitem);
-		}
+		g_string_erase(priv->image_path, 0, -1);
+		g_string_overwrite(priv->image_path, 0, g_value_get_string (value)); 
 	}		
 }
 
-static void
-update_album_art(MetadataWidget* self){
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);	
-	GdkPixbuf* pixbuf;
-	pixbuf = gdk_pixbuf_new_from_file(priv->image_path, NULL);
-  pixbuf = gdk_pixbuf_scale_simple(pixbuf,60, 60, GDK_INTERP_BILINEAR);
-	g_debug("attempting to set the image with path %s", priv->image_path);
-	gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf);
-	g_object_unref(pixbuf);	
+
+static cairo_surface_t *
+surface_from_pixbuf (GdkPixbuf *pixbuf)
+{
+        cairo_surface_t *surface;
+        cairo_t         *cr;
+
+        surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ?
+                                              CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
+                                              gdk_pixbuf_get_width (pixbuf),
+                                              gdk_pixbuf_get_height (pixbuf));
+        cr = cairo_create (surface);
+        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+        cairo_paint (cr);
+        cairo_destroy (cr);
+
+        return surface;
 }
 
-// TODO refactor next 3 methods into one once the style has been 
-// "signed off" by design
 static void
-style_artist_text(MetadataWidget* self)
+rounded_rectangle (cairo_t *cr,
+                   gdouble  aspect,
+                   gdouble  x,
+                   gdouble  y,
+                   gdouble  corner_radius,
+                   gdouble  width,
+                   gdouble  height)
 {
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);	
-	char* markup;
-	markup = g_markup_printf_escaped ("<span size=\"small\">%s</span>",
-	                                  gtk_label_get_text(GTK_LABEL(priv->artist_label)));
-	gtk_label_set_markup (GTK_LABEL (priv->artist_label), markup);
-	g_free(markup);
+        gdouble radius;
+        gdouble degrees;
+
+        radius = corner_radius / aspect;
+        degrees = G_PI / 180.0;
+
+        cairo_new_sub_path (cr);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + radius,
+                   radius,
+                   -90 * degrees,
+                   0 * degrees);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + height - radius,
+                   radius,
+                   0 * degrees,
+                   90 * degrees);
+        cairo_arc (cr,
+                   x + radius,
+                   y + height - radius,
+                   radius,
+                   90 * degrees,
+                   180 * degrees);
+        cairo_arc (cr,
+                   x + radius,
+                   y + radius,
+                   radius,
+                   180 * degrees,
+                   270 * degrees);
+        cairo_close_path (cr);
 }
 
 static void
-style_title_text(MetadataWidget* self)
+image_set_from_pixbuf (GtkWidget  *widget,
+                       MetadataWidget* metadata,
+                       GdkPixbuf *source)
 {
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);	
+  cairo_t         *cr;
+  cairo_t         *cr_mask;
+  cairo_surface_t *surface;
+  GdkPixmap       *pixmap;
+  GdkPixmap       *bitmask;
+  int              w;
+  int              h;
+  int              frame_width;
+  double           radius;
+  GdkColor         color;
+  double           r;
+  double           g;
+  double           b;
+	
+	MetadataWidgetPrivate* priv = METADATA_WIDGET_GET_PRIVATE(metadata);	
+	GtkImage* image = GTK_IMAGE(priv->album_art);
+  frame_width = 5;
 
-	char* markup;
-	markup = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
-	                                  gtk_label_get_text(GTK_LABEL(priv->piece_label)));
-	gtk_label_set_markup (GTK_LABEL (priv->piece_label), markup);
-	g_free(markup);
+  w = gdk_pixbuf_get_width (source) + frame_width * 2;
+  h = gdk_pixbuf_get_height (source) + frame_width * 2;
+
+  radius = w / 10;
+
+  pixmap = gdk_pixmap_new (gtk_widget_get_window (widget), w, h, -1);
+  bitmask = gdk_pixmap_new (gtk_widget_get_window (widget), w, h, 1);
+
+	if (gtk_widget_get_window (widget) == NULL)
+		return;
+
+  cr = gdk_cairo_create (pixmap);
+  cr_mask = gdk_cairo_create (bitmask);
+
+  /* setup mask */
+  cairo_rectangle (cr_mask, 0, 0, w, h);
+  cairo_set_operator (cr_mask, CAIRO_OPERATOR_CLEAR);
+  cairo_fill (cr_mask);
+
+  rounded_rectangle (cr_mask, 1.0, 0.5, 0.5, radius, w - 1, h - 1);
+  cairo_set_operator (cr_mask, CAIRO_OPERATOR_OVER);
+  cairo_set_source_rgb (cr_mask, 1, 1, 1);
+  cairo_fill (cr_mask);
+
+  color = gtk_widget_get_style (GTK_WIDGET (image))->bg [GTK_STATE_NORMAL];
+  r = (float)color.red / 65535.0;
+  g = (float)color.green / 65535.0;
+  b = (float)color.blue / 65535.0;
+
+  /* set up image */
+  cairo_rectangle (cr, 0, 0, w, h);
+  cairo_set_source_rgb (cr, r, g, b);
+  cairo_fill (cr);
+
+  rounded_rectangle (cr,
+                     1.0,
+                     frame_width + 0.5,
+                     frame_width + 0.5,
+                     radius,
+                     w - frame_width * 2 - 1,
+                     h - frame_width * 2 - 1);
+  cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3);
+  cairo_fill_preserve (cr);
+
+  surface = surface_from_pixbuf (source);
+  cairo_set_source_surface (cr, surface, frame_width, frame_width);
+  cairo_fill (cr);
+
+  gtk_image_set_from_pixmap (image, pixmap, bitmask);
+
+  cairo_surface_destroy (surface);
+
+  g_object_unref (bitmask);
+  g_object_unref (pixmap);
+
+  cairo_destroy (cr_mask);
+  cairo_destroy (cr);
 }
 
+// TODO refactor next 3 methods into one once the style has been 
 static void
-style_album_text(MetadataWidget* self)
+metadata_widget_style_labels(MetadataWidget* self, GtkLabel* label)
 {
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);	
 	char* markup;
-	markup = g_markup_printf_escaped ("<span size=\"small\">%s</span>",
-	                                  gtk_label_get_text(GTK_LABEL(priv->container_label)));
-	gtk_label_set_markup (GTK_LABEL (priv->container_label), markup);
-	g_free(markup);
+	markup = g_markup_printf_escaped ("<span size=\"smaller\">%s</span>",
+	                                  gtk_label_get_text(GTK_LABEL(label)));
+	gtk_label_set_markup (GTK_LABEL (label), markup);
+	g_free(markup);	
+}
+
+void
+metadata_widget_set_style(GtkWidget* metadata, GtkStyle* style)
+{
+	g_return_if_fail(IS_METADATA_WIDGET(metadata));
+	MetadataWidget* widg = METADATA_WIDGET(metadata);
+	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widg);	
+	if(style == NULL){
+		g_warning("metadata_widget_set_style -> style is NULL!");
+		return;
+	}
+	else{
+		g_debug("metadata_widget: about to set the style colours");
+		priv->eight_note_colour = style->fg[GTK_STATE_NORMAL];
+		priv->bevel_colour = style->bg[GTK_STATE_NORMAL];		
+	}
 }
 
  /**
diff --git a/src/mpris-bridge.c b/src/mpris-bridge.c
index 15ad9d5..d85ec3d 100644
--- a/src/mpris-bridge.c
+++ b/src/mpris-bridge.c
@@ -1,4 +1,4 @@
-/* mpris-bridge.c generated by valac 0.9.5, the Vala compiler
+/* mpris-bridge.c generated by valac 0.9.7, the Vala compiler
  * generated from mpris-bridge.vala, do not modify */
 
 
@@ -94,26 +94,26 @@ enum  {
 	MPRIS_BRIDGE_DUMMY_PROPERTY
 };
 GType player_controller_get_type (void) G_GNUC_CONST;
+MprisBridge* mpris_bridge_new (PlayerController* ctrl);
+MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
 Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
 Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
 gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
 void mpris2_controller_initial_update (Mpris2Controller* self);
 MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
 MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
-MprisBridge* mpris_bridge_new (PlayerController* ctrl);
-MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
+gboolean mpris_bridge_connected (MprisBridge* self);
 gboolean mpris_controller_connected (MprisController* self);
 gboolean mpris2_controller_connected (Mpris2Controller* self);
-gboolean mpris_bridge_connected (MprisBridge* self);
 GType transport_menuitem_action_get_type (void) G_GNUC_CONST;
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
 void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
 void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
-void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
-void mpris2_controller_expose (Mpris2Controller* self);
 void mpris_bridge_expose (MprisBridge* self);
+void mpris2_controller_expose (Mpris2Controller* self);
+void mpris_bridge_set_track_position (MprisBridge* self, double pos);
 void mpris_controller_set_position (MprisController* self, double position);
 void mpris2_controller_set_position (Mpris2Controller* self, double position);
-void mpris_bridge_set_track_position (MprisBridge* self, double pos);
 static void mpris_bridge_finalize (GObject* obj);
 
 
diff --git a/src/mpris-controller.c b/src/mpris-controller.c
index 1f891f7..98151e0 100644
--- a/src/mpris-controller.c
+++ b/src/mpris-controller.c
@@ -1,4 +1,4 @@
-/* mpris-controller.c generated by valac 0.9.5, the Vala compiler
+/* mpris-controller.c generated by valac 0.9.7, the Vala compiler
  * generated from mpris-controller.vala, do not modify */
 
 /*
@@ -97,16 +97,6 @@ typedef struct _TransportMenuitem TransportMenuitem;
 typedef struct _TransportMenuitemClass TransportMenuitemClass;
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
-#define TYPE_SCRUB_MENUITEM (scrub_menuitem_get_type ())
-#define SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitem))
-#define SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-#define IS_SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCRUB_MENUITEM))
-#define IS_SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCRUB_MENUITEM))
-#define SCRUB_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-
-typedef struct _ScrubMenuitem ScrubMenuitem;
-typedef struct _ScrubMenuitemClass ScrubMenuitemClass;
-
 #define TRANSPORT_MENUITEM_TYPE_ACTION (transport_menuitem_action_get_type ())
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
@@ -149,7 +139,6 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
-	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
@@ -173,6 +162,7 @@ enum  {
 };
 MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
 MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
+static void mpris_controller_initial_update (MprisController* self);
 DBusGProxy* mpris_controller_get_mpris_player (MprisController* self);
 static GType mpris_controller_status_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static MprisControllerstatus* mpris_controller_status_dup (const MprisControllerstatus* self);
@@ -187,31 +177,21 @@ void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
 static GHashTable* _dynamic_GetMetadata1 (DBusGProxy* self, GError** error);
 void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes);
 GeeHashSet* metadata_menuitem_attributes_format (void);
-static GHashTable* _dynamic_GetMetadata2 (DBusGProxy* self, GError** error);
-GeeHashSet* scrub_menuitem_attributes_format (void);
-GType scrub_menuitem_get_type (void) G_GNUC_CONST;
-static gint32 _dynamic_PositionGet3 (DBusGProxy* self, GError** error);
-void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
-static void mpris_controller_initial_update (MprisController* self);
 GType transport_menuitem_action_get_type (void) G_GNUC_CONST;
-static void _dynamic_Pause4 (DBusGProxy* self, GError** error);
-static void _dynamic_Prev5 (DBusGProxy* self, GError** error);
-static void _dynamic_Next6 (DBusGProxy* self, GError** error);
 void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
-static GHashTable* _dynamic_GetMetadata7 (DBusGProxy* self, GError** error);
-static GValue* _g_value_dup (GValue* self);
-static void _dynamic_PositionSet8 (DBusGProxy* self, gint32 param1, GError** error);
-static gint32 _dynamic_PositionGet9 (DBusGProxy* self, GError** error);
+static void _dynamic_Pause2 (DBusGProxy* self, GError** error);
+static void _dynamic_Prev3 (DBusGProxy* self, GError** error);
+static void _dynamic_Next4 (DBusGProxy* self, GError** error);
 void mpris_controller_set_position (MprisController* self, double position);
+static GHashTable* _dynamic_GetMetadata5 (DBusGProxy* self, GError** error);
+static GValue* _g_value_dup (GValue* self);
+static void _dynamic_PositionSet6 (DBusGProxy* self, gint32 param1, GError** error);
 gboolean mpris_controller_connected (MprisController* self);
-GeeHashSet* transport_menuitem_attributes_format (void);
 static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy* mpris_client, MprisControllerstatus* st);
-void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
-static void _dynamic_GetStatus10 (DBusGProxy* self, MprisControllerstatus* result, GError** error);
-void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
-static GHashTable* _dynamic_GetMetadata11 (DBusGProxy* self, GError** error);
-static gint32 _dynamic_PositionGet12 (DBusGProxy* self, GError** error);
+GeeHashSet* transport_menuitem_attributes_format (void);
 static void mpris_controller_onTrackChange (MprisController* self, DBusGProxy* mpris_client, GHashTable* ht);
+void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
+static void _dynamic_GetStatus7 (DBusGProxy* self, MprisControllerstatus* result, GError** error);
 static void mpris_controller_set_mpris_player (MprisController* self, DBusGProxy* value);
 static void mpris_controller_set_owner (MprisController* self, PlayerController* value);
 const char* mpris_controller_get_mpris_interface (MprisController* self);
@@ -266,46 +246,18 @@ static GHashTable* _dynamic_GetMetadata1 (DBusGProxy* self, GError** error) {
 }
 
 
-static GHashTable* _dynamic_GetMetadata2 (DBusGProxy* self, GError** error) {
-	GHashTable* result;
-	dbus_g_proxy_call (self, "GetMetadata", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &result, G_TYPE_INVALID);
-	if (*error) {
-		return NULL;
-	}
-	return result;
-}
-
-
-static gint32 _dynamic_PositionGet3 (DBusGProxy* self, GError** error) {
-	gint32 result;
-	dbus_g_proxy_call (self, "PositionGet", error, G_TYPE_INVALID, G_TYPE_INT, &result, G_TYPE_INVALID);
-	if (*error) {
-		return 0;
-	}
-	return result;
-}
-
-
 static void mpris_controller_initial_update (MprisController* self) {
-	GError * _inner_error_;
 	MprisControllerstatus _tmp0_ = {0};
 	MprisControllerstatus st;
 	gint play_state;
-	TransportMenuitem* _tmp2_;
 	PlayerItem* _tmp1_;
+	TransportMenuitem* _tmp2_;
 	GHashTable* _tmp3_;
-	GeeHashSet* _tmp6_;
-	GHashTable* _tmp5_;
 	PlayerItem* _tmp4_;
-	GHashTable* _tmp7_;
-	GeeHashSet* _tmp10_;
-	GHashTable* _tmp9_;
-	PlayerItem* _tmp8_;
-	PlayerItem* _tmp11_;
-	ScrubMenuitem* scrub;
-	gint32 _tmp12_;
+	GHashTable* _tmp5_;
+	GeeHashSet* _tmp6_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
 	st = (_dynamic_GetStatus0 (self->priv->_mpris_player, &_tmp0_, &_inner_error_), _tmp0_);
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -326,30 +278,10 @@ static void mpris_controller_initial_update (MprisController* self) {
 	_g_object_unref0 (_tmp6_);
 	_g_hash_table_unref0 (_tmp5_);
 	_g_object_unref0 (_tmp4_);
-	_tmp7_ = _dynamic_GetMetadata2 (self->priv->_mpris_player, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	player_item_update (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp9_ = _tmp7_, _tmp10_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp10_);
-	_g_hash_table_unref0 (_tmp9_);
-	_g_object_unref0 (_tmp8_);
-	scrub = (_tmp11_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp11_) ? ((ScrubMenuitem*) _tmp11_) : NULL);
-	_tmp12_ = _dynamic_PositionGet3 (self->priv->_mpris_player, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		_g_object_unref0 (scrub);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	scrub_menuitem_update_position (scrub, _tmp12_);
-	_g_object_unref0 (scrub);
 }
 
 
-static void _dynamic_Pause4 (DBusGProxy* self, GError** error) {
+static void _dynamic_Pause2 (DBusGProxy* self, GError** error) {
 	dbus_g_proxy_call (self, "Pause", error, G_TYPE_INVALID, G_TYPE_INVALID);
 	if (*error) {
 		return;
@@ -357,7 +289,7 @@ static void _dynamic_Pause4 (DBusGProxy* self, GError** error) {
 }
 
 
-static void _dynamic_Prev5 (DBusGProxy* self, GError** error) {
+static void _dynamic_Prev3 (DBusGProxy* self, GError** error) {
 	dbus_g_proxy_call (self, "Prev", error, G_TYPE_INVALID, G_TYPE_INVALID);
 	if (*error) {
 		return;
@@ -365,7 +297,7 @@ static void _dynamic_Prev5 (DBusGProxy* self, GError** error) {
 }
 
 
-static void _dynamic_Next6 (DBusGProxy* self, GError** error) {
+static void _dynamic_Next4 (DBusGProxy* self, GError** error) {
 	dbus_g_proxy_call (self, "Next", error, G_TYPE_INVALID, G_TYPE_INVALID);
 	if (*error) {
 		return;
@@ -374,13 +306,12 @@ static void _dynamic_Next6 (DBusGProxy* self, GError** error) {
 
 
 void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command) {
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:72: transport_event input = %i", (gint) command);
+	g_debug ("mpris-controller.vala:68: transport_event input = %i", (gint) command);
 	if (command == TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE) {
-		g_debug ("mpris-controller.vala:74: transport_event PLAY_PAUSE");
-		_dynamic_Pause4 (self->priv->_mpris_player, &_inner_error_);
+		g_debug ("mpris-controller.vala:70: transport_event PLAY_PAUSE");
+		_dynamic_Pause2 (self->priv->_mpris_player, &_inner_error_);
 		if (_inner_error_ != NULL) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -388,7 +319,7 @@ void mpris_controller_transport_event (MprisController* self, TransportMenuitema
 		}
 	} else {
 		if (command == TRANSPORT_MENUITEM_ACTION_PREVIOUS) {
-			_dynamic_Prev5 (self->priv->_mpris_player, &_inner_error_);
+			_dynamic_Prev3 (self->priv->_mpris_player, &_inner_error_);
 			if (_inner_error_ != NULL) {
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
@@ -396,7 +327,7 @@ void mpris_controller_transport_event (MprisController* self, TransportMenuitema
 			}
 		} else {
 			if (command == TRANSPORT_MENUITEM_ACTION_NEXT) {
-				_dynamic_Next6 (self->priv->_mpris_player, &_inner_error_);
+				_dynamic_Next4 (self->priv->_mpris_player, &_inner_error_);
 				if (_inner_error_ != NULL) {
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 					g_clear_error (&_inner_error_);
@@ -408,7 +339,7 @@ void mpris_controller_transport_event (MprisController* self, TransportMenuitema
 }
 
 
-static GHashTable* _dynamic_GetMetadata7 (DBusGProxy* self, GError** error) {
+static GHashTable* _dynamic_GetMetadata5 (DBusGProxy* self, GError** error) {
 	GHashTable* result;
 	dbus_g_proxy_call (self, "GetMetadata", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &result, G_TYPE_INVALID);
 	if (*error) {
@@ -428,7 +359,7 @@ static gpointer __g_value_dup0 (gpointer self) {
 }
 
 
-static void _dynamic_PositionSet8 (DBusGProxy* self, gint32 param1, GError** error) {
+static void _dynamic_PositionSet6 (DBusGProxy* self, gint32 param1, GError** error) {
 	dbus_g_proxy_call (self, "PositionSet", error, G_TYPE_INT, param1, G_TYPE_INVALID, G_TYPE_INVALID);
 	if (*error) {
 		return;
@@ -436,29 +367,15 @@ static void _dynamic_PositionSet8 (DBusGProxy* self, gint32 param1, GError** err
 }
 
 
-static gint32 _dynamic_PositionGet9 (DBusGProxy* self, GError** error) {
-	gint32 result;
-	dbus_g_proxy_call (self, "PositionGet", error, G_TYPE_INVALID, G_TYPE_INT, &result, G_TYPE_INVALID);
-	if (*error) {
-		return 0;
-	}
-	return result;
-}
-
-
 void mpris_controller_set_position (MprisController* self, double position) {
-	GError * _inner_error_;
 	GHashTable* data;
 	GValue* time_value;
 	guint32 total_time;
 	double new_time_position;
-	PlayerItem* _tmp0_;
-	ScrubMenuitem* scrub;
-	gint32 _tmp1_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:87: Set position with pos (0-100) %f", position);
-	data = _dynamic_GetMetadata7 (self->priv->_mpris_player, &_inner_error_);
+	g_debug ("mpris-controller.vala:83: Set position with pos (0-100) %f", position);
+	data = _dynamic_GetMetadata5 (self->priv->_mpris_player, &_inner_error_);
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -466,17 +383,17 @@ void mpris_controller_set_position (MprisController* self, double position) {
 	}
 	time_value = __g_value_dup0 ((GValue*) g_hash_table_lookup (data, "time"));
 	if (time_value == NULL) {
-		g_warning ("mpris-controller.vala:91: Can't fetch the duration of the track theref" \
+		g_warning ("mpris-controller.vala:87: Can't fetch the duration of the track theref" \
 "ore cant set the position");
 		_g_free0 (time_value);
 		_g_hash_table_unref0 (data);
 		return;
 	}
 	total_time = (guint32) g_value_get_uint (time_value);
-	g_debug ("mpris-controller.vala:95: total time of track = %i", (gint) total_time);
+	g_debug ("mpris-controller.vala:91: total time of track = %i", (gint) total_time);
 	new_time_position = (total_time * position) / 100.0;
-	g_debug ("mpris-controller.vala:97: new position = %f", new_time_position * 1000);
-	_dynamic_PositionSet8 (self->priv->_mpris_player, (gint32) new_time_position, &_inner_error_);
+	g_debug ("mpris-controller.vala:93: new position = %f", new_time_position * 1000);
+	_dynamic_PositionSet6 (self->priv->_mpris_player, (gint32) new_time_position, &_inner_error_);
 	if (_inner_error_ != NULL) {
 		_g_free0 (time_value);
 		_g_hash_table_unref0 (data);
@@ -484,18 +401,6 @@ void mpris_controller_set_position (MprisController* self, double position) {
 		g_clear_error (&_inner_error_);
 		return;
 	}
-	scrub = (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp0_) ? ((ScrubMenuitem*) _tmp0_) : NULL);
-	_tmp1_ = _dynamic_PositionGet9 (self->priv->_mpris_player, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		_g_object_unref0 (scrub);
-		_g_free0 (time_value);
-		_g_hash_table_unref0 (data);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	scrub_menuitem_update_position (scrub, _tmp1_);
-	_g_object_unref0 (scrub);
 	_g_free0 (time_value);
 	_g_hash_table_unref0 (data);
 }
@@ -515,17 +420,15 @@ static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy*
 	gint play_state;
 	GHashTable* ht;
 	GValue v = {0};
-	GeeHashSet* _tmp1_;
 	PlayerItem* _tmp0_;
-	GeeHashSet* _tmp3_;
-	PlayerItem* _tmp2_;
+	GeeHashSet* _tmp1_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (mpris_client != NULL);
-	g_debug ("mpris-controller.vala:110: onStatusChange - signal received");
+	g_debug ("mpris-controller.vala:104: onStatusChange - signal received");
 	status = st;
 	ar = (GValueArray*) status;
 	play_state = g_value_get_int (g_value_array_get_nth (ar, (guint) 0));
-	g_debug ("mpris-controller.vala:114: onStatusChange - play state %i", play_state);
+	g_debug ("mpris-controller.vala:108: onStatusChange - play state %i", play_state);
 	ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	g_value_init (&v, G_TYPE_INT);
 	g_value_set_int (&v, play_state);
@@ -533,15 +436,12 @@ static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy*
 	player_item_update (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), ht, _tmp1_ = transport_menuitem_attributes_format ());
 	_g_object_unref0 (_tmp1_);
 	_g_object_unref0 (_tmp0_);
-	player_item_update (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), ht, _tmp3_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp3_);
-	_g_object_unref0 (_tmp2_);
 	G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
 	_g_hash_table_unref0 (ht);
 }
 
 
-static void _dynamic_GetStatus10 (DBusGProxy* self, MprisControllerstatus* result, GError** error) {
+static void _dynamic_GetStatus7 (DBusGProxy* self, MprisControllerstatus* result, GError** error) {
 	GValueArray* dbus_result;
 	dbus_g_proxy_call (self, "GetStatus", error, G_TYPE_INVALID, dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID), &dbus_result, G_TYPE_INVALID);
 	if (*error) {
@@ -554,91 +454,36 @@ static void _dynamic_GetStatus10 (DBusGProxy* self, MprisControllerstatus* resul
 }
 
 
-static GHashTable* _dynamic_GetMetadata11 (DBusGProxy* self, GError** error) {
-	GHashTable* result;
-	dbus_g_proxy_call (self, "GetMetadata", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &result, G_TYPE_INVALID);
-	if (*error) {
-		return NULL;
-	}
-	return result;
-}
-
-
-static gint32 _dynamic_PositionGet12 (DBusGProxy* self, GError** error) {
-	gint32 result;
-	dbus_g_proxy_call (self, "PositionGet", error, G_TYPE_INVALID, G_TYPE_INT, &result, G_TYPE_INVALID);
-	if (*error) {
-		return 0;
-	}
-	return result;
-}
-
-
 static void mpris_controller_onTrackChange (MprisController* self, DBusGProxy* mpris_client, GHashTable* ht) {
-	GError * _inner_error_;
-	GeeHashSet* _tmp1_;
 	PlayerItem* _tmp0_;
-	GeeHashSet* _tmp3_;
-	PlayerItem* _tmp2_;
-	MprisControllerstatus _tmp4_ = {0};
+	GeeHashSet* _tmp1_;
+	MprisControllerstatus _tmp2_ = {0};
 	MprisControllerstatus st;
 	gint play_state;
-	PlayerItem* _tmp5_;
-	ScrubMenuitem* scrub;
-	GHashTable* _tmp6_;
-	GeeHashSet* _tmp9_;
-	GHashTable* _tmp8_;
-	PlayerItem* _tmp7_;
-	GeeHashSet* _tmp11_;
-	PlayerItem* _tmp10_;
-	gint32 _tmp12_;
+	PlayerItem* _tmp3_;
+	GeeHashSet* _tmp4_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (mpris_client != NULL);
 	g_return_if_fail (ht != NULL);
-	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:125: onTrackChange");
+	g_debug ("mpris-controller.vala:118: onTrackChange");
 	player_item_reset (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp1_ = metadata_menuitem_attributes_format ());
 	_g_object_unref0 (_tmp1_);
 	_g_object_unref0 (_tmp0_);
-	player_item_reset (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp3_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp3_);
-	_g_object_unref0 (_tmp2_);
-	st = (_dynamic_GetStatus10 (self->priv->_mpris_player, &_tmp4_, &_inner_error_), _tmp4_);
+	st = (_dynamic_GetStatus7 (self->priv->_mpris_player, &_tmp2_, &_inner_error_), _tmp2_);
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
 		return;
 	}
 	play_state = (gint) st.playback;
-	g_debug ("mpris-controller.vala:133: GetStatusChange, about to update scrub with" \
+	g_debug ("mpris-controller.vala:124: GetStatusChange, about to update scrub with" \
 " play state - %i", play_state);
-	scrub = (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp5_) ? ((ScrubMenuitem*) _tmp5_) : NULL);
-	scrub_menuitem_update_playstate (scrub, play_state);
-	_tmp6_ = _dynamic_GetMetadata11 (self->priv->_mpris_player, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		_g_object_unref0 (scrub);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	player_item_update (_tmp7_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp8_ = _tmp6_, _tmp9_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp9_);
-	_g_hash_table_unref0 (_tmp8_);
-	_g_object_unref0 (_tmp7_);
-	player_item_update (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), ht, _tmp11_ = metadata_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp11_);
-	_g_object_unref0 (_tmp10_);
-	g_debug ("mpris-controller.vala:141: about to update the duration on the scrub b" \
+	player_item_update (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), ht, _tmp4_ = metadata_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
+	g_debug ("mpris-controller.vala:128: about to update the duration on the scrub b" \
 "ar");
-	_tmp12_ = _dynamic_PositionGet12 (self->priv->_mpris_player, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		_g_object_unref0 (scrub);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	scrub_menuitem_update_position (scrub, _tmp12_);
-	_g_object_unref0 (scrub);
 }
 
 
@@ -729,11 +574,11 @@ static GObject * mpris_controller_constructor (GType type, guint n_construct_pro
 	self = MPRIS_CONTROLLER (obj);
 	_inner_error_ = NULL;
 	{
-		DBusGProxy* _tmp4_;
-		char* _tmp3_;
 		char* _tmp2_;
-		char* _tmp6_;
+		char* _tmp3_;
+		DBusGProxy* _tmp4_;
 		char* _tmp5_;
+		char* _tmp6_;
 		{
 			DBusGConnection* _tmp0_;
 			DBusGConnection* _tmp1_;
diff --git a/src/mpris-controller.vala b/src/mpris-controller.vala
index 1e1e00a..fc9eee0 100644
--- a/src/mpris-controller.vala
+++ b/src/mpris-controller.vala
@@ -61,10 +61,6 @@ public class MprisController : GLib.Object
 		(this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(play_state);
 		this.owner.custom_items[PlayerController.widget_order.METADATA].update(this.mpris_player.GetMetadata(),
 		                            MetadataMenuitem.attributes_format());
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.mpris_player.GetMetadata(),
-		                        ScrubMenuitem.attributes_format());		
-		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
-		scrub.update_position(this.mpris_player.PositionGet());		
 	}
 
 	public void transport_event(TransportMenuitem.action command)
@@ -96,8 +92,6 @@ public class MprisController : GLib.Object
 		double new_time_position = total_time * position/100.0;
 		debug("new position = %f", (new_time_position * 1000));		
 		this.mpris_player.PositionSet((int32)(new_time_position));
-		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
-		scrub.update_position(this.mpris_player.PositionGet());				
 	}
 	
 	public bool connected()
@@ -117,7 +111,6 @@ public class MprisController : GLib.Object
 		v.set_int(play_state);
 		ht.insert("state", v); 
 		this.owner.custom_items[PlayerController.widget_order.TRANSPORT].update(ht, TransportMenuitem.attributes_format());
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(ht, ScrubMenuitem.attributes_format());
 	}
 	
 	private void onTrackChange(dynamic DBus.Object mpris_client, HashTable<string,Value?> ht)
@@ -125,21 +118,13 @@ public class MprisController : GLib.Object
 		debug("onTrackChange");
 		
 		this.owner.custom_items[PlayerController.widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());
-		//HashTable<string, Value?> status_hash = new HashTable<string, Value?>(str_hash, str_equal);
 
 		status st = this.mpris_player.GetStatus();
 		int play_state =  st.playback;
 		debug("GetStatusChange, about to update scrub with play state - %i", play_state);
 
-		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
-		scrub.update_playstate(play_state);
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.mpris_player.GetMetadata(),
-		                        ScrubMenuitem.attributes_format());		
 		this.owner.custom_items[PlayerController.widget_order.METADATA].update(ht,
 		                            MetadataMenuitem.attributes_format());
 		debug("about to update the duration on the scrub bar");
-		// temporary fix
-		scrub.update_position(this.mpris_player.PositionGet());
 	}
 }
diff --git a/src/mpris2-controller.c b/src/mpris2-controller.c
index a6546bb..87ec14a 100644
--- a/src/mpris2-controller.c
+++ b/src/mpris2-controller.c
@@ -1,4 +1,4 @@
-/* mpris2-controller.c generated by valac 0.9.5, the Vala compiler
+/* mpris2-controller.c generated by valac 0.9.7, the Vala compiler
  * generated from mpris2-controller.vala, do not modify */
 
 /*
@@ -125,16 +125,6 @@ typedef struct _MprisBridgeClass MprisBridgeClass;
 typedef struct _TransportMenuitem TransportMenuitem;
 typedef struct _TransportMenuitemClass TransportMenuitemClass;
 
-#define TYPE_SCRUB_MENUITEM (scrub_menuitem_get_type ())
-#define SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitem))
-#define SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-#define IS_SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCRUB_MENUITEM))
-#define IS_SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCRUB_MENUITEM))
-#define SCRUB_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-
-typedef struct _ScrubMenuitem ScrubMenuitem;
-typedef struct _ScrubMenuitemClass ScrubMenuitemClass;
-
 #define TRANSPORT_MENUITEM_TYPE_ACTION (transport_menuitem_action_get_type ())
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _dbus_g_connection_unref0(var) ((var == NULL) ? NULL : (var = (dbus_g_connection_unref (var), NULL)))
@@ -225,7 +215,6 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
-	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
@@ -367,6 +356,7 @@ enum  {
 #define MPRIS2_CONTROLLER_root_interface "org.mpris.MediaPlayer2"
 Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
 Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
+void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1);
 static GValue* _g_value_dup (GValue* self);
 static gint mpris2_controller_determine_play_state (Mpris2Controller* self, const char* status);
 PlayerController* mpris2_controller_get_owner (Mpris2Controller* self);
@@ -375,22 +365,19 @@ GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType transport_menuitem_get_type (void) G_GNUC_CONST;
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
-GType scrub_menuitem_get_type (void) G_GNUC_CONST;
-void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
-void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
-MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self);
+static GHashTable* mpris2_controller_clean_metadata (Mpris2Controller* self);
 void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
 GeeHashSet* metadata_menuitem_attributes_format (void);
 void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes);
-GeeHashSet* scrub_menuitem_attributes_format (void);
-void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1);
+MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self);
+static char** _vala_array_dup1 (char** self, int length);
 void mpris2_controller_initial_update (Mpris2Controller* self);
 GType transport_menuitem_action_get_type (void) G_GNUC_CONST;
 void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
 void mpris2_controller_set_position (Mpris2Controller* self, double position);
 void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position);
-MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self);
 gboolean mpris2_controller_connected (Mpris2Controller* self);
+MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self);
 gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
 void mpris2_controller_expose (Mpris2Controller* self);
 static void mpris2_controller_set_mpris2_root (Mpris2Controller* self, MprisRoot* value);
@@ -1182,74 +1169,74 @@ static void mpris_root_dbus_proxy_Quit (MprisRoot* self, GError** error) {
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp20_;
+			const char* _tmp0_;
 			_edomain = DBUS_GERROR;
-			_tmp20_ = _dbus_error.name + 27;
-			if (strcmp (_tmp20_, "Failed") == 0) {
+			_tmp0_ = _dbus_error.name + 27;
+			if (strcmp (_tmp0_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp20_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp0_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp20_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp0_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp20_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp0_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp20_, "NoReply") == 0) {
+			} else if (strcmp (_tmp0_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp20_, "IOError") == 0) {
+			} else if (strcmp (_tmp0_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp20_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp0_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp20_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp0_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp20_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp0_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp20_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp0_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp20_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp0_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp20_, "NoServer") == 0) {
+			} else if (strcmp (_tmp0_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp20_, "Timeout") == 0) {
+			} else if (strcmp (_tmp0_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp20_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp0_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp20_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp0_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp20_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp0_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp20_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp0_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp20_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp0_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp20_, "FileExists") == 0) {
+			} else if (strcmp (_tmp0_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp20_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp0_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp20_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp0_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp20_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp0_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp20_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp0_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp20_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp0_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp20_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp0_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp20_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp0_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp20_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp0_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp20_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp0_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp20_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp0_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp20_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp0_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp20_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp0_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp20_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp0_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp20_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp0_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -1287,74 +1274,74 @@ static void mpris_root_dbus_proxy_Raise (MprisRoot* self, GError** error) {
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp21_;
+			const char* _tmp1_;
 			_edomain = DBUS_GERROR;
-			_tmp21_ = _dbus_error.name + 27;
-			if (strcmp (_tmp21_, "Failed") == 0) {
+			_tmp1_ = _dbus_error.name + 27;
+			if (strcmp (_tmp1_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp21_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp1_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp21_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp1_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp21_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp1_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp21_, "NoReply") == 0) {
+			} else if (strcmp (_tmp1_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp21_, "IOError") == 0) {
+			} else if (strcmp (_tmp1_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp21_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp1_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp21_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp1_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp21_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp1_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp21_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp1_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp21_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp1_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp21_, "NoServer") == 0) {
+			} else if (strcmp (_tmp1_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp21_, "Timeout") == 0) {
+			} else if (strcmp (_tmp1_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp21_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp1_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp21_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp1_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp21_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp1_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp21_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp1_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp21_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp1_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp21_, "FileExists") == 0) {
+			} else if (strcmp (_tmp1_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp21_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp1_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp21_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp1_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp21_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp1_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp21_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp1_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp21_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp1_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp21_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp1_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp21_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp1_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp21_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp1_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp21_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp1_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp21_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp1_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp21_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp1_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp21_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp1_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp21_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp1_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp21_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp1_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -1377,19 +1364,19 @@ static gboolean mpris_root_dbus_proxy_get_HasTracklist (MprisRoot* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp22_;
-	const char* _tmp23_;
+	const char* _tmp2_;
+	const char* _tmp3_;
 	gboolean _result;
-	dbus_bool_t _tmp24_;
+	dbus_bool_t _tmp4_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return FALSE;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp22_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp22_);
-	_tmp23_ = "HasTracklist";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp23_);
+	_tmp2_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp2_);
+	_tmp3_ = "HasTracklist";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp3_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -1412,9 +1399,9 @@ static gboolean mpris_root_dbus_proxy_get_HasTracklist (MprisRoot* self) {
 		dbus_message_unref (_reply);
 		return FALSE;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp24_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp4_);
 	dbus_message_iter_next (&_subiter);
-	_result = _tmp24_;
+	_result = _tmp4_;
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -1425,21 +1412,21 @@ static void mpris_root_dbus_proxy_set_HasTracklist (MprisRoot* self, gboolean va
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp25_;
-	const char* _tmp26_;
-	dbus_bool_t _tmp27_;
+	const char* _tmp5_;
+	const char* _tmp6_;
+	dbus_bool_t _tmp7_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp25_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp25_);
-	_tmp26_ = "HasTracklist";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp26_);
+	_tmp5_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp5_);
+	_tmp6_ = "HasTracklist";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp6_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
-	_tmp27_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp27_);
+	_tmp7_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp7_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -1466,19 +1453,19 @@ static gboolean mpris_root_dbus_proxy_get_CanQuit (MprisRoot* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp28_;
-	const char* _tmp29_;
+	const char* _tmp8_;
+	const char* _tmp9_;
 	gboolean _result;
-	dbus_bool_t _tmp30_;
+	dbus_bool_t _tmp10_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return FALSE;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp28_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp28_);
-	_tmp29_ = "CanQuit";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp29_);
+	_tmp8_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp8_);
+	_tmp9_ = "CanQuit";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp9_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -1501,9 +1488,9 @@ static gboolean mpris_root_dbus_proxy_get_CanQuit (MprisRoot* self) {
 		dbus_message_unref (_reply);
 		return FALSE;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp30_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp10_);
 	dbus_message_iter_next (&_subiter);
-	_result = _tmp30_;
+	_result = _tmp10_;
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -1514,21 +1501,21 @@ static void mpris_root_dbus_proxy_set_CanQuit (MprisRoot* self, gboolean value)
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp31_;
-	const char* _tmp32_;
-	dbus_bool_t _tmp33_;
+	const char* _tmp11_;
+	const char* _tmp12_;
+	dbus_bool_t _tmp13_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp31_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp31_);
-	_tmp32_ = "CanQuit";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp32_);
+	_tmp11_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp11_);
+	_tmp12_ = "CanQuit";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp12_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
-	_tmp33_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp33_);
+	_tmp13_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp13_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -1555,19 +1542,19 @@ static gboolean mpris_root_dbus_proxy_get_CanRaise (MprisRoot* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp34_;
-	const char* _tmp35_;
+	const char* _tmp14_;
+	const char* _tmp15_;
 	gboolean _result;
-	dbus_bool_t _tmp36_;
+	dbus_bool_t _tmp16_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return FALSE;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp34_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp34_);
-	_tmp35_ = "CanRaise";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp35_);
+	_tmp14_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp14_);
+	_tmp15_ = "CanRaise";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp15_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -1590,9 +1577,9 @@ static gboolean mpris_root_dbus_proxy_get_CanRaise (MprisRoot* self) {
 		dbus_message_unref (_reply);
 		return FALSE;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp36_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp16_);
 	dbus_message_iter_next (&_subiter);
-	_result = _tmp36_;
+	_result = _tmp16_;
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -1603,21 +1590,21 @@ static void mpris_root_dbus_proxy_set_CanRaise (MprisRoot* self, gboolean value)
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp37_;
-	const char* _tmp38_;
-	dbus_bool_t _tmp39_;
+	const char* _tmp17_;
+	const char* _tmp18_;
+	dbus_bool_t _tmp19_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp37_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp37_);
-	_tmp38_ = "CanRaise";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp38_);
+	_tmp17_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp17_);
+	_tmp18_ = "CanRaise";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp18_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
-	_tmp39_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp39_);
+	_tmp19_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp19_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -1644,19 +1631,19 @@ static char* mpris_root_dbus_proxy_get_Identity (MprisRoot* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp40_;
-	const char* _tmp41_;
+	const char* _tmp20_;
+	const char* _tmp21_;
 	char* _result;
-	const char* _tmp42_;
+	const char* _tmp22_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return NULL;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp40_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp40_);
-	_tmp41_ = "Identity";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp41_);
+	_tmp20_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp20_);
+	_tmp21_ = "Identity";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp21_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -1679,9 +1666,9 @@ static char* mpris_root_dbus_proxy_get_Identity (MprisRoot* self) {
 		dbus_message_unref (_reply);
 		return NULL;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp42_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp22_);
 	dbus_message_iter_next (&_subiter);
-	_result = g_strdup (_tmp42_);
+	_result = g_strdup (_tmp22_);
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -1692,21 +1679,21 @@ static void mpris_root_dbus_proxy_set_Identity (MprisRoot* self, const char* val
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp43_;
-	const char* _tmp44_;
-	const char* _tmp45_;
+	const char* _tmp23_;
+	const char* _tmp24_;
+	const char* _tmp25_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp43_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp43_);
-	_tmp44_ = "Identity";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp44_);
+	_tmp23_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp23_);
+	_tmp24_ = "Identity";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp24_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
-	_tmp45_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp45_);
+	_tmp25_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp25_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -1733,19 +1720,19 @@ static char* mpris_root_dbus_proxy_get_DesktopEntry (MprisRoot* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp46_;
-	const char* _tmp47_;
+	const char* _tmp26_;
+	const char* _tmp27_;
 	char* _result;
-	const char* _tmp48_;
+	const char* _tmp28_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return NULL;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp46_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp46_);
-	_tmp47_ = "DesktopEntry";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp47_);
+	_tmp26_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp26_);
+	_tmp27_ = "DesktopEntry";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp27_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -1768,9 +1755,9 @@ static char* mpris_root_dbus_proxy_get_DesktopEntry (MprisRoot* self) {
 		dbus_message_unref (_reply);
 		return NULL;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp48_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp28_);
 	dbus_message_iter_next (&_subiter);
-	_result = g_strdup (_tmp48_);
+	_result = g_strdup (_tmp28_);
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -1781,21 +1768,21 @@ static void mpris_root_dbus_proxy_set_DesktopEntry (MprisRoot* self, const char*
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp49_;
-	const char* _tmp50_;
-	const char* _tmp51_;
+	const char* _tmp29_;
+	const char* _tmp30_;
+	const char* _tmp31_;
 	if (((MprisRootDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp49_ = "org.mpris.MediaPlayer2";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp49_);
-	_tmp50_ = "DesktopEntry";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp50_);
+	_tmp29_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp29_);
+	_tmp30_ = "DesktopEntry";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp30_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
-	_tmp51_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp51_);
+	_tmp31_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp31_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -1932,124 +1919,124 @@ static DBusHandlerResult _dbus_mpris_player_property_get (MprisPlayer* self, DBu
 	DBusMessage* reply;
 	DBusMessageIter iter, reply_iter, subiter;
 	char* interface_name;
-	const char* _tmp52_;
+	const char* _tmp0_;
 	char* property_name;
-	const char* _tmp53_;
+	const char* _tmp1_;
 	if (strcmp (dbus_message_get_signature (message), "ss")) {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 	dbus_message_iter_init (message, &iter);
 	reply = dbus_message_new_method_return (message);
 	dbus_message_iter_init_append (reply, &reply_iter);
-	dbus_message_iter_get_basic (&iter, &_tmp52_);
+	dbus_message_iter_get_basic (&iter, &_tmp0_);
 	dbus_message_iter_next (&iter);
-	interface_name = g_strdup (_tmp52_);
-	dbus_message_iter_get_basic (&iter, &_tmp53_);
+	interface_name = g_strdup (_tmp0_);
+	dbus_message_iter_get_basic (&iter, &_tmp1_);
 	dbus_message_iter_next (&iter);
-	property_name = g_strdup (_tmp53_);
+	property_name = g_strdup (_tmp1_);
 	if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Metadata") == 0)) {
 		GHashTable* result;
-		DBusMessageIter _tmp54_, _tmp55_;
-		GHashTableIter _tmp56_;
-		gpointer _tmp57_, _tmp58_;
+		DBusMessageIter _tmp2_, _tmp3_;
+		GHashTableIter _tmp4_;
+		gpointer _tmp5_, _tmp6_;
 		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "a{sv}", &subiter);
 		result = mpris_player_get_Metadata (self);
-		dbus_message_iter_open_container (&subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp54_);
-		g_hash_table_iter_init (&_tmp56_, result);
-		while (g_hash_table_iter_next (&_tmp56_, &_tmp57_, &_tmp58_)) {
+		dbus_message_iter_open_container (&subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp2_);
+		g_hash_table_iter_init (&_tmp4_, result);
+		while (g_hash_table_iter_next (&_tmp4_, &_tmp5_, &_tmp6_)) {
 			char* _key;
 			GValue* _value;
-			const char* _tmp59_;
-			DBusMessageIter _tmp60_;
-			dbus_message_iter_open_container (&_tmp54_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp55_);
-			_key = (char*) _tmp57_;
-			_value = (GValue*) _tmp58_;
-			_tmp59_ = _key;
-			dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_STRING, &_tmp59_);
+			const char* _tmp7_;
+			DBusMessageIter _tmp8_;
+			dbus_message_iter_open_container (&_tmp2_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp3_);
+			_key = (char*) _tmp5_;
+			_value = (GValue*) _tmp6_;
+			_tmp7_ = _key;
+			dbus_message_iter_append_basic (&_tmp3_, DBUS_TYPE_STRING, &_tmp7_);
 			if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
-				guint8 _tmp61_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "y", &_tmp60_);
-				_tmp61_ = g_value_get_uchar (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_BYTE, &_tmp61_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				guint8 _tmp9_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "y", &_tmp8_);
+				_tmp9_ = g_value_get_uchar (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_BYTE, &_tmp9_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
-				dbus_bool_t _tmp62_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "b", &_tmp60_);
-				_tmp62_ = g_value_get_boolean (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_BOOLEAN, &_tmp62_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_bool_t _tmp10_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "b", &_tmp8_);
+				_tmp10_ = g_value_get_boolean (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_BOOLEAN, &_tmp10_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
-				dbus_int32_t _tmp63_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "i", &_tmp60_);
-				_tmp63_ = g_value_get_int (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_INT32, &_tmp63_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_int32_t _tmp11_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "i", &_tmp8_);
+				_tmp11_ = g_value_get_int (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_INT32, &_tmp11_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
-				dbus_uint32_t _tmp64_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "u", &_tmp60_);
-				_tmp64_ = g_value_get_uint (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_UINT32, &_tmp64_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_uint32_t _tmp12_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "u", &_tmp8_);
+				_tmp12_ = g_value_get_uint (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_UINT32, &_tmp12_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
-				dbus_int64_t _tmp65_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "x", &_tmp60_);
-				_tmp65_ = g_value_get_int64 (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_INT64, &_tmp65_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_int64_t _tmp13_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "x", &_tmp8_);
+				_tmp13_ = g_value_get_int64 (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_INT64, &_tmp13_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
-				dbus_uint64_t _tmp66_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "t", &_tmp60_);
-				_tmp66_ = g_value_get_uint64 (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_UINT64, &_tmp66_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_uint64_t _tmp14_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "t", &_tmp8_);
+				_tmp14_ = g_value_get_uint64 (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_UINT64, &_tmp14_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
-				double _tmp67_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "d", &_tmp60_);
-				_tmp67_ = g_value_get_double (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_DOUBLE, &_tmp67_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				double _tmp15_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "d", &_tmp8_);
+				_tmp15_ = g_value_get_double (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_DOUBLE, &_tmp15_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
-				const char* _tmp68_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "s", &_tmp60_);
-				_tmp68_ = g_value_get_string (_value);
-				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_STRING, &_tmp68_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				const char* _tmp16_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "s", &_tmp8_);
+				_tmp16_ = g_value_get_string (_value);
+				dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_STRING, &_tmp16_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
-				const char** _tmp69_;
-				DBusMessageIter _tmp70_;
-				int _tmp71_;
-				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "as", &_tmp60_);
-				_tmp69_ = g_value_get_boxed (_value);
-				dbus_message_iter_open_container (&_tmp60_, DBUS_TYPE_ARRAY, "s", &_tmp70_);
-				for (_tmp71_ = 0; _tmp71_ < g_strv_length (g_value_get_boxed (_value)); _tmp71_++) {
-					const char* _tmp72_;
-					_tmp72_ = *_tmp69_;
-					dbus_message_iter_append_basic (&_tmp70_, DBUS_TYPE_STRING, &_tmp72_);
-					_tmp69_++;
+				const char** _tmp17_;
+				DBusMessageIter _tmp18_;
+				int _tmp19_;
+				dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "as", &_tmp8_);
+				_tmp17_ = g_value_get_boxed (_value);
+				dbus_message_iter_open_container (&_tmp8_, DBUS_TYPE_ARRAY, "s", &_tmp18_);
+				for (_tmp19_ = 0; _tmp19_ < g_strv_length (g_value_get_boxed (_value)); _tmp19_++) {
+					const char* _tmp20_;
+					_tmp20_ = *_tmp17_;
+					dbus_message_iter_append_basic (&_tmp18_, DBUS_TYPE_STRING, &_tmp20_);
+					_tmp17_++;
 				}
-				dbus_message_iter_close_container (&_tmp60_, &_tmp70_);
-				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+				dbus_message_iter_close_container (&_tmp8_, &_tmp18_);
+				dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 			}
-			dbus_message_iter_close_container (&_tmp54_, &_tmp55_);
+			dbus_message_iter_close_container (&_tmp2_, &_tmp3_);
 		}
-		dbus_message_iter_close_container (&subiter, &_tmp54_);
+		dbus_message_iter_close_container (&subiter, &_tmp2_);
 		_g_hash_table_unref0 (result);
 		dbus_message_iter_close_container (&reply_iter, &subiter);
 	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Position") == 0)) {
 		gint32 result;
-		dbus_int32_t _tmp73_;
+		dbus_int32_t _tmp21_;
 		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "i", &subiter);
 		result = mpris_player_get_Position (self);
-		_tmp73_ = result;
-		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_INT32, &_tmp73_);
+		_tmp21_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_INT32, &_tmp21_);
 		dbus_message_iter_close_container (&reply_iter, &subiter);
 	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "PlaybackStatus") == 0)) {
 		char* result;
-		const char* _tmp74_;
+		const char* _tmp22_;
 		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "s", &subiter);
 		result = mpris_player_get_PlaybackStatus (self);
-		_tmp74_ = result;
-		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_STRING, &_tmp74_);
+		_tmp22_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_STRING, &_tmp22_);
 		_g_free0 (result);
 		dbus_message_iter_close_container (&reply_iter, &subiter);
 	} else {
@@ -2072,146 +2059,146 @@ static DBusHandlerResult _dbus_mpris_player_property_set (MprisPlayer* self, DBu
 	DBusMessage* reply;
 	DBusMessageIter iter, subiter;
 	char* interface_name;
-	const char* _tmp75_;
+	const char* _tmp23_;
 	char* property_name;
-	const char* _tmp76_;
+	const char* _tmp24_;
 	if (strcmp (dbus_message_get_signature (message), "ssv")) {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 	dbus_message_iter_init (message, &iter);
 	reply = dbus_message_new_method_return (message);
-	dbus_message_iter_get_basic (&iter, &_tmp75_);
+	dbus_message_iter_get_basic (&iter, &_tmp23_);
 	dbus_message_iter_next (&iter);
-	interface_name = g_strdup (_tmp75_);
-	dbus_message_iter_get_basic (&iter, &_tmp76_);
+	interface_name = g_strdup (_tmp23_);
+	dbus_message_iter_get_basic (&iter, &_tmp24_);
 	dbus_message_iter_next (&iter);
-	property_name = g_strdup (_tmp76_);
+	property_name = g_strdup (_tmp24_);
 	dbus_message_iter_recurse (&iter, &subiter);
 	if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Metadata") == 0)) {
 		GHashTable* value;
-		GHashTable* _tmp77_;
-		DBusMessageIter _tmp78_;
-		DBusMessageIter _tmp79_;
-		_tmp77_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-		dbus_message_iter_recurse (&subiter, &_tmp78_);
-		while (dbus_message_iter_get_arg_type (&_tmp78_)) {
+		GHashTable* _tmp25_;
+		DBusMessageIter _tmp26_;
+		DBusMessageIter _tmp27_;
+		_tmp25_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+		dbus_message_iter_recurse (&subiter, &_tmp26_);
+		while (dbus_message_iter_get_arg_type (&_tmp26_)) {
 			char* _key;
 			GValue* _value;
-			const char* _tmp80_;
-			GValue _tmp81_ = {0};
-			DBusMessageIter _tmp82_;
-			dbus_message_iter_recurse (&_tmp78_, &_tmp79_);
-			dbus_message_iter_get_basic (&_tmp79_, &_tmp80_);
-			dbus_message_iter_next (&_tmp79_);
-			_key = g_strdup (_tmp80_);
-			dbus_message_iter_recurse (&_tmp79_, &_tmp82_);
-			if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_BYTE) {
-				guint8 _tmp83_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp83_);
-				g_value_init (&_tmp81_, G_TYPE_UCHAR);
-				g_value_set_uchar (&_tmp81_, _tmp83_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_BOOLEAN) {
-				dbus_bool_t _tmp84_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp84_);
-				g_value_init (&_tmp81_, G_TYPE_BOOLEAN);
-				g_value_set_boolean (&_tmp81_, _tmp84_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT16) {
-				dbus_int16_t _tmp85_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp85_);
-				g_value_init (&_tmp81_, G_TYPE_INT);
-				g_value_set_int (&_tmp81_, _tmp85_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT16) {
-				dbus_uint16_t _tmp86_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp86_);
-				g_value_init (&_tmp81_, G_TYPE_UINT);
-				g_value_set_uint (&_tmp81_, _tmp86_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT32) {
-				dbus_int32_t _tmp87_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp87_);
-				g_value_init (&_tmp81_, G_TYPE_INT);
-				g_value_set_int (&_tmp81_, _tmp87_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT32) {
-				dbus_uint32_t _tmp88_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp88_);
-				g_value_init (&_tmp81_, G_TYPE_UINT);
-				g_value_set_uint (&_tmp81_, _tmp88_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT64) {
-				dbus_int64_t _tmp89_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp89_);
-				g_value_init (&_tmp81_, G_TYPE_INT64);
-				g_value_set_int64 (&_tmp81_, _tmp89_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT64) {
-				dbus_uint64_t _tmp90_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp90_);
-				g_value_init (&_tmp81_, G_TYPE_UINT64);
-				g_value_set_uint64 (&_tmp81_, _tmp90_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_DOUBLE) {
-				double _tmp91_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp91_);
-				g_value_init (&_tmp81_, G_TYPE_DOUBLE);
-				g_value_set_double (&_tmp81_, _tmp91_);
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_STRING) {
-				const char* _tmp92_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp92_);
-				g_value_init (&_tmp81_, G_TYPE_STRING);
-				g_value_take_string (&_tmp81_, g_strdup (_tmp92_));
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_OBJECT_PATH) {
-				const char* _tmp93_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp93_);
-				g_value_init (&_tmp81_, G_TYPE_STRING);
-				g_value_take_string (&_tmp81_, g_strdup (_tmp93_));
-			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_SIGNATURE) {
-				const char* _tmp94_;
-				dbus_message_iter_get_basic (&_tmp82_, &_tmp94_);
-				g_value_init (&_tmp81_, G_TYPE_STRING);
-				g_value_take_string (&_tmp81_, g_strdup (_tmp94_));
-			} else if ((dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp82_) == DBUS_TYPE_STRING)) {
-				const char** _tmp95_;
-				int _tmp95__length;
-				int _tmp95__size;
-				int _tmp95__length1;
-				DBusMessageIter _tmp96_;
-				_tmp95_ = g_new (const char*, 5);
-				_tmp95__length = 0;
-				_tmp95__size = 4;
-				_tmp95__length1 = 0;
-				dbus_message_iter_recurse (&_tmp82_, &_tmp96_);
-				for (; dbus_message_iter_get_arg_type (&_tmp96_); _tmp95__length1++) {
-					const char* _tmp97_;
-					if (_tmp95__size == _tmp95__length) {
-						_tmp95__size = 2 * _tmp95__size;
-						_tmp95_ = g_renew (const char*, _tmp95_, _tmp95__size + 1);
+			const char* _tmp28_;
+			GValue _tmp29_ = {0};
+			DBusMessageIter _tmp30_;
+			dbus_message_iter_recurse (&_tmp26_, &_tmp27_);
+			dbus_message_iter_get_basic (&_tmp27_, &_tmp28_);
+			dbus_message_iter_next (&_tmp27_);
+			_key = g_strdup (_tmp28_);
+			dbus_message_iter_recurse (&_tmp27_, &_tmp30_);
+			if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_BYTE) {
+				guint8 _tmp31_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp31_);
+				g_value_init (&_tmp29_, G_TYPE_UCHAR);
+				g_value_set_uchar (&_tmp29_, _tmp31_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_BOOLEAN) {
+				dbus_bool_t _tmp32_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp32_);
+				g_value_init (&_tmp29_, G_TYPE_BOOLEAN);
+				g_value_set_boolean (&_tmp29_, _tmp32_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_INT16) {
+				dbus_int16_t _tmp33_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp33_);
+				g_value_init (&_tmp29_, G_TYPE_INT);
+				g_value_set_int (&_tmp29_, _tmp33_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_UINT16) {
+				dbus_uint16_t _tmp34_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp34_);
+				g_value_init (&_tmp29_, G_TYPE_UINT);
+				g_value_set_uint (&_tmp29_, _tmp34_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_INT32) {
+				dbus_int32_t _tmp35_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp35_);
+				g_value_init (&_tmp29_, G_TYPE_INT);
+				g_value_set_int (&_tmp29_, _tmp35_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_UINT32) {
+				dbus_uint32_t _tmp36_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp36_);
+				g_value_init (&_tmp29_, G_TYPE_UINT);
+				g_value_set_uint (&_tmp29_, _tmp36_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_INT64) {
+				dbus_int64_t _tmp37_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp37_);
+				g_value_init (&_tmp29_, G_TYPE_INT64);
+				g_value_set_int64 (&_tmp29_, _tmp37_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_UINT64) {
+				dbus_uint64_t _tmp38_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp38_);
+				g_value_init (&_tmp29_, G_TYPE_UINT64);
+				g_value_set_uint64 (&_tmp29_, _tmp38_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_DOUBLE) {
+				double _tmp39_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp39_);
+				g_value_init (&_tmp29_, G_TYPE_DOUBLE);
+				g_value_set_double (&_tmp29_, _tmp39_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_STRING) {
+				const char* _tmp40_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp40_);
+				g_value_init (&_tmp29_, G_TYPE_STRING);
+				g_value_take_string (&_tmp29_, g_strdup (_tmp40_));
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_OBJECT_PATH) {
+				const char* _tmp41_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp41_);
+				g_value_init (&_tmp29_, G_TYPE_STRING);
+				g_value_take_string (&_tmp29_, g_strdup (_tmp41_));
+			} else if (dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_SIGNATURE) {
+				const char* _tmp42_;
+				dbus_message_iter_get_basic (&_tmp30_, &_tmp42_);
+				g_value_init (&_tmp29_, G_TYPE_STRING);
+				g_value_take_string (&_tmp29_, g_strdup (_tmp42_));
+			} else if ((dbus_message_iter_get_arg_type (&_tmp30_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp30_) == DBUS_TYPE_STRING)) {
+				const char** _tmp43_;
+				int _tmp43__length;
+				int _tmp43__size;
+				int _tmp43__length1;
+				DBusMessageIter _tmp44_;
+				_tmp43_ = g_new (const char*, 5);
+				_tmp43__length = 0;
+				_tmp43__size = 4;
+				_tmp43__length1 = 0;
+				dbus_message_iter_recurse (&_tmp30_, &_tmp44_);
+				for (; dbus_message_iter_get_arg_type (&_tmp44_); _tmp43__length1++) {
+					const char* _tmp45_;
+					if (_tmp43__size == _tmp43__length) {
+						_tmp43__size = 2 * _tmp43__size;
+						_tmp43_ = g_renew (const char*, _tmp43_, _tmp43__size + 1);
 					}
-					dbus_message_iter_get_basic (&_tmp96_, &_tmp97_);
-					dbus_message_iter_next (&_tmp96_);
-					_tmp95_[_tmp95__length++] = g_strdup (_tmp97_);
+					dbus_message_iter_get_basic (&_tmp44_, &_tmp45_);
+					dbus_message_iter_next (&_tmp44_);
+					_tmp43_[_tmp43__length++] = g_strdup (_tmp45_);
 				}
-				_tmp95_[_tmp95__length] = NULL;
-				g_value_init (&_tmp81_, G_TYPE_STRV);
-				g_value_take_boxed (&_tmp81_, _tmp95_);
+				_tmp43_[_tmp43__length] = NULL;
+				g_value_init (&_tmp29_, G_TYPE_STRV);
+				g_value_take_boxed (&_tmp29_, _tmp43_);
 			}
-			dbus_message_iter_next (&_tmp79_);
-			_value = g_memdup (&_tmp81_, sizeof (GValue));
-			g_hash_table_insert (_tmp77_, _key, _value);
-			dbus_message_iter_next (&_tmp78_);
+			dbus_message_iter_next (&_tmp27_);
+			_value = g_memdup (&_tmp29_, sizeof (GValue));
+			g_hash_table_insert (_tmp25_, _key, _value);
+			dbus_message_iter_next (&_tmp26_);
 		}
 		dbus_message_iter_next (&subiter);
-		value = _tmp77_;
+		value = _tmp25_;
 		mpris_player_set_Metadata (self, value);
 		_g_hash_table_unref0 (value);
 	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Position") == 0)) {
 		gint32 value;
-		dbus_int32_t _tmp98_;
-		dbus_message_iter_get_basic (&subiter, &_tmp98_);
+		dbus_int32_t _tmp46_;
+		dbus_message_iter_get_basic (&subiter, &_tmp46_);
 		dbus_message_iter_next (&subiter);
-		value = _tmp98_;
+		value = _tmp46_;
 		mpris_player_set_Position (self, value);
 	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "PlaybackStatus") == 0)) {
 		char* value;
-		const char* _tmp99_;
-		dbus_message_iter_get_basic (&subiter, &_tmp99_);
+		const char* _tmp47_;
+		dbus_message_iter_get_basic (&subiter, &_tmp47_);
 		dbus_message_iter_next (&subiter);
-		value = g_strdup (_tmp99_);
+		value = g_strdup (_tmp47_);
 		mpris_player_set_PlaybackStatus (self, value);
 		_g_free0 (value);
 	} else {
@@ -2234,7 +2221,7 @@ static DBusHandlerResult _dbus_mpris_player_property_get_all (MprisPlayer* self,
 	DBusMessage* reply;
 	DBusMessageIter iter, reply_iter, subiter, entry_iter, value_iter;
 	char* interface_name;
-	const char* _tmp100_;
+	const char* _tmp48_;
 	const char* property_name;
 	if (strcmp (dbus_message_get_signature (message), "s")) {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -2242,127 +2229,127 @@ static DBusHandlerResult _dbus_mpris_player_property_get_all (MprisPlayer* self,
 	dbus_message_iter_init (message, &iter);
 	reply = dbus_message_new_method_return (message);
 	dbus_message_iter_init_append (reply, &reply_iter);
-	dbus_message_iter_get_basic (&iter, &_tmp100_);
+	dbus_message_iter_get_basic (&iter, &_tmp48_);
 	dbus_message_iter_next (&iter);
-	interface_name = g_strdup (_tmp100_);
+	interface_name = g_strdup (_tmp48_);
 	if (strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) {
 		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_ARRAY, "{sv}", &subiter);
 		{
 			GHashTable* result;
-			DBusMessageIter _tmp101_, _tmp102_;
-			GHashTableIter _tmp103_;
-			gpointer _tmp104_, _tmp105_;
+			DBusMessageIter _tmp49_, _tmp50_;
+			GHashTableIter _tmp51_;
+			gpointer _tmp52_, _tmp53_;
 			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
 			property_name = "Metadata";
 			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
 			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "a{sv}", &value_iter);
 			result = mpris_player_get_Metadata (self);
-			dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp101_);
-			g_hash_table_iter_init (&_tmp103_, result);
-			while (g_hash_table_iter_next (&_tmp103_, &_tmp104_, &_tmp105_)) {
+			dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp49_);
+			g_hash_table_iter_init (&_tmp51_, result);
+			while (g_hash_table_iter_next (&_tmp51_, &_tmp52_, &_tmp53_)) {
 				char* _key;
 				GValue* _value;
-				const char* _tmp106_;
-				DBusMessageIter _tmp107_;
-				dbus_message_iter_open_container (&_tmp101_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp102_);
-				_key = (char*) _tmp104_;
-				_value = (GValue*) _tmp105_;
-				_tmp106_ = _key;
-				dbus_message_iter_append_basic (&_tmp102_, DBUS_TYPE_STRING, &_tmp106_);
+				const char* _tmp54_;
+				DBusMessageIter _tmp55_;
+				dbus_message_iter_open_container (&_tmp49_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp50_);
+				_key = (char*) _tmp52_;
+				_value = (GValue*) _tmp53_;
+				_tmp54_ = _key;
+				dbus_message_iter_append_basic (&_tmp50_, DBUS_TYPE_STRING, &_tmp54_);
 				if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
-					guint8 _tmp108_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "y", &_tmp107_);
-					_tmp108_ = g_value_get_uchar (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_BYTE, &_tmp108_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					guint8 _tmp56_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "y", &_tmp55_);
+					_tmp56_ = g_value_get_uchar (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_BYTE, &_tmp56_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
-					dbus_bool_t _tmp109_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "b", &_tmp107_);
-					_tmp109_ = g_value_get_boolean (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_BOOLEAN, &_tmp109_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_bool_t _tmp57_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "b", &_tmp55_);
+					_tmp57_ = g_value_get_boolean (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_BOOLEAN, &_tmp57_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
-					dbus_int32_t _tmp110_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "i", &_tmp107_);
-					_tmp110_ = g_value_get_int (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_INT32, &_tmp110_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_int32_t _tmp58_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "i", &_tmp55_);
+					_tmp58_ = g_value_get_int (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_INT32, &_tmp58_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
-					dbus_uint32_t _tmp111_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "u", &_tmp107_);
-					_tmp111_ = g_value_get_uint (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_UINT32, &_tmp111_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_uint32_t _tmp59_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "u", &_tmp55_);
+					_tmp59_ = g_value_get_uint (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_UINT32, &_tmp59_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
-					dbus_int64_t _tmp112_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "x", &_tmp107_);
-					_tmp112_ = g_value_get_int64 (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_INT64, &_tmp112_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_int64_t _tmp60_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "x", &_tmp55_);
+					_tmp60_ = g_value_get_int64 (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_INT64, &_tmp60_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
-					dbus_uint64_t _tmp113_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "t", &_tmp107_);
-					_tmp113_ = g_value_get_uint64 (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_UINT64, &_tmp113_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_uint64_t _tmp61_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "t", &_tmp55_);
+					_tmp61_ = g_value_get_uint64 (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_UINT64, &_tmp61_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
-					double _tmp114_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "d", &_tmp107_);
-					_tmp114_ = g_value_get_double (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_DOUBLE, &_tmp114_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					double _tmp62_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "d", &_tmp55_);
+					_tmp62_ = g_value_get_double (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_DOUBLE, &_tmp62_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
-					const char* _tmp115_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "s", &_tmp107_);
-					_tmp115_ = g_value_get_string (_value);
-					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_STRING, &_tmp115_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					const char* _tmp63_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "s", &_tmp55_);
+					_tmp63_ = g_value_get_string (_value);
+					dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_STRING, &_tmp63_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
-					const char** _tmp116_;
-					DBusMessageIter _tmp117_;
-					int _tmp118_;
-					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "as", &_tmp107_);
-					_tmp116_ = g_value_get_boxed (_value);
-					dbus_message_iter_open_container (&_tmp107_, DBUS_TYPE_ARRAY, "s", &_tmp117_);
-					for (_tmp118_ = 0; _tmp118_ < g_strv_length (g_value_get_boxed (_value)); _tmp118_++) {
-						const char* _tmp119_;
-						_tmp119_ = *_tmp116_;
-						dbus_message_iter_append_basic (&_tmp117_, DBUS_TYPE_STRING, &_tmp119_);
-						_tmp116_++;
+					const char** _tmp64_;
+					DBusMessageIter _tmp65_;
+					int _tmp66_;
+					dbus_message_iter_open_container (&_tmp50_, DBUS_TYPE_VARIANT, "as", &_tmp55_);
+					_tmp64_ = g_value_get_boxed (_value);
+					dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_ARRAY, "s", &_tmp65_);
+					for (_tmp66_ = 0; _tmp66_ < g_strv_length (g_value_get_boxed (_value)); _tmp66_++) {
+						const char* _tmp67_;
+						_tmp67_ = *_tmp64_;
+						dbus_message_iter_append_basic (&_tmp65_, DBUS_TYPE_STRING, &_tmp67_);
+						_tmp64_++;
 					}
-					dbus_message_iter_close_container (&_tmp107_, &_tmp117_);
-					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+					dbus_message_iter_close_container (&_tmp55_, &_tmp65_);
+					dbus_message_iter_close_container (&_tmp50_, &_tmp55_);
 				}
-				dbus_message_iter_close_container (&_tmp101_, &_tmp102_);
+				dbus_message_iter_close_container (&_tmp49_, &_tmp50_);
 			}
-			dbus_message_iter_close_container (&value_iter, &_tmp101_);
+			dbus_message_iter_close_container (&value_iter, &_tmp49_);
 			_g_hash_table_unref0 (result);
 			dbus_message_iter_close_container (&entry_iter, &value_iter);
 			dbus_message_iter_close_container (&subiter, &entry_iter);
 		}
 		{
 			gint32 result;
-			dbus_int32_t _tmp120_;
+			dbus_int32_t _tmp68_;
 			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
 			property_name = "Position";
 			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
 			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "i", &value_iter);
 			result = mpris_player_get_Position (self);
-			_tmp120_ = result;
-			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_INT32, &_tmp120_);
+			_tmp68_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_INT32, &_tmp68_);
 			dbus_message_iter_close_container (&entry_iter, &value_iter);
 			dbus_message_iter_close_container (&subiter, &entry_iter);
 		}
 		{
 			char* result;
-			const char* _tmp121_;
+			const char* _tmp69_;
 			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
 			property_name = "PlaybackStatus";
 			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
 			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "s", &value_iter);
 			result = mpris_player_get_PlaybackStatus (self);
-			_tmp121_ = result;
-			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &_tmp121_);
+			_tmp69_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &_tmp69_);
 			_g_free0 (result);
 			dbus_message_iter_close_container (&entry_iter, &value_iter);
 			dbus_message_iter_close_container (&subiter, &entry_iter);
@@ -2387,21 +2374,21 @@ static DBusHandlerResult _dbus_mpris_player_SetPosition (MprisPlayer* self, DBus
 	DBusMessageIter iter;
 	GError* error;
 	char* path = NULL;
-	const char* _tmp122_;
+	const char* _tmp70_;
 	gint64 pos = 0LL;
-	dbus_int64_t _tmp123_;
+	dbus_int64_t _tmp71_;
 	DBusMessage* reply;
 	error = NULL;
 	if (strcmp (dbus_message_get_signature (message), "ox")) {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 	dbus_message_iter_init (message, &iter);
-	dbus_message_iter_get_basic (&iter, &_tmp122_);
+	dbus_message_iter_get_basic (&iter, &_tmp70_);
 	dbus_message_iter_next (&iter);
-	path = g_strdup (_tmp122_);
-	dbus_message_iter_get_basic (&iter, &_tmp123_);
+	path = g_strdup (_tmp70_);
+	dbus_message_iter_get_basic (&iter, &_tmp71_);
 	dbus_message_iter_next (&iter);
-	pos = _tmp123_;
+	pos = _tmp71_;
 	mpris_player_SetPosition (self, path, pos, &error);
 	if (error) {
 		if (error->domain == DBUS_GERROR) {
@@ -3078,12 +3065,12 @@ static void _dbus_mpris_player_seeked (GObject* _sender, gint64 new_position, DB
 	const char * _path;
 	DBusMessage *_message;
 	DBusMessageIter _iter;
-	dbus_int64_t _tmp124_;
+	dbus_int64_t _tmp72_;
 	_path = g_object_get_data (_sender, "dbus_object_path");
 	_message = dbus_message_new_signal (_path, "org.mpris.MediaPlayer2.Player", "Seeked");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp124_ = new_position;
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp124_);
+	_tmp72_ = new_position;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp72_);
 	dbus_connection_send (_connection, _message, NULL);
 	dbus_message_unref (_message);
 }
@@ -3155,15 +3142,15 @@ static GObject* mpris_player_dbus_proxy_construct (GType gtype, guint n_properti
 static void _dbus_handle_mpris_player_seeked (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
 	DBusMessageIter iter;
 	gint64 new_position = 0LL;
-	dbus_int64_t _tmp125_;
+	dbus_int64_t _tmp32_;
 	DBusMessage* reply;
 	if (strcmp (dbus_message_get_signature (message), "x")) {
 		return;
 	}
 	dbus_message_iter_init (message, &iter);
-	dbus_message_iter_get_basic (&iter, &_tmp125_);
+	dbus_message_iter_get_basic (&iter, &_tmp32_);
 	dbus_message_iter_next (&iter);
-	new_position = _tmp125_;
+	new_position = _tmp32_;
 	g_signal_emit_by_name (self, "seeked", new_position);
 }
 
@@ -3210,18 +3197,18 @@ static void mpris_player_dbus_proxy_SetPosition (MprisPlayer* self, const char*
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter;
-	const char* _tmp126_;
-	dbus_int64_t _tmp127_;
+	const char* _tmp33_;
+	dbus_int64_t _tmp34_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "SetPosition");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp126_ = path;
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_OBJECT_PATH, &_tmp126_);
-	_tmp127_ = pos;
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp127_);
+	_tmp33_ = path;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_OBJECT_PATH, &_tmp33_);
+	_tmp34_ = pos;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp34_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -3231,74 +3218,74 @@ static void mpris_player_dbus_proxy_SetPosition (MprisPlayer* self, const char*
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp128_;
+			const char* _tmp35_;
 			_edomain = DBUS_GERROR;
-			_tmp128_ = _dbus_error.name + 27;
-			if (strcmp (_tmp128_, "Failed") == 0) {
+			_tmp35_ = _dbus_error.name + 27;
+			if (strcmp (_tmp35_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp128_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp35_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp128_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp35_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp128_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp35_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp128_, "NoReply") == 0) {
+			} else if (strcmp (_tmp35_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp128_, "IOError") == 0) {
+			} else if (strcmp (_tmp35_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp128_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp35_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp128_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp35_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp128_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp35_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp128_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp35_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp128_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp35_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp128_, "NoServer") == 0) {
+			} else if (strcmp (_tmp35_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp128_, "Timeout") == 0) {
+			} else if (strcmp (_tmp35_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp128_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp35_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp128_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp35_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp128_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp35_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp128_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp35_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp128_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp35_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp128_, "FileExists") == 0) {
+			} else if (strcmp (_tmp35_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp128_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp35_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp128_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp35_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp128_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp35_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp128_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp35_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp128_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp35_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp128_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp35_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp128_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp35_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp128_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp35_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp128_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp35_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp128_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp35_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp128_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp35_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp128_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp35_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp128_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp35_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp128_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp35_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -3336,74 +3323,74 @@ static void mpris_player_dbus_proxy_PlayPause (MprisPlayer* self, GError** error
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp129_;
+			const char* _tmp36_;
 			_edomain = DBUS_GERROR;
-			_tmp129_ = _dbus_error.name + 27;
-			if (strcmp (_tmp129_, "Failed") == 0) {
+			_tmp36_ = _dbus_error.name + 27;
+			if (strcmp (_tmp36_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp129_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp36_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp129_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp36_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp129_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp36_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp129_, "NoReply") == 0) {
+			} else if (strcmp (_tmp36_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp129_, "IOError") == 0) {
+			} else if (strcmp (_tmp36_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp129_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp36_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp129_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp36_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp129_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp36_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp129_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp36_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp129_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp36_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp129_, "NoServer") == 0) {
+			} else if (strcmp (_tmp36_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp129_, "Timeout") == 0) {
+			} else if (strcmp (_tmp36_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp129_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp36_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp129_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp36_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp129_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp36_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp129_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp36_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp129_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp36_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp129_, "FileExists") == 0) {
+			} else if (strcmp (_tmp36_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp129_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp36_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp129_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp36_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp129_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp36_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp129_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp36_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp129_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp36_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp129_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp36_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp129_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp36_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp129_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp36_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp129_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp36_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp129_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp36_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp129_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp36_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp129_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp36_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp129_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp36_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp129_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp36_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -3441,74 +3428,74 @@ static void mpris_player_dbus_proxy_Pause (MprisPlayer* self, GError** error) {
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp130_;
+			const char* _tmp37_;
 			_edomain = DBUS_GERROR;
-			_tmp130_ = _dbus_error.name + 27;
-			if (strcmp (_tmp130_, "Failed") == 0) {
+			_tmp37_ = _dbus_error.name + 27;
+			if (strcmp (_tmp37_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp130_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp37_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp130_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp37_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp130_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp37_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp130_, "NoReply") == 0) {
+			} else if (strcmp (_tmp37_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp130_, "IOError") == 0) {
+			} else if (strcmp (_tmp37_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp130_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp37_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp130_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp37_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp130_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp37_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp130_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp37_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp130_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp37_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp130_, "NoServer") == 0) {
+			} else if (strcmp (_tmp37_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp130_, "Timeout") == 0) {
+			} else if (strcmp (_tmp37_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp130_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp37_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp130_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp37_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp130_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp37_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp130_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp37_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp130_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp37_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp130_, "FileExists") == 0) {
+			} else if (strcmp (_tmp37_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp130_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp37_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp130_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp37_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp130_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp37_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp130_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp37_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp130_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp37_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp130_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp37_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp130_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp37_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp130_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp37_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp130_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp37_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp130_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp37_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp130_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp37_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp130_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp37_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp130_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp37_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp130_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp37_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -3546,74 +3533,74 @@ static void mpris_player_dbus_proxy_Next (MprisPlayer* self, GError** error) {
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp131_;
+			const char* _tmp38_;
 			_edomain = DBUS_GERROR;
-			_tmp131_ = _dbus_error.name + 27;
-			if (strcmp (_tmp131_, "Failed") == 0) {
+			_tmp38_ = _dbus_error.name + 27;
+			if (strcmp (_tmp38_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp131_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp38_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp131_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp38_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp131_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp38_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp131_, "NoReply") == 0) {
+			} else if (strcmp (_tmp38_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp131_, "IOError") == 0) {
+			} else if (strcmp (_tmp38_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp131_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp38_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp131_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp38_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp131_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp38_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp131_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp38_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp131_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp38_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp131_, "NoServer") == 0) {
+			} else if (strcmp (_tmp38_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp131_, "Timeout") == 0) {
+			} else if (strcmp (_tmp38_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp131_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp38_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp131_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp38_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp131_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp38_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp131_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp38_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp131_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp38_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp131_, "FileExists") == 0) {
+			} else if (strcmp (_tmp38_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp131_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp38_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp131_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp38_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp131_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp38_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp131_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp38_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp131_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp38_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp131_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp38_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp131_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp38_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp131_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp38_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp131_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp38_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp131_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp38_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp131_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp38_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp131_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp38_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp131_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp38_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp131_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp38_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -3651,74 +3638,74 @@ static void mpris_player_dbus_proxy_Previous (MprisPlayer* self, GError** error)
 		GQuark _edomain;
 		gint _ecode;
 		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
-			const char* _tmp132_;
+			const char* _tmp39_;
 			_edomain = DBUS_GERROR;
-			_tmp132_ = _dbus_error.name + 27;
-			if (strcmp (_tmp132_, "Failed") == 0) {
+			_tmp39_ = _dbus_error.name + 27;
+			if (strcmp (_tmp39_, "Failed") == 0) {
 				_ecode = DBUS_GERROR_FAILED;
-			} else if (strcmp (_tmp132_, "NoMemory") == 0) {
+			} else if (strcmp (_tmp39_, "NoMemory") == 0) {
 				_ecode = DBUS_GERROR_NO_MEMORY;
-			} else if (strcmp (_tmp132_, "ServiceUnknown") == 0) {
+			} else if (strcmp (_tmp39_, "ServiceUnknown") == 0) {
 				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
-			} else if (strcmp (_tmp132_, "NameHasNoOwner") == 0) {
+			} else if (strcmp (_tmp39_, "NameHasNoOwner") == 0) {
 				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
-			} else if (strcmp (_tmp132_, "NoReply") == 0) {
+			} else if (strcmp (_tmp39_, "NoReply") == 0) {
 				_ecode = DBUS_GERROR_NO_REPLY;
-			} else if (strcmp (_tmp132_, "IOError") == 0) {
+			} else if (strcmp (_tmp39_, "IOError") == 0) {
 				_ecode = DBUS_GERROR_IO_ERROR;
-			} else if (strcmp (_tmp132_, "BadAddress") == 0) {
+			} else if (strcmp (_tmp39_, "BadAddress") == 0) {
 				_ecode = DBUS_GERROR_BAD_ADDRESS;
-			} else if (strcmp (_tmp132_, "NotSupported") == 0) {
+			} else if (strcmp (_tmp39_, "NotSupported") == 0) {
 				_ecode = DBUS_GERROR_NOT_SUPPORTED;
-			} else if (strcmp (_tmp132_, "LimitsExceeded") == 0) {
+			} else if (strcmp (_tmp39_, "LimitsExceeded") == 0) {
 				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
-			} else if (strcmp (_tmp132_, "AccessDenied") == 0) {
+			} else if (strcmp (_tmp39_, "AccessDenied") == 0) {
 				_ecode = DBUS_GERROR_ACCESS_DENIED;
-			} else if (strcmp (_tmp132_, "AuthFailed") == 0) {
+			} else if (strcmp (_tmp39_, "AuthFailed") == 0) {
 				_ecode = DBUS_GERROR_AUTH_FAILED;
-			} else if (strcmp (_tmp132_, "NoServer") == 0) {
+			} else if (strcmp (_tmp39_, "NoServer") == 0) {
 				_ecode = DBUS_GERROR_NO_SERVER;
-			} else if (strcmp (_tmp132_, "Timeout") == 0) {
+			} else if (strcmp (_tmp39_, "Timeout") == 0) {
 				_ecode = DBUS_GERROR_TIMEOUT;
-			} else if (strcmp (_tmp132_, "NoNetwork") == 0) {
+			} else if (strcmp (_tmp39_, "NoNetwork") == 0) {
 				_ecode = DBUS_GERROR_NO_NETWORK;
-			} else if (strcmp (_tmp132_, "AddressInUse") == 0) {
+			} else if (strcmp (_tmp39_, "AddressInUse") == 0) {
 				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
-			} else if (strcmp (_tmp132_, "Disconnected") == 0) {
+			} else if (strcmp (_tmp39_, "Disconnected") == 0) {
 				_ecode = DBUS_GERROR_DISCONNECTED;
-			} else if (strcmp (_tmp132_, "InvalidArgs") == 0) {
+			} else if (strcmp (_tmp39_, "InvalidArgs") == 0) {
 				_ecode = DBUS_GERROR_INVALID_ARGS;
-			} else if (strcmp (_tmp132_, "FileNotFound") == 0) {
+			} else if (strcmp (_tmp39_, "FileNotFound") == 0) {
 				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
-			} else if (strcmp (_tmp132_, "FileExists") == 0) {
+			} else if (strcmp (_tmp39_, "FileExists") == 0) {
 				_ecode = DBUS_GERROR_FILE_EXISTS;
-			} else if (strcmp (_tmp132_, "UnknownMethod") == 0) {
+			} else if (strcmp (_tmp39_, "UnknownMethod") == 0) {
 				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
-			} else if (strcmp (_tmp132_, "TimedOut") == 0) {
+			} else if (strcmp (_tmp39_, "TimedOut") == 0) {
 				_ecode = DBUS_GERROR_TIMED_OUT;
-			} else if (strcmp (_tmp132_, "MatchRuleNotFound") == 0) {
+			} else if (strcmp (_tmp39_, "MatchRuleNotFound") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
-			} else if (strcmp (_tmp132_, "MatchRuleInvalid") == 0) {
+			} else if (strcmp (_tmp39_, "MatchRuleInvalid") == 0) {
 				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
-			} else if (strcmp (_tmp132_, "Spawn.ExecFailed") == 0) {
+			} else if (strcmp (_tmp39_, "Spawn.ExecFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
-			} else if (strcmp (_tmp132_, "Spawn.ForkFailed") == 0) {
+			} else if (strcmp (_tmp39_, "Spawn.ForkFailed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
-			} else if (strcmp (_tmp132_, "Spawn.ChildExited") == 0) {
+			} else if (strcmp (_tmp39_, "Spawn.ChildExited") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
-			} else if (strcmp (_tmp132_, "Spawn.ChildSignaled") == 0) {
+			} else if (strcmp (_tmp39_, "Spawn.ChildSignaled") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
-			} else if (strcmp (_tmp132_, "Spawn.Failed") == 0) {
+			} else if (strcmp (_tmp39_, "Spawn.Failed") == 0) {
 				_ecode = DBUS_GERROR_SPAWN_FAILED;
-			} else if (strcmp (_tmp132_, "UnixProcessIdUnknown") == 0) {
+			} else if (strcmp (_tmp39_, "UnixProcessIdUnknown") == 0) {
 				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
-			} else if (strcmp (_tmp132_, "InvalidSignature") == 0) {
+			} else if (strcmp (_tmp39_, "InvalidSignature") == 0) {
 				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
-			} else if (strcmp (_tmp132_, "InvalidFileContent") == 0) {
+			} else if (strcmp (_tmp39_, "InvalidFileContent") == 0) {
 				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
-			} else if (strcmp (_tmp132_, "SELinuxSecurityContextUnknown") == 0) {
+			} else if (strcmp (_tmp39_, "SELinuxSecurityContextUnknown") == 0) {
 				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
-			} else if (strcmp (_tmp132_, "RemoteException") == 0) {
+			} else if (strcmp (_tmp39_, "RemoteException") == 0) {
 				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
 			}
 		}
@@ -3741,21 +3728,21 @@ static GHashTable* mpris_player_dbus_proxy_get_Metadata (MprisPlayer* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp133_;
-	const char* _tmp134_;
+	const char* _tmp40_;
+	const char* _tmp41_;
 	GHashTable* _result;
-	GHashTable* _tmp135_;
-	DBusMessageIter _tmp136_;
-	DBusMessageIter _tmp137_;
+	GHashTable* _tmp42_;
+	DBusMessageIter _tmp43_;
+	DBusMessageIter _tmp44_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return NULL;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp133_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp133_);
-	_tmp134_ = "Metadata";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp134_);
+	_tmp40_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp40_);
+	_tmp41_ = "Metadata";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp41_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -3778,111 +3765,111 @@ static GHashTable* mpris_player_dbus_proxy_get_Metadata (MprisPlayer* self) {
 		dbus_message_unref (_reply);
 		return NULL;
 	}
-	_tmp135_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-	dbus_message_iter_recurse (&_subiter, &_tmp136_);
-	while (dbus_message_iter_get_arg_type (&_tmp136_)) {
+	_tmp42_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	dbus_message_iter_recurse (&_subiter, &_tmp43_);
+	while (dbus_message_iter_get_arg_type (&_tmp43_)) {
 		char* _key;
 		GValue* _value;
-		const char* _tmp138_;
-		GValue _tmp139_ = {0};
-		DBusMessageIter _tmp140_;
-		dbus_message_iter_recurse (&_tmp136_, &_tmp137_);
-		dbus_message_iter_get_basic (&_tmp137_, &_tmp138_);
-		dbus_message_iter_next (&_tmp137_);
-		_key = g_strdup (_tmp138_);
-		dbus_message_iter_recurse (&_tmp137_, &_tmp140_);
-		if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_BYTE) {
-			guint8 _tmp141_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp141_);
-			g_value_init (&_tmp139_, G_TYPE_UCHAR);
-			g_value_set_uchar (&_tmp139_, _tmp141_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_BOOLEAN) {
-			dbus_bool_t _tmp142_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp142_);
-			g_value_init (&_tmp139_, G_TYPE_BOOLEAN);
-			g_value_set_boolean (&_tmp139_, _tmp142_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT16) {
-			dbus_int16_t _tmp143_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp143_);
-			g_value_init (&_tmp139_, G_TYPE_INT);
-			g_value_set_int (&_tmp139_, _tmp143_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT16) {
-			dbus_uint16_t _tmp144_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp144_);
-			g_value_init (&_tmp139_, G_TYPE_UINT);
-			g_value_set_uint (&_tmp139_, _tmp144_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT32) {
-			dbus_int32_t _tmp145_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp145_);
-			g_value_init (&_tmp139_, G_TYPE_INT);
-			g_value_set_int (&_tmp139_, _tmp145_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT32) {
-			dbus_uint32_t _tmp146_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp146_);
-			g_value_init (&_tmp139_, G_TYPE_UINT);
-			g_value_set_uint (&_tmp139_, _tmp146_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT64) {
-			dbus_int64_t _tmp147_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp147_);
-			g_value_init (&_tmp139_, G_TYPE_INT64);
-			g_value_set_int64 (&_tmp139_, _tmp147_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT64) {
-			dbus_uint64_t _tmp148_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp148_);
-			g_value_init (&_tmp139_, G_TYPE_UINT64);
-			g_value_set_uint64 (&_tmp139_, _tmp148_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_DOUBLE) {
-			double _tmp149_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp149_);
-			g_value_init (&_tmp139_, G_TYPE_DOUBLE);
-			g_value_set_double (&_tmp139_, _tmp149_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_STRING) {
-			const char* _tmp150_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp150_);
-			g_value_init (&_tmp139_, G_TYPE_STRING);
-			g_value_take_string (&_tmp139_, g_strdup (_tmp150_));
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_OBJECT_PATH) {
-			const char* _tmp151_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp151_);
-			g_value_init (&_tmp139_, G_TYPE_STRING);
-			g_value_take_string (&_tmp139_, g_strdup (_tmp151_));
-		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_SIGNATURE) {
-			const char* _tmp152_;
-			dbus_message_iter_get_basic (&_tmp140_, &_tmp152_);
-			g_value_init (&_tmp139_, G_TYPE_STRING);
-			g_value_take_string (&_tmp139_, g_strdup (_tmp152_));
-		} else if ((dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp140_) == DBUS_TYPE_STRING)) {
-			const char** _tmp153_;
-			int _tmp153__length;
-			int _tmp153__size;
-			int _tmp153__length1;
-			DBusMessageIter _tmp154_;
-			_tmp153_ = g_new (const char*, 5);
-			_tmp153__length = 0;
-			_tmp153__size = 4;
-			_tmp153__length1 = 0;
-			dbus_message_iter_recurse (&_tmp140_, &_tmp154_);
-			for (; dbus_message_iter_get_arg_type (&_tmp154_); _tmp153__length1++) {
-				const char* _tmp155_;
-				if (_tmp153__size == _tmp153__length) {
-					_tmp153__size = 2 * _tmp153__size;
-					_tmp153_ = g_renew (const char*, _tmp153_, _tmp153__size + 1);
+		const char* _tmp45_;
+		GValue _tmp46_ = {0};
+		DBusMessageIter _tmp47_;
+		dbus_message_iter_recurse (&_tmp43_, &_tmp44_);
+		dbus_message_iter_get_basic (&_tmp44_, &_tmp45_);
+		dbus_message_iter_next (&_tmp44_);
+		_key = g_strdup (_tmp45_);
+		dbus_message_iter_recurse (&_tmp44_, &_tmp47_);
+		if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_BYTE) {
+			guint8 _tmp48_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp48_);
+			g_value_init (&_tmp46_, G_TYPE_UCHAR);
+			g_value_set_uchar (&_tmp46_, _tmp48_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp49_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp49_);
+			g_value_init (&_tmp46_, G_TYPE_BOOLEAN);
+			g_value_set_boolean (&_tmp46_, _tmp49_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_INT16) {
+			dbus_int16_t _tmp50_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp50_);
+			g_value_init (&_tmp46_, G_TYPE_INT);
+			g_value_set_int (&_tmp46_, _tmp50_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_UINT16) {
+			dbus_uint16_t _tmp51_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp51_);
+			g_value_init (&_tmp46_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp46_, _tmp51_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_INT32) {
+			dbus_int32_t _tmp52_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp52_);
+			g_value_init (&_tmp46_, G_TYPE_INT);
+			g_value_set_int (&_tmp46_, _tmp52_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_UINT32) {
+			dbus_uint32_t _tmp53_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp53_);
+			g_value_init (&_tmp46_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp46_, _tmp53_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_INT64) {
+			dbus_int64_t _tmp54_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp54_);
+			g_value_init (&_tmp46_, G_TYPE_INT64);
+			g_value_set_int64 (&_tmp46_, _tmp54_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_UINT64) {
+			dbus_uint64_t _tmp55_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp55_);
+			g_value_init (&_tmp46_, G_TYPE_UINT64);
+			g_value_set_uint64 (&_tmp46_, _tmp55_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_DOUBLE) {
+			double _tmp56_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp56_);
+			g_value_init (&_tmp46_, G_TYPE_DOUBLE);
+			g_value_set_double (&_tmp46_, _tmp56_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_STRING) {
+			const char* _tmp57_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp57_);
+			g_value_init (&_tmp46_, G_TYPE_STRING);
+			g_value_take_string (&_tmp46_, g_strdup (_tmp57_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_OBJECT_PATH) {
+			const char* _tmp58_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp58_);
+			g_value_init (&_tmp46_, G_TYPE_STRING);
+			g_value_take_string (&_tmp46_, g_strdup (_tmp58_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_SIGNATURE) {
+			const char* _tmp59_;
+			dbus_message_iter_get_basic (&_tmp47_, &_tmp59_);
+			g_value_init (&_tmp46_, G_TYPE_STRING);
+			g_value_take_string (&_tmp46_, g_strdup (_tmp59_));
+		} else if ((dbus_message_iter_get_arg_type (&_tmp47_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp47_) == DBUS_TYPE_STRING)) {
+			const char** _tmp60_;
+			int _tmp60__length;
+			int _tmp60__size;
+			int _tmp60__length1;
+			DBusMessageIter _tmp61_;
+			_tmp60_ = g_new (const char*, 5);
+			_tmp60__length = 0;
+			_tmp60__size = 4;
+			_tmp60__length1 = 0;
+			dbus_message_iter_recurse (&_tmp47_, &_tmp61_);
+			for (; dbus_message_iter_get_arg_type (&_tmp61_); _tmp60__length1++) {
+				const char* _tmp62_;
+				if (_tmp60__size == _tmp60__length) {
+					_tmp60__size = 2 * _tmp60__size;
+					_tmp60_ = g_renew (const char*, _tmp60_, _tmp60__size + 1);
 				}
-				dbus_message_iter_get_basic (&_tmp154_, &_tmp155_);
-				dbus_message_iter_next (&_tmp154_);
-				_tmp153_[_tmp153__length++] = g_strdup (_tmp155_);
+				dbus_message_iter_get_basic (&_tmp61_, &_tmp62_);
+				dbus_message_iter_next (&_tmp61_);
+				_tmp60_[_tmp60__length++] = g_strdup (_tmp62_);
 			}
-			_tmp153_[_tmp153__length] = NULL;
-			g_value_init (&_tmp139_, G_TYPE_STRV);
-			g_value_take_boxed (&_tmp139_, _tmp153_);
+			_tmp60_[_tmp60__length] = NULL;
+			g_value_init (&_tmp46_, G_TYPE_STRV);
+			g_value_take_boxed (&_tmp46_, _tmp60_);
 		}
-		dbus_message_iter_next (&_tmp137_);
-		_value = g_memdup (&_tmp139_, sizeof (GValue));
-		g_hash_table_insert (_tmp135_, _key, _value);
-		dbus_message_iter_next (&_tmp136_);
+		dbus_message_iter_next (&_tmp44_);
+		_value = g_memdup (&_tmp46_, sizeof (GValue));
+		g_hash_table_insert (_tmp42_, _key, _value);
+		dbus_message_iter_next (&_tmp43_);
 	}
 	dbus_message_iter_next (&_subiter);
-	_result = _tmp135_;
+	_result = _tmp42_;
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -3893,100 +3880,100 @@ static void mpris_player_dbus_proxy_set_Metadata (MprisPlayer* self, GHashTable*
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp156_;
-	const char* _tmp157_;
-	DBusMessageIter _tmp158_, _tmp159_;
-	GHashTableIter _tmp160_;
-	gpointer _tmp161_, _tmp162_;
+	const char* _tmp63_;
+	const char* _tmp64_;
+	DBusMessageIter _tmp65_, _tmp66_;
+	GHashTableIter _tmp67_;
+	gpointer _tmp68_, _tmp69_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp156_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp156_);
-	_tmp157_ = "Metadata";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp157_);
+	_tmp63_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp63_);
+	_tmp64_ = "Metadata";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp64_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "a{sv}", &_subiter);
-	dbus_message_iter_open_container (&_subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp158_);
-	g_hash_table_iter_init (&_tmp160_, value);
-	while (g_hash_table_iter_next (&_tmp160_, &_tmp161_, &_tmp162_)) {
+	dbus_message_iter_open_container (&_subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp65_);
+	g_hash_table_iter_init (&_tmp67_, value);
+	while (g_hash_table_iter_next (&_tmp67_, &_tmp68_, &_tmp69_)) {
 		char* _key;
 		GValue* _value;
-		const char* _tmp163_;
-		DBusMessageIter _tmp164_;
-		dbus_message_iter_open_container (&_tmp158_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp159_);
-		_key = (char*) _tmp161_;
-		_value = (GValue*) _tmp162_;
-		_tmp163_ = _key;
-		dbus_message_iter_append_basic (&_tmp159_, DBUS_TYPE_STRING, &_tmp163_);
+		const char* _tmp70_;
+		DBusMessageIter _tmp71_;
+		dbus_message_iter_open_container (&_tmp65_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp66_);
+		_key = (char*) _tmp68_;
+		_value = (GValue*) _tmp69_;
+		_tmp70_ = _key;
+		dbus_message_iter_append_basic (&_tmp66_, DBUS_TYPE_STRING, &_tmp70_);
 		if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
-			guint8 _tmp165_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "y", &_tmp164_);
-			_tmp165_ = g_value_get_uchar (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_BYTE, &_tmp165_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			guint8 _tmp72_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "y", &_tmp71_);
+			_tmp72_ = g_value_get_uchar (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_BYTE, &_tmp72_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
-			dbus_bool_t _tmp166_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "b", &_tmp164_);
-			_tmp166_ = g_value_get_boolean (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_BOOLEAN, &_tmp166_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_bool_t _tmp73_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "b", &_tmp71_);
+			_tmp73_ = g_value_get_boolean (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_BOOLEAN, &_tmp73_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
-			dbus_int32_t _tmp167_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "i", &_tmp164_);
-			_tmp167_ = g_value_get_int (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_INT32, &_tmp167_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_int32_t _tmp74_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "i", &_tmp71_);
+			_tmp74_ = g_value_get_int (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_INT32, &_tmp74_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
-			dbus_uint32_t _tmp168_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "u", &_tmp164_);
-			_tmp168_ = g_value_get_uint (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_UINT32, &_tmp168_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_uint32_t _tmp75_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "u", &_tmp71_);
+			_tmp75_ = g_value_get_uint (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_UINT32, &_tmp75_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
-			dbus_int64_t _tmp169_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "x", &_tmp164_);
-			_tmp169_ = g_value_get_int64 (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_INT64, &_tmp169_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_int64_t _tmp76_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "x", &_tmp71_);
+			_tmp76_ = g_value_get_int64 (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_INT64, &_tmp76_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
-			dbus_uint64_t _tmp170_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "t", &_tmp164_);
-			_tmp170_ = g_value_get_uint64 (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_UINT64, &_tmp170_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_uint64_t _tmp77_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "t", &_tmp71_);
+			_tmp77_ = g_value_get_uint64 (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_UINT64, &_tmp77_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
-			double _tmp171_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "d", &_tmp164_);
-			_tmp171_ = g_value_get_double (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_DOUBLE, &_tmp171_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			double _tmp78_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "d", &_tmp71_);
+			_tmp78_ = g_value_get_double (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_DOUBLE, &_tmp78_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
-			const char* _tmp172_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "s", &_tmp164_);
-			_tmp172_ = g_value_get_string (_value);
-			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_STRING, &_tmp172_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			const char* _tmp79_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "s", &_tmp71_);
+			_tmp79_ = g_value_get_string (_value);
+			dbus_message_iter_append_basic (&_tmp71_, DBUS_TYPE_STRING, &_tmp79_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
-			const char** _tmp173_;
-			DBusMessageIter _tmp174_;
-			int _tmp175_;
-			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "as", &_tmp164_);
-			_tmp173_ = g_value_get_boxed (_value);
-			dbus_message_iter_open_container (&_tmp164_, DBUS_TYPE_ARRAY, "s", &_tmp174_);
-			for (_tmp175_ = 0; _tmp175_ < g_strv_length (g_value_get_boxed (_value)); _tmp175_++) {
-				const char* _tmp176_;
-				_tmp176_ = *_tmp173_;
-				dbus_message_iter_append_basic (&_tmp174_, DBUS_TYPE_STRING, &_tmp176_);
-				_tmp173_++;
+			const char** _tmp80_;
+			DBusMessageIter _tmp81_;
+			int _tmp82_;
+			dbus_message_iter_open_container (&_tmp66_, DBUS_TYPE_VARIANT, "as", &_tmp71_);
+			_tmp80_ = g_value_get_boxed (_value);
+			dbus_message_iter_open_container (&_tmp71_, DBUS_TYPE_ARRAY, "s", &_tmp81_);
+			for (_tmp82_ = 0; _tmp82_ < g_strv_length (g_value_get_boxed (_value)); _tmp82_++) {
+				const char* _tmp83_;
+				_tmp83_ = *_tmp80_;
+				dbus_message_iter_append_basic (&_tmp81_, DBUS_TYPE_STRING, &_tmp83_);
+				_tmp80_++;
 			}
-			dbus_message_iter_close_container (&_tmp164_, &_tmp174_);
-			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+			dbus_message_iter_close_container (&_tmp71_, &_tmp81_);
+			dbus_message_iter_close_container (&_tmp66_, &_tmp71_);
 		}
-		dbus_message_iter_close_container (&_tmp158_, &_tmp159_);
+		dbus_message_iter_close_container (&_tmp65_, &_tmp66_);
 	}
-	dbus_message_iter_close_container (&_subiter, &_tmp158_);
+	dbus_message_iter_close_container (&_subiter, &_tmp65_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -4013,19 +4000,19 @@ static gint32 mpris_player_dbus_proxy_get_Position (MprisPlayer* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp177_;
-	const char* _tmp178_;
+	const char* _tmp84_;
+	const char* _tmp85_;
 	gint32 _result;
-	dbus_int32_t _tmp179_;
+	dbus_int32_t _tmp86_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return 0;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp177_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp177_);
-	_tmp178_ = "Position";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp178_);
+	_tmp84_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp84_);
+	_tmp85_ = "Position";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp85_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -4048,9 +4035,9 @@ static gint32 mpris_player_dbus_proxy_get_Position (MprisPlayer* self) {
 		dbus_message_unref (_reply);
 		return 0;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp179_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp86_);
 	dbus_message_iter_next (&_subiter);
-	_result = _tmp179_;
+	_result = _tmp86_;
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -4061,21 +4048,21 @@ static void mpris_player_dbus_proxy_set_Position (MprisPlayer* self, gint32 valu
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp180_;
-	const char* _tmp181_;
-	dbus_int32_t _tmp182_;
+	const char* _tmp87_;
+	const char* _tmp88_;
+	dbus_int32_t _tmp89_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp180_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp180_);
-	_tmp181_ = "Position";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp181_);
+	_tmp87_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp87_);
+	_tmp88_ = "Position";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp88_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "i", &_subiter);
-	_tmp182_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_INT32, &_tmp182_);
+	_tmp89_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_INT32, &_tmp89_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -4102,19 +4089,19 @@ static char* mpris_player_dbus_proxy_get_PlaybackStatus (MprisPlayer* self) {
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp183_;
-	const char* _tmp184_;
+	const char* _tmp90_;
+	const char* _tmp91_;
 	char* _result;
-	const char* _tmp185_;
+	const char* _tmp92_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return NULL;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp183_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp183_);
-	_tmp184_ = "PlaybackStatus";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp184_);
+	_tmp90_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp90_);
+	_tmp91_ = "PlaybackStatus";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp91_);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
 	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
@@ -4137,9 +4124,9 @@ static char* mpris_player_dbus_proxy_get_PlaybackStatus (MprisPlayer* self) {
 		dbus_message_unref (_reply);
 		return NULL;
 	}
-	dbus_message_iter_get_basic (&_subiter, &_tmp185_);
+	dbus_message_iter_get_basic (&_subiter, &_tmp92_);
 	dbus_message_iter_next (&_subiter);
-	_result = g_strdup (_tmp185_);
+	_result = g_strdup (_tmp92_);
 	dbus_message_unref (_reply);
 	return _result;
 }
@@ -4150,21 +4137,21 @@ static void mpris_player_dbus_proxy_set_PlaybackStatus (MprisPlayer* self, const
 	DBusGConnection *_connection;
 	DBusMessage *_message, *_reply;
 	DBusMessageIter _iter, _subiter;
-	const char* _tmp186_;
-	const char* _tmp187_;
-	const char* _tmp188_;
+	const char* _tmp93_;
+	const char* _tmp94_;
+	const char* _tmp95_;
 	if (((MprisPlayerDBusProxy*) self)->disposed) {
 		return;
 	}
 	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp186_ = "org.mpris.MediaPlayer2.Player";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp186_);
-	_tmp187_ = "PlaybackStatus";
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp187_);
+	_tmp93_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp93_);
+	_tmp94_ = "PlaybackStatus";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp94_);
 	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
-	_tmp188_ = value;
-	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp188_);
+	_tmp95_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp95_);
 	dbus_message_iter_close_container (&_iter, &_subiter);
 	g_object_get (self, "connection", &_connection, NULL);
 	dbus_error_init (&_dbus_error);
@@ -4245,16 +4232,16 @@ static DBusHandlerResult _dbus_free_desktop_properties_property_get_all (FreeDes
 	DBusMessage* reply;
 	DBusMessageIter iter, reply_iter, subiter;
 	char* interface_name;
-	const char* _tmp189_;
+	const char* _tmp0_;
 	if (strcmp (dbus_message_get_signature (message), "s")) {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 	dbus_message_iter_init (message, &iter);
 	reply = dbus_message_new_method_return (message);
 	dbus_message_iter_init_append (reply, &reply_iter);
-	dbus_message_iter_get_basic (&iter, &_tmp189_);
+	dbus_message_iter_get_basic (&iter, &_tmp0_);
 	dbus_message_iter_next (&iter);
-	interface_name = g_strdup (_tmp189_);
+	interface_name = g_strdup (_tmp0_);
 	if (strcmp (interface_name, "org.freedesktop.DBus.Properties") == 0) {
 		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_ARRAY, "{sv}", &subiter);
 		dbus_message_iter_close_container (&reply_iter, &subiter);
@@ -4293,106 +4280,106 @@ static void _dbus_free_desktop_properties_properties_changed (GObject* _sender,
 	const char * _path;
 	DBusMessage *_message;
 	DBusMessageIter _iter;
-	const char* _tmp190_;
-	DBusMessageIter _tmp191_, _tmp192_;
-	GHashTableIter _tmp193_;
-	gpointer _tmp194_, _tmp195_;
-	char** _tmp210_;
-	DBusMessageIter _tmp211_;
-	int _tmp212_;
+	const char* _tmp1_;
+	DBusMessageIter _tmp2_, _tmp3_;
+	GHashTableIter _tmp4_;
+	gpointer _tmp5_, _tmp6_;
+	char** _tmp21_;
+	DBusMessageIter _tmp22_;
+	int _tmp23_;
 	_path = g_object_get_data (_sender, "dbus_object_path");
 	_message = dbus_message_new_signal (_path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
 	dbus_message_iter_init_append (_message, &_iter);
-	_tmp190_ = source;
-	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp190_);
-	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp191_);
-	g_hash_table_iter_init (&_tmp193_, changed_properties);
-	while (g_hash_table_iter_next (&_tmp193_, &_tmp194_, &_tmp195_)) {
+	_tmp1_ = source;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp1_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp2_);
+	g_hash_table_iter_init (&_tmp4_, changed_properties);
+	while (g_hash_table_iter_next (&_tmp4_, &_tmp5_, &_tmp6_)) {
 		char* _key;
 		GValue* _value;
-		const char* _tmp196_;
-		DBusMessageIter _tmp197_;
-		dbus_message_iter_open_container (&_tmp191_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp192_);
-		_key = (char*) _tmp194_;
-		_value = (GValue*) _tmp195_;
-		_tmp196_ = _key;
-		dbus_message_iter_append_basic (&_tmp192_, DBUS_TYPE_STRING, &_tmp196_);
+		const char* _tmp7_;
+		DBusMessageIter _tmp8_;
+		dbus_message_iter_open_container (&_tmp2_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp3_);
+		_key = (char*) _tmp5_;
+		_value = (GValue*) _tmp6_;
+		_tmp7_ = _key;
+		dbus_message_iter_append_basic (&_tmp3_, DBUS_TYPE_STRING, &_tmp7_);
 		if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
-			guint8 _tmp198_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "y", &_tmp197_);
-			_tmp198_ = g_value_get_uchar (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_BYTE, &_tmp198_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			guint8 _tmp9_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "y", &_tmp8_);
+			_tmp9_ = g_value_get_uchar (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_BYTE, &_tmp9_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
-			dbus_bool_t _tmp199_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "b", &_tmp197_);
-			_tmp199_ = g_value_get_boolean (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_BOOLEAN, &_tmp199_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_bool_t _tmp10_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "b", &_tmp8_);
+			_tmp10_ = g_value_get_boolean (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_BOOLEAN, &_tmp10_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
-			dbus_int32_t _tmp200_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "i", &_tmp197_);
-			_tmp200_ = g_value_get_int (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_INT32, &_tmp200_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_int32_t _tmp11_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "i", &_tmp8_);
+			_tmp11_ = g_value_get_int (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_INT32, &_tmp11_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
-			dbus_uint32_t _tmp201_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "u", &_tmp197_);
-			_tmp201_ = g_value_get_uint (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_UINT32, &_tmp201_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_uint32_t _tmp12_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "u", &_tmp8_);
+			_tmp12_ = g_value_get_uint (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_UINT32, &_tmp12_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
-			dbus_int64_t _tmp202_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "x", &_tmp197_);
-			_tmp202_ = g_value_get_int64 (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_INT64, &_tmp202_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_int64_t _tmp13_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "x", &_tmp8_);
+			_tmp13_ = g_value_get_int64 (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_INT64, &_tmp13_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
-			dbus_uint64_t _tmp203_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "t", &_tmp197_);
-			_tmp203_ = g_value_get_uint64 (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_UINT64, &_tmp203_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_uint64_t _tmp14_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "t", &_tmp8_);
+			_tmp14_ = g_value_get_uint64 (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_UINT64, &_tmp14_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
-			double _tmp204_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "d", &_tmp197_);
-			_tmp204_ = g_value_get_double (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_DOUBLE, &_tmp204_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			double _tmp15_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "d", &_tmp8_);
+			_tmp15_ = g_value_get_double (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_DOUBLE, &_tmp15_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
-			const char* _tmp205_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "s", &_tmp197_);
-			_tmp205_ = g_value_get_string (_value);
-			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_STRING, &_tmp205_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			const char* _tmp16_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "s", &_tmp8_);
+			_tmp16_ = g_value_get_string (_value);
+			dbus_message_iter_append_basic (&_tmp8_, DBUS_TYPE_STRING, &_tmp16_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
-			const char** _tmp206_;
-			DBusMessageIter _tmp207_;
-			int _tmp208_;
-			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "as", &_tmp197_);
-			_tmp206_ = g_value_get_boxed (_value);
-			dbus_message_iter_open_container (&_tmp197_, DBUS_TYPE_ARRAY, "s", &_tmp207_);
-			for (_tmp208_ = 0; _tmp208_ < g_strv_length (g_value_get_boxed (_value)); _tmp208_++) {
-				const char* _tmp209_;
-				_tmp209_ = *_tmp206_;
-				dbus_message_iter_append_basic (&_tmp207_, DBUS_TYPE_STRING, &_tmp209_);
-				_tmp206_++;
+			const char** _tmp17_;
+			DBusMessageIter _tmp18_;
+			int _tmp19_;
+			dbus_message_iter_open_container (&_tmp3_, DBUS_TYPE_VARIANT, "as", &_tmp8_);
+			_tmp17_ = g_value_get_boxed (_value);
+			dbus_message_iter_open_container (&_tmp8_, DBUS_TYPE_ARRAY, "s", &_tmp18_);
+			for (_tmp19_ = 0; _tmp19_ < g_strv_length (g_value_get_boxed (_value)); _tmp19_++) {
+				const char* _tmp20_;
+				_tmp20_ = *_tmp17_;
+				dbus_message_iter_append_basic (&_tmp18_, DBUS_TYPE_STRING, &_tmp20_);
+				_tmp17_++;
 			}
-			dbus_message_iter_close_container (&_tmp197_, &_tmp207_);
-			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+			dbus_message_iter_close_container (&_tmp8_, &_tmp18_);
+			dbus_message_iter_close_container (&_tmp3_, &_tmp8_);
 		}
-		dbus_message_iter_close_container (&_tmp191_, &_tmp192_);
-	}
-	dbus_message_iter_close_container (&_iter, &_tmp191_);
-	_tmp210_ = invalid;
-	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "s", &_tmp211_);
-	for (_tmp212_ = 0; _tmp212_ < invalid_length1; _tmp212_++) {
-		const char* _tmp213_;
-		_tmp213_ = *_tmp210_;
-		dbus_message_iter_append_basic (&_tmp211_, DBUS_TYPE_STRING, &_tmp213_);
-		_tmp210_++;
-	}
-	dbus_message_iter_close_container (&_iter, &_tmp211_);
+		dbus_message_iter_close_container (&_tmp2_, &_tmp3_);
+	}
+	dbus_message_iter_close_container (&_iter, &_tmp2_);
+	_tmp21_ = invalid;
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "s", &_tmp22_);
+	for (_tmp23_ = 0; _tmp23_ < invalid_length1; _tmp23_++) {
+		const char* _tmp24_;
+		_tmp24_ = *_tmp21_;
+		dbus_message_iter_append_basic (&_tmp22_, DBUS_TYPE_STRING, &_tmp24_);
+		_tmp21_++;
+	}
+	dbus_message_iter_close_container (&_iter, &_tmp22_);
 	dbus_connection_send (_connection, _message, NULL);
 	dbus_message_unref (_message);
 }
@@ -4461,151 +4448,151 @@ static GObject* free_desktop_properties_dbus_proxy_construct (GType gtype, guint
 static void _dbus_handle_free_desktop_properties_properties_changed (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message) {
 	DBusMessageIter iter;
 	char* source = NULL;
-	const char* _tmp214_;
+	const char* _tmp96_;
 	GHashTable* changed_properties = NULL;
-	GHashTable* _tmp215_;
-	DBusMessageIter _tmp216_;
-	DBusMessageIter _tmp217_;
+	GHashTable* _tmp97_;
+	DBusMessageIter _tmp98_;
+	DBusMessageIter _tmp99_;
 	char** invalid = NULL;
 	int invalid_length1;
-	char** _tmp236_;
-	int _tmp236__length;
-	int _tmp236__size;
-	int _tmp236__length1;
-	DBusMessageIter _tmp237_;
+	char** _tmp118_;
+	int _tmp118__length;
+	int _tmp118__size;
+	int _tmp118__length1;
+	DBusMessageIter _tmp119_;
 	DBusMessage* reply;
 	if (strcmp (dbus_message_get_signature (message), "sa{sv}as")) {
 		return;
 	}
 	dbus_message_iter_init (message, &iter);
-	dbus_message_iter_get_basic (&iter, &_tmp214_);
+	dbus_message_iter_get_basic (&iter, &_tmp96_);
 	dbus_message_iter_next (&iter);
-	source = g_strdup (_tmp214_);
-	_tmp215_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-	dbus_message_iter_recurse (&iter, &_tmp216_);
-	while (dbus_message_iter_get_arg_type (&_tmp216_)) {
+	source = g_strdup (_tmp96_);
+	_tmp97_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	dbus_message_iter_recurse (&iter, &_tmp98_);
+	while (dbus_message_iter_get_arg_type (&_tmp98_)) {
 		char* _key;
 		GValue* _value;
-		const char* _tmp218_;
-		GValue _tmp219_ = {0};
-		DBusMessageIter _tmp220_;
-		dbus_message_iter_recurse (&_tmp216_, &_tmp217_);
-		dbus_message_iter_get_basic (&_tmp217_, &_tmp218_);
-		dbus_message_iter_next (&_tmp217_);
-		_key = g_strdup (_tmp218_);
-		dbus_message_iter_recurse (&_tmp217_, &_tmp220_);
-		if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_BYTE) {
-			guint8 _tmp221_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp221_);
-			g_value_init (&_tmp219_, G_TYPE_UCHAR);
-			g_value_set_uchar (&_tmp219_, _tmp221_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_BOOLEAN) {
-			dbus_bool_t _tmp222_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp222_);
-			g_value_init (&_tmp219_, G_TYPE_BOOLEAN);
-			g_value_set_boolean (&_tmp219_, _tmp222_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT16) {
-			dbus_int16_t _tmp223_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp223_);
-			g_value_init (&_tmp219_, G_TYPE_INT);
-			g_value_set_int (&_tmp219_, _tmp223_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT16) {
-			dbus_uint16_t _tmp224_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp224_);
-			g_value_init (&_tmp219_, G_TYPE_UINT);
-			g_value_set_uint (&_tmp219_, _tmp224_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT32) {
-			dbus_int32_t _tmp225_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp225_);
-			g_value_init (&_tmp219_, G_TYPE_INT);
-			g_value_set_int (&_tmp219_, _tmp225_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT32) {
-			dbus_uint32_t _tmp226_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp226_);
-			g_value_init (&_tmp219_, G_TYPE_UINT);
-			g_value_set_uint (&_tmp219_, _tmp226_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT64) {
-			dbus_int64_t _tmp227_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp227_);
-			g_value_init (&_tmp219_, G_TYPE_INT64);
-			g_value_set_int64 (&_tmp219_, _tmp227_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT64) {
-			dbus_uint64_t _tmp228_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp228_);
-			g_value_init (&_tmp219_, G_TYPE_UINT64);
-			g_value_set_uint64 (&_tmp219_, _tmp228_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_DOUBLE) {
-			double _tmp229_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp229_);
-			g_value_init (&_tmp219_, G_TYPE_DOUBLE);
-			g_value_set_double (&_tmp219_, _tmp229_);
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_STRING) {
-			const char* _tmp230_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp230_);
-			g_value_init (&_tmp219_, G_TYPE_STRING);
-			g_value_take_string (&_tmp219_, g_strdup (_tmp230_));
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_OBJECT_PATH) {
-			const char* _tmp231_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp231_);
-			g_value_init (&_tmp219_, G_TYPE_STRING);
-			g_value_take_string (&_tmp219_, g_strdup (_tmp231_));
-		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_SIGNATURE) {
-			const char* _tmp232_;
-			dbus_message_iter_get_basic (&_tmp220_, &_tmp232_);
-			g_value_init (&_tmp219_, G_TYPE_STRING);
-			g_value_take_string (&_tmp219_, g_strdup (_tmp232_));
-		} else if ((dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp220_) == DBUS_TYPE_STRING)) {
-			const char** _tmp233_;
-			int _tmp233__length;
-			int _tmp233__size;
-			int _tmp233__length1;
-			DBusMessageIter _tmp234_;
-			_tmp233_ = g_new (const char*, 5);
-			_tmp233__length = 0;
-			_tmp233__size = 4;
-			_tmp233__length1 = 0;
-			dbus_message_iter_recurse (&_tmp220_, &_tmp234_);
-			for (; dbus_message_iter_get_arg_type (&_tmp234_); _tmp233__length1++) {
-				const char* _tmp235_;
-				if (_tmp233__size == _tmp233__length) {
-					_tmp233__size = 2 * _tmp233__size;
-					_tmp233_ = g_renew (const char*, _tmp233_, _tmp233__size + 1);
+		const char* _tmp100_;
+		GValue _tmp101_ = {0};
+		DBusMessageIter _tmp102_;
+		dbus_message_iter_recurse (&_tmp98_, &_tmp99_);
+		dbus_message_iter_get_basic (&_tmp99_, &_tmp100_);
+		dbus_message_iter_next (&_tmp99_);
+		_key = g_strdup (_tmp100_);
+		dbus_message_iter_recurse (&_tmp99_, &_tmp102_);
+		if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_BYTE) {
+			guint8 _tmp103_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp103_);
+			g_value_init (&_tmp101_, G_TYPE_UCHAR);
+			g_value_set_uchar (&_tmp101_, _tmp103_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp104_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp104_);
+			g_value_init (&_tmp101_, G_TYPE_BOOLEAN);
+			g_value_set_boolean (&_tmp101_, _tmp104_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_INT16) {
+			dbus_int16_t _tmp105_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp105_);
+			g_value_init (&_tmp101_, G_TYPE_INT);
+			g_value_set_int (&_tmp101_, _tmp105_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_UINT16) {
+			dbus_uint16_t _tmp106_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp106_);
+			g_value_init (&_tmp101_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp101_, _tmp106_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_INT32) {
+			dbus_int32_t _tmp107_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp107_);
+			g_value_init (&_tmp101_, G_TYPE_INT);
+			g_value_set_int (&_tmp101_, _tmp107_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_UINT32) {
+			dbus_uint32_t _tmp108_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp108_);
+			g_value_init (&_tmp101_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp101_, _tmp108_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_INT64) {
+			dbus_int64_t _tmp109_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp109_);
+			g_value_init (&_tmp101_, G_TYPE_INT64);
+			g_value_set_int64 (&_tmp101_, _tmp109_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_UINT64) {
+			dbus_uint64_t _tmp110_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp110_);
+			g_value_init (&_tmp101_, G_TYPE_UINT64);
+			g_value_set_uint64 (&_tmp101_, _tmp110_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_DOUBLE) {
+			double _tmp111_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp111_);
+			g_value_init (&_tmp101_, G_TYPE_DOUBLE);
+			g_value_set_double (&_tmp101_, _tmp111_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_STRING) {
+			const char* _tmp112_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp112_);
+			g_value_init (&_tmp101_, G_TYPE_STRING);
+			g_value_take_string (&_tmp101_, g_strdup (_tmp112_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_OBJECT_PATH) {
+			const char* _tmp113_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp113_);
+			g_value_init (&_tmp101_, G_TYPE_STRING);
+			g_value_take_string (&_tmp101_, g_strdup (_tmp113_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_SIGNATURE) {
+			const char* _tmp114_;
+			dbus_message_iter_get_basic (&_tmp102_, &_tmp114_);
+			g_value_init (&_tmp101_, G_TYPE_STRING);
+			g_value_take_string (&_tmp101_, g_strdup (_tmp114_));
+		} else if ((dbus_message_iter_get_arg_type (&_tmp102_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp102_) == DBUS_TYPE_STRING)) {
+			const char** _tmp115_;
+			int _tmp115__length;
+			int _tmp115__size;
+			int _tmp115__length1;
+			DBusMessageIter _tmp116_;
+			_tmp115_ = g_new (const char*, 5);
+			_tmp115__length = 0;
+			_tmp115__size = 4;
+			_tmp115__length1 = 0;
+			dbus_message_iter_recurse (&_tmp102_, &_tmp116_);
+			for (; dbus_message_iter_get_arg_type (&_tmp116_); _tmp115__length1++) {
+				const char* _tmp117_;
+				if (_tmp115__size == _tmp115__length) {
+					_tmp115__size = 2 * _tmp115__size;
+					_tmp115_ = g_renew (const char*, _tmp115_, _tmp115__size + 1);
 				}
-				dbus_message_iter_get_basic (&_tmp234_, &_tmp235_);
-				dbus_message_iter_next (&_tmp234_);
-				_tmp233_[_tmp233__length++] = g_strdup (_tmp235_);
+				dbus_message_iter_get_basic (&_tmp116_, &_tmp117_);
+				dbus_message_iter_next (&_tmp116_);
+				_tmp115_[_tmp115__length++] = g_strdup (_tmp117_);
 			}
-			_tmp233_[_tmp233__length] = NULL;
-			g_value_init (&_tmp219_, G_TYPE_STRV);
-			g_value_take_boxed (&_tmp219_, _tmp233_);
+			_tmp115_[_tmp115__length] = NULL;
+			g_value_init (&_tmp101_, G_TYPE_STRV);
+			g_value_take_boxed (&_tmp101_, _tmp115_);
 		}
-		dbus_message_iter_next (&_tmp217_);
-		_value = g_memdup (&_tmp219_, sizeof (GValue));
-		g_hash_table_insert (_tmp215_, _key, _value);
-		dbus_message_iter_next (&_tmp216_);
+		dbus_message_iter_next (&_tmp99_);
+		_value = g_memdup (&_tmp101_, sizeof (GValue));
+		g_hash_table_insert (_tmp97_, _key, _value);
+		dbus_message_iter_next (&_tmp98_);
 	}
 	dbus_message_iter_next (&iter);
-	changed_properties = _tmp215_;
+	changed_properties = _tmp97_;
 	invalid_length1 = 0;
-	_tmp236_ = g_new (char*, 5);
-	_tmp236__length = 0;
-	_tmp236__size = 4;
-	_tmp236__length1 = 0;
-	dbus_message_iter_recurse (&iter, &_tmp237_);
-	for (; dbus_message_iter_get_arg_type (&_tmp237_); _tmp236__length1++) {
-		const char* _tmp238_;
-		if (_tmp236__size == _tmp236__length) {
-			_tmp236__size = 2 * _tmp236__size;
-			_tmp236_ = g_renew (char*, _tmp236_, _tmp236__size + 1);
+	_tmp118_ = g_new (char*, 5);
+	_tmp118__length = 0;
+	_tmp118__size = 4;
+	_tmp118__length1 = 0;
+	dbus_message_iter_recurse (&iter, &_tmp119_);
+	for (; dbus_message_iter_get_arg_type (&_tmp119_); _tmp118__length1++) {
+		const char* _tmp120_;
+		if (_tmp118__size == _tmp118__length) {
+			_tmp118__size = 2 * _tmp118__size;
+			_tmp118_ = g_renew (char*, _tmp118_, _tmp118__size + 1);
 		}
-		dbus_message_iter_get_basic (&_tmp237_, &_tmp238_);
-		dbus_message_iter_next (&_tmp237_);
-		_tmp236_[_tmp236__length++] = g_strdup (_tmp238_);
+		dbus_message_iter_get_basic (&_tmp119_, &_tmp120_);
+		dbus_message_iter_next (&_tmp119_);
+		_tmp118_[_tmp118__length++] = g_strdup (_tmp120_);
 	}
-	invalid_length1 = _tmp236__length1;
-	_tmp236_[_tmp236__length] = NULL;
+	invalid_length1 = _tmp118__length1;
+	_tmp118_[_tmp118__length] = NULL;
 	dbus_message_iter_next (&iter);
-	invalid = _tmp236_;
+	invalid = _tmp118_;
 	g_signal_emit_by_name (self, "properties-changed", source, changed_properties, invalid, invalid_length1);
 	_g_free0 (source);
 	_g_hash_table_unref0 (changed_properties);
@@ -4690,14 +4677,14 @@ void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char*
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (interface_source != NULL);
 	g_return_if_fail (changed_properties != NULL);
-	g_debug ("mpris2-controller.vala:98: properties-changed for interface %s", interface_source);
+	g_debug ("mpris2-controller.vala:99: properties-changed for interface %s", interface_source);
 	if (changed_properties == NULL) {
 		_tmp0_ = TRUE;
 	} else {
 		_tmp0_ = g_str_has_prefix (interface_source, MPRIS2_CONTROLLER_root_interface) == FALSE;
 	}
 	if (_tmp0_) {
-		g_warning ("mpris2-controller.vala:100: Property-changed hash is null or this is a" \
+		g_warning ("mpris2-controller.vala:101: Property-changed hash is null or this is a" \
 "n interface that concerns us");
 		return;
 	}
@@ -4705,77 +4692,36 @@ void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char*
 	if (play_v != NULL) {
 		char* state;
 		gint p;
-		TransportMenuitem* _tmp2_;
 		PlayerItem* _tmp1_;
-		ScrubMenuitem* _tmp4_;
-		PlayerItem* _tmp3_;
+		TransportMenuitem* _tmp2_;
 		state = g_strdup (g_value_get_string (play_v));
-		g_debug ("mpris2-controller.vala:106: new playback state = %s", state);
+		g_debug ("mpris2-controller.vala:107: new playback state = %s", state);
 		p = mpris2_controller_determine_play_state (self, state);
 		transport_menuitem_change_play_state (_tmp2_ = (_tmp1_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), IS_TRANSPORT_MENUITEM (_tmp1_) ? ((TransportMenuitem*) _tmp1_) : NULL), p);
 		_g_object_unref0 (_tmp2_);
-		scrub_menuitem_update_playstate (_tmp4_ = (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp3_) ? ((ScrubMenuitem*) _tmp3_) : NULL), p);
-		_g_object_unref0 (_tmp4_);
 		_g_free0 (state);
 	}
 	pos_v = __g_value_dup0 ((GValue*) g_hash_table_lookup (changed_properties, "Position"));
 	if (pos_v != NULL) {
 		gint64 pos;
-		ScrubMenuitem* _tmp6_;
-		PlayerItem* _tmp5_;
 		pos = g_value_get_int64 (pos_v);
 		g_debug ("mpris2-controller.vala:115: new position = %i", (gint) pos);
-		scrub_menuitem_update_position (_tmp6_ = (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp5_) ? ((ScrubMenuitem*) _tmp5_) : NULL), (gint32) pos);
-		_g_object_unref0 (_tmp6_);
 	}
 	meta_v = __g_value_dup0 ((GValue*) g_hash_table_lookup (changed_properties, "Metadata"));
 	if (meta_v != NULL) {
-		GHashTable* _tmp7_;
-		GeeHashSet* _tmp9_;
-		PlayerItem* _tmp8_;
-		GeeHashSet* _tmp12_;
-		GHashTable* _tmp11_;
-		PlayerItem* _tmp10_;
-		GeeHashSet* _tmp14_;
-		PlayerItem* _tmp13_;
-		gboolean _tmp15_ = FALSE;
-		GHashTable* _tmp16_;
-		gboolean _tmp17_;
-		char* _tmp24_;
-		ScrubMenuitem* _tmp23_;
-		PlayerItem* _tmp22_;
-		g_debug ("mpris2-controller.vala:121: metadata is not empty");
-		g_debug ("mpris2-controller.vala:122: artist : %s", g_value_get_string ((GValue*) g_hash_table_lookup (_tmp7_ = mpris_player_get_Metadata (self->priv->_player), "artist")));
-		_g_hash_table_unref0 (_tmp7_);
-		player_item_reset (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp9_ = metadata_menuitem_attributes_format ());
-		_g_object_unref0 (_tmp9_);
-		_g_object_unref0 (_tmp8_);
-		player_item_update (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp11_ = mpris_player_get_Metadata (self->priv->_player), _tmp12_ = metadata_menuitem_attributes_format ());
-		_g_object_unref0 (_tmp12_);
-		_g_hash_table_unref0 (_tmp11_);
-		_g_object_unref0 (_tmp10_);
-		player_item_reset (_tmp13_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp14_ = scrub_menuitem_attributes_format ());
-		_g_object_unref0 (_tmp14_);
-		_g_object_unref0 (_tmp13_);
-		if ((_tmp17_ = ((gint) g_utf8_strlen (g_value_get_string ((GValue*) g_hash_table_lookup (_tmp16_ = mpris_player_get_Metadata (self->priv->_player), "artist")), -1)) > 0, _g_hash_table_unref0 (_tmp16_), _tmp17_)) {
-			_tmp15_ = TRUE;
-		} else {
-			GHashTable* _tmp18_;
-			_tmp15_ = ((gint) g_utf8_strlen (g_value_get_string ((GValue*) g_hash_table_lookup (_tmp18_ = mpris_player_get_Metadata (self->priv->_player), "artist")), -1)) > 0;
-			_g_hash_table_unref0 (_tmp18_);
-		}
-		if (_tmp15_) {
-			GeeHashSet* _tmp21_;
-			GHashTable* _tmp20_;
-			PlayerItem* _tmp19_;
-			player_item_update (_tmp19_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp20_ = mpris_player_get_Metadata (self->priv->_player), _tmp21_ = scrub_menuitem_attributes_format ());
-			_g_object_unref0 (_tmp21_);
-			_g_hash_table_unref0 (_tmp20_);
-			_g_object_unref0 (_tmp19_);
-		}
-		scrub_menuitem_update_playstate (_tmp23_ = (_tmp22_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp22_) ? ((ScrubMenuitem*) _tmp22_) : NULL), mpris2_controller_determine_play_state (self, _tmp24_ = mpris_player_get_PlaybackStatus (self->priv->_player)));
-		_g_free0 (_tmp24_);
-		_g_object_unref0 (_tmp23_);
+		GHashTable* changed_updates;
+		PlayerItem* _tmp3_;
+		GeeHashSet* _tmp4_;
+		PlayerItem* _tmp5_;
+		GeeHashSet* _tmp6_;
+		changed_updates = mpris2_controller_clean_metadata (self);
+		player_item_reset (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp4_ = metadata_menuitem_attributes_format ());
+		_g_object_unref0 (_tmp4_);
+		_g_object_unref0 (_tmp3_);
+		player_item_update (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), changed_updates, _tmp6_ = metadata_menuitem_attributes_format ());
+		_g_object_unref0 (_tmp6_);
+		_g_object_unref0 (_tmp5_);
+		_g_hash_table_unref0 (changed_updates);
 	}
 	_g_free0 (meta_v);
 	_g_free0 (pos_v);
@@ -4783,6 +4729,62 @@ void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char*
 }
 
 
+static char** _vala_array_dup1 (char** self, int length) {
+	char** result;
+	int i;
+	result = g_new0 (char*, length + 1);
+	for (i = 0; i < length; i++) {
+		result[i] = g_strdup (self[i]);
+	}
+	return result;
+}
+
+
+static GHashTable* mpris2_controller_clean_metadata (Mpris2Controller* self) {
+	GHashTable* result = NULL;
+	GHashTable* changed_updates;
+	GHashTable* _tmp0_;
+	GValue* _tmp1_;
+	GValue* artist_v;
+	GHashTable* _tmp7_;
+	GValue* _tmp8_;
+	GValue* length_v;
+	g_return_val_if_fail (self != NULL, NULL);
+	changed_updates = mpris_player_get_Metadata (self->priv->_player);
+	artist_v = (_tmp1_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp0_ = mpris_player_get_Metadata (self->priv->_player), "xesam:artist")), _g_hash_table_unref0 (_tmp0_), _tmp1_);
+	if (artist_v != NULL) {
+		gint artists_length1;
+		gint _artists_size_;
+		char** _tmp5_;
+		GHashTable* _tmp2_;
+		char** _tmp3_;
+		char** _tmp4_;
+		char** artists;
+		char* display_artists;
+		GValue* _tmp6_ = NULL;
+		artists = (_tmp5_ = (_tmp4_ = (_tmp3_ = g_value_get_boxed ((GValue*) g_hash_table_lookup (_tmp2_ = mpris_player_get_Metadata (self->priv->_player), "xesam:artist")), (_tmp3_ == NULL) ? ((gpointer) _tmp3_) : _vala_array_dup1 (_tmp3_, g_strv_length (g_value_get_boxed ((GValue*) g_hash_table_lookup (_tmp2_ = mpris_player_get_Metadata (self->priv->_player), "xesam:artist"))))), _g_hash_table_unref0 (_tmp2_), _tmp4_), artists_length1 = g_strv_length (g_value_get_boxed ((GValue*) g_hash_table_lookup (_tmp2_ = mpris_player_get_Metadata (self->priv->_player), "xesam:artist"))), _artists_size_ = artists_length1, _tmp5_);
+		display_artists = g_strjoinv (", ", artists);
+		g_hash_table_replace (changed_updates, g_strdup ("xesam:artist"), (_tmp6_ = g_new0 (GValue, 1), g_value_init (_tmp6_, G_TYPE_STRING), g_value_set_string (_tmp6_, display_artists), _tmp6_));
+		g_debug ("mpris2-controller.vala:135: artist : %s", display_artists);
+		_g_free0 (display_artists);
+		artists = (_vala_array_free (artists, artists_length1, (GDestroyNotify) g_free), NULL);
+	}
+	length_v = (_tmp8_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp7_ = mpris_player_get_Metadata (self->priv->_player), "mpris:length")), _g_hash_table_unref0 (_tmp7_), _tmp8_);
+	if (length_v != NULL) {
+		GHashTable* _tmp9_;
+		gint64 _tmp10_;
+		gint64 duration;
+		GValue* _tmp11_ = NULL;
+		duration = (_tmp10_ = g_value_get_int64 ((GValue*) g_hash_table_lookup (_tmp9_ = mpris_player_get_Metadata (self->priv->_player), "mpris:length")), _g_hash_table_unref0 (_tmp9_), _tmp10_);
+		g_hash_table_replace (changed_updates, g_strdup ("mpris:length"), (_tmp11_ = g_new0 (GValue, 1), g_value_init (_tmp11_, G_TYPE_INT64), g_value_set_int64 (_tmp11_, duration / 1000000), _tmp11_));
+	}
+	result = changed_updates;
+	_g_free0 (length_v);
+	_g_free0 (artist_v);
+	return result;
+}
+
+
 static gint mpris2_controller_determine_play_state (Mpris2Controller* self, const char* status) {
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
@@ -4798,7 +4800,7 @@ static gint mpris2_controller_determine_play_state (Mpris2Controller* self, cons
 		_tmp0_ = FALSE;
 	}
 	if (_tmp0_) {
-		g_debug ("mpris2-controller.vala:142: determine play state - state = %s", status);
+		g_debug ("mpris2-controller.vala:151: determine play state - state = %s", status);
 		result = 0;
 		return result;
 	}
@@ -4811,14 +4813,11 @@ void mpris2_controller_initial_update (Mpris2Controller* self) {
 	gint32 status = 0;
 	char* _tmp0_;
 	gboolean _tmp1_;
-	TransportMenuitem* _tmp4_;
 	PlayerItem* _tmp3_;
-	GeeHashSet* _tmp7_;
-	GHashTable* _tmp6_;
+	TransportMenuitem* _tmp4_;
+	GHashTable* cleaned_metadata;
 	PlayerItem* _tmp5_;
-	GeeHashSet* _tmp10_;
-	GHashTable* _tmp9_;
-	PlayerItem* _tmp8_;
+	GeeHashSet* _tmp6_;
 	g_return_if_fail (self != NULL);
 	if ((_tmp1_ = (_tmp0_ = mpris_player_get_PlaybackStatus (self->priv->_player)) == NULL, _g_free0 (_tmp0_), _tmp1_)) {
 		status = (gint32) 1;
@@ -4827,27 +4826,23 @@ void mpris2_controller_initial_update (Mpris2Controller* self) {
 		status = (gint32) mpris2_controller_determine_play_state (self, _tmp2_ = mpris_player_get_PlaybackStatus (self->priv->_player));
 		_g_free0 (_tmp2_);
 	}
-	g_debug ("mpris2-controller.vala:157: initial update - play state %i", (gint) status);
+	g_debug ("mpris2-controller.vala:166: initial update - play state %i", (gint) status);
 	transport_menuitem_change_play_state (_tmp4_ = (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), IS_TRANSPORT_MENUITEM (_tmp3_) ? ((TransportMenuitem*) _tmp3_) : NULL), (gint) status);
 	_g_object_unref0 (_tmp4_);
-	player_item_update (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp6_ = mpris_player_get_Metadata (self->priv->_player), _tmp7_ = metadata_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp7_);
-	_g_hash_table_unref0 (_tmp6_);
+	cleaned_metadata = mpris2_controller_clean_metadata (self);
+	player_item_update (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), cleaned_metadata, _tmp6_ = metadata_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp6_);
 	_g_object_unref0 (_tmp5_);
-	player_item_update (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp9_ = mpris_player_get_Metadata (self->priv->_player), _tmp10_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp10_);
-	_g_hash_table_unref0 (_tmp9_);
-	_g_object_unref0 (_tmp8_);
+	_g_hash_table_unref0 (cleaned_metadata);
 }
 
 
 void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command) {
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
-	g_debug ("mpris2-controller.vala:168: transport_event input = %i", (gint) command);
+	g_debug ("mpris2-controller.vala:176: transport_event input = %i", (gint) command);
 	if (command == TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE) {
-		g_debug ("mpris2-controller.vala:170: transport_event PLAY_PAUSE");
+		g_debug ("mpris2-controller.vala:178: transport_event PLAY_PAUSE");
 		{
 			mpris_player_PlayPause (self->priv->_player, &_inner_error_);
 			if (_inner_error_ != NULL) {
@@ -4866,7 +4861,7 @@ void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuite
 			_error_ = _inner_error_;
 			_inner_error_ = NULL;
 			{
-				g_warning ("mpris2-controller.vala:175: DBus Error calling the player objects Play" \
+				g_warning ("mpris2-controller.vala:183: DBus Error calling the player objects Play" \
 "Pause method %s", _error_->message);
 				_g_error_free0 (_error_);
 			}
@@ -4897,7 +4892,7 @@ void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuite
 				_error_ = _inner_error_;
 				_inner_error_ = NULL;
 				{
-					g_warning ("mpris2-controller.vala:184: DBus Error calling the player objects Prev" \
+					g_warning ("mpris2-controller.vala:192: DBus Error calling the player objects Prev" \
 "ious method %s", _error_->message);
 					_g_error_free0 (_error_);
 				}
@@ -4928,7 +4923,7 @@ void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuite
 					_error_ = _inner_error_;
 					_inner_error_ = NULL;
 					{
-						g_warning ("mpris2-controller.vala:193: DBus Error calling the player objects Next" \
+						g_warning ("mpris2-controller.vala:201: DBus Error calling the player objects Next" \
 " method %s", _error_->message);
 						_g_error_free0 (_error_);
 					}
@@ -4950,37 +4945,46 @@ TODO: SetPosition on the player object is not working with rhythmbox,
   runtime error - "dbus function not supported"
  */
 void mpris2_controller_set_position (Mpris2Controller* self, double position) {
-	GError * _inner_error_;
-	GHashTable* data;
-	GValue* time_value;
-	guint32 total_time;
-	double new_time_position;
 	GHashTable* _tmp0_;
 	GValue* _tmp1_;
+	GValue* time_value;
+	gint64 total_time;
+	double new_time_position;
+	GHashTable* _tmp2_;
+	GValue* _tmp3_;
 	GValue* v;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
-	g_debug ("mpris2-controller.vala:204: Set position with pos (0-100) %f", position);
-	data = mpris_player_get_Metadata (self->priv->_player);
-	time_value = __g_value_dup0 ((GValue*) g_hash_table_lookup (data, "time"));
+	g_debug ("mpris2-controller.vala:212: Set position with pos (0-100) %f", position);
+	time_value = (_tmp1_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp0_ = mpris_player_get_Metadata (self->priv->_player), "mpris:length")), _g_hash_table_unref0 (_tmp0_), _tmp1_);
 	if (time_value == NULL) {
-		g_warning ("mpris2-controller.vala:208: Can't fetch the duration of the track ther" \
+		g_warning ("mpris2-controller.vala:215: Can't fetch the duration of the track ther" \
 "efore cant set the position");
 		_g_free0 (time_value);
-		_g_hash_table_unref0 (data);
 		return;
 	}
-	total_time = (guint32) (g_value_get_uint (time_value) * 1000);
-	g_debug ("mpris2-controller.vala:213: total time of track = %i", (gint) total_time);
-	new_time_position = (total_time * position) / 100.0;
-	g_debug ("mpris2-controller.vala:215: new position = %f", new_time_position);
-	v = (_tmp1_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp0_ = mpris_player_get_Metadata (self->priv->_player), "trackid")), _g_hash_table_unref0 (_tmp0_), _tmp1_);
+	total_time = g_value_get_int64 (time_value);
+	g_debug ("mpris2-controller.vala:220: total time of track = %i", (gint) total_time);
+	new_time_position = total_time * (position / 100.0);
+	g_debug ("mpris2-controller.vala:222: new position = %f", new_time_position);
+	v = (_tmp3_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp2_ = mpris_player_get_Metadata (self->priv->_player), "mpris:trackid")), _g_hash_table_unref0 (_tmp2_), _tmp3_);
 	if (v != NULL) {
 		if (G_VALUE_HOLDS (v, G_TYPE_STRING)) {
 			char* path;
-			g_debug ("mpris2-controller.vala:220: the trackid = %s", g_value_get_string (v));
 			path = g_strdup (g_value_get_string (v));
 			{
+				mpris_player_SetPosition (self->priv->_player, path, (gint64) new_time_position, &_inner_error_);
+				if (_inner_error_ != NULL) {
+					if (_inner_error_->domain == DBUS_GERROR) {
+						goto __catch5_dbus_gerror;
+					}
+					_g_free0 (path);
+					_g_free0 (v);
+					_g_free0 (time_value);
+					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+					g_clear_error (&_inner_error_);
+					return;
+				}
 			}
 			goto __finally5;
 			__catch5_dbus_gerror:
@@ -4989,7 +4993,7 @@ void mpris2_controller_set_position (Mpris2Controller* self, double position) {
 				e = _inner_error_;
 				_inner_error_ = NULL;
 				{
-					g_error ("mpris2-controller.vala:226: DBus Error calling the player objects SetP" \
+					g_error ("mpris2-controller.vala:234: DBus Error calling the player objects SetP" \
 "osition method %s", e->message);
 					_g_error_free0 (e);
 				}
@@ -4999,7 +5003,6 @@ void mpris2_controller_set_position (Mpris2Controller* self, double position) {
 				_g_free0 (path);
 				_g_free0 (v);
 				_g_free0 (time_value);
-				_g_hash_table_unref0 (data);
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
 				return;
@@ -5009,18 +5012,12 @@ void mpris2_controller_set_position (Mpris2Controller* self, double position) {
 	}
 	_g_free0 (v);
 	_g_free0 (time_value);
-	_g_hash_table_unref0 (data);
 }
 
 
 void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position) {
-	PlayerItem* _tmp0_;
-	ScrubMenuitem* scrub;
 	g_return_if_fail (self != NULL);
-	g_debug ("mpris2-controller.vala:234: Seeked signal callback with pos = %i", ((gint) position) / 1000);
-	scrub = (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp0_) ? ((ScrubMenuitem*) _tmp0_) : NULL);
-	scrub_menuitem_update_position (scrub, ((gint32) position) / 1000);
-	_g_object_unref0 (scrub);
+	g_debug ("mpris2-controller.vala:242: Seeked signal callback with pos = %i", ((gint) position) / 1000);
 }
 
 
@@ -5057,9 +5054,8 @@ gboolean mpris2_controller_was_successfull (Mpris2Controller* self) {
 
 
 void mpris2_controller_expose (Mpris2Controller* self) {
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
 	if (mpris2_controller_connected (self) == TRUE) {
 		{
 			mpris_root_Raise (self->priv->_mpris2_root, &_inner_error_);
@@ -5079,7 +5075,7 @@ void mpris2_controller_expose (Mpris2Controller* self) {
 			e = _inner_error_;
 			_inner_error_ = NULL;
 			{
-				g_error ("mpris2-controller.vala:259: Exception thrown while calling root functi" \
+				g_error ("mpris2-controller.vala:267: Exception thrown while calling root functi" \
 "on Raise - %s", e->message);
 				_g_error_free0 (e);
 			}
@@ -5185,28 +5181,28 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 	{
 		{
 			DBusGConnection* connection;
-			MprisRoot* _tmp245_;
-			char* _tmp244_;
-			char* _tmp243_;
-			char* _tmp242_;
-			char* _tmp241_;
-			char* _tmp240_;
-			char* _tmp239_;
-			MprisPlayer* _tmp253_;
-			char* _tmp252_;
-			char* _tmp251_;
-			char* _tmp250_;
-			char* _tmp249_;
-			char* _tmp248_;
-			char* _tmp247_;
-			char* _tmp246_;
-			FreeDesktopProperties* _tmp260_;
-			char* _tmp259_;
-			char* _tmp258_;
-			char* _tmp257_;
-			char* _tmp256_;
-			char* _tmp255_;
-			char* _tmp254_;
+			char* _tmp0_;
+			char* _tmp1_;
+			char* _tmp2_;
+			char* _tmp3_;
+			char* _tmp4_;
+			char* _tmp5_;
+			MprisRoot* _tmp6_;
+			char* _tmp7_;
+			char* _tmp8_;
+			char* _tmp9_;
+			char* _tmp10_;
+			char* _tmp11_;
+			char* _tmp12_;
+			char* _tmp13_;
+			MprisPlayer* _tmp14_;
+			char* _tmp15_;
+			char* _tmp16_;
+			char* _tmp17_;
+			char* _tmp18_;
+			char* _tmp19_;
+			char* _tmp20_;
+			FreeDesktopProperties* _tmp21_;
 			connection = dbus_g_bus_get (DBUS_BUS_SESSION, &_inner_error_);
 			if (_inner_error_ != NULL) {
 				if (_inner_error_->domain == DBUS_GERROR) {
@@ -5215,32 +5211,32 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
 			}
-			mpris2_controller_set_mpris2_root (self, _tmp245_ = mpris_root_dbus_proxy_new (connection, _tmp244_ = g_strconcat (_tmp242_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp243_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
-			_g_object_unref0 (_tmp245_);
-			_g_free0 (_tmp244_);
-			_g_free0 (_tmp243_);
-			_g_free0 (_tmp242_);
-			_g_free0 (_tmp241_);
-			_g_free0 (_tmp240_);
-			_g_free0 (_tmp239_);
-			mpris2_controller_set_player (self, _tmp253_ = mpris_player_dbus_proxy_new (connection, _tmp252_ = g_strconcat (_tmp250_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp251_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
-			_g_object_unref0 (_tmp253_);
-			_g_free0 (_tmp252_);
-			_g_free0 (_tmp251_);
-			_g_free0 (_tmp250_);
-			_g_free0 (_tmp249_);
-			_g_free0 (_tmp248_);
-			_g_free0 (_tmp247_);
-			_g_free0 (_tmp246_);
+			mpris2_controller_set_mpris2_root (self, _tmp6_ = mpris_root_dbus_proxy_new (connection, _tmp5_ = g_strconcat (_tmp3_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp4_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp6_);
+			_g_free0 (_tmp5_);
+			_g_free0 (_tmp4_);
+			_g_free0 (_tmp3_);
+			_g_free0 (_tmp2_);
+			_g_free0 (_tmp1_);
+			_g_free0 (_tmp0_);
+			mpris2_controller_set_player (self, _tmp14_ = mpris_player_dbus_proxy_new (connection, _tmp13_ = g_strconcat (_tmp11_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp12_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp14_);
+			_g_free0 (_tmp13_);
+			_g_free0 (_tmp12_);
+			_g_free0 (_tmp11_);
+			_g_free0 (_tmp10_);
+			_g_free0 (_tmp9_);
+			_g_free0 (_tmp8_);
+			_g_free0 (_tmp7_);
 			g_signal_connect_object (self->priv->_player, "seeked", (GCallback) _mpris2_controller_onSeeked_mpris_player_seeked, self, 0);
-			mpris2_controller_set_properties_interface (self, _tmp260_ = free_desktop_properties_dbus_proxy_new (connection, _tmp259_ = g_strconcat (_tmp257_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp258_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
-			_g_object_unref0 (_tmp260_);
-			_g_free0 (_tmp259_);
-			_g_free0 (_tmp258_);
-			_g_free0 (_tmp257_);
-			_g_free0 (_tmp256_);
-			_g_free0 (_tmp255_);
-			_g_free0 (_tmp254_);
+			mpris2_controller_set_properties_interface (self, _tmp21_ = free_desktop_properties_dbus_proxy_new (connection, _tmp20_ = g_strconcat (_tmp18_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp19_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp21_);
+			_g_free0 (_tmp20_);
+			_g_free0 (_tmp19_);
+			_g_free0 (_tmp18_);
+			_g_free0 (_tmp17_);
+			_g_free0 (_tmp16_);
+			_g_free0 (_tmp15_);
 			g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
 			_dbus_g_connection_unref0 (connection);
 		}
@@ -5251,7 +5247,7 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 			e = _inner_error_;
 			_inner_error_ = NULL;
 			{
-				g_error ("mpris2-controller.vala:92: Problems connecting to the session bus - %s", e->message);
+				g_error ("mpris2-controller.vala:93: Problems connecting to the session bus - %s", e->message);
 				_g_error_free0 (e);
 			}
 		}
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 65d881a..df2bbd3 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -19,6 +19,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using DBus;
 
+
 [DBus (name = "org.mpris.MediaPlayer2")]
 public interface MprisRoot : DBus.Object {
 	// properties
@@ -89,7 +90,7 @@ public class Mpris2Controller : GLib.Object
 			this.properties_interface.PropertiesChanged += property_changed_cb;			
 			
 		} catch (DBus.Error e) {
-      error("Problems connecting to the session bus - %s", e.message);
+      	error("Problems connecting to the session bus - %s", e.message);
     }		
 	}
 
@@ -106,33 +107,41 @@ public class Mpris2Controller : GLib.Object
 			debug("new playback state = %s", state);			
 			int p = this.determine_play_state(state);
 			(this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(p);			
-			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_playstate(p);			
 		}
 		
 		Value? pos_v = changed_properties.lookup("Position");
 		if(pos_v != null){
 			int64 pos = pos_v.get_int64();
 			debug("new position = %i", (int)pos);
-			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_position((int32)pos);						
 		}
 
 		Value? meta_v = changed_properties.lookup("Metadata");
 		if(meta_v != null){
-			debug("metadata is not empty");
-			debug("artist : %s", this.player.Metadata.lookup("artist").get_string());			
-			this.owner.custom_items[PlayerController.widget_order.METADATA].reset(MetadataMenuitem.attributes_format());			
-			this.owner.custom_items[PlayerController.widget_order.METADATA].update(this.player.Metadata,
+			GLib.HashTable<string, Value?> changed_updates = clean_metadata();	
+			this.owner.custom_items[PlayerController.widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
+			this.owner.custom_items[PlayerController.widget_order.METADATA].update(changed_updates,
 			                          																						 MetadataMenuitem.attributes_format());			
-			this.owner.custom_items[PlayerController.widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());	
-			if((int)this.player.Metadata.lookup("artist").get_string().len() > 0 ||
-			   (int)this.player.Metadata.lookup("artist").get_string().len() > 0){
-				this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.player.Metadata,
-					                    																							ScrubMenuitem.attributes_format());			
-			}
-			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_playstate(this.determine_play_state(this.player.PlaybackStatus));			
-			
 		}
 	}
+
+	private GLib.HashTable<string, Value?> clean_metadata()
+	{ 
+		GLib.HashTable<string, Value?> changed_updates = this.player.Metadata; 
+    Value? artist_v = this.player.Metadata.lookup("xesam:artist");
+    if(artist_v != null){
+		  string[] artists = (string[])this.player.Metadata.lookup("xesam:artist");
+		  string display_artists = string.joinv(", ", artists);
+		  changed_updates.replace("xesam:artist", display_artists);
+		  debug("artist : %s", display_artists);
+    }
+    Value? length_v = this.player.Metadata.lookup("mpris:length");
+    if(length_v != null){
+		  int64 duration = this.player.Metadata.lookup("mpris:length").get_int64();
+		  changed_updates.replace("mpris:length", duration/1000000); 
+    }
+		return changed_updates;
+	}
+	
 	
 	private int determine_play_state(string status){
 		if(status == null)
@@ -157,10 +166,9 @@ public class Mpris2Controller : GLib.Object
 		debug("initial update - play state %i", status);
 		
 		(this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(status);
-		this.owner.custom_items[PlayerController.widget_order.METADATA].update(this.player.Metadata,
+		GLib.HashTable<string, Value?> cleaned_metadata = this.clean_metadata();
+		this.owner.custom_items[PlayerController.widget_order.METADATA].update(cleaned_metadata,
 			                          MetadataMenuitem.attributes_format());
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.player.Metadata,
-			                      ScrubMenuitem.attributes_format());		
 	}
 
 	public void transport_event(TransportMenuitem.action command)
@@ -202,25 +210,25 @@ public class Mpris2Controller : GLib.Object
 	public void set_position(double position)
 	{			
 		debug("Set position with pos (0-100) %f", position);
-		HashTable<string, Value?> data = this.player.Metadata;
-		Value? time_value = data.lookup("time");
+		Value? time_value = this.player.Metadata.lookup("mpris:length");
 		if(time_value == null){
 			warning("Can't fetch the duration of the track therefore cant set the position");
 			return;
 		}
-		// work in microseconds (scale up by 10 TTP-of 3)
-		uint32 total_time = time_value.get_uint() * 1000;
+		// work in microseconds (scale up by 10 TTP-of 6)
+		int64 total_time = time_value.get_int64();
 		debug("total time of track = %i", (int)total_time);				
-		double new_time_position = total_time * position/100.0;
+		double new_time_position = total_time * (position/100.0);
 		debug("new position = %f", (new_time_position));		
 
-		Value? v = this.player.Metadata.lookup("trackid");
+		Value? v = this.player.Metadata.lookup("mpris:trackid");
 		if(v != null){
 			if(v.holds (typeof (string))){
-				debug("the trackid = %s", v.get_string());
 				DBus.ObjectPath path = new ObjectPath(v.get_string());
 				try{
-					//this.player.SetPosition(path, (int64)(new_time_position));
+					this.player.SetPosition(path, (int64)(new_time_position));
+					//ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
+					//scrub.update_position(((int32)new_time_position) / 1000);			
 				}
 				catch(DBus.Error e){
 					error("DBus Error calling the player objects SetPosition method %s",
@@ -232,8 +240,8 @@ public class Mpris2Controller : GLib.Object
 
 	public void onSeeked(int64 position){
 		debug("Seeked signal callback with pos = %i", (int)position/1000);
-		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
-		scrub.update_position((int32)position/1000);			
+		//ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
+		//scrub.update_position((int32)position/1000);			
 	}
 	
 	public bool connected()
diff --git a/src/music-player-bridge.c b/src/music-player-bridge.c
index 3e83e7c..1e908a9 100644
--- a/src/music-player-bridge.c
+++ b/src/music-player-bridge.c
@@ -1,4 +1,4 @@
-/* music-player-bridge.c generated by valac 0.9.5, the Vala compiler
+/* music-player-bridge.c generated by valac 0.9.7, the Vala compiler
  * generated from music-player-bridge.vala, do not modify */
 
 /*
@@ -107,6 +107,8 @@ GType familiar_players_db_get_type (void) G_GNUC_CONST;
 enum  {
 	MUSIC_PLAYER_BRIDGE_DUMMY_PROPERTY
 };
+MusicPlayerBridge* music_player_bridge_new (void);
+MusicPlayerBridge* music_player_bridge_construct (GType object_type);
 FamiliarPlayersDB* familiar_players_db_new (void);
 FamiliarPlayersDB* familiar_players_db_construct (GType object_type);
 void music_player_bridge_on_indicator_added (MusicPlayerBridge* self, IndicateListenerServer* object, IndicateListenerIndicator* p0);
@@ -121,15 +123,13 @@ void music_player_bridge_on_server_removed (MusicPlayerBridge* self, IndicateLis
 static void _music_player_bridge_on_server_removed_indicate_listener_server_removed (IndicateListener* _sender, IndicateListenerServer* object, const char* p0, gpointer self);
 void music_player_bridge_on_server_count_changed (MusicPlayerBridge* self, IndicateListenerServer* object, guint i);
 static void _music_player_bridge_on_server_count_changed_indicate_listener_server_count_changed (IndicateListener* _sender, IndicateListenerServer* object, guint p0, gpointer self);
-MusicPlayerBridge* music_player_bridge_new (void);
-MusicPlayerBridge* music_player_bridge_construct (GType object_type);
+static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self);
 GeeSet* familiar_players_db_records (FamiliarPlayersDB* self);
 static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self);
 GType player_controller_state_get_type (void) G_GNUC_CONST;
 PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
-static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self);
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 4
 static gboolean music_player_bridge_server_is_not_of_interest (MusicPlayerBridge* self, const char* type);
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state);
 void player_controller_activate (PlayerController* self);
@@ -237,10 +237,10 @@ static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlaye
 				GDesktopAppInfo* _tmp2_;
 				GAppInfo* app_info;
 				PlayerController* ctrl;
-				char* _tmp4_;
 				char* _tmp3_;
-				char* _tmp6_;
+				char* _tmp4_;
 				char* _tmp5_;
+				char* _tmp6_;
 				if (app == NULL) {
 					g_warning ("music-player-bridge.vala:52: App string in keyfile is null therefore m" \
 "oving on to next player");
@@ -292,9 +292,9 @@ static gint music_player_bridge_calculate_menu_position (MusicPlayerBridge* self
 
 
 void music_player_bridge_on_server_added (MusicPlayerBridge* self, IndicateListenerServer* object, const char* type) {
-	gint _tmp1__length1;
-	char** _tmp1_;
 	char** _tmp0_;
+	char** _tmp1_;
+	gint _tmp1__length1;
 	char* _tmp2_;
 	char* client_name;
 	gboolean _tmp3_ = FALSE;
@@ -344,9 +344,9 @@ void music_player_bridge_on_server_added (MusicPlayerBridge* self, IndicateListe
 
 
 void music_player_bridge_on_server_removed (MusicPlayerBridge* self, IndicateListenerServer* object, const char* type) {
-	gint _tmp1__length1;
-	char** _tmp1_;
 	char** _tmp0_;
+	char** _tmp1_;
+	gint _tmp1__length1;
 	char* _tmp2_;
 	char* client_name;
 	gboolean _tmp3_ = FALSE;
@@ -419,8 +419,8 @@ static void music_player_bridge_desktop_info_callback (MusicPlayerBridge* self,
 		familiar_players_db_insert (bridge->priv->playersDB, path);
 		app_info = music_player_bridge_create_app_info (path);
 		if (app_info != NULL) {
-			char* _tmp3_;
 			char* _tmp2_;
+			char* _tmp3_;
 			PlayerController* _tmp4_;
 			PlayerController* ctrl;
 			ctrl = (_tmp4_ = (PlayerController*) gee_abstract_map_get ((GeeAbstractMap*) bridge->priv->registered_clients, _tmp3_ = string_strip (_tmp2_ = g_utf8_strdown (g_app_info_get_name (app_info), -1))), _g_free0 (_tmp3_), _g_free0 (_tmp2_), _tmp4_);
diff --git a/src/music-player-bridge.h b/src/music-player-bridge.h
index 1670d28..64ccb1c 100644
--- a/src/music-player-bridge.h
+++ b/src/music-player-bridge.h
@@ -1,4 +1,4 @@
-/* music-player-bridge.h generated by valac 0.9.5, the Vala compiler, do not modify */
+/* music-player-bridge.h generated by valac 0.9.7, the Vala compiler, do not modify */
 
 
 #ifndef __MUSIC_PLAYER_BRIDGE_H__
@@ -254,7 +254,6 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
-	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
@@ -374,7 +373,7 @@ GeeHashSet* title_menuitem_attributes_format (void);
 GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 4
 PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state);
diff --git a/src/play-button.c b/src/play-button.c
index 2f3a553..a2eaf2e 100644
--- a/src/play-button.c
+++ b/src/play-button.c
@@ -750,9 +750,9 @@ draw (GtkWidget* button, cairo_t *cr)
                X,
                Y + 2,
                RECT_WIDTH - 4,
-               INNER_RADIUS,
-               INNER_START,
-               INNER_END);
+               MIDDLE_RADIUS,
+               MIDDLE_START,
+               MIDDLE_END);
 
 	if(priv->current_command == TRANSPORT_PREVIOUS){
 		draw_gradient (cr,
@@ -774,35 +774,35 @@ draw (GtkWidget* button, cairo_t *cr)
 	}
 
 	// play/pause-background
-        draw_circle (cr,
-		     X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f,
-		     Y - ((CIRCLE_RADIUS - OUTER_RADIUS)),
-		     CIRCLE_RADIUS,
-		     OUTER_START,
-		     OUTER_END);
-        draw_circle (cr,
-                       X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 0.5f,
-                       Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 0.5f,
-                       CIRCLE_RADIUS - 0.75f,
-                       MIDDLE_START,
-                       MIDDLE_END);
-
-				if(priv->current_command == TRANSPORT_PLAY_PAUSE){
-		      draw_circle (cr,
-		                   X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
-		                   Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
-		                   CIRCLE_RADIUS - 1.5f,
-		               		 INNER_COMPRESSED_START,
-		                   INNER_COMPRESSED_END);
-				}
-				else{        
-					draw_circle (cr,
-                     X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
-                     Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
-                     CIRCLE_RADIUS - 1.5f,
-                     INNER_START,
-		     						 INNER_END);
-				}					
+  draw_circle (cr,
+							 X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f,
+							 Y - ((CIRCLE_RADIUS - OUTER_RADIUS)),
+							 CIRCLE_RADIUS,
+							 OUTER_START,
+							 OUTER_END);
+  draw_circle (cr,
+               X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 0.5f,
+               Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 0.5f,
+               CIRCLE_RADIUS - 0.75f,
+               MIDDLE_START,
+               MIDDLE_END);
+
+	if(priv->current_command == TRANSPORT_PLAY_PAUSE){
+    draw_circle (cr,
+                 X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
+                 Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
+                 CIRCLE_RADIUS - 1.5f,
+             		 INNER_COMPRESSED_START,
+                 INNER_COMPRESSED_END);
+	}
+	else{        
+		draw_circle (cr,
+               X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
+               Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
+               CIRCLE_RADIUS - 1.5f,
+               MIDDLE_START,
+               MIDDLE_END);
+	}					
 	// draw previous-button drop-shadow
 	_setup (&cr_surf, &surf, PREV_WIDTH, PREV_HEIGHT);
 	_mask_prev (cr_surf,
diff --git a/src/player-controller.c b/src/player-controller.c
index 39189f3..28bb28c 100644
--- a/src/player-controller.c
+++ b/src/player-controller.c
@@ -1,4 +1,4 @@
-/* player-controller.c generated by valac 0.9.5, the Vala compiler
+/* player-controller.c generated by valac 0.9.7, the Vala compiler
  * generated from player-controller.vala, do not modify */
 
 /*
@@ -91,16 +91,6 @@ typedef struct _TitleMenuitemClass TitleMenuitemClass;
 typedef struct _MetadataMenuitem MetadataMenuitem;
 typedef struct _MetadataMenuitemClass MetadataMenuitemClass;
 
-#define TYPE_SCRUB_MENUITEM (scrub_menuitem_get_type ())
-#define SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitem))
-#define SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-#define IS_SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCRUB_MENUITEM))
-#define IS_SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCRUB_MENUITEM))
-#define SCRUB_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
-
-typedef struct _ScrubMenuitem ScrubMenuitem;
-typedef struct _ScrubMenuitemClass ScrubMenuitemClass;
-
 #define TYPE_TRANSPORT_MENUITEM (transport_menuitem_get_type ())
 #define TRANSPORT_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TRANSPORT_MENUITEM, TransportMenuitem))
 #define TRANSPORT_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TRANSPORT_MENUITEM, TransportMenuitemClass))
@@ -134,7 +124,6 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
-	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
 	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
@@ -161,29 +150,28 @@ enum  {
 };
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 4
+PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
+PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 static char* player_controller_format_client_name (const char* client_name);
 void player_controller_set_name (PlayerController* self, const char* value);
 void player_controller_set_menu_offset (PlayerController* self, gint value);
 static void player_controller_construct_widgets (PlayerController* self);
 static void player_controller_establish_mpris_connection (PlayerController* self);
 void player_controller_update_layout (PlayerController* self);
-PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
-PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
-const char* player_controller_get_name (PlayerController* self);
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state);
+const char* player_controller_get_name (PlayerController* self);
 void player_controller_activate (PlayerController* self);
-GAppInfo* player_controller_get_app_info (PlayerController* self);
 void player_controller_instantiate (PlayerController* self);
+GAppInfo* player_controller_get_app_info (PlayerController* self);
 MprisBridge* mpris_bridge_new (PlayerController* ctrl);
 MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
 void player_controller_determine_state (PlayerController* self);
 void player_controller_vanish (PlayerController* self);
+void player_controller_hibernate (PlayerController* self);
 void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
 GeeHashSet* transport_menuitem_attributes_format (void);
 GeeHashSet* metadata_menuitem_attributes_format (void);
-GeeHashSet* scrub_menuitem_attributes_format (void);
-void player_controller_hibernate (PlayerController* self);
 gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs);
 PlayerItem* player_item_new (const char* type);
 PlayerItem* player_item_construct (GType object_type, const char* type);
@@ -193,9 +181,6 @@ GType title_menuitem_get_type (void) G_GNUC_CONST;
 MetadataMenuitem* metadata_menuitem_new (void);
 MetadataMenuitem* metadata_menuitem_construct (GType object_type);
 GType metadata_menuitem_get_type (void) G_GNUC_CONST;
-ScrubMenuitem* scrub_menuitem_new (PlayerController* parent);
-ScrubMenuitem* scrub_menuitem_construct (GType object_type, PlayerController* parent);
-GType scrub_menuitem_get_type (void) G_GNUC_CONST;
 TransportMenuitem* transport_menuitem_new (PlayerController* parent);
 TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerController* parent);
 GType transport_menuitem_get_type (void) G_GNUC_CONST;
@@ -211,7 +196,7 @@ static void player_controller_set_property (GObject * object, guint property_id,
 GType player_controller_widget_order_get_type (void) {
 	static volatile gsize player_controller_widget_order_type_id__volatile = 0;
 	if (g_once_init_enter (&player_controller_widget_order_type_id__volatile)) {
-		static const GEnumValue values[] = {{PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR, "PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR", "separator"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TITLE, "PLAYER_CONTROLLER_WIDGET_ORDER_TITLE", "title"}, {PLAYER_CONTROLLER_WIDGET_ORDER_METADATA, "PLAYER_CONTROLLER_WIDGET_ORDER_METADATA", "metadata"}, {PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB, "PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB", "scrub"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT, "PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT", "transport"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR, "PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR", "separator"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TITLE, "PLAYER_CONTROLLER_WIDGET_ORDER_TITLE", "title"}, {PLAYER_CONTROLLER_WIDGET_ORDER_METADATA, "PLAYER_CONTROLLER_WIDGET_ORDER_METADATA", "metadata"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT, "PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT", "transport"}, {0, NULL, NULL}};
 		GType player_controller_widget_order_type_id;
 		player_controller_widget_order_type_id = g_enum_register_static ("PlayerControllerwidget_order", values);
 		g_once_init_leave (&player_controller_widget_order_type_id__volatile, player_controller_widget_order_type_id);
@@ -251,8 +236,8 @@ static char* string_strip (const char* self) {
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state) {
 	PlayerController * self;
 	DbusmenuMenuitem* _tmp0_;
-	char* _tmp2_;
 	char* _tmp1_;
+	char* _tmp2_;
 	GeeArrayList* _tmp3_;
 	g_return_val_if_fail (root != NULL, NULL);
 	g_return_val_if_fail (client_name != NULL, NULL);
@@ -278,7 +263,7 @@ PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* cli
 
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state) {
 	g_return_if_fail (self != NULL);
-	g_debug ("player-controller.vala:67: update_state - player controller %s : new s" \
+	g_debug ("player-controller.vala:66: update_state - player controller %s : new s" \
 "tate %i", self->priv->_name, (gint) new_state);
 	self->current_state = (gint) new_state;
 	player_controller_update_layout (self);
@@ -292,10 +277,9 @@ void player_controller_activate (PlayerController* self) {
 
 
 void player_controller_instantiate (PlayerController* self) {
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
-	_inner_error_ = NULL;
-	g_debug ("player-controller.vala:85: instantiate in player controller for %s", self->priv->_name);
+	g_debug ("player-controller.vala:84: instantiate in player controller for %s", self->priv->_name);
 	{
 		g_app_info_launch (self->priv->_app_info, NULL, NULL, &_inner_error_);
 		if (_inner_error_ != NULL) {
@@ -310,7 +294,7 @@ void player_controller_instantiate (PlayerController* self) {
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
 		{
-			g_warning ("player-controller.vala:91: Failed to launch app %s with error message:" \
+			g_warning ("player-controller.vala:90: Failed to launch app %s with error message:" \
 " %s", self->priv->_name, _error_->message);
 			_g_error_free0 (_error_);
 		}
@@ -328,7 +312,7 @@ static void player_controller_establish_mpris_connection (PlayerController* self
 	MprisBridge* _tmp0_;
 	g_return_if_fail (self != NULL);
 	if (self->current_state != PLAYER_CONTROLLER_STATE_READY) {
-		g_debug ("player-controller.vala:98: establish_mpris_connection - Not ready to c" \
+		g_debug ("player-controller.vala:97: establish_mpris_connection - Not ready to c" \
 "onnect");
 		return;
 	}
@@ -357,12 +341,10 @@ void player_controller_vanish (PlayerController* self) {
 
 
 void player_controller_hibernate (PlayerController* self) {
-	GeeHashSet* _tmp1_;
 	PlayerItem* _tmp0_;
-	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp1_;
 	PlayerItem* _tmp2_;
-	GeeHashSet* _tmp5_;
-	PlayerItem* _tmp4_;
+	GeeHashSet* _tmp3_;
 	g_return_if_fail (self != NULL);
 	player_controller_update_state (self, PLAYER_CONTROLLER_STATE_OFFLINE);
 	player_item_reset (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), _tmp1_ = transport_menuitem_attributes_format ());
@@ -371,43 +353,30 @@ void player_controller_hibernate (PlayerController* self) {
 	player_item_reset (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp3_ = metadata_menuitem_attributes_format ());
 	_g_object_unref0 (_tmp3_);
 	_g_object_unref0 (_tmp2_);
-	player_item_reset (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp5_ = scrub_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp5_);
-	_g_object_unref0 (_tmp4_);
 }
 
 
 void player_controller_update_layout (PlayerController* self) {
-	GeeHashSet* _tmp5_;
-	PlayerItem* _tmp4_;
+	PlayerItem* _tmp2_;
 	PlayerItem* _tmp3_;
-	GeeHashSet* _tmp8_;
-	PlayerItem* _tmp7_;
-	PlayerItem* _tmp6_;
-	PlayerItem* _tmp9_;
+	GeeHashSet* _tmp4_;
+	PlayerItem* _tmp5_;
 	g_return_if_fail (self != NULL);
 	if (self->current_state != PLAYER_CONTROLLER_STATE_CONNECTED) {
 		PlayerItem* _tmp0_;
 		PlayerItem* _tmp1_;
-		PlayerItem* _tmp2_;
 		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 		_g_object_unref0 (_tmp0_);
-		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp1_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp1_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 		_g_object_unref0 (_tmp1_);
-		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-		_g_object_unref0 (_tmp2_);
 		return;
 	}
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp5_ = metadata_menuitem_attributes_format ()));
-	_g_object_unref0 (_tmp5_);
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp4_ = metadata_menuitem_attributes_format ()));
 	_g_object_unref0 (_tmp4_);
 	_g_object_unref0 (_tmp3_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp6_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp7_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp8_ = scrub_menuitem_attributes_format ()));
-	_g_object_unref0 (_tmp8_);
-	_g_object_unref0 (_tmp7_);
-	_g_object_unref0 (_tmp6_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp9_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp2_);
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+	_g_object_unref0 (_tmp5_);
 }
 
 
@@ -415,7 +384,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 	PlayerItem* _tmp0_;
 	TitleMenuitem* title_menu_item;
 	MetadataMenuitem* metadata_item;
-	ScrubMenuitem* scrub_item;
 	TransportMenuitem* transport_item;
 	g_return_if_fail (self != NULL);
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, _tmp0_ = player_item_new (DBUSMENU_CLIENT_TYPES_SEPARATOR));
@@ -424,8 +392,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) title_menu_item);
 	metadata_item = metadata_menuitem_new ();
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) metadata_item);
-	scrub_item = scrub_menuitem_new (self);
-	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) scrub_item);
 	transport_item = transport_menuitem_new (self);
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) transport_item);
 	{
@@ -443,7 +409,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 		_g_object_unref0 (_item_it);
 	}
 	_g_object_unref0 (transport_item);
-	_g_object_unref0 (scrub_item);
 	_g_object_unref0 (metadata_item);
 	_g_object_unref0 (title_menu_item);
 }
@@ -488,13 +453,13 @@ static char* player_controller_format_client_name (const char* client_name) {
 	g_return_val_if_fail (client_name != NULL, NULL);
 	formatted = g_strdup (client_name);
 	if (g_utf8_strlen (formatted, -1) > 1) {
-		char* _tmp2_;
-		char* _tmp1_;
 		char* _tmp0_;
+		char* _tmp1_;
+		char* _tmp2_;
 		formatted = (_tmp2_ = g_strconcat (_tmp0_ = g_utf8_strup (client_name, (gssize) 1), _tmp1_ = string_slice (client_name, (glong) 1, g_utf8_strlen (client_name, -1)), NULL), _g_free0 (formatted), _tmp2_);
 		_g_free0 (_tmp1_);
 		_g_free0 (_tmp0_);
-		g_debug ("player-controller.vala:171: PlayerController->format_client_name - : %" \
+		g_debug ("player-controller.vala:160: PlayerController->format_client_name - : %" \
 "s", formatted);
 	}
 	result = formatted;
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 2aa4382..3e12dce 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -23,13 +23,12 @@ using Gee;
 
 public class PlayerController : GLib.Object
 {
-	public const int WIDGET_QUANTITY = 5;
+	public const int WIDGET_QUANTITY = 4;
 
 	public static enum widget_order{
 		SEPARATOR,
 		TITLE,
 		METADATA,
-		SCRUB,
 		TRANSPORT,
 	}
 
@@ -114,25 +113,19 @@ public class PlayerController : GLib.Object
 		update_state(PlayerController.state.OFFLINE);
 		this.custom_items[widget_order.TRANSPORT].reset(TransportMenuitem.attributes_format());
 		this.custom_items[widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
-		this.custom_items[widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());			
 	}
 
 	public void update_layout()
-	{	
-		
+	{			
 		if(this.current_state != state.CONNECTED){
 			this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
 			                                                            false);
-			this.custom_items[widget_order.SCRUB].property_set_bool(MENUITEM_PROP_VISIBLE,
-			                                                        false);
 			this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
 			                                                           false);
 			return;	
 		}
 		this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
 			                                                        this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));		
-		this.custom_items[widget_order.SCRUB].property_set_bool(MENUITEM_PROP_VISIBLE,
-		                                                        this.custom_items[widget_order.SCRUB].populated(ScrubMenuitem.attributes_format()));
 		this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
 		                                                            true);
 	}
@@ -150,10 +143,6 @@ public class PlayerController : GLib.Object
 		MetadataMenuitem metadata_item = new MetadataMenuitem();
 		this.custom_items.add(metadata_item);
 
-		// Scrub item
-		ScrubMenuitem scrub_item = new ScrubMenuitem(this);
-		this.custom_items.add(scrub_item);
-
 		// Transport item
 		TransportMenuitem transport_item = new TransportMenuitem(this);
 		this.custom_items.add(transport_item);
diff --git a/src/player-item.c b/src/player-item.c
index 74d3e2f..f70c04c 100644
--- a/src/player-item.c
+++ b/src/player-item.c
@@ -1,4 +1,4 @@
-/* player-item.c generated by valac 0.9.5, the Vala compiler
+/* player-item.c generated by valac 0.9.7, the Vala compiler
  * generated from player-item.vala, do not modify */
 
 /*
@@ -84,8 +84,8 @@ enum  {
 PlayerItem* player_item_new (const char* type);
 PlayerItem* player_item_construct (GType object_type, const char* type);
 void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
-static GValue* _g_value_dup (GValue* self);
 void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes);
+static GValue* _g_value_dup (GValue* self);
 gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs);
 PlayerController* player_item_get_owner (PlayerItem* self);
 static void player_item_set_owner (PlayerItem* self, PlayerController* value);
@@ -178,11 +178,10 @@ static char* bool_to_string (gboolean self) {
 
 
 void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes) {
-	GError * _inner_error_;
+	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (data != NULL);
 	g_return_if_fail (attributes != NULL);
-	_inner_error_ = NULL;
 	g_debug ("player-item.vala:47: PlayerItem::update()");
 	if (data == NULL) {
 		g_debug ("player-item.vala:49: PlayerItem::Update -> The hashtable was null - ju" \
@@ -194,13 +193,13 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 		_property_it = gee_abstract_collection_iterator ((GeeAbstractCollection*) attributes);
 		while (TRUE) {
 			char* property;
-			char** _tmp1_;
-			gint _input_keys_size_;
 			gint input_keys_length1;
+			gint _input_keys_size_;
+			char** _tmp1_;
 			char** _tmp0_;
 			char** input_keys;
-			char** _tmp3_ = NULL;
 			gint _tmp2_;
+			char** _tmp3_ = NULL;
 			char* search_key;
 			GValue* v;
 			if (!gee_iterator_next (_property_it)) {
@@ -215,7 +214,7 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 				char* update;
 				update = string_strip (g_value_get_string (v));
 				g_debug ("player-item.vala:61: with value : %s", update);
-				if (string_contains (property, "arturl")) {
+				if (string_contains (property, "mpris:artUrl")) {
 					{
 						char* _tmp4_;
 						char* _tmp5_;
@@ -269,9 +268,9 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 					g_debug ("player-item.vala:74: with value : %i", g_value_get_int (v));
 					dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, g_value_get_int (v));
 				} else {
-					if (G_VALUE_HOLDS (v, G_TYPE_UINT)) {
-						g_debug ("player-item.vala:78: with value : %i", (gint) g_value_get_uint (v));
-						dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, (gint) g_value_get_uint (v));
+					if (G_VALUE_HOLDS (v, G_TYPE_INT64)) {
+						g_debug ("player-item.vala:78: with value : %i", (gint) g_value_get_int64 (v));
+						dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, (gint) g_value_get_int64 (v));
 					} else {
 						if (G_VALUE_HOLDS (v, G_TYPE_BOOLEAN)) {
 							char* _tmp8_;
@@ -309,8 +308,9 @@ gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs) {
 				break;
 			}
 			prop = (char*) gee_iterator_get (_prop_it);
+			g_debug ("player-item.vala:95: populated ? - prop: %s", prop);
 			value_int = dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop);
-			g_debug ("player-item.vala:96: populate - prop %s and value %i", prop, value_int);
+			g_debug ("player-item.vala:97: populated ? - prop %s and value %i", prop, value_int);
 			if (dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop) != PLAYER_ITEM_EMPTY) {
 				result = TRUE;
 				_g_free0 (prop);
diff --git a/src/player-item.vala b/src/player-item.vala
index e5d8bfc..fbfacbd 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -60,7 +60,7 @@ public class PlayerItem : Dbusmenu.Menuitem
 				string update = v.get_string().strip();
 				debug("with value : %s", update);
 				// Special case for the arturl URI's.
-				if(property.contains("arturl")){
+				if(property.contains("mpris:artUrl")){
 					try{
 						update = Filename.from_uri(update.strip());
 					}
@@ -74,9 +74,9 @@ public class PlayerItem : Dbusmenu.Menuitem
 				debug("with value : %i", v.get_int());
 				this.property_set_int(property, v.get_int());
 			}
-			else if (v.holds (typeof (uint))){
-				debug("with value : %i", (int)v.get_uint());
-				this.property_set_int(property, (int)v.get_uint());
+			else if (v.holds (typeof (int64))){
+				debug("with value : %i", (int)v.get_int64());
+				this.property_set_int(property, (int)v.get_int64());
 			}
 			else if(v.holds (typeof (bool))){
 				debug("with value : %s", v.get_boolean().to_string());				
@@ -92,8 +92,9 @@ public class PlayerItem : Dbusmenu.Menuitem
 	public bool populated(HashSet<string> attrs)
 	{
 		foreach(string prop in attrs){
+			debug("populated ? - prop: %s", prop);
 		  int value_int = property_get_int(prop);
-			debug("populate - prop %s and value %i", prop, value_int);
+			debug("populated ? - prop %s and value %i", prop, value_int);
 			if(property_get_int(prop) != EMPTY){
 				return true;
 			}
diff --git a/src/scrub-menu-item.c b/src/scrub-menu-item.c
index f31b24e..c4aa807 100644
--- a/src/scrub-menu-item.c
+++ b/src/scrub-menu-item.c
@@ -1,4 +1,4 @@
-/* scrub-menu-item.c generated by valac 0.9.5, the Vala compiler
+/* scrub-menu-item.c generated by valac 0.9.7, the Vala compiler
  * generated from scrub-menu-item.vala, do not modify */
 
 /*
@@ -55,7 +55,6 @@ typedef struct _PlayerItemPrivate PlayerItemPrivate;
 typedef struct _ScrubMenuitem ScrubMenuitem;
 typedef struct _ScrubMenuitemClass ScrubMenuitemClass;
 typedef struct _ScrubMenuitemPrivate ScrubMenuitemPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_PLAYER_CONTROLLER (player_controller_get_type ())
 #define PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PLAYER_CONTROLLER, PlayerController))
@@ -66,6 +65,7 @@ typedef struct _ScrubMenuitemPrivate ScrubMenuitemPrivate;
 
 typedef struct _PlayerController PlayerController;
 typedef struct _PlayerControllerClass PlayerControllerClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
 #define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
@@ -116,16 +116,16 @@ GType scrub_menuitem_get_type (void) G_GNUC_CONST;
 enum  {
 	SCRUB_MENUITEM_DUMMY_PROPERTY
 };
-void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
-GeeHashSet* scrub_menuitem_attributes_format (void);
 GType player_controller_get_type (void) G_GNUC_CONST;
 ScrubMenuitem* scrub_menuitem_new (PlayerController* parent);
 ScrubMenuitem* scrub_menuitem_construct (GType object_type, PlayerController* parent);
+void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
+GeeHashSet* scrub_menuitem_attributes_format (void);
+static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
 GType mpris_bridge_get_type (void) G_GNUC_CONST;
 void mpris_bridge_set_track_position (MprisBridge* self, double pos);
-static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
 void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
 
diff --git a/src/scrub-menu-item.vala b/src/scrub-menu-item.vala
index 7368a0c..d7b60a0 100644
--- a/src/scrub-menu-item.vala
+++ b/src/scrub-menu-item.vala
@@ -42,7 +42,7 @@ public class ScrubMenuitem : PlayerItem
 
 	public void update_playstate(int state)
 	{
-		this.property_set_int(MENUITEM_PLAY_STATE, state);		
+		this.property_set_int(MENUITEM_PLAY_STATE, state);	
 	}
 	
 	public static HashSet<string> attributes_format()
diff --git a/src/title-menu-item.c b/src/title-menu-item.c
index a81e2ce..2733bde 100644
--- a/src/title-menu-item.c
+++ b/src/title-menu-item.c
@@ -1,4 +1,4 @@
-/* title-menu-item.c generated by valac 0.9.5, the Vala compiler
+/* title-menu-item.c generated by valac 0.9.7, the Vala compiler
  * generated from title-menu-item.vala, do not modify */
 
 /*
@@ -125,15 +125,15 @@ enum  {
 	TITLE_MENUITEM_DUMMY_PROPERTY
 };
 GType player_controller_get_type (void) G_GNUC_CONST;
-const char* player_controller_get_name (PlayerController* self);
 TitleMenuitem* title_menuitem_new (PlayerController* parent);
 TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent);
+const char* player_controller_get_name (PlayerController* self);
+static void title_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 PlayerController* player_item_get_owner (PlayerItem* self);
 GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
 void player_controller_instantiate (PlayerController* self);
 void mpris_bridge_expose (MprisBridge* self);
-static void title_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 GeeHashSet* title_menuitem_attributes_format (void);
 
 
diff --git a/src/title-widget.c b/src/title-widget.c
index 8037eb7..e9f34d6 100644
--- a/src/title-widget.c
+++ b/src/title-widget.c
@@ -49,10 +49,6 @@ static void title_widget_finalize   (GObject *object);
 // keyevent consumers
 static gboolean title_widget_button_press_event (GtkWidget *menuitem, 
                                   							 GdkEventButton *event);
-static gboolean title_widget_button_release_event (GtkWidget *menuitem, 
-                                  								 GdkEventButton *event);
-static gboolean title_widget_expose_event(GtkWidget* widget, 
-                                          GdkEventExpose* event);
 
 // Dbusmenuitem properties update callback
 static void title_widget_property_update(DbusmenuMenuitem* item, gchar* property, 
@@ -72,8 +68,6 @@ title_widget_class_init (TitleWidgetClass *klass)
   GtkWidgetClass    *widget_class = GTK_WIDGET_CLASS (klass);
 
 	widget_class->button_press_event = title_widget_button_press_event;
-  widget_class->button_release_event = title_widget_button_release_event;
-	widget_class->expose_event = title_widget_expose_event;
 	
 	g_type_class_add_private (klass, sizeof (TitleWidgetPrivate));
 
@@ -124,24 +118,7 @@ title_widget_button_press_event (GtkWidget *menuitem,
 	g_value_set_boolean(&value, TRUE);	
 	dbusmenu_menuitem_handle_event (priv->twin_item, "Title menu event", &value, 0);
 	
-	return TRUE;
-}
-
-static gboolean
-title_widget_button_release_event (GtkWidget *menuitem, 
-                                  GdkEventButton *event)
-{
-	g_debug("TitleWidget::menu_release_event");
-	return TRUE;
-}
-
-static gboolean
-title_widget_expose_event(GtkWidget* widget, GdkEventExpose* event)
-{
-	TitleWidgetPrivate * priv = TITLE_WIDGET_GET_PRIVATE(widget);
-		
-	gtk_container_propagate_expose(GTK_CONTAINER(widget), priv->hbox, event); 
-	return TRUE;
+	return FALSE;
 }
 
 static void 
@@ -183,12 +160,12 @@ title_widget_style_name_text(TitleWidget* self)
 	TitleWidgetPrivate * priv = TITLE_WIDGET_GET_PRIVATE(self);
 
 	char* markup;
-	markup = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
+	markup = g_markup_printf_escaped ("<span size=\"medium\">%s</span>",
 	                                  gtk_label_get_text(GTK_LABEL(priv->name)));
 	gtk_label_set_markup (GTK_LABEL (priv->name), markup);
 	g_free(markup);
 }
-
+ 
  /**
  * transport_new:
  * @returns: a new #TitleWidget.
diff --git a/src/transport-menu-item.c b/src/transport-menu-item.c
index 7c6b46b..40051f4 100644
--- a/src/transport-menu-item.c
+++ b/src/transport-menu-item.c
@@ -1,4 +1,4 @@
-/* transport-menu-item.c generated by valac 0.9.5, the Vala compiler
+/* transport-menu-item.c generated by valac 0.9.7, the Vala compiler
  * generated from transport-menu-item.vala, do not modify */
 
 /*
@@ -128,11 +128,11 @@ GType player_controller_get_type (void) G_GNUC_CONST;
 TransportMenuitem* transport_menuitem_new (PlayerController* parent);
 TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerController* parent);
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
+static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
 GType mpris_bridge_get_type (void) G_GNUC_CONST;
 void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
-static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 GeeHashSet* transport_menuitem_attributes_format (void);