Import upstream version 0.5.7

1 files changed, 25 insertions, 31 deletions

diff --git a/src/settings-manager.c b/src/settings-manager.c
index 0bb50dc..94dc8f9 100644
--- a/src/settings-manager.c
+++ b/src/settings-manager.c
@@ -1,4 +1,4 @@
-/* settings-manager.c generated by valac 0.11.3, the Vala compiler
+/* settings-manager.c generated by valac 0.11.5, the Vala compiler
  * generated from settings-manager.vala, do not modify */
 
 /*
@@ -121,31 +121,27 @@ GeeArrayList* settings_manager_fetch_interested (SettingsManager* self) {
 	GeeArrayList* result = NULL;
 	gchar** _tmp0_;
 	gchar** _tmp1_ = NULL;
+	gchar** blacklisted;
 	gint blacklisted_length1;
 	gint _blacklisted_size_;
 	gchar** _tmp2_;
-	gchar** blacklisted;
-	gchar** _tmp3_;
-	gchar** _tmp4_ = NULL;
+	gchar** _tmp3_ = NULL;
+	gchar** interested;
 	gint interested_length1;
 	gint _interested_size_;
-	gchar** _tmp5_;
-	gchar** interested;
-	GeeArrayList* _tmp6_ = NULL;
+	GeeArrayList* _tmp4_ = NULL;
 	GeeArrayList* list;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp1_ = _tmp0_ = g_settings_get_strv (self->priv->settings, "blacklisted-media-players");
-	_tmp2_ = _tmp1_;
+	blacklisted = _tmp1_;
 	blacklisted_length1 = _vala_array_length (_tmp0_);
-	_blacklisted_size_ = blacklisted_length1;
-	blacklisted = _tmp2_;
-	_tmp4_ = _tmp3_ = g_settings_get_strv (self->priv->settings, "interested-media-players");
-	_tmp5_ = _tmp4_;
-	interested_length1 = _vala_array_length (_tmp3_);
-	_interested_size_ = interested_length1;
-	interested = _tmp5_;
-	_tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
-	list = _tmp6_;
+	_blacklisted_size_ = _vala_array_length (_tmp0_);
+	_tmp3_ = _tmp2_ = g_settings_get_strv (self->priv->settings, "interested-media-players");
+	interested = _tmp3_;
+	interested_length1 = _vala_array_length (_tmp2_);
+	_interested_size_ = _vala_array_length (_tmp2_);
+	_tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
+	list = _tmp4_;
 	{
 		gchar** s_collection;
 		int s_collection_length1;
@@ -153,10 +149,10 @@ GeeArrayList* settings_manager_fetch_interested (SettingsManager* self) {
 		s_collection = interested;
 		s_collection_length1 = interested_length1;
 		for (s_it = 0; s_it < interested_length1; s_it = s_it + 1) {
-			gchar* _tmp7_;
+			gchar* _tmp5_;
 			gchar* s;
-			_tmp7_ = g_strdup (s_collection[s_it]);
-			s = _tmp7_;
+			_tmp5_ = g_strdup (s_collection[s_it]);
+			s = _tmp5_;
 			{
 				if (_vala_string_array_contains (blacklisted, blacklisted_length1, s)) {
 					_g_free0 (s);
@@ -193,18 +189,16 @@ static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* val
 void settings_manager_add_interested (SettingsManager* self, const gchar* app_desktop_name) {
 	gchar** _tmp0_;
 	gchar** _tmp1_ = NULL;
+	gchar** already_interested;
 	gint already_interested_length1;
 	gint _already_interested_size_;
-	gchar** _tmp2_;
-	gchar** already_interested;
-	gchar* _tmp4_;
+	gchar* _tmp3_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (app_desktop_name != NULL);
 	_tmp1_ = _tmp0_ = g_settings_get_strv (self->priv->settings, "interested-media-players");
-	_tmp2_ = _tmp1_;
+	already_interested = _tmp1_;
 	already_interested_length1 = _vala_array_length (_tmp0_);
-	_already_interested_size_ = already_interested_length1;
-	already_interested = _tmp2_;
+	_already_interested_size_ = _vala_array_length (_tmp0_);
 	{
 		gchar** s_collection;
 		int s_collection_length1;
@@ -212,10 +206,10 @@ void settings_manager_add_interested (SettingsManager* self, const gchar* app_de
 		s_collection = already_interested;
 		s_collection_length1 = already_interested_length1;
 		for (s_it = 0; s_it < already_interested_length1; s_it = s_it + 1) {
-			gchar* _tmp3_;
+			gchar* _tmp2_;
 			gchar* s;
-			_tmp3_ = g_strdup (s_collection[s_it]);
-			s = _tmp3_;
+			_tmp2_ = g_strdup (s_collection[s_it]);
+			s = _tmp2_;
 			{
 				if (g_strcmp0 (s, app_desktop_name) == 0) {
 					_g_free0 (s);
@@ -226,8 +220,8 @@ void settings_manager_add_interested (SettingsManager* self, const gchar* app_de
 			}
 		}
 	}
-	_tmp4_ = g_strdup (app_desktop_name);
-	_vala_array_add1 (&already_interested, &already_interested_length1, &_already_interested_size_, _tmp4_);
+	_tmp3_ = g_strdup (app_desktop_name);
+	_vala_array_add1 (&already_interested, &already_interested_length1, &_already_interested_size_, _tmp3_);
 	g_settings_set_strv (self->priv->settings, "interested-media-players", already_interested);
 	g_settings_apply (self->priv->settings);
 	already_interested = (_vala_array_free (already_interested, already_interested_length1, (GDestroyNotify) g_free), NULL);