Import upstream version 0.5.2

1 files changed, 229 insertions, 161 deletions

diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c
index 5cb2d03..8acf1ed 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.10.0, the Vala compiler
+/* metadata-menu-item.c generated by valac 0.11.2, the Vala compiler
  * generated from metadata-menu-item.vala, do not modify */
 
 /*
@@ -89,15 +89,15 @@ struct _MetadataMenuitemClass {
 };
 
 struct _MetadataMenuitemPrivate {
-	char* previous_temp_album_art_path;
+	gchar* previous_temp_album_art_path;
 };
 
 
-extern char* metadata_menuitem_album_art_cache_dir;
-char* metadata_menuitem_album_art_cache_dir = NULL;
+static gpointer metadata_menuitem_parent_class = NULL;
+extern gchar* metadata_menuitem_album_art_cache_dir;
+gchar* metadata_menuitem_album_art_cache_dir = NULL;
 static FetchFile* metadata_menuitem_fetcher;
 static FetchFile* metadata_menuitem_fetcher = NULL;
-static gpointer metadata_menuitem_parent_class = NULL;
 
 GType player_item_get_type (void) G_GNUC_CONST;
 GType metadata_menuitem_get_type (void) G_GNUC_CONST;
@@ -113,28 +113,30 @@ void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
 GeeHashSet* metadata_menuitem_attributes_format (void);
 static void metadata_menuitem_clean_album_art_temp_dir (void);
 static gboolean metadata_menuitem_delete_album_art_contents (GFile* dir);
-static char* metadata_menuitem_create_album_art_temp_dir (void);
-void metadata_menuitem_fetch_art (MetadataMenuitem* self, const char* uri, const char* prop);
-FetchFile* fetch_file_new (const char* uri, const char* prop);
-FetchFile* fetch_file_construct (GType object_type, const char* uri, const char* prop);
+static gchar* metadata_menuitem_create_album_art_temp_dir (void);
+void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, const gchar* prop);
+FetchFile* fetch_file_new (const gchar* uri, const gchar* prop);
+FetchFile* fetch_file_construct (GType object_type, const gchar* uri, const gchar* prop);
 static void _lambda0_ (MetadataMenuitem* self);
 static void metadata_menuitem_on_fetcher_failed (MetadataMenuitem* self);
 static void __lambda0__fetch_file_failed (FetchFile* _sender, gpointer self);
-static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByteArray* update, const char* property);
-static void _metadata_menuitem_on_fetcher_completed_fetch_file_completed (FetchFile* _sender, GByteArray* data, const char* property, gpointer self);
+static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByteArray* update, const gchar* property);
+static void _metadata_menuitem_on_fetcher_completed_fetch_file_completed (FetchFile* _sender, GByteArray* data, const gchar* property, gpointer self);
 void fetch_file_fetch_data (FetchFile* self, GAsyncReadyCallback _callback_, gpointer _user_data_);
 void fetch_file_fetch_data_finish (FetchFile* self, GAsyncResult* _res_);
 static GObject * metadata_menuitem_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 static void metadata_menuitem_finalize (GObject* obj);
 
 
-
 MetadataMenuitem* metadata_menuitem_construct (GType object_type) {
-	MetadataMenuitem * self;
-	GeeHashSet* _tmp0_;
+	MetadataMenuitem * self = NULL;
+	GeeHashSet* _tmp0_ = NULL;
+	GeeHashSet* _tmp1_;
 	self = (MetadataMenuitem*) g_object_new (object_type, "item-type", DBUSMENU_METADATA_MENUITEM_TYPE, NULL);
-	player_item_reset ((PlayerItem*) self, _tmp0_ = metadata_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp0_);
+	_tmp0_ = metadata_menuitem_attributes_format ();
+	_tmp1_ = _tmp0_;
+	player_item_reset ((PlayerItem*) self, _tmp1_);
+	_g_object_unref0 (_tmp1_);
 	return self;
 }
 
@@ -145,11 +147,19 @@ MetadataMenuitem* metadata_menuitem_new (void) {
 
 
 static void metadata_menuitem_clean_album_art_temp_dir (void) {
-	char* path;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* path;
+	GFile* _tmp2_ = NULL;
 	GFile* album_art_dir;
-	path = g_build_filename (g_get_user_cache_dir (), METADATA_MENUITEM_ALBUM_ART_DIR_SUFFIX, NULL);
-	album_art_dir = g_file_new_for_path (path);
-	if (metadata_menuitem_delete_album_art_contents (album_art_dir) == FALSE) {
+	gboolean _tmp3_;
+	_tmp0_ = g_get_user_cache_dir ();
+	_tmp1_ = g_build_filename (_tmp0_, METADATA_MENUITEM_ALBUM_ART_DIR_SUFFIX, NULL);
+	path = _tmp1_;
+	_tmp2_ = g_file_new_for_path (path);
+	album_art_dir = _tmp2_;
+	_tmp3_ = metadata_menuitem_delete_album_art_contents (album_art_dir);
+	if (_tmp3_ == FALSE) {
 		g_warning ("metadata-menu-item.vala:52: could not remove the temp album art files " \
 "%s", path);
 	}
@@ -158,11 +168,17 @@ static void metadata_menuitem_clean_album_art_temp_dir (void) {
 }
 
 
-static char* metadata_menuitem_create_album_art_temp_dir (void) {
-	char* result = NULL;
-	char* path;
-	path = g_build_filename (g_get_user_cache_dir (), METADATA_MENUITEM_ALBUM_ART_DIR_SUFFIX, NULL);
-	if (g_mkdir (path, 0700) == (-1)) {
+static gchar* metadata_menuitem_create_album_art_temp_dir (void) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* path;
+	gint _tmp2_;
+	_tmp0_ = g_get_user_cache_dir ();
+	_tmp1_ = g_build_filename (_tmp0_, METADATA_MENUITEM_ALBUM_ART_DIR_SUFFIX, NULL);
+	path = _tmp1_;
+	_tmp2_ = g_mkdir (path, 0700);
+	if (_tmp2_ == (-1)) {
 		g_warning ("metadata-menu-item.vala:60: could not create a temp dir for remote alb" \
 "um art, it must have been created already");
 	}
@@ -171,8 +187,8 @@ static char* metadata_menuitem_create_album_art_temp_dir (void) {
 }
 
 
-static const char* string_to_string (const char* self) {
-	const char* result = NULL;
+static const gchar* string_to_string (const gchar* self) {
+	const gchar* result = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	result = self;
 	return result;
@@ -182,78 +198,98 @@ static const char* string_to_string (const char* self) {
 static gboolean metadata_menuitem_delete_album_art_contents (GFile* dir) {
 	gboolean result = FALSE;
 	gboolean _result_;
+	GFileEnumerator* _tmp0_ = NULL;
+	GFileEnumerator* e;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (dir != NULL, FALSE);
 	_result_ = TRUE;
-	{
-		GFileEnumerator* e;
-		e = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
+	_tmp0_ = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
+	e = _tmp0_;
+	if (_inner_error_ != NULL) {
+		goto __catch0_g_error;
+	}
+	while (TRUE) {
+		GFileInfo* _tmp1_ = NULL;
+		GFileInfo* file;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		GFile* _tmp4_ = NULL;
+		GFile* child;
+		_tmp1_ = g_file_enumerator_next_file (e, NULL, &_inner_error_);
+		file = _tmp1_;
 		if (_inner_error_ != NULL) {
+			_g_object_unref0 (e);
 			goto __catch0_g_error;
 		}
-		while (TRUE) {
-			GFileInfo* file;
-			GFile* child;
-			file = g_file_enumerator_next_file (e, NULL, &_inner_error_);
-			if (_inner_error_ != NULL) {
-				_g_object_unref0 (e);
-				goto __catch0_g_error;
-			}
-			g_debug ("metadata-menu-item.vala:76: file name = %s", g_file_info_get_name (file));
-			if (file == NULL) {
-				_g_object_unref0 (file);
-				break;
-			}
-			child = g_file_get_child (dir, g_file_info_get_name (file));
-			{
-				g_file_delete (child, NULL, &_inner_error_);
-				if (_inner_error_ != NULL) {
-					goto __catch1_g_error;
-				}
-			}
-			goto __finally1;
-			__catch1_g_error:
-			{
-				GError * error_;
-				error_ = _inner_error_;
-				_inner_error_ = NULL;
-				{
-					char* _tmp0_;
-					char* _tmp1_;
-					g_warning ("metadata-menu-item.vala:86: %s", _tmp1_ = g_strconcat ("Unable to delete file '", string_to_string (_tmp0_ = g_file_get_basename (child)), ": ", string_to_string (error_->message), NULL));
-					_g_free0 (_tmp1_);
-					_g_free0 (_tmp0_);
-					_result_ = FALSE;
-					_g_error_free0 (error_);
-				}
-			}
-			__finally1:
-			if (_inner_error_ != NULL) {
-				_g_object_unref0 (child);
-				_g_object_unref0 (file);
-				_g_object_unref0 (e);
-				goto __catch0_g_error;
-			}
+		_tmp2_ = g_file_info_get_name (file);
+		g_debug ("metadata-menu-item.vala:76: file name = %s", _tmp2_);
+		if (file == NULL) {
+			_g_object_unref0 (file);
+			break;
+		}
+		_tmp3_ = g_file_info_get_name (file);
+		_tmp4_ = g_file_get_child (dir, _tmp3_);
+		child = _tmp4_;
+		g_file_delete (child, NULL, &_inner_error_);
+		if (_inner_error_ != NULL) {
+			goto __catch1_g_error;
+		}
+		goto __finally1;
+		__catch1_g_error:
+		{
+			GError * error_;
+			gchar* _tmp5_ = NULL;
+			gchar* _tmp6_;
+			const gchar* _tmp7_ = NULL;
+			const gchar* _tmp8_ = NULL;
+			gchar* _tmp9_ = NULL;
+			gchar* _tmp10_;
+			error_ = _inner_error_;
+			_inner_error_ = NULL;
+			_tmp5_ = g_file_get_basename (child);
+			_tmp6_ = _tmp5_;
+			_tmp7_ = string_to_string (_tmp6_);
+			_tmp8_ = string_to_string (error_->message);
+			_tmp9_ = g_strconcat ("Unable to delete file '", _tmp7_, ": ", _tmp8_, NULL);
+			_tmp10_ = _tmp9_;
+			g_warning ("metadata-menu-item.vala:86: %s", _tmp10_);
+			_g_free0 (_tmp10_);
+			_g_free0 (_tmp6_);
+			_result_ = FALSE;
+			_g_error_free0 (error_);
+		}
+		__finally1:
+		if (_inner_error_ != NULL) {
 			_g_object_unref0 (child);
 			_g_object_unref0 (file);
+			_g_object_unref0 (e);
+			goto __catch0_g_error;
 		}
-		_g_object_unref0 (e);
+		_g_object_unref0 (child);
+		_g_object_unref0 (file);
 	}
+	_g_object_unref0 (e);
 	goto __finally0;
 	__catch0_g_error:
 	{
 		GError * _error_;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		gchar* _tmp15_;
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
-		{
-			char* _tmp2_;
-			char* _tmp3_;
-			g_warning (_tmp3_ = g_strconcat ("Unable to read files from directory '", string_to_string (_tmp2_ = g_file_get_basename (dir)), "': %s", NULL), _error_->message);
-			_g_free0 (_tmp3_);
-			_g_free0 (_tmp2_);
-			_result_ = FALSE;
-			_g_error_free0 (_error_);
-		}
+		_tmp11_ = g_file_get_basename (dir);
+		_tmp12_ = _tmp11_;
+		_tmp13_ = string_to_string (_tmp12_);
+		_tmp14_ = g_strconcat ("Unable to read files from directory '", _tmp13_, "': %s", NULL);
+		_tmp15_ = _tmp14_;
+		g_warning (_tmp15_, _error_->message);
+		_g_free0 (_tmp15_);
+		_g_free0 (_tmp12_);
+		_result_ = FALSE;
+		_g_error_free0 (_error_);
 	}
 	__finally0:
 	if (_inner_error_ != NULL) {
@@ -266,11 +302,13 @@ static gboolean metadata_menuitem_delete_album_art_contents (GFile* dir) {
 }
 
 
-static char* string_strip (const char* self) {
-	char* result = NULL;
-	char* _result_;
+static gchar* string_strip (const gchar* self) {
+	gchar* result = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* _result_;
 	g_return_val_if_fail (self != NULL, NULL);
-	_result_ = g_strdup (self);
+	_tmp0_ = g_strdup (self);
+	_result_ = _tmp0_;
 	g_strstrip (_result_);
 	result = _result_;
 	return result;
@@ -287,51 +325,59 @@ static void __lambda0__fetch_file_failed (FetchFile* _sender, gpointer self) {
 }
 
 
-static void _metadata_menuitem_on_fetcher_completed_fetch_file_completed (FetchFile* _sender, GByteArray* data, const char* property, gpointer self) {
+static void _metadata_menuitem_on_fetcher_completed_fetch_file_completed (FetchFile* _sender, GByteArray* data, const gchar* property, gpointer self) {
 	metadata_menuitem_on_fetcher_completed (self, data, property);
 }
 
 
-void metadata_menuitem_fetch_art (MetadataMenuitem* self, const char* uri, const char* prop) {
+void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, const gchar* prop) {
+	GFile* _tmp0_ = NULL;
 	GFile* art_file;
-	FetchFile* _tmp4_;
+	gboolean _tmp1_;
+	FetchFile* _tmp8_ = NULL;
+	FetchFile* _tmp9_;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (uri != NULL);
 	g_return_if_fail (prop != NULL);
-	art_file = g_file_new_for_uri (uri);
-	if (g_file_is_native (art_file) == TRUE) {
-		char* path;
+	_tmp0_ = g_file_new_for_uri (uri);
+	art_file = _tmp0_;
+	_tmp1_ = g_file_is_native (art_file);
+	if (_tmp1_ == TRUE) {
+		gchar* path;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_;
+		gchar* _tmp4_ = NULL;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 		path = NULL;
-		{
-			char* _tmp0_;
-			char* _tmp1_;
-			char* _tmp2_;
-			char* _tmp3_;
-			_tmp2_ = (_tmp1_ = g_filename_from_uri (_tmp0_ = string_strip (uri), NULL, &_inner_error_), _g_free0 (_tmp0_), _tmp1_);
-			if (_inner_error_ != NULL) {
-				if (_inner_error_->domain == G_CONVERT_ERROR) {
-					goto __catch2_g_convert_error;
-				}
-				_g_free0 (path);
-				_g_object_unref0 (art_file);
-				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;
+		_tmp2_ = string_strip (uri);
+		_tmp3_ = _tmp2_;
+		_tmp4_ = g_filename_from_uri (_tmp3_, NULL, &_inner_error_);
+		_tmp6_ = (_tmp5_ = _tmp4_, _g_free0 (_tmp3_), _tmp5_);
+		if (_inner_error_ != NULL) {
+			if (_inner_error_->domain == G_CONVERT_ERROR) {
+				goto __catch2_g_convert_error;
 			}
-			path = (_tmp3_ = _tmp2_, _g_free0 (path), _tmp3_);
-			dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, prop, path);
+			_g_free0 (path);
+			_g_object_unref0 (art_file);
+			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;
 		}
+		_tmp7_ = _tmp6_;
+		_g_free0 (path);
+		path = _tmp7_;
+		dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, prop, path);
 		goto __finally2;
 		__catch2_g_convert_error:
 		{
 			GError * e;
 			e = _inner_error_;
 			_inner_error_ = NULL;
-			{
-				g_warning ("metadata-menu-item.vala:108: Problem converting URI %s to file path", uri);
-				_g_error_free0 (e);
-			}
+			g_warning ("metadata-menu-item.vala:108: Problem converting URI %s to file path", uri);
+			_g_error_free0 (e);
 		}
 		__finally2:
 		if (_inner_error_ != NULL) {
@@ -350,7 +396,10 @@ void metadata_menuitem_fetch_art (MetadataMenuitem* self, const char* uri, const
 		_g_object_unref0 (art_file);
 		return;
 	}
-	metadata_menuitem_fetcher = (_tmp4_ = fetch_file_new (uri, prop), _g_object_unref0 (metadata_menuitem_fetcher), _tmp4_);
+	_tmp8_ = fetch_file_new (uri, prop);
+	_tmp9_ = _tmp8_;
+	_g_object_unref0 (metadata_menuitem_fetcher);
+	metadata_menuitem_fetcher = _tmp9_;
 	g_signal_connect_object (metadata_menuitem_fetcher, "failed", (GCallback) __lambda0__fetch_file_failed, self, 0);
 	g_signal_connect_object (metadata_menuitem_fetcher, "completed", (GCallback) _metadata_menuitem_on_fetcher_completed_fetch_file_completed, self, 0);
 	fetch_file_fetch_data (metadata_menuitem_fetcher, NULL, NULL);
@@ -370,60 +419,74 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByteArray* update, const char* property) {
+static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByteArray* update, const gchar* property) {
+	GdkPixbufLoader* _tmp0_ = NULL;
+	GdkPixbufLoader* loader;
+	GdkPixbuf* _tmp1_ = NULL;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* icon;
+	gchar* _tmp3_ = NULL;
+	gchar* path;
+	gint _tmp4_;
+	gint r;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (update != NULL);
 	g_return_if_fail (property != NULL);
-	{
-		GdkPixbufLoader* loader;
-		GdkPixbuf* icon;
-		char* path;
-		gint r;
-		loader = gdk_pixbuf_loader_new ();
-		gdk_pixbuf_loader_write (loader, update->data, (gsize) update->len, &_inner_error_);
-		if (_inner_error_ != NULL) {
-			_g_object_unref0 (loader);
-			goto __catch3_g_error;
-		}
-		gdk_pixbuf_loader_close (loader, &_inner_error_);
+	_tmp0_ = gdk_pixbuf_loader_new ();
+	loader = _tmp0_;
+	gdk_pixbuf_loader_write (loader, update->data, (gsize) ((gint) update->len), &_inner_error_);
+	if (_inner_error_ != NULL) {
+		_g_object_unref0 (loader);
+		goto __catch3_g_error;
+	}
+	gdk_pixbuf_loader_close (loader, &_inner_error_);
+	if (_inner_error_ != NULL) {
+		_g_object_unref0 (loader);
+		goto __catch3_g_error;
+	}
+	_tmp1_ = gdk_pixbuf_loader_get_pixbuf (loader);
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+	icon = _tmp2_;
+	_tmp3_ = g_strconcat (metadata_menuitem_album_art_cache_dir, "/downloaded-coverart-XXXXXX", NULL);
+	path = _tmp3_;
+	_tmp4_ = g_mkstemp (path);
+	r = _tmp4_;
+	if (r != (-1)) {
+		GdkPixbufFormat* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		_tmp5_ = gdk_pixbuf_loader_get_format (loader);
+		_tmp6_ = gdk_pixbuf_format_get_name (_tmp5_);
+		gdk_pixbuf_save (icon, path, _tmp6_, &_inner_error_, NULL);
 		if (_inner_error_ != NULL) {
+			_g_free0 (path);
+			_g_object_unref0 (icon);
 			_g_object_unref0 (loader);
 			goto __catch3_g_error;
 		}
-		icon = _g_object_ref0 (gdk_pixbuf_loader_get_pixbuf (loader));
-		path = g_strconcat (metadata_menuitem_album_art_cache_dir, "/downloaded-coverart-XXXXXX", NULL);
-		r = g_mkstemp (path);
-		if (r != (-1)) {
-			char* _tmp0_;
-			gdk_pixbuf_save (icon, path, gdk_pixbuf_format_get_name (gdk_pixbuf_loader_get_format (loader)), &_inner_error_, NULL);
-			if (_inner_error_ != NULL) {
-				_g_free0 (path);
-				_g_object_unref0 (icon);
-				_g_object_unref0 (loader);
-				goto __catch3_g_error;
-			}
-			dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, property, path);
-			if (self->priv->previous_temp_album_art_path != NULL) {
-				g_remove (self->priv->previous_temp_album_art_path);
-			}
-			self->priv->previous_temp_album_art_path = (_tmp0_ = g_strdup (path), _g_free0 (self->priv->previous_temp_album_art_path), _tmp0_);
+		dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, property, path);
+		if (self->priv->previous_temp_album_art_path != NULL) {
+			g_remove (self->priv->previous_temp_album_art_path);
 		}
-		_g_free0 (path);
-		_g_object_unref0 (icon);
-		_g_object_unref0 (loader);
+		_tmp7_ = g_strdup (path);
+		_tmp8_ = _tmp7_;
+		_g_free0 (self->priv->previous_temp_album_art_path);
+		self->priv->previous_temp_album_art_path = _tmp8_;
 	}
+	_g_free0 (path);
+	_g_object_unref0 (icon);
+	_g_object_unref0 (loader);
 	goto __finally3;
 	__catch3_g_error:
 	{
 		GError * e;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		{
-			g_warning ("metadata-menu-item.vala:151: Problem creating file from bytearray fetc" \
+		g_warning ("metadata-menu-item.vala:151: Problem creating file from bytearray fetc" \
 "hed from the interweb - error: %s", e->message);
-			_g_error_free0 (e);
-		}
+		_g_error_free0 (e);
 	}
 	__finally3:
 	if (_inner_error_ != NULL) {
@@ -436,8 +499,10 @@ static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByt
 
 GeeHashSet* metadata_menuitem_attributes_format (void) {
 	GeeHashSet* result = NULL;
+	GeeHashSet* _tmp0_ = NULL;
 	GeeHashSet* attrs;
-	attrs = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL);
+	attrs = _tmp0_;
 	gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_TITLE);
 	gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_ARTIST);
 	gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_ALBUM);
@@ -451,16 +516,20 @@ static GObject * metadata_menuitem_constructor (GType type, guint n_construct_pr
 	GObject * obj;
 	GObjectClass * parent_class;
 	MetadataMenuitem * self;
+	gchar* _tmp0_;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_;
 	parent_class = G_OBJECT_CLASS (metadata_menuitem_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = METADATA_MENUITEM (obj);
-	{
-		char* _tmp0_;
-		char* _tmp1_;
-		metadata_menuitem_clean_album_art_temp_dir ();
-		self->priv->previous_temp_album_art_path = (_tmp0_ = NULL, _g_free0 (self->priv->previous_temp_album_art_path), _tmp0_);
-		metadata_menuitem_album_art_cache_dir = (_tmp1_ = metadata_menuitem_create_album_art_temp_dir (), _g_free0 (metadata_menuitem_album_art_cache_dir), _tmp1_);
-	}
+	metadata_menuitem_clean_album_art_temp_dir ();
+	_tmp0_ = NULL;
+	_g_free0 (self->priv->previous_temp_album_art_path);
+	self->priv->previous_temp_album_art_path = _tmp0_;
+	_tmp1_ = metadata_menuitem_create_album_art_temp_dir ();
+	_tmp2_ = _tmp1_;
+	_g_free0 (metadata_menuitem_album_art_cache_dir);
+	metadata_menuitem_album_art_cache_dir = _tmp2_;
 	return obj;
 }
 
@@ -499,4 +568,3 @@ GType metadata_menuitem_get_type (void) {
 
 
 
-