[Pkg-xfce-commits] r2899 - in goodies/xfce4-places-plugin/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2009-03-03 22:42:17 +0000 (Tue, 03 Mar 2009)
New Revision: 2899

Added:
   goodies/xfce4-places-plugin/debian/patches/02_fix-xdg-icons.patch
Modified:
   goodies/xfce4-places-plugin/debian/changelog
   goodies/xfce4-places-plugin/debian/patches/series
Log:
* debian/patches:
  - 02_fix-xdg-icons added, use freedesktop icon names.

Modified: goodies/xfce4-places-plugin/debian/changelog
===================================================================
--- goodies/xfce4-places-plugin/debian/changelog	2009-03-03 09:03:29 UTC (rev 2898)
+++ goodies/xfce4-places-plugin/debian/changelog	2009-03-03 22:42:17 UTC (rev 2899)
@@ -1,3 +1,10 @@
+xfce4-places-plugin (1.1.0-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_fix-xdg-icons added, use freedesktop icon names.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 03 Mar 2009 23:31:20 +0100
+
 xfce4-places-plugin (1.1.0-2) unstable; urgency=low
 
   * debian/patches:

Added: goodies/xfce4-places-plugin/debian/patches/02_fix-xdg-icons.patch
===================================================================
--- goodies/xfce4-places-plugin/debian/patches/02_fix-xdg-icons.patch	                        (rev 0)
+++ goodies/xfce4-places-plugin/debian/patches/02_fix-xdg-icons.patch	2009-03-03 22:42:17 UTC (rev 2899)
@@ -0,0 +1,65 @@
+diff --git a/panel-plugin/model_system.c b/panel-plugin/model_system.c
+index b4a5d8c..6e21a27 100644
+--- a/panel-plugin/model_system.c
++++ b/panel-plugin/model_system.c
+@@ -95,7 +95,7 @@ pbsys_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
+     /* Home */
+     bookmark                = places_bookmark_create((gchar*) g_get_user_name());
+     bookmark->uri           = (gchar*) home_dir;
+-    bookmark->icon          = "gnome-fs-home";
++    bookmark->icon          = "user-home";
+ 
+     terminal                 = places_create_open_terminal_action(bookmark);
+     bookmark->actions        = g_list_prepend(bookmark->actions, terminal);
+@@ -117,9 +117,9 @@ pbsys_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
+     trash_info = thunar_vfs_info_new_for_path(pbg_priv(bookmark_group)->trash_path, NULL);
+     if(trash_info->custom_icon != NULL){
+         bookmark->icon = g_strdup(trash_info->custom_icon);
+-        pbg_priv(bookmark_group)->trash_is_empty = (strcmp("gnome-fs-trash-full", bookmark->icon) != 0);
++        pbg_priv(bookmark_group)->trash_is_empty = (strcmp("user-trash-full", bookmark->icon) != 0);
+     }else{
+-        bookmark->icon = g_strdup("gnome-fs-trash-full");
++        bookmark->icon = g_strdup("user-trash-full");
+         pbg_priv(bookmark_group)->trash_is_empty = FALSE;
+     }
+     thunar_vfs_info_unref(trash_info);
+@@ -134,7 +134,7 @@ pbsys_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
+     /* Desktop */
+     bookmark                = places_bookmark_create(_("Desktop"));
+     bookmark->uri           = g_build_filename(home_dir, "Desktop", NULL);
+-    bookmark->icon          = "gnome-fs-desktop";
++    bookmark->icon          = "user-desktop";
+     bookmark->finalize      = pbsys_finalize_desktop_bookmark;
+ 
+     if(g_file_test(bookmark->uri, G_FILE_TEST_IS_DIR)){
+@@ -158,7 +158,7 @@ pbsys_get_bookmarks(PlacesBookmarkGroup *bookmark_group)
+     /* File System (/) */
+     bookmark                = places_bookmark_create(_("File System"));
+     bookmark->uri           = "/";
+-    bookmark->icon          = "gnome-dev-harddisk";
++    bookmark->icon          = "gtk-harddisk";
+ 
+     terminal                 = places_create_open_terminal_action(bookmark);
+     bookmark->actions        = g_list_prepend(bookmark->actions, terminal);
+@@ -195,7 +195,7 @@ pbsys_changed(PlacesBookmarkGroup *bookmark_group)
+     /* see if trash gets a different icon (e.g., was empty, now full) */
+     trash_info = thunar_vfs_info_new_for_path(pbg_priv(bookmark_group)->trash_path, NULL);
+     if(trash_info->custom_icon != NULL)
+-        trash_is_empty = (strcmp("gnome-fs-trash-full", trash_info->custom_icon) != 0);
++        trash_is_empty = (strcmp("user-trash-full", trash_info->custom_icon) != 0);
+     thunar_vfs_info_unref(trash_info);
+     
+     if(trash_is_empty != pbg_priv(bookmark_group)->trash_is_empty)
+diff --git a/panel-plugin/model_user.c b/panel-plugin/model_user.c
+index f71ed52..1b85a30 100644
+--- a/panel-plugin/model_user.c
++++ b/panel-plugin/model_user.c
+@@ -168,7 +168,7 @@ pbuser_build_bookmarks(PlacesBookmarkGroup *bookmark_group)
+         /* create the BookmarkInfo container */
+         bookmark        = places_bookmark_create(name);           /* label needs to be freed */
+         bookmark->uri   = path;                                   /* uri   needs to be freed */
+-        bookmark->icon  = "gnome-fs-directory";
++        bookmark->icon  = "folder";
+         bookmark->priv  = GINT_TO_POINTER(pbuser_dir_exists(path));
+         bookmark->finalize = pbuser_finalize_bookmark;
+ 

Modified: goodies/xfce4-places-plugin/debian/patches/series
===================================================================
--- goodies/xfce4-places-plugin/debian/patches/series	2009-03-03 09:03:29 UTC (rev 2898)
+++ goodies/xfce4-places-plugin/debian/patches/series	2009-03-03 22:42:17 UTC (rev 2899)
@@ -1 +1,2 @@
 01_fix-segfault-exit.patch
+02_fix-xdg-icons.patch