[Pkg-xfce-commits] r1529 - in desktop/trunk/xfdesktop4/debian: . patches

[huggie at alioth.debian.org]

Author: huggie
Date: 2008-01-09 13:03:49 +0000 (Wed, 09 Jan 2008)
New Revision: 1529

Added:
   desktop/trunk/xfdesktop4/debian/patches/02_use_eject_where_needed.patch
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/patches/series
Log:
Add fix for #455866 the Eject Volume bug in xfdesktop


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2008-01-08 07:45:25 UTC (rev 1528)
+++ desktop/trunk/xfdesktop4/debian/changelog	2008-01-09 13:03:49 UTC (rev 1529)
@@ -1,3 +1,10 @@
+xfdesktop4 (4.4.2-2) UNRELEASED; urgency=low
+
+  * Add 02_use_eject_where_needed.patch to replace Unmount Volume with
+    Eject Volume when this is required                          closes: #455866
+
+ -- Simon Huggins <huggie at earth.li>  Wed, 09 Jan 2008 12:57:35 +0000
+
 xfdesktop4 (4.4.2-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Added: desktop/trunk/xfdesktop4/debian/patches/02_use_eject_where_needed.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/02_use_eject_where_needed.patch	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/02_use_eject_where_needed.patch	2008-01-09 13:03:49 UTC (rev 1529)
@@ -0,0 +1,42 @@
+diff -ru xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c
+--- xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c	2007-11-17 20:31:41.000000000 +0100
++++ xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c	2007-12-12 01:07:27.421327344 +0100
+@@ -562,19 +562,7 @@
+                          icon);
+     }
+     
+-    mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume"));
+-    gtk_widget_show(mi);
+-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+-    if(!thunar_vfs_volume_is_mounted(volume))
+-        gtk_widget_set_sensitive(mi, FALSE);
+-    else {
+-        g_signal_connect(G_OBJECT(mi), "activate",
+-                         G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),
+-                         icon);
+-    }
+-    
+-    if(thunar_vfs_volume_is_disc(volume)
+-       && thunar_vfs_volume_is_ejectable(volume))
++    if(thunar_vfs_volume_is_ejectable(volume))
+     {
+         mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume"));
+         gtk_widget_show(mi);
+@@ -582,6 +570,17 @@
+         g_signal_connect(G_OBJECT(mi), "activate",
+                          G_CALLBACK(xfdesktop_volume_icon_menu_eject),
+                          icon);
++    } else {
++	mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume"));
++	gtk_widget_show(mi);
++	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
++	if(!thunar_vfs_volume_is_mounted(volume))
++	    gtk_widget_set_sensitive(mi, FALSE);
++	else {
++	    g_signal_connect(G_OBJECT(mi), "activate",
++			     G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),
++			     icon);
++	}
+     }
+     
+     mi = gtk_separator_menu_item_new();

Modified: desktop/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series	2008-01-08 07:45:25 UTC (rev 1528)
+++ desktop/trunk/xfdesktop4/debian/patches/series	2008-01-09 13:03:49 UTC (rev 1529)
@@ -1 +1,2 @@
 01_show-backdrop-by-default.patch
+02_use_eject_where_needed.patch