[Pkg-xfce-commits] r1481 - in desktop/trunk/thunar/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2007-12-12 13:06:51 +0000 (Wed, 12 Dec 2007)
New Revision: 1481

Added:
   desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch
Modified:
   desktop/trunk/thunar/debian/changelog
Log:
use upstream patch to correctly have eject button when needed
closes: #455866


Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2007-12-12 07:33:21 UTC (rev 1480)
+++ desktop/trunk/thunar/debian/changelog	2007-12-12 13:06:51 UTC (rev 1481)
@@ -1,8 +1,10 @@
 thunar (0.9.0-2) UNRELEASED; urgency=low
 
   * debian/control: explicitely enable options for ./configure.
+  * debian/patches:
+    - 03_use-eject-where-necessary added, taken from upstream. closes:  #455866
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 08 Dec 2007 18:48:56 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Dec 2007 14:06:09 +0100
 
 thunar (0.9.0-1) unstable; urgency=low
 

Added: desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch	                        (rev 0)
+++ desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch	2007-12-12 13:06:51 UTC (rev 1481)
@@ -0,0 +1,44 @@
+Thunar 0.9.0 displays the "Eject" menu item only for disc volumes. Apply
+this patch to fix that issue and have Thunar display "Eject" also for
+iPods and other volumes that require eject.
+
+Index: thunar/thunar-shortcuts-view.c
+===================================================================
+--- thunar/thunar-shortcuts-view.c	(revision 26456)
++++ thunar/thunar-shortcuts-view.c	(revision 26459)
+@@ -834,13 +834,12 @@
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show (item);
+ 
+-      /* check if the volume is a disc */
+-      if (thunar_vfs_volume_is_disc (volume))
++      /* check if the volume is ejectable */
++      if (thunar_vfs_volume_is_ejectable (volume))
+         {
+           /* append the "Eject Volume" menu action */
+           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
+           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_eject), view);
+-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
+           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+           gtk_widget_show (item);
+         }
+Index: thunar/thunar-tree-view.c
+===================================================================
+--- thunar/thunar-tree-view.c	(revision 26456)
++++ thunar/thunar-tree-view.c	(revision 26459)
+@@ -1041,13 +1041,12 @@
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show (item);
+ 
+-      /* check if the volume is a disc */
+-      if (thunar_vfs_volume_is_disc (volume))
++      /* check if the volume is ejectable */
++      if (thunar_vfs_volume_is_ejectable (volume))
+         {
+           /* append the "Eject Volume" menu action */
+           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
+           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
+-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
+           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+           gtk_widget_show (item);
+         }