* New upstream release.

  - No easy way to turn the sound menu on/off (lp: #829648)
  - Avoid spawning notification daemon at startup (lp: #912150)
  - Creation of album-art-cache folder (lp: #799383)
  - schema id & path are inconsistent with other indicators (lp: #914377)

1 files changed, 418 insertions, 690 deletions

diff --git a/src/mpris2-controller.c b/src/mpris2-controller.c
index 298c9fe..3a8ab9b 100644
--- a/src/mpris2-controller.c
+++ b/src/mpris2-controller.c
@@ -1,4 +1,4 @@
-/* mpris2-controller.c generated by valac 0.14.0, the Vala compiler
+/* mpris2-controller.c generated by valac 0.12.1, the Vala compiler
  * generated from mpris2-controller.vala, do not modify */
 
 /*
@@ -264,25 +264,17 @@ struct _Mpris2ControllerFetchPlaylistsData {
 	PlaylistDetails* current_playlists;
 	gint current_playlists_length1;
 	gint _current_playlists_size_;
-	MprisPlaylists* _tmp0_;
-	gint _tmp1_;
+	gint _tmp0_;
+	PlaylistDetails* _tmp1_;
 	PlaylistDetails* _tmp2_;
-	PlaylistDetails* _tmp3_;
-	gint _tmp3__length1;
-	gint __tmp3__size_;
-	GError* e;
-	PlaylistDetails* _tmp4_;
-	gint _tmp4__length1;
-	PlayerController* _tmp5_;
-	GeeArrayList* _tmp6_;
-	gpointer _tmp7_;
+	gint _tmp2__length1;
+	gint __tmp2__size_;
+	GError * e;
+	gpointer _tmp3_;
+	PlayerItem* _tmp4_;
 	PlaylistsMenuitem* playlists_item;
-	PlaylistsMenuitem* _tmp8_;
-	PlaylistDetails* _tmp9_;
-	gint _tmp9__length1;
-	PlayerController* _tmp10_;
-	gboolean _tmp11_;
-	gboolean* _tmp12_;
+	gboolean _tmp5_;
+	gboolean* _tmp6_;
 	GError * _inner_error_;
 };
 
@@ -375,7 +367,7 @@ static void mpris2_controller_on_playlistdetails_changed (Mpris2Controller* self
 GType playlists_menuitem_get_type (void) G_GNUC_CONST;
 void playlists_menuitem_update_individual_playlist (PlaylistsMenuitem* self, PlaylistDetails* new_detail);
 static void mpris2_controller_fetch_playlists_data_free (gpointer _data);
-static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlaylistsData* _data_);
+static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlaylistsData* data);
 MprisPlaylists* mpris2_controller_get_playlists (Mpris2Controller* self);
 void mpris_playlists_GetPlaylists (MprisPlaylists* self, guint32 index, guint32 max_count, const gchar* order, gboolean reverse_order, GAsyncReadyCallback _callback_, gpointer _user_data_);
 PlaylistDetails* mpris_playlists_GetPlaylists_finish (MprisPlaylists* self, GAsyncResult* _res_, int* result_length1, GError** error);
@@ -407,10 +399,8 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl) {
 	Mpris2Controller * self = NULL;
-	PlayerController* _tmp0_;
 	g_return_val_if_fail (ctrl != NULL, NULL);
-	_tmp0_ = ctrl;
-	self = (Mpris2Controller*) g_object_new (object_type, "owner", _tmp0_, NULL);
+	self = (Mpris2Controller*) g_object_new (object_type, "owner", ctrl, NULL);
 	return self;
 }
 
@@ -462,194 +452,128 @@ static gboolean _mpris2_controller_fetch_active_playlist_gsource_func (gpointer
 
 void mpris2_controller_property_changed_cb (Mpris2Controller* self, const gchar* interface_source, GHashTable* changed_properties, gchar** invalid, int invalid_length1) {
 	gboolean _tmp0_ = FALSE;
-	GHashTable* _tmp1_;
-	gboolean _tmp4_;
-	GHashTable* _tmp5_;
-	gconstpointer _tmp6_ = NULL;
-	GVariant* _tmp7_;
+	gconstpointer _tmp2_ = NULL;
+	GVariant* _tmp3_;
 	GVariant* play_v;
-	GVariant* _tmp8_;
-	GHashTable* _tmp19_;
-	gconstpointer _tmp20_ = NULL;
-	GVariant* _tmp21_;
+	gconstpointer _tmp9_ = NULL;
+	GVariant* _tmp10_;
 	GVariant* meta_v;
-	GVariant* _tmp22_;
-	GHashTable* _tmp23_;
-	gconstpointer _tmp24_ = NULL;
-	GVariant* _tmp25_;
+	gconstpointer _tmp11_ = NULL;
+	GVariant* _tmp12_;
 	GVariant* playlist_v;
-	gboolean _tmp26_ = FALSE;
-	GVariant* _tmp27_;
-	gboolean _tmp31_;
-	GHashTable* _tmp32_;
-	gconstpointer _tmp33_ = NULL;
-	GVariant* _tmp34_;
+	gboolean _tmp13_ = FALSE;
+	gconstpointer _tmp15_ = NULL;
+	GVariant* _tmp16_;
 	GVariant* playlist_count_v;
-	gboolean _tmp35_ = FALSE;
-	GVariant* _tmp36_;
-	gboolean _tmp40_;
-	GHashTable* _tmp41_;
-	gconstpointer _tmp42_ = NULL;
-	GVariant* _tmp43_;
+	gboolean _tmp17_ = FALSE;
+	gconstpointer _tmp19_ = NULL;
+	GVariant* _tmp20_;
 	GVariant* playlist_orderings_v;
-	gboolean _tmp44_ = FALSE;
-	GVariant* _tmp45_;
-	gboolean _tmp49_;
-	GHashTable* _tmp50_;
-	gconstpointer _tmp51_ = NULL;
-	GVariant* _tmp52_;
+	gboolean _tmp21_ = FALSE;
+	gconstpointer _tmp23_ = NULL;
+	GVariant* _tmp24_;
 	GVariant* identity_v;
-	GVariant* _tmp53_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (interface_source != NULL);
 	g_return_if_fail (changed_properties != NULL);
-	_tmp1_ = changed_properties;
-	if (_tmp1_ == NULL) {
+	if (changed_properties == NULL) {
 		_tmp0_ = TRUE;
 	} else {
-		const gchar* _tmp2_;
-		gboolean _tmp3_ = FALSE;
-		_tmp2_ = interface_source;
-		_tmp3_ = g_str_has_prefix (_tmp2_, MPRIS_PREFIX);
-		_tmp0_ = _tmp3_ == FALSE;
+		gboolean _tmp1_;
+		_tmp1_ = g_str_has_prefix (interface_source, MPRIS_PREFIX);
+		_tmp0_ = _tmp1_ == FALSE;
 	}
-	_tmp4_ = _tmp0_;
-	if (_tmp4_) {
+	if (_tmp0_) {
 		g_warning ("mpris2-controller.vala:78: Property-changed hash is null or this is an" \
 " interface that doesn't concern us");
 		return;
 	}
-	_tmp5_ = changed_properties;
-	_tmp6_ = g_hash_table_lookup (_tmp5_, "PlaybackStatus");
-	_tmp7_ = _g_variant_ref0 ((GVariant*) _tmp6_);
-	play_v = _tmp7_;
-	_tmp8_ = play_v;
-	if (_tmp8_ != NULL) {
-		MprisPlayer* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
+	_tmp2_ = g_hash_table_lookup (changed_properties, "PlaybackStatus");
+	_tmp3_ = _g_variant_ref0 ((GVariant*) _tmp2_);
+	play_v = _tmp3_;
+	if (play_v != NULL) {
+		gchar* _tmp4_ = NULL;
 		gchar* state;
-		const gchar* _tmp12_;
-		TransportState _tmp13_ = 0;
+		TransportState _tmp5_;
 		TransportState p;
-		PlayerController* _tmp14_;
-		GeeArrayList* _tmp15_;
-		gpointer _tmp16_ = NULL;
-		TransportMenuitem* _tmp17_;
-		TransportState _tmp18_;
-		_tmp9_ = self->priv->_player;
-		_tmp10_ = mpris_player_get_PlaybackStatus (_tmp9_);
-		_tmp11_ = _tmp10_;
-		state = _tmp11_;
+		gpointer _tmp6_ = NULL;
+		PlayerItem* _tmp7_;
+		TransportMenuitem* _tmp8_;
+		_tmp4_ = mpris_player_get_PlaybackStatus (self->priv->_player);
+		state = _tmp4_;
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, _mpris2_controller_ensure_correct_playback_status_gsource_func, g_object_ref (self), g_object_unref);
-		_tmp12_ = state;
-		_tmp13_ = mpris2_controller_determine_play_state (self, _tmp12_);
-		p = (TransportState) _tmp13_;
-		_tmp14_ = self->priv->_owner;
-		_tmp15_ = _tmp14_->custom_items;
-		_tmp16_ = gee_abstract_list_get ((GeeAbstractList*) _tmp15_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
-		_tmp17_ = IS_TRANSPORT_MENUITEM ((PlayerItem*) _tmp16_) ? ((TransportMenuitem*) ((PlayerItem*) _tmp16_)) : NULL;
-		_tmp18_ = p;
-		transport_menuitem_change_play_state (_tmp17_, _tmp18_);
-		_g_object_unref0 (_tmp17_);
+		_tmp5_ = mpris2_controller_determine_play_state (self, state);
+		p = (TransportState) _tmp5_;
+		_tmp6_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
+		_tmp7_ = (PlayerItem*) _tmp6_;
+		_tmp8_ = IS_TRANSPORT_MENUITEM (_tmp7_) ? ((TransportMenuitem*) _tmp7_) : NULL;
+		transport_menuitem_change_play_state (_tmp8_, p);
+		_g_object_unref0 (_tmp8_);
 		_g_free0 (state);
 	}
-	_tmp19_ = changed_properties;
-	_tmp20_ = g_hash_table_lookup (_tmp19_, "Metadata");
-	_tmp21_ = _g_variant_ref0 ((GVariant*) _tmp20_);
-	meta_v = _tmp21_;
-	_tmp22_ = meta_v;
-	if (_tmp22_ != NULL) {
+	_tmp9_ = g_hash_table_lookup (changed_properties, "Metadata");
+	_tmp10_ = _g_variant_ref0 ((GVariant*) _tmp9_);
+	meta_v = _tmp10_;
+	if (meta_v != NULL) {
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, _mpris2_controller_ensure_correct_metadata_gsource_func, g_object_ref (self), g_object_unref);
 	}
-	_tmp23_ = changed_properties;
-	_tmp24_ = g_hash_table_lookup (_tmp23_, "ActivePlaylist");
-	_tmp25_ = _g_variant_ref0 ((GVariant*) _tmp24_);
-	playlist_v = _tmp25_;
-	_tmp27_ = playlist_v;
-	if (_tmp27_ != NULL) {
-		PlayerController* _tmp28_;
-		gboolean* _tmp29_;
-		gboolean _tmp30_;
-		_tmp28_ = self->priv->_owner;
-		_tmp29_ = _tmp28_->use_playlists;
-		_tmp30_ = TRUE;
-		_tmp26_ = _bool_equal (_tmp29_, &_tmp30_) == TRUE;
+	_tmp11_ = g_hash_table_lookup (changed_properties, "ActivePlaylist");
+	_tmp12_ = _g_variant_ref0 ((GVariant*) _tmp11_);
+	playlist_v = _tmp12_;
+	if (playlist_v != NULL) {
+		gboolean _tmp14_;
+		_tmp14_ = TRUE;
+		_tmp13_ = _bool_equal (self->priv->_owner->use_playlists, &_tmp14_) == TRUE;
 	} else {
-		_tmp26_ = FALSE;
+		_tmp13_ = FALSE;
 	}
-	_tmp31_ = _tmp26_;
-	if (_tmp31_) {
+	if (_tmp13_) {
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref);
 	}
-	_tmp32_ = changed_properties;
-	_tmp33_ = g_hash_table_lookup (_tmp32_, "PlaylistCount");
-	_tmp34_ = _g_variant_ref0 ((GVariant*) _tmp33_);
-	playlist_count_v = _tmp34_;
-	_tmp36_ = playlist_count_v;
-	if (_tmp36_ != NULL) {
-		PlayerController* _tmp37_;
-		gboolean* _tmp38_;
-		gboolean _tmp39_;
-		_tmp37_ = self->priv->_owner;
-		_tmp38_ = _tmp37_->use_playlists;
-		_tmp39_ = TRUE;
-		_tmp35_ = _bool_equal (_tmp38_, &_tmp39_) == TRUE;
+	_tmp15_ = g_hash_table_lookup (changed_properties, "PlaylistCount");
+	_tmp16_ = _g_variant_ref0 ((GVariant*) _tmp15_);
+	playlist_count_v = _tmp16_;
+	if (playlist_count_v != NULL) {
+		gboolean _tmp18_;
+		_tmp18_ = TRUE;
+		_tmp17_ = _bool_equal (self->priv->_owner->use_playlists, &_tmp18_) == TRUE;
 	} else {
-		_tmp35_ = FALSE;
+		_tmp17_ = FALSE;
 	}
-	_tmp40_ = _tmp35_;
-	if (_tmp40_) {
+	if (_tmp17_) {
 		mpris2_controller_fetch_playlists (self, NULL, NULL);
 		mpris2_controller_fetch_active_playlist (self);
 	}
-	_tmp41_ = changed_properties;
-	_tmp42_ = g_hash_table_lookup (_tmp41_, "Orderings");
-	_tmp43_ = _g_variant_ref0 ((GVariant*) _tmp42_);
-	playlist_orderings_v = _tmp43_;
-	_tmp45_ = playlist_orderings_v;
-	if (_tmp45_ != NULL) {
-		PlayerController* _tmp46_;
-		gboolean* _tmp47_;
-		gboolean _tmp48_;
-		_tmp46_ = self->priv->_owner;
-		_tmp47_ = _tmp46_->use_playlists;
-		_tmp48_ = TRUE;
-		_tmp44_ = _bool_equal (_tmp47_, &_tmp48_) == TRUE;
+	_tmp19_ = g_hash_table_lookup (changed_properties, "Orderings");
+	_tmp20_ = _g_variant_ref0 ((GVariant*) _tmp19_);
+	playlist_orderings_v = _tmp20_;
+	if (playlist_orderings_v != NULL) {
+		gboolean _tmp22_;
+		_tmp22_ = TRUE;
+		_tmp21_ = _bool_equal (self->priv->_owner->use_playlists, &_tmp22_) == TRUE;
 	} else {
-		_tmp44_ = FALSE;
+		_tmp21_ = FALSE;
 	}
-	_tmp49_ = _tmp44_;
-	if (_tmp49_) {
+	if (_tmp21_) {
 		mpris2_controller_fetch_playlists (self, NULL, NULL);
 		mpris2_controller_fetch_active_playlist (self);
 	}
-	_tmp50_ = changed_properties;
-	_tmp51_ = g_hash_table_lookup (_tmp50_, "Identity");
-	_tmp52_ = _g_variant_ref0 ((GVariant*) _tmp51_);
-	identity_v = _tmp52_;
-	_tmp53_ = identity_v;
-	if (_tmp53_ != NULL) {
-		PlayerController* _tmp54_;
-		GeeArrayList* _tmp55_;
-		gpointer _tmp56_ = NULL;
+	_tmp23_ = g_hash_table_lookup (changed_properties, "Identity");
+	_tmp24_ = _g_variant_ref0 ((GVariant*) _tmp23_);
+	identity_v = _tmp24_;
+	if (identity_v != NULL) {
+		gpointer _tmp25_ = NULL;
+		PlayerItem* _tmp26_;
 		MetadataMenuitem* md;
-		MetadataMenuitem* _tmp57_;
-		MprisRoot* _tmp58_;
-		gchar* _tmp59_;
-		gchar* _tmp60_;
-		gchar* _tmp61_;
-		_tmp54_ = self->priv->_owner;
-		_tmp55_ = _tmp54_->custom_items;
-		_tmp56_ = gee_abstract_list_get ((GeeAbstractList*) _tmp55_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
-		md = IS_METADATA_MENUITEM ((PlayerItem*) _tmp56_) ? ((MetadataMenuitem*) ((PlayerItem*) _tmp56_)) : NULL;
-		_tmp57_ = md;
-		_tmp58_ = self->priv->_mpris2_root;
-		_tmp59_ = mpris_root_get_Identity (_tmp58_);
-		_tmp60_ = _tmp59_;
-		_tmp61_ = _tmp60_;
-		metadata_menuitem_alter_label (_tmp57_, _tmp61_);
-		_g_free0 (_tmp61_);
+		gchar* _tmp27_ = NULL;
+		gchar* _tmp28_;
+		_tmp25_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
+		_tmp26_ = (PlayerItem*) _tmp25_;
+		md = IS_METADATA_MENUITEM (_tmp26_) ? ((MetadataMenuitem*) _tmp26_) : NULL;
+		_tmp27_ = mpris_root_get_Identity (self->priv->_mpris2_root);
+		_tmp28_ = _tmp27_;
+		metadata_menuitem_alter_label (md, _tmp28_);
+		_g_free0 (_tmp28_);
 		_g_object_unref0 (md);
 	}
 	_g_variant_unref0 (identity_v);
@@ -665,48 +589,42 @@ static gboolean mpris2_controller_ensure_correct_metadata (Mpris2Controller* sel
 	gboolean result = FALSE;
 	GHashTable* _tmp0_ = NULL;
 	GHashTable* changed_updates;
-	PlayerController* _tmp1_;
-	GeeArrayList* _tmp2_;
-	gpointer _tmp3_ = NULL;
+	gpointer _tmp1_ = NULL;
 	PlayerItem* metadata;
+	GeeHashSet* _tmp2_ = NULL;
+	GeeHashSet* _tmp3_;
 	GeeHashSet* _tmp4_ = NULL;
 	GeeHashSet* _tmp5_;
-	GeeHashSet* _tmp6_ = NULL;
-	GeeHashSet* _tmp7_;
-	PlayerController* _tmp8_;
-	GeeArrayList* _tmp9_;
-	gpointer _tmp10_ = NULL;
+	gpointer _tmp6_ = NULL;
+	PlayerItem* _tmp7_;
 	MetadataMenuitem* md;
-	GeeHashSet* _tmp11_ = NULL;
-	GeeHashSet* _tmp12_;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_;
+	GeeHashSet* _tmp8_ = NULL;
+	GeeHashSet* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 	gboolean collapsing;
 	g_return_val_if_fail (self != NULL, FALSE);
 	_tmp0_ = mpris2_controller_clean_metadata (self);
 	changed_updates = _tmp0_;
-	_tmp1_ = self->priv->_owner;
-	_tmp2_ = _tmp1_->custom_items;
-	_tmp3_ = gee_abstract_list_get ((GeeAbstractList*) _tmp2_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
-	metadata = (PlayerItem*) _tmp3_;
+	_tmp1_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
+	metadata = (PlayerItem*) _tmp1_;
+	_tmp2_ = metadata_menuitem_relevant_attributes_for_ui ();
+	_tmp3_ = _tmp2_;
+	player_item_reset (metadata, _tmp3_);
+	_g_object_unref0 (_tmp3_);
 	_tmp4_ = metadata_menuitem_relevant_attributes_for_ui ();
 	_tmp5_ = _tmp4_;
-	player_item_reset (metadata, _tmp5_);
+	player_item_update (metadata, changed_updates, _tmp5_);
 	_g_object_unref0 (_tmp5_);
-	_tmp6_ = metadata_menuitem_relevant_attributes_for_ui ();
-	_tmp7_ = _tmp6_;
-	player_item_update (metadata, changed_updates, _tmp7_);
-	_g_object_unref0 (_tmp7_);
-	_tmp8_ = self->priv->_owner;
-	_tmp9_ = _tmp8_->custom_items;
-	_tmp10_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
-	md = IS_METADATA_MENUITEM ((PlayerItem*) _tmp10_) ? ((MetadataMenuitem*) ((PlayerItem*) _tmp10_)) : NULL;
-	_tmp11_ = metadata_menuitem_relevant_attributes_for_ui ();
-	_tmp12_ = _tmp11_;
-	_tmp13_ = player_item_populated (metadata, _tmp12_);
-	_tmp14_ = !_tmp13_;
-	_g_object_unref0 (_tmp12_);
-	collapsing = _tmp14_;
+	_tmp6_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
+	_tmp7_ = (PlayerItem*) _tmp6_;
+	md = IS_METADATA_MENUITEM (_tmp7_) ? ((MetadataMenuitem*) _tmp7_) : NULL;
+	_tmp8_ = metadata_menuitem_relevant_attributes_for_ui ();
+	_tmp9_ = _tmp8_;
+	_tmp10_ = player_item_populated (metadata, _tmp9_);
+	_tmp11_ = !_tmp10_;
+	_g_object_unref0 (_tmp9_);
+	collapsing = _tmp11_;
 	metadata_menuitem_should_collapse (md, collapsing);
 	result = FALSE;
 	_g_object_unref0 (md);
@@ -718,32 +636,26 @@ static gboolean mpris2_controller_ensure_correct_metadata (Mpris2Controller* sel
 
 static gboolean mpris2_controller_ensure_correct_playback_status (Mpris2Controller* self) {
 	gboolean result = FALSE;
-	MprisPlayer* _tmp0_;
+	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	TransportState _tmp4_ = 0;
-	TransportState _tmp5_;
+	TransportState _tmp2_;
+	TransportState _tmp3_;
 	TransportState p;
-	PlayerController* _tmp6_;
-	GeeArrayList* _tmp7_;
-	gpointer _tmp8_ = NULL;
-	TransportMenuitem* _tmp9_;
+	gpointer _tmp4_ = NULL;
+	PlayerItem* _tmp5_;
+	TransportMenuitem* _tmp6_;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp0_ = self->priv->_player;
-	_tmp1_ = mpris_player_get_PlaybackStatus (_tmp0_);
-	_tmp2_ = _tmp1_;
-	_tmp3_ = _tmp2_;
-	_tmp4_ = mpris2_controller_determine_play_state (self, _tmp3_);
-	_tmp5_ = (TransportState) _tmp4_;
-	_g_free0 (_tmp3_);
-	p = _tmp5_;
-	_tmp6_ = self->priv->_owner;
-	_tmp7_ = _tmp6_->custom_items;
-	_tmp8_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
-	_tmp9_ = IS_TRANSPORT_MENUITEM ((PlayerItem*) _tmp8_) ? ((TransportMenuitem*) ((PlayerItem*) _tmp8_)) : NULL;
-	transport_menuitem_change_play_state (_tmp9_, p);
-	_g_object_unref0 (_tmp9_);
+	_tmp0_ = mpris_player_get_PlaybackStatus (self->priv->_player);
+	_tmp1_ = _tmp0_;
+	_tmp2_ = mpris2_controller_determine_play_state (self, _tmp1_);
+	_tmp3_ = (TransportState) _tmp2_;
+	_g_free0 (_tmp1_);
+	p = _tmp3_;
+	_tmp4_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
+	_tmp5_ = (PlayerItem*) _tmp4_;
+	_tmp6_ = IS_TRANSPORT_MENUITEM (_tmp5_) ? ((TransportMenuitem*) _tmp5_) : NULL;
+	transport_menuitem_change_play_state (_tmp6_, p);
+	_g_object_unref0 (_tmp6_);
 	result = FALSE;
 	return result;
 }
@@ -756,80 +668,54 @@ static GVariant* _variant_new1 (const gchar* value) {
 
 static GHashTable* mpris2_controller_clean_metadata (Mpris2Controller* self) {
 	GHashTable* result = NULL;
-	MprisPlayer* _tmp0_;
-	GHashTable* _tmp1_;
-	GHashTable* _tmp2_;
+	GHashTable* _tmp0_ = NULL;
 	GHashTable* changed_updates;
-	MprisPlayer* _tmp3_;
-	GHashTable* _tmp4_;
-	GHashTable* _tmp5_;
-	GHashTable* _tmp6_;
-	gconstpointer _tmp7_ = NULL;
-	GVariant* _tmp8_;
-	GVariant* _tmp9_;
+	GHashTable* _tmp1_ = NULL;
+	GHashTable* _tmp2_;
+	gconstpointer _tmp3_ = NULL;
+	GVariant* _tmp4_;
+	GVariant* _tmp5_;
 	GVariant* artist_v;
-	GVariant* _tmp10_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_player;
-	_tmp1_ = mpris_player_get_Metadata (_tmp0_);
+	_tmp0_ = mpris_player_get_Metadata (self->priv->_player);
+	changed_updates = _tmp0_;
+	_tmp1_ = mpris_player_get_Metadata (self->priv->_player);
 	_tmp2_ = _tmp1_;
-	changed_updates = _tmp2_;
-	_tmp3_ = self->priv->_player;
-	_tmp4_ = mpris_player_get_Metadata (_tmp3_);
+	_tmp3_ = g_hash_table_lookup (_tmp2_, "xesam:artist");
+	_tmp4_ = _g_variant_ref0 ((GVariant*) _tmp3_);
 	_tmp5_ = _tmp4_;
-	_tmp6_ = _tmp5_;
-	_tmp7_ = g_hash_table_lookup (_tmp6_, "xesam:artist");
-	_tmp8_ = _g_variant_ref0 ((GVariant*) _tmp7_);
-	_tmp9_ = _tmp8_;
-	_g_hash_table_unref0 (_tmp6_);
-	artist_v = _tmp9_;
-	_tmp10_ = artist_v;
-	if (_tmp10_ != NULL) {
+	_g_hash_table_unref0 (_tmp2_);
+	artist_v = _tmp5_;
+	if (artist_v != NULL) {
 		gchar* display_artists = NULL;
-		GVariant* _tmp11_;
-		const gchar* _tmp12_ = NULL;
-		GHashTable* _tmp21_;
-		gchar* _tmp22_;
-		const gchar* _tmp23_;
-		GVariant* _tmp24_;
-		_tmp11_ = artist_v;
-		_tmp12_ = g_variant_get_type_string (_tmp11_);
-		if (g_strcmp0 (_tmp12_, "s") == 0) {
-			GVariant* _tmp13_;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_;
-			_tmp13_ = artist_v;
-			_tmp14_ = g_variant_get_string (_tmp13_, NULL);
-			_tmp15_ = g_strdup (_tmp14_);
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp12_;
+		_tmp6_ = g_variant_get_type_string (artist_v);
+		if (g_strcmp0 (_tmp6_, "s") == 0) {
+			const gchar* _tmp7_ = NULL;
+			gchar* _tmp8_;
+			_tmp7_ = g_variant_get_string (artist_v, NULL);
+			_tmp8_ = g_strdup (_tmp7_);
 			_g_free0 (display_artists);
-			display_artists = _tmp15_;
+			display_artists = _tmp8_;
 		} else {
-			GVariant* _tmp16_;
-			size_t _tmp17_;
-			gchar** _tmp18_ = NULL;
+			size_t _tmp9_;
+			gchar** _tmp10_ = NULL;
 			gchar** artists;
 			gint artists_length1;
 			gint _artists_size_;
-			gchar** _tmp19_;
-			gint _tmp19__length1;
-			gchar* _tmp20_ = NULL;
-			_tmp16_ = artist_v;
-			_tmp18_ = g_variant_dup_strv (_tmp16_, &_tmp17_);
-			artists = _tmp18_;
-			artists_length1 = _tmp17_;
-			_artists_size_ = artists_length1;
-			_tmp19_ = artists;
-			_tmp19__length1 = artists_length1;
-			_tmp20_ = g_strjoinv (", ", _tmp19_);
+			gchar* _tmp11_ = NULL;
+			_tmp10_ = g_variant_dup_strv (artist_v, &_tmp9_);
+			artists = _tmp10_;
+			artists_length1 = _tmp9_;
+			_artists_size_ = _tmp9_;
+			_tmp11_ = g_strjoinv (", ", artists);
 			_g_free0 (display_artists);
-			display_artists = _tmp20_;
+			display_artists = _tmp11_;
 			artists = (_vala_array_free (artists, artists_length1, (GDestroyNotify) g_free), NULL);
 		}
-		_tmp21_ = changed_updates;
-		_tmp22_ = g_strdup ("xesam:artist");
-		_tmp23_ = display_artists;
-		_tmp24_ = _variant_new1 (_tmp23_);
-		g_hash_table_replace (_tmp21_, _tmp22_, _tmp24_);
+		_tmp12_ = g_strdup ("xesam:artist");
+		g_hash_table_replace (changed_updates, _tmp12_, _variant_new1 (display_artists));
 		_g_free0 (display_artists);
 	}
 	result = changed_updates;
@@ -841,19 +727,13 @@ static GHashTable* mpris2_controller_clean_metadata (Mpris2Controller* self) {
 static TransportState mpris2_controller_determine_play_state (Mpris2Controller* self, const gchar* status) {
 	TransportState result = 0;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-	gboolean _tmp3_;
 	g_return_val_if_fail (self != NULL, 0);
-	_tmp1_ = status;
-	if (_tmp1_ != NULL) {
-		const gchar* _tmp2_;
-		_tmp2_ = status;
-		_tmp0_ = g_strcmp0 (_tmp2_, "Playing") == 0;
+	if (status != NULL) {
+		_tmp0_ = g_strcmp0 (status, "Playing") == 0;
 	} else {
 		_tmp0_ = FALSE;
 	}
-	_tmp3_ = _tmp0_;
-	if (_tmp3_) {
+	if (_tmp0_) {
 		result = TRANSPORT_STATE_PLAYING;
 		return result;
 	}
@@ -864,108 +744,74 @@ static TransportState mpris2_controller_determine_play_state (Mpris2Controller*
 
 void mpris2_controller_initial_update (Mpris2Controller* self) {
 	TransportState update = 0;
-	MprisPlayer* _tmp0_;
+	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gboolean _tmp4_;
-	MprisRoot* _tmp10_;
-	gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* _tmp13_;
-	gboolean _tmp14_;
-	PlayerController* _tmp23_;
-	GeeArrayList* _tmp24_;
-	gpointer _tmp25_ = NULL;
-	TransportMenuitem* _tmp26_;
-	TransportState _tmp27_;
-	GHashTable* _tmp28_ = NULL;
+	gboolean _tmp2_;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_;
+	gboolean _tmp8_;
+	gpointer _tmp13_ = NULL;
+	PlayerItem* _tmp14_;
+	TransportMenuitem* _tmp15_;
+	GHashTable* _tmp16_ = NULL;
 	GHashTable* cleaned_metadata;
-	PlayerController* _tmp29_;
-	GeeArrayList* _tmp30_;
-	gpointer _tmp31_ = NULL;
-	PlayerItem* _tmp32_;
-	GHashTable* _tmp33_;
-	GeeHashSet* _tmp34_ = NULL;
-	GeeHashSet* _tmp35_;
-	PlayerController* _tmp36_;
-	gboolean* _tmp37_;
-	gboolean _tmp38_;
+	gpointer _tmp17_ = NULL;
+	PlayerItem* _tmp18_;
+	GeeHashSet* _tmp19_ = NULL;
+	GeeHashSet* _tmp20_;
+	gboolean _tmp21_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = self->priv->_player;
-	_tmp1_ = mpris_player_get_PlaybackStatus (_tmp0_);
-	_tmp2_ = _tmp1_;
-	_tmp3_ = _tmp2_;
-	_tmp4_ = _tmp3_ == NULL;
-	_g_free0 (_tmp3_);
-	if (_tmp4_) {
+	_tmp0_ = mpris_player_get_PlaybackStatus (self->priv->_player);
+	_tmp1_ = _tmp0_;
+	_tmp2_ = _tmp1_ == NULL;
+	_g_free0 (_tmp1_);
+	if (_tmp2_) {
 		update = TRANSPORT_STATE_PAUSED;
 	} else {
-		MprisPlayer* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		TransportState _tmp9_ = 0;
-		_tmp5_ = self->priv->_player;
-		_tmp6_ = mpris_player_get_PlaybackStatus (_tmp5_);
-		_tmp7_ = _tmp6_;
-		_tmp8_ = _tmp7_;
-		_tmp9_ = mpris2_controller_determine_play_state (self, _tmp8_);
-		update = _tmp9_;
-		_g_free0 (_tmp8_);
+		gchar* _tmp3_ = NULL;
+		gchar* _tmp4_;
+		TransportState _tmp5_;
+		_tmp3_ = mpris_player_get_PlaybackStatus (self->priv->_player);
+		_tmp4_ = _tmp3_;
+		_tmp5_ = mpris2_controller_determine_play_state (self, _tmp4_);
+		update = _tmp5_;
+		_g_free0 (_tmp4_);
 	}
-	_tmp10_ = self->priv->_mpris2_root;
-	_tmp11_ = mpris_root_get_Identity (_tmp10_);
-	_tmp12_ = _tmp11_;
-	_tmp13_ = _tmp12_;
-	_tmp14_ = _tmp13_ != NULL;
-	_g_free0 (_tmp13_);
-	if (_tmp14_) {
-		PlayerController* _tmp15_;
-		GeeArrayList* _tmp16_;
-		gpointer _tmp17_ = NULL;
+	_tmp6_ = mpris_root_get_Identity (self->priv->_mpris2_root);
+	_tmp7_ = _tmp6_;
+	_tmp8_ = _tmp7_ != NULL;
+	_g_free0 (_tmp7_);
+	if (_tmp8_) {
+		gpointer _tmp9_ = NULL;
+		PlayerItem* _tmp10_;
 		MetadataMenuitem* md;
-		MetadataMenuitem* _tmp18_;
-		MprisRoot* _tmp19_;
-		gchar* _tmp20_;
-		gchar* _tmp21_;
-		gchar* _tmp22_;
-		_tmp15_ = self->priv->_owner;
-		_tmp16_ = _tmp15_->custom_items;
-		_tmp17_ = gee_abstract_list_get ((GeeAbstractList*) _tmp16_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
-		md = IS_METADATA_MENUITEM ((PlayerItem*) _tmp17_) ? ((MetadataMenuitem*) ((PlayerItem*) _tmp17_)) : NULL;
-		_tmp18_ = md;
-		_tmp19_ = self->priv->_mpris2_root;
-		_tmp20_ = mpris_root_get_Identity (_tmp19_);
-		_tmp21_ = _tmp20_;
-		_tmp22_ = _tmp21_;
-		metadata_menuitem_alter_label (_tmp18_, _tmp22_);
-		_g_free0 (_tmp22_);
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_;
+		_tmp9_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
+		_tmp10_ = (PlayerItem*) _tmp9_;
+		md = IS_METADATA_MENUITEM (_tmp10_) ? ((MetadataMenuitem*) _tmp10_) : NULL;
+		_tmp11_ = mpris_root_get_Identity (self->priv->_mpris2_root);
+		_tmp12_ = _tmp11_;
+		metadata_menuitem_alter_label (md, _tmp12_);
+		_g_free0 (_tmp12_);
 		_g_object_unref0 (md);
 	}
-	_tmp23_ = self->priv->_owner;
-	_tmp24_ = _tmp23_->custom_items;
-	_tmp25_ = gee_abstract_list_get ((GeeAbstractList*) _tmp24_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
-	_tmp26_ = IS_TRANSPORT_MENUITEM ((PlayerItem*) _tmp25_) ? ((TransportMenuitem*) ((PlayerItem*) _tmp25_)) : NULL;
-	_tmp27_ = update;
-	transport_menuitem_change_play_state (_tmp26_, _tmp27_);
-	_g_object_unref0 (_tmp26_);
-	_tmp28_ = mpris2_controller_clean_metadata (self);
-	cleaned_metadata = _tmp28_;
-	_tmp29_ = self->priv->_owner;
-	_tmp30_ = _tmp29_->custom_items;
-	_tmp31_ = gee_abstract_list_get ((GeeAbstractList*) _tmp30_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
-	_tmp32_ = (PlayerItem*) _tmp31_;
-	_tmp33_ = cleaned_metadata;
-	_tmp34_ = metadata_menuitem_attributes_format ();
-	_tmp35_ = _tmp34_;
-	player_item_update (_tmp32_, _tmp33_, _tmp35_);
-	_g_object_unref0 (_tmp35_);
-	_g_object_unref0 (_tmp32_);
-	_tmp36_ = self->priv->_owner;
-	_tmp37_ = _tmp36_->use_playlists;
-	_tmp38_ = TRUE;
-	if (_bool_equal (_tmp37_, &_tmp38_) == TRUE) {
+	_tmp13_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
+	_tmp14_ = (PlayerItem*) _tmp13_;
+	_tmp15_ = IS_TRANSPORT_MENUITEM (_tmp14_) ? ((TransportMenuitem*) _tmp14_) : NULL;
+	transport_menuitem_change_play_state (_tmp15_, update);
+	_g_object_unref0 (_tmp15_);
+	_tmp16_ = mpris2_controller_clean_metadata (self);
+	cleaned_metadata = _tmp16_;
+	_tmp17_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA);
+	_tmp18_ = (PlayerItem*) _tmp17_;
+	_tmp19_ = metadata_menuitem_attributes_format ();
+	_tmp20_ = _tmp19_;
+	player_item_update (_tmp18_, cleaned_metadata, _tmp20_);
+	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp18_);
+	_tmp21_ = TRUE;
+	if (_bool_equal (self->priv->_owner->use_playlists, &_tmp21_) == TRUE) {
 		mpris2_controller_fetch_playlists (self, NULL, NULL);
 		mpris2_controller_fetch_active_playlist (self);
 	}
@@ -974,41 +820,21 @@ void mpris2_controller_initial_update (Mpris2Controller* self) {
 
 
 void mpris2_controller_transport_update (Mpris2Controller* self, TransportAction command) {
-	TransportAction _tmp0_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = command;
-	if (_tmp0_ == TRANSPORT_ACTION_PLAY_PAUSE) {
-		MprisPlayer* _tmp1_;
-		_tmp1_ = self->priv->_player;
-		mpris_player_PlayPause (_tmp1_, NULL, NULL);
+	if (command == TRANSPORT_ACTION_PLAY_PAUSE) {
+		mpris_player_PlayPause (self->priv->_player, NULL, NULL);
 	} else {
-		TransportAction _tmp2_;
-		_tmp2_ = command;
-		if (_tmp2_ == TRANSPORT_ACTION_PREVIOUS) {
-			MprisPlayer* _tmp3_;
-			_tmp3_ = self->priv->_player;
-			mpris_player_Previous (_tmp3_, NULL, NULL);
+		if (command == TRANSPORT_ACTION_PREVIOUS) {
+			mpris_player_Previous (self->priv->_player, NULL, NULL);
 		} else {
-			TransportAction _tmp4_;
-			_tmp4_ = command;
-			if (_tmp4_ == TRANSPORT_ACTION_NEXT) {
-				MprisPlayer* _tmp5_;
-				_tmp5_ = self->priv->_player;
-				mpris_player_Next (_tmp5_, NULL, NULL);
+			if (command == TRANSPORT_ACTION_NEXT) {
+				mpris_player_Next (self->priv->_player, NULL, NULL);
 			} else {
-				TransportAction _tmp6_;
-				_tmp6_ = command;
-				if (_tmp6_ == TRANSPORT_ACTION_REWIND) {
-					MprisPlayer* _tmp7_;
-					_tmp7_ = self->priv->_player;
-					mpris_player_Seek (_tmp7_, (gint64) (-500000), NULL, NULL);
+				if (command == TRANSPORT_ACTION_REWIND) {
+					mpris_player_Seek (self->priv->_player, (gint64) (-500000), NULL, NULL);
 				} else {
-					TransportAction _tmp8_;
-					_tmp8_ = command;
-					if (_tmp8_ == TRANSPORT_ACTION_FORWIND) {
-						MprisPlayer* _tmp9_;
-						_tmp9_ = self->priv->_player;
-						mpris_player_Seek (_tmp9_, (gint64) 400000, NULL, NULL);
+					if (command == TRANSPORT_ACTION_FORWIND) {
+						mpris_player_Seek (self->priv->_player, (gint64) 400000, NULL, NULL);
 					}
 				}
 			}
@@ -1020,58 +846,45 @@ void mpris2_controller_transport_update (Mpris2Controller* self, TransportAction
 gboolean mpris2_controller_connected (Mpris2Controller* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	MprisPlayer* _tmp1_;
-	gboolean _tmp3_;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp1_ = self->priv->_player;
-	if (_tmp1_ != NULL) {
-		MprisRoot* _tmp2_;
-		_tmp2_ = self->priv->_mpris2_root;
-		_tmp0_ = _tmp2_ != NULL;
+	if (self->priv->_player != NULL) {
+		_tmp0_ = self->priv->_mpris2_root != NULL;
 	} else {
 		_tmp0_ = FALSE;
 	}
-	_tmp3_ = _tmp0_;
-	result = _tmp3_;
+	result = _tmp0_;
 	return result;
 }
 
 
 void mpris2_controller_expose (Mpris2Controller* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = mpris2_controller_connected (self);
 	if (_tmp0_ == TRUE) {
-		MprisRoot* _tmp1_;
-		_tmp1_ = self->priv->_mpris2_root;
-		mpris_root_Raise (_tmp1_, NULL, NULL);
+		mpris_root_Raise (self->priv->_mpris2_root, NULL, NULL);
 	}
 }
 
 
 static void mpris2_controller_on_playlistdetails_changed (Mpris2Controller* self, PlaylistDetails* details) {
-	PlayerController* _tmp0_;
-	GeeArrayList* _tmp1_;
-	gpointer _tmp2_ = NULL;
+	gpointer _tmp0_ = NULL;
+	PlayerItem* _tmp1_;
 	PlaylistsMenuitem* playlists_item;
-	PlaylistDetails _tmp3_;
 	g_return_if_fail (self != NULL);
-	g_return_if_fail (details != NULL);
-	_tmp0_ = self->priv->_owner;
-	_tmp1_ = _tmp0_->custom_items;
-	_tmp2_ = gee_abstract_list_get ((GeeAbstractList*) _tmp1_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
-	playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp2_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp2_)) : NULL;
-	_tmp3_ = *details;
-	playlists_menuitem_update_individual_playlist (playlists_item, &_tmp3_);
+	_tmp0_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
+	_tmp1_ = (PlayerItem*) _tmp0_;
+	playlists_item = IS_PLAYLISTS_MENUITEM (_tmp1_) ? ((PlaylistsMenuitem*) _tmp1_) : NULL;
+	playlists_menuitem_update_individual_playlist (playlists_item, details);
 	_g_object_unref0 (playlists_item);
 }
 
 
 static void mpris2_controller_fetch_playlists_data_free (gpointer _data) {
-	Mpris2ControllerFetchPlaylistsData* _data_;
-	_data_ = _data;
-	_g_object_unref0 (_data_->self);
-	g_slice_free (Mpris2ControllerFetchPlaylistsData, _data_);
+	Mpris2ControllerFetchPlaylistsData* data;
+	data = _data;
+	_g_object_unref0 (data->self);
+	g_slice_free (Mpris2ControllerFetchPlaylistsData, data);
 }
 
 
@@ -1082,12 +895,10 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 void mpris2_controller_fetch_playlists (Mpris2Controller* self, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	Mpris2ControllerFetchPlaylistsData* _data_;
-	Mpris2Controller* _tmp0_;
 	_data_ = g_slice_new0 (Mpris2ControllerFetchPlaylistsData);
 	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, mpris2_controller_fetch_playlists);
 	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, mpris2_controller_fetch_playlists_data_free);
-	_tmp0_ = _g_object_ref0 (self);
-	_data_->self = _tmp0_;
+	_data_->self = _g_object_ref0 (self);
 	mpris2_controller_fetch_playlists_co (_data_);
 }
 
@@ -1099,11 +910,11 @@ void mpris2_controller_fetch_playlists_finish (Mpris2Controller* self, GAsyncRes
 
 
 static void mpris2_controller_fetch_playlists_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
-	Mpris2ControllerFetchPlaylistsData* _data_;
-	_data_ = _user_data_;
-	_data_->_source_object_ = source_object;
-	_data_->_res_ = _res_;
-	mpris2_controller_fetch_playlists_co (_data_);
+	Mpris2ControllerFetchPlaylistsData* data;
+	data = _user_data_;
+	data->_source_object_ = source_object;
+	data->_res_ = _res_;
+	mpris2_controller_fetch_playlists_co (data);
 }
 
 
@@ -1131,8 +942,8 @@ static gpointer __bool_dup0 (gpointer self) {
 }
 
 
-static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlaylistsData* _data_) {
-	switch (_data_->_state_) {
+static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlaylistsData* data) {
+	switch (data->_state_) {
 		case 0:
 		goto _state_0;
 		case 1:
@@ -1141,128 +952,103 @@ static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlayl
 		g_assert_not_reached ();
 	}
 	_state_0:
-	_data_->current_playlists = NULL;
-	_data_->current_playlists_length1 = 0;
-	_data_->_current_playlists_size_ = _data_->current_playlists_length1;
-	{
-		_data_->_tmp0_ = _data_->self->priv->_playlists;
-		_data_->_tmp1_ = 0;
-		_data_->_state_ = 1;
-		mpris_playlists_GetPlaylists (_data_->_tmp0_, (guint32) 0, (guint32) MPRIS2_CONTROLLER_MAX_PLAYLIST_COUNT, "Alphabetical", FALSE, mpris2_controller_fetch_playlists_ready, _data_);
-		return FALSE;
-		_state_1:
-		_data_->_tmp2_ = NULL;
-		_data_->_tmp2_ = mpris_playlists_GetPlaylists_finish (_data_->_tmp0_, _data_->_res_, &_data_->_tmp1_, &_data_->_inner_error_);
-		_data_->_tmp3_ = _data_->_tmp2_;
-		_data_->_tmp3__length1 = _data_->_tmp1_;
-		_data_->__tmp3__size_ = _data_->_tmp3__length1;
-		if (_data_->_inner_error_ != NULL) {
-			if (_data_->_inner_error_->domain == G_IO_ERROR) {
-				goto __catch11_g_io_error;
-			}
-			_data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
-			g_clear_error (&_data_->_inner_error_);
-			return FALSE;
+	data->current_playlists = NULL;
+	data->current_playlists_length1 = 0;
+	data->_current_playlists_size_ = 0;
+	data->_state_ = 1;
+	mpris_playlists_GetPlaylists (data->self->priv->_playlists, (guint32) 0, (guint32) MPRIS2_CONTROLLER_MAX_PLAYLIST_COUNT, "Alphabetical", FALSE, mpris2_controller_fetch_playlists_ready, data);
+	return FALSE;
+	_state_1:
+	data->_tmp1_ = NULL;
+	data->_tmp1_ = mpris_playlists_GetPlaylists_finish (data->self->priv->_playlists, data->_res_, &data->_tmp0_, &data->_inner_error_);
+	data->_tmp2_ = data->_tmp1_;
+	data->_tmp2__length1 = data->_tmp0_;
+	data->__tmp2__size_ = data->_tmp0_;
+	if (data->_inner_error_ != NULL) {
+		if (data->_inner_error_->domain == G_IO_ERROR) {
+			goto __catch11_g_io_error;
 		}
-		_data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
-		_data_->current_playlists = _data_->_tmp3_;
-		_data_->current_playlists_length1 = _data_->_tmp3__length1;
-		_data_->_current_playlists_size_ = _data_->current_playlists_length1;
+		data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
+		g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, data->_inner_error_->message, g_quark_to_string (data->_inner_error_->domain), data->_inner_error_->code);
+		g_clear_error (&data->_inner_error_);
+		return FALSE;
 	}
+	data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
+	data->current_playlists = data->_tmp2_;
+	data->current_playlists_length1 = data->_tmp2__length1;
+	data->_current_playlists_size_ = data->_tmp2__length1;
 	goto __finally11;
 	__catch11_g_io_error:
 	{
-		_data_->e = _data_->_inner_error_;
-		_data_->_inner_error_ = NULL;
-		_g_error_free0 (_data_->e);
-		_data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
-		if (_data_->_state_ == 0) {
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
+		data->e = data->_inner_error_;
+		data->_inner_error_ = NULL;
+		_g_error_free0 (data->e);
+		data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
+		if (data->_state_ == 0) {
+			g_simple_async_result_complete_in_idle (data->_async_result);
 		} else {
-			g_simple_async_result_complete (_data_->_async_result);
+			g_simple_async_result_complete (data->_async_result);
 		}
-		g_object_unref (_data_->_async_result);
+		g_object_unref (data->_async_result);
 		return FALSE;
 	}
 	__finally11:
-	if (_data_->_inner_error_ != NULL) {
-		_data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
-		g_clear_error (&_data_->_inner_error_);
+	if (data->_inner_error_ != NULL) {
+		data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, data->_inner_error_->message, g_quark_to_string (data->_inner_error_->domain), data->_inner_error_->code);
+		g_clear_error (&data->_inner_error_);
 		return FALSE;
 	}
-	_data_->_tmp4_ = _data_->current_playlists;
-	_data_->_tmp4__length1 = _data_->current_playlists_length1;
-	if (_data_->_tmp4_ != NULL) {
-		_data_->_tmp5_ = _data_->self->priv->_owner;
-		_data_->_tmp6_ = _data_->_tmp5_->custom_items;
-		_data_->_tmp7_ = NULL;
-		_data_->_tmp7_ = gee_abstract_list_get ((GeeAbstractList*) _data_->_tmp6_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
-		_data_->playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _data_->_tmp7_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _data_->_tmp7_)) : NULL;
-		_data_->_tmp8_ = _data_->playlists_item;
-		_data_->_tmp9_ = _data_->current_playlists;
-		_data_->_tmp9__length1 = _data_->current_playlists_length1;
-		playlists_menuitem_update (_data_->_tmp8_, _data_->_tmp9_, _data_->_tmp9__length1);
-		_g_object_unref0 (_data_->playlists_item);
+	if (data->current_playlists != NULL) {
+		data->_tmp3_ = NULL;
+		data->_tmp3_ = gee_abstract_list_get ((GeeAbstractList*) data->self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
+		data->_tmp4_ = (PlayerItem*) data->_tmp3_;
+		data->playlists_item = IS_PLAYLISTS_MENUITEM (data->_tmp4_) ? ((PlaylistsMenuitem*) data->_tmp4_) : NULL;
+		playlists_menuitem_update (data->playlists_item, data->current_playlists, data->current_playlists_length1);
+		_g_object_unref0 (data->playlists_item);
 	} else {
 		g_warning ("mpris2-controller.vala:243:  Playlists are on but its returning no cur" \
 "rent_playlists");
-		_data_->_tmp10_ = _data_->self->priv->_owner;
-		_data_->_tmp11_ = FALSE;
-		_data_->_tmp12_ = __bool_dup0 (&_data_->_tmp11_);
-		_g_free0 (_data_->_tmp10_->use_playlists);
-		_data_->_tmp10_->use_playlists = _data_->_tmp12_;
+		data->_tmp5_ = FALSE;
+		data->_tmp6_ = __bool_dup0 (&data->_tmp5_);
+		_g_free0 (data->self->priv->_owner->use_playlists);
+		data->self->priv->_owner->use_playlists = data->_tmp6_;
 	}
-	_data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL);
-	if (_data_->_state_ == 0) {
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
+	data->current_playlists = (_vala_PlaylistDetails_array_free (data->current_playlists, data->current_playlists_length1), NULL);
+	if (data->_state_ == 0) {
+		g_simple_async_result_complete_in_idle (data->_async_result);
 	} else {
-		g_simple_async_result_complete (_data_->_async_result);
+		g_simple_async_result_complete (data->_async_result);
 	}
-	g_object_unref (_data_->_async_result);
+	g_object_unref (data->_async_result);
 	return FALSE;
 }
 
 
 static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) {
 	gboolean result = FALSE;
-	MprisPlaylists* _tmp0_;
+	ActivePlaylistContainer _tmp0_ = {0};
 	ActivePlaylistContainer _tmp1_;
-	ActivePlaylistContainer _tmp2_;
-	ActivePlaylistContainer _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-	PlayerController* _tmp6_;
-	GeeArrayList* _tmp7_;
-	gpointer _tmp8_ = NULL;
+	gboolean _tmp2_;
+	gpointer _tmp3_ = NULL;
+	PlayerItem* _tmp4_;
 	PlaylistsMenuitem* playlists_item;
-	MprisPlaylists* _tmp9_;
-	ActivePlaylistContainer _tmp10_;
-	ActivePlaylistContainer _tmp11_;
-	ActivePlaylistContainer _tmp12_;
-	PlaylistDetails _tmp13_;
+	ActivePlaylistContainer _tmp5_ = {0};
+	ActivePlaylistContainer _tmp6_;
 	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp0_ = self->priv->_playlists;
-	mpris_playlists_get_ActivePlaylist (_tmp0_, &_tmp1_);
-	_tmp2_ = _tmp1_;
-	_tmp3_ = _tmp2_;
-	_tmp4_ = _tmp3_.valid;
-	_tmp5_ = _tmp4_ == FALSE;
-	active_playlist_container_destroy (&_tmp3_);
-	if (_tmp5_) {
+	mpris_playlists_get_ActivePlaylist (self->priv->_playlists, &_tmp0_);
+	_tmp1_ = _tmp0_;
+	_tmp2_ = _tmp1_.valid == FALSE;
+	active_playlist_container_destroy (&_tmp1_);
+	if (_tmp2_) {
 	}
-	_tmp6_ = self->priv->_owner;
-	_tmp7_ = _tmp6_->custom_items;
-	_tmp8_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
-	playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp8_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp8_)) : NULL;
-	_tmp9_ = self->priv->_playlists;
-	mpris_playlists_get_ActivePlaylist (_tmp9_, &_tmp10_);
-	_tmp11_ = _tmp10_;
-	_tmp12_ = _tmp11_;
-	_tmp13_ = _tmp12_.details;
-	playlists_menuitem_active_playlist_update (playlists_item, &_tmp13_);
-	active_playlist_container_destroy (&_tmp12_);
+	_tmp3_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS);
+	_tmp4_ = (PlayerItem*) _tmp3_;
+	playlists_item = IS_PLAYLISTS_MENUITEM (_tmp4_) ? ((PlaylistsMenuitem*) _tmp4_) : NULL;
+	mpris_playlists_get_ActivePlaylist (self->priv->_playlists, &_tmp5_);
+	_tmp6_ = _tmp5_;
+	playlists_menuitem_active_playlist_update (playlists_item, &_tmp6_.details);
+	active_playlist_container_destroy (&_tmp6_);
 	result = FALSE;
 	_g_object_unref0 (playlists_item);
 	return result;
@@ -1273,26 +1059,14 @@ void mpris2_controller_activate_playlist (Mpris2Controller* self, const char* pa
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (path != NULL);
-	{
-		MprisPlaylists* _tmp0_;
-		const char* _tmp1_;
-		_tmp0_ = self->priv->_playlists;
-		_tmp1_ = path;
-		mpris_playlists_ActivatePlaylist (_tmp0_, _tmp1_, NULL, NULL);
-	}
+	mpris_playlists_ActivatePlaylist (self->priv->_playlists, path, NULL, NULL);
 	goto __finally12;
 	__catch12_g_io_error:
 	{
-		GError* e = NULL;
-		const char* _tmp2_;
-		GError* _tmp3_;
-		const gchar* _tmp4_;
+		GError * e;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp2_ = path;
-		_tmp3_ = e;
-		_tmp4_ = _tmp3_->message;
-		g_warning ("mpris2-controller.vala:265: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_);
+		g_warning ("mpris2-controller.vala:265: Could not activate playlist %s because %s", (const gchar*) path, e->message);
 		_g_error_free0 (e);
 	}
 	__finally12:
@@ -1306,110 +1080,90 @@ void mpris2_controller_activate_playlist (Mpris2Controller* self, const char* pa
 
 MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self) {
 	MprisRoot* result;
-	MprisRoot* _tmp0_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_mpris2_root;
-	result = _tmp0_;
+	result = self->priv->_mpris2_root;
 	return result;
 }
 
 
 static void mpris2_controller_set_mpris2_root (Mpris2Controller* self, MprisRoot* value) {
 	MprisRoot* _tmp0_;
-	MprisRoot* _tmp1_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = value;
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 	_g_object_unref0 (self->priv->_mpris2_root);
-	self->priv->_mpris2_root = _tmp1_;
+	self->priv->_mpris2_root = _tmp0_;
 	g_object_notify ((GObject *) self, "mpris2-root");
 }
 
 
 MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self) {
 	MprisPlayer* result;
-	MprisPlayer* _tmp0_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_player;
-	result = _tmp0_;
+	result = self->priv->_player;
 	return result;
 }
 
 
 static void mpris2_controller_set_player (Mpris2Controller* self, MprisPlayer* value) {
 	MprisPlayer* _tmp0_;
-	MprisPlayer* _tmp1_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = value;
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 	_g_object_unref0 (self->priv->_player);
-	self->priv->_player = _tmp1_;
+	self->priv->_player = _tmp0_;
 	g_object_notify ((GObject *) self, "player");
 }
 
 
 MprisPlaylists* mpris2_controller_get_playlists (Mpris2Controller* self) {
 	MprisPlaylists* result;
-	MprisPlaylists* _tmp0_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_playlists;
-	result = _tmp0_;
+	result = self->priv->_playlists;
 	return result;
 }
 
 
 static void mpris2_controller_set_playlists (Mpris2Controller* self, MprisPlaylists* value) {
 	MprisPlaylists* _tmp0_;
-	MprisPlaylists* _tmp1_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = value;
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 	_g_object_unref0 (self->priv->_playlists);
-	self->priv->_playlists = _tmp1_;
+	self->priv->_playlists = _tmp0_;
 	g_object_notify ((GObject *) self, "playlists");
 }
 
 
 FreeDesktopProperties* mpris2_controller_get_properties_interface (Mpris2Controller* self) {
 	FreeDesktopProperties* result;
-	FreeDesktopProperties* _tmp0_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_properties_interface;
-	result = _tmp0_;
+	result = self->priv->_properties_interface;
 	return result;
 }
 
 
 static void mpris2_controller_set_properties_interface (Mpris2Controller* self, FreeDesktopProperties* value) {
 	FreeDesktopProperties* _tmp0_;
-	FreeDesktopProperties* _tmp1_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = value;
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 	_g_object_unref0 (self->priv->_properties_interface);
-	self->priv->_properties_interface = _tmp1_;
+	self->priv->_properties_interface = _tmp0_;
 	g_object_notify ((GObject *) self, "properties-interface");
 }
 
 
 PlayerController* mpris2_controller_get_owner (Mpris2Controller* self) {
 	PlayerController* result;
-	PlayerController* _tmp0_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->_owner;
-	result = _tmp0_;
+	result = self->priv->_owner;
 	return result;
 }
 
 
 static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerController* value) {
 	PlayerController* _tmp0_;
-	PlayerController* _tmp1_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = value;
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 	_g_object_unref0 (self->priv->_owner);
-	self->priv->_owner = _tmp1_;
+	self->priv->_owner = _tmp0_;
 	g_object_notify ((GObject *) self, "owner");
 }
 
@@ -1428,62 +1182,70 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 	GObject * obj;
 	GObjectClass * parent_class;
 	Mpris2Controller * self;
+	const gchar* _tmp0_ = NULL;
+	MprisRoot* _tmp1_ = NULL;
+	MprisRoot* _tmp2_;
+	MprisRoot* _tmp3_;
+	const gchar* _tmp4_ = NULL;
+	MprisPlayer* _tmp5_ = NULL;
+	MprisPlayer* _tmp6_;
+	MprisPlayer* _tmp7_;
+	FreeDesktopProperties* _tmp8_ = NULL;
+	FreeDesktopProperties* _tmp9_;
+	FreeDesktopProperties* _tmp10_;
+	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
 	parent_class = G_OBJECT_CLASS (mpris2_controller_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = MPRIS2_CONTROLLER (obj);
-	{
-		PlayerController* _tmp0_;
-		const gchar* _tmp1_;
-		const gchar* _tmp2_;
-		MprisRoot* _tmp3_ = NULL;
-		MprisRoot* _tmp4_;
-		MprisRoot* _tmp5_;
-		PlayerController* _tmp6_;
-		const gchar* _tmp7_;
-		const gchar* _tmp8_;
-		MprisPlayer* _tmp9_ = NULL;
-		MprisPlayer* _tmp10_;
-		MprisPlayer* _tmp11_;
-		FreeDesktopProperties* _tmp12_ = NULL;
-		FreeDesktopProperties* _tmp13_;
-		FreeDesktopProperties* _tmp14_;
-		FreeDesktopProperties* _tmp15_;
-		PlayerController* _tmp16_;
-		gboolean* _tmp17_;
-		gboolean _tmp18_;
-		_tmp0_ = self->priv->_owner;
-		_tmp1_ = player_controller_get_dbus_name (_tmp0_);
-		_tmp2_ = _tmp1_;
-		_tmp3_ = g_initable_new (TYPE_MPRIS_ROOT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp2_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2", NULL);
-		_tmp4_ = (MprisRoot*) _tmp3_;
-		if (_inner_error_ != NULL) {
-			if (_inner_error_->domain == G_IO_ERROR) {
-				goto __catch13_g_io_error;
-			}
-			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_);
+	_tmp0_ = player_controller_get_dbus_name (self->priv->_owner);
+	_tmp1_ = g_initable_new (TYPE_MPRIS_ROOT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp0_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2", NULL);
+	_tmp2_ = (MprisRoot*) _tmp1_;
+	if (_inner_error_ != NULL) {
+		if (_inner_error_->domain == G_IO_ERROR) {
+			goto __catch13_g_io_error;
 		}
-		_tmp5_ = _tmp4_;
-		mpris2_controller_set_mpris2_root (self, _tmp5_);
-		_g_object_unref0 (_tmp5_);
-		_tmp6_ = self->priv->_owner;
-		_tmp7_ = player_controller_get_dbus_name (_tmp6_);
-		_tmp8_ = _tmp7_;
-		_tmp9_ = g_initable_new (TYPE_MPRIS_PLAYER_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp8_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
-		_tmp10_ = (MprisPlayer*) _tmp9_;
-		if (_inner_error_ != NULL) {
-			if (_inner_error_->domain == G_IO_ERROR) {
-				goto __catch13_g_io_error;
-			}
-			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_);
+		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_);
+	}
+	_tmp3_ = _tmp2_;
+	mpris2_controller_set_mpris2_root (self, _tmp3_);
+	_g_object_unref0 (_tmp3_);
+	_tmp4_ = player_controller_get_dbus_name (self->priv->_owner);
+	_tmp5_ = g_initable_new (TYPE_MPRIS_PLAYER_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp4_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
+	_tmp6_ = (MprisPlayer*) _tmp5_;
+	if (_inner_error_ != NULL) {
+		if (_inner_error_->domain == G_IO_ERROR) {
+			goto __catch13_g_io_error;
 		}
-		_tmp11_ = _tmp10_;
-		mpris2_controller_set_player (self, _tmp11_);
-		_g_object_unref0 (_tmp11_);
-		_tmp12_ = g_initable_new (TYPE_FREE_DESKTOP_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.Properties.PropertiesChanged", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.freedesktop.DBus.Properties", NULL);
-		_tmp13_ = (FreeDesktopProperties*) _tmp12_;
+		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_);
+	}
+	_tmp7_ = _tmp6_;
+	mpris2_controller_set_player (self, _tmp7_);
+	_g_object_unref0 (_tmp7_);
+	_tmp8_ = g_initable_new (TYPE_FREE_DESKTOP_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.Properties.PropertiesChanged", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.freedesktop.DBus.Properties", NULL);
+	_tmp9_ = (FreeDesktopProperties*) _tmp8_;
+	if (_inner_error_ != NULL) {
+		if (_inner_error_->domain == G_IO_ERROR) {
+			goto __catch13_g_io_error;
+		}
+		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_);
+	}
+	_tmp10_ = _tmp9_;
+	mpris2_controller_set_properties_interface (self, _tmp10_);
+	_g_object_unref0 (_tmp10_);
+	g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
+	_tmp11_ = TRUE;
+	if (_bool_equal (self->priv->_owner->use_playlists, &_tmp11_) == TRUE) {
+		const gchar* _tmp12_ = NULL;
+		MprisPlaylists* _tmp13_ = NULL;
+		MprisPlaylists* _tmp14_;
+		MprisPlaylists* _tmp15_;
+		_tmp12_ = player_controller_get_dbus_name (self->priv->_owner);
+		_tmp13_ = g_initable_new (TYPE_MPRIS_PLAYLISTS_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp12_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Playlists", NULL);
+		_tmp14_ = (MprisPlaylists*) _tmp13_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_IO_ERROR) {
 				goto __catch13_g_io_error;
@@ -1491,52 +1253,18 @@ 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_);
 		}
-		_tmp14_ = _tmp13_;
-		mpris2_controller_set_properties_interface (self, _tmp14_);
-		_g_object_unref0 (_tmp14_);
-		_tmp15_ = self->priv->_properties_interface;
-		g_signal_connect_object (_tmp15_, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
-		_tmp16_ = self->priv->_owner;
-		_tmp17_ = _tmp16_->use_playlists;
-		_tmp18_ = TRUE;
-		if (_bool_equal (_tmp17_, &_tmp18_) == TRUE) {
-			PlayerController* _tmp19_;
-			const gchar* _tmp20_;
-			const gchar* _tmp21_;
-			MprisPlaylists* _tmp22_ = NULL;
-			MprisPlaylists* _tmp23_;
-			MprisPlaylists* _tmp24_;
-			MprisPlaylists* _tmp25_;
-			_tmp19_ = self->priv->_owner;
-			_tmp20_ = player_controller_get_dbus_name (_tmp19_);
-			_tmp21_ = _tmp20_;
-			_tmp22_ = g_initable_new (TYPE_MPRIS_PLAYLISTS_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp21_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Playlists", NULL);
-			_tmp23_ = (MprisPlaylists*) _tmp22_;
-			if (_inner_error_ != NULL) {
-				if (_inner_error_->domain == G_IO_ERROR) {
-					goto __catch13_g_io_error;
-				}
-				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_);
-			}
-			_tmp24_ = _tmp23_;
-			mpris2_controller_set_playlists (self, _tmp24_);
-			_g_object_unref0 (_tmp24_);
-			_tmp25_ = self->priv->_playlists;
-			g_signal_connect_object (_tmp25_, "playlist-changed", (GCallback) _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed, self, 0);
-		}
+		_tmp15_ = _tmp14_;
+		mpris2_controller_set_playlists (self, _tmp15_);
+		_g_object_unref0 (_tmp15_);
+		g_signal_connect_object (self->priv->_playlists, "playlist-changed", (GCallback) _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed, self, 0);
 	}
 	goto __finally13;
 	__catch13_g_io_error:
 	{
-		GError* e = NULL;
-		GError* _tmp26_;
-		const gchar* _tmp27_;
+		GError * e;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp26_ = e;
-		_tmp27_ = _tmp26_->message;
-		g_critical ("mpris2-controller.vala:57: Problems connecting to the session bus - %s", _tmp27_);
+		g_critical ("mpris2-controller.vala:57: Problems connecting to the session bus - %s", e->message);
 		_g_error_free0 (e);
 	}
 	__finally13: