diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-03-17 14:26:55 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-03-17 14:26:55 -0400 |
commit | ab3d1a08d064b423b2e2a3702c3039947bbb810f (patch) | |
tree | 40786cc8fafef4ae34fb55d3c1d95f2d49ff6730 /src/metadata-menu-item.c | |
parent | d1a4d4e51d74192975dd2aa1dda35581b1d23d73 (diff) | |
parent | 7619eab48daaa739fb3418237c693b7b463182f0 (diff) | |
download | ayatana-indicator-sound-ab3d1a08d064b423b2e2a3702c3039947bbb810f.tar.gz ayatana-indicator-sound-ab3d1a08d064b423b2e2a3702c3039947bbb810f.tar.bz2 ayatana-indicator-sound-ab3d1a08d064b423b2e2a3702c3039947bbb810f.zip |
releasing version 0.6.4-0ubuntu1
Diffstat (limited to 'src/metadata-menu-item.c')
-rw-r--r-- | src/metadata-menu-item.c | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c index 08231ca..981b951 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.11.6, the Vala compiler +/* metadata-menu-item.c generated by valac 0.11.7, the Vala compiler * generated from metadata-menu-item.vala, do not modify */ /* @@ -337,8 +337,7 @@ void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, cons GFile* _tmp0_ = NULL; GFile* art_file; gboolean _tmp1_; - FetchFile* _tmp8_ = NULL; - FetchFile* _tmp9_; + FetchFile* _tmp7_ = NULL; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (uri != NULL); @@ -353,11 +352,12 @@ void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, cons gchar* _tmp4_ = NULL; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; _tmp2_ = string_strip (uri); _tmp3_ = _tmp2_; _tmp4_ = g_filename_from_uri (_tmp3_, NULL, &_inner_error_); - _tmp6_ = (_tmp5_ = _tmp4_, _g_free0 (_tmp3_), _tmp5_); + _tmp5_ = _tmp4_; + _g_free0 (_tmp3_); + _tmp6_ = _tmp5_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_CONVERT_ERROR) { goto __catch4_g_convert_error; @@ -368,9 +368,8 @@ void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, cons g_clear_error (&_inner_error_); return; } - _tmp7_ = _tmp6_; _g_free0 (path); - path = _tmp7_; + path = _tmp6_; dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, prop, path); goto __finally4; __catch4_g_convert_error: @@ -398,10 +397,9 @@ void metadata_menuitem_fetch_art (MetadataMenuitem* self, const gchar* uri, cons _g_object_unref0 (art_file); return; } - _tmp8_ = fetch_file_new (uri, prop); - _tmp9_ = _tmp8_; + _tmp7_ = fetch_file_new (uri, prop); _g_object_unref0 (metadata_menuitem_fetcher); - metadata_menuitem_fetcher = _tmp9_; + metadata_menuitem_fetcher = _tmp7_; 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); @@ -458,7 +456,6 @@ static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByt 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); @@ -473,9 +470,8 @@ static void metadata_menuitem_on_fetcher_completed (MetadataMenuitem* self, GByt g_remove (self->priv->previous_temp_album_art_path); } _tmp7_ = g_strdup (path); - _tmp8_ = _tmp7_; _g_free0 (self->priv->previous_temp_album_art_path); - self->priv->previous_temp_album_art_path = _tmp8_; + self->priv->previous_temp_album_art_path = _tmp7_; } _g_free0 (path); _g_object_unref0 (icon); @@ -518,20 +514,16 @@ 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_; + gchar* _tmp0_ = NULL; parent_class = G_OBJECT_CLASS (metadata_menuitem_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = METADATA_MENUITEM (obj); 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_; + self->priv->previous_temp_album_art_path = NULL; + _tmp0_ = metadata_menuitem_create_album_art_temp_dir (); _g_free0 (metadata_menuitem_album_art_cache_dir); - metadata_menuitem_album_art_cache_dir = _tmp2_; + metadata_menuitem_album_art_cache_dir = _tmp0_; return obj; } |