diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-09-07 16:10:41 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-09-07 16:10:41 +0100 |
| commit | cfd5b54dfa45a7d469059b93e0201401c5017ece (patch) | |
| tree | 51e5c57b7c70afad7c63d6bbf42af4da87dea9f8 | |
| parent | b69ebdb28bb8b2d508c5788977d3c49f1d2fd28a (diff) | |
| download | ayatana-indicator-sound-cfd5b54dfa45a7d469059b93e0201401c5017ece.tar.gz ayatana-indicator-sound-cfd5b54dfa45a7d469059b93e0201401c5017ece.tar.bz2 ayatana-indicator-sound-cfd5b54dfa45a7d469059b93e0201401c5017ece.zip | |
remote art url fixed
| -rw-r--r-- | src/metadata-menu-item.vala | 8 | ||||
| -rw-r--r-- | src/metadata-widget.c | 2 | ||||
| -rw-r--r-- | src/sound-service.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala index 581fa10..cd50129 100644 --- a/src/metadata-menu-item.vala +++ b/src/metadata-menu-item.vala @@ -23,7 +23,7 @@ using Gdk; public class MetadataMenuitem : PlayerItem { - public const string ALBUM_ART_DIR_SUFFIX = "/indicators/sound/album-art-cache"; + public const string ALBUM_ART_DIR_SUFFIX = "indicators/sound/album-art-cache"; public static string album_art_cache_dir; private static FetchFile fetcher; @@ -43,9 +43,9 @@ public class MetadataMenuitem : PlayerItem private static void clean_album_art_temp_dir() { - string path = Environment.get_user_cache_dir().dup().concat(ALBUM_ART_DIR_SUFFIX); + string path = GLib.Path.build_filename(Environment.get_user_cache_dir(), ALBUM_ART_DIR_SUFFIX); - GLib.File? album_art_dir = GLib.File.new_for_uri(path); + GLib.File? album_art_dir = GLib.File.new_for_path(path); if(delete_album_art_contents(album_art_dir) == false) { @@ -55,7 +55,7 @@ public class MetadataMenuitem : PlayerItem private static string? create_album_art_temp_dir() { - string path = Environment.get_user_cache_dir().dup().concat(ALBUM_ART_DIR_SUFFIX); + string path = GLib.Path.build_filename(Environment.get_user_cache_dir(), ALBUM_ART_DIR_SUFFIX); if(DirUtils.create(path, 0700) == -1){ warning("could not create a temp dir for remote album art, it must have been created already"); } diff --git a/src/metadata-widget.c b/src/metadata-widget.c index dc6aaa6..2bca072 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -325,7 +325,7 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property, g_string_erase(priv->image_path, 0, -1); g_string_overwrite(priv->image_path, 0, g_value_get_string (value)); // if its a remote image queue a redraw incase the download took too long - if (g_str_has_prefix(g_value_get_string (value), g_get_user_special_dir(G_USER_DIRECTORY_PICTURES))){ + if (g_str_has_prefix(g_value_get_string (value), g_get_user_cache_dir())){ g_debug("the image update is a download so redraw"); gtk_widget_queue_draw(GTK_WIDGET(mitem)); } diff --git a/src/sound-service.c b/src/sound-service.c index 51f5f37..f19379d 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -41,8 +41,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); //TODO: uncomment for release !! - //close_pulse_activites(); - //g_main_loop_quit(mainloop); + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } |