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

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-06-09 14:20:27 +0000 (Mon, 09 Jun 2008)
New Revision: 2115

Added:
   desktop/trunk/xfdesktop4/debian/patches/08_handle-crypto-fs.patch
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/control
Log:
08_handle-crypto-fs added, manage luks encrypted filesystems.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2008-06-09 14:10:59 UTC (rev 2114)
+++ desktop/trunk/xfdesktop4/debian/changelog	2008-06-09 14:20:27 UTC (rev 2115)
@@ -2,10 +2,11 @@
 
   * debian/patches:
     - 07_fix-italian-typos added, thanks David Paleino.         closes: #483709
+    - 08_handle-crypto-fs added, manage luks encrypted filesystems.
   * debian/control:
     - updated standards version to 3.8.0. No change needed.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 09 Jun 2008 16:10:34 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 09 Jun 2008 16:12:19 +0200
 
 xfdesktop4 (4.4.2-7) unstable; urgency=low
 

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2008-06-09 14:10:59 UTC (rev 2114)
+++ desktop/trunk/xfdesktop4/debian/control	2008-06-09 14:20:27 UTC (rev 2115)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.2), libexo-0.3-dev (>= 0.3.2), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/

Added: desktop/trunk/xfdesktop4/debian/patches/08_handle-crypto-fs.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/08_handle-crypto-fs.patch	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/08_handle-crypto-fs.patch	2008-06-09 14:20:27 UTC (rev 2115)
@@ -0,0 +1,52 @@
+Index: src/xfdesktop-volume-icon.c
+===================================================================
+--- src/xfdesktop-volume-icon.c	(revision 27044)
++++ src/xfdesktop-volume-icon.c	(working copy)
+@@ -568,27 +568,31 @@
+     gtk_widget_show(mi);
+     gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+     
+-    mi = gtk_image_menu_item_new_with_mnemonic(_("_Mount Volume"));
++    if (G_UNLIKELY(thunar_vfs_volume_is_crypto(volume))) {
++      mi = gtk_image_menu_item_new_with_mnemonic(_("_Setup crypto layer"));
++      gtk_widget_set_sensitive(mi, !thunar_vfs_volume_is_crypto_setup(volume));
++    } else {
++      mi = gtk_image_menu_item_new_with_mnemonic(_("_Mount Volume"));
++      gtk_widget_set_sensitive(mi, !thunar_vfs_volume_is_mounted(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);
++    g_signal_connect(G_OBJECT(mi), "activate",
++                     G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),
++                     icon);
++    
++    if (G_UNLIKELY(thunar_vfs_volume_is_crypto(volume))) {
++      mi = gtk_image_menu_item_new_with_mnemonic(_("_Teardown crypto layer"));
++      gtk_widget_set_sensitive(mi, thunar_vfs_volume_is_crypto_setup(volume));
++    } else {
++      mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume"));
++      gtk_widget_set_sensitive(mi, thunar_vfs_volume_is_mounted(volume));
+     }
+-    
+-    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);
+-    }
++    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))