Import upstream version 0.6.6.1

1 files changed, 39 insertions, 39 deletions

diff --git a/src/mpris2-controller.c b/src/mpris2-controller.c
index 0576340..0b84e72 100644
--- a/src/mpris2-controller.c
+++ b/src/mpris2-controller.c
@@ -1,4 +1,4 @@
-/* mpris2-controller.c generated by valac 0.11.7, the Vala compiler
+/* mpris2-controller.c generated by valac 0.12.0, the Vala compiler
  * generated from mpris2-controller.vala, do not modify */
 
 /*
@@ -383,8 +383,8 @@ static void mpris2_controller_set_properties_interface (Mpris2Controller* self,
 static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerController* value);
 static GObject * mpris2_controller_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 const gchar* player_controller_get_dbus_name (PlayerController* self);
-static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self);
 static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self);
+static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self);
 static void mpris2_controller_finalize (GObject* obj);
 static void _vala_mpris2_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_mpris2_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
@@ -473,7 +473,7 @@ void mpris2_controller_property_changed_cb (Mpris2Controller* self, const gchar*
 	}
 	if (_tmp0_) {
 		g_warning ("mpris2-controller.vala:71: Property-changed hash is null or this is an" \
-" interface that doesn't concerns us");
+" interface that doesn't concern us");
 		return;
 	}
 	_tmp2_ = g_hash_table_lookup (changed_properties, "PlaybackStatus");
@@ -958,7 +958,7 @@ static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlayl
 	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__size_;
+	data->_current_playlists_size_ = data->_tmp2__length1;
 	goto __finally11;
 	__catch11_g_io_error:
 	{
@@ -989,7 +989,7 @@ static gboolean mpris2_controller_fetch_playlists_co (Mpris2ControllerFetchPlayl
 		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:239:  Playlists are on but its returning no cur" \
+		g_warning ("mpris2-controller.vala:240:  Playlists are on but its returning no cur" \
 "rent_playlists");
 		data->_tmp5_ = FALSE;
 		data->_tmp6_ = __bool_dup0 (&data->_tmp5_);
@@ -1149,13 +1149,13 @@ static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerControlle
 }
 
 
-static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self) {
-	mpris2_controller_on_playlistdetails_changed (self, details);
+static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self) {
+	mpris2_controller_property_changed_cb (self, source, changed_properties, invalid, invalid_length1);
 }
 
 
-static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const gchar* source, GHashTable* changed_properties, gchar** invalid, int invalid_length1, gpointer self) {
-	mpris2_controller_property_changed_cb (self, source, changed_properties, invalid, invalid_length1);
+static void _mpris2_controller_on_playlistdetails_changed_mpris_playlists_playlist_changed (MprisPlaylists* _sender, PlaylistDetails* details, gpointer self) {
+	mpris2_controller_on_playlistdetails_changed (self, details);
 }
 
 
@@ -1171,10 +1171,10 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 	MprisPlayer* _tmp5_ = NULL;
 	MprisPlayer* _tmp6_;
 	MprisPlayer* _tmp7_;
-	gboolean _tmp8_;
-	FreeDesktopProperties* _tmp13_ = NULL;
-	FreeDesktopProperties* _tmp14_;
-	FreeDesktopProperties* _tmp15_;
+	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);
@@ -1205,15 +1205,28 @@ static GObject * mpris2_controller_constructor (GType type, guint n_construct_pr
 	_tmp7_ = _tmp6_;
 	mpris2_controller_set_player (self, _tmp7_);
 	_g_object_unref0 (_tmp7_);
-	_tmp8_ = TRUE;
-	if (_bool_equal (self->priv->_owner->use_playlists, &_tmp8_) == TRUE) {
-		const gchar* _tmp9_ = NULL;
-		MprisPlaylists* _tmp10_ = NULL;
-		MprisPlaylists* _tmp11_;
-		MprisPlaylists* _tmp12_;
-		_tmp9_ = player_controller_get_dbus_name (self->priv->_owner);
-		_tmp10_ = g_initable_new (TYPE_MPRIS_PLAYLISTS_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp9_, "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/mpris/MediaPlayer2", "g-interface-name", "org.mpris.MediaPlayer2.Playlists", NULL);
-		_tmp11_ = (MprisPlaylists*) _tmp10_;
+	_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;
@@ -1221,31 +1234,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_);
 		}
-		_tmp12_ = _tmp11_;
-		mpris2_controller_set_playlists (self, _tmp12_);
-		_g_object_unref0 (_tmp12_);
+		_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);
 	}
-	_tmp13_ = 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);
-	_tmp14_ = (FreeDesktopProperties*) _tmp13_;
-	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_);
-	}
-	_tmp15_ = _tmp14_;
-	mpris2_controller_set_properties_interface (self, _tmp15_);
-	_g_object_unref0 (_tmp15_);
-	g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
 	goto __finally13;
 	__catch13_g_io_error:
 	{
 		GError * e;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		g_error ("mpris2-controller.vala:60: Problems connecting to the session bus - %s", e->message);
+		g_critical ("mpris2-controller.vala:60: Problems connecting to the session bus - %s", e->message);
 		_g_error_free0 (e);
 	}
 	__finally13: