[Pkg-xfce-commits] r3908 - in goodies/trunk/thunar-volman/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-03-13 11:13:18 +0000 (Sat, 13 Mar 2010)
New Revision: 3908

Added:
   goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
Modified:
   goodies/trunk/thunar-volman/debian/changelog
   goodies/trunk/thunar-volman/debian/control
Log:
* debian/patches
  - 02_fix-race-asking-passphrase-twice added, don't ask twice for
    passphrase on encrypted volumes (Xfce #5416).
* debian/control:
  - update standards version to 3.8.4.

Modified: goodies/trunk/thunar-volman/debian/changelog
===================================================================
--- goodies/trunk/thunar-volman/debian/changelog	2010-03-11 19:07:57 UTC (rev 3907)
+++ goodies/trunk/thunar-volman/debian/changelog	2010-03-13 11:13:18 UTC (rev 3908)
@@ -3,8 +3,15 @@
   [ Stefan Ott ]
   * Fix debian/watch
 
- -- Stefan Ott <stefan at ott.net>  Thu, 11 Mar 2010 18:11:24 +0100
+  [ Yves-Alexis Perez ]
+  * debian/patches
+    - 02_fix-race-asking-passphrase-twice added, don't ask twice for
+      passphrase on encrypted volumes (Xfce #5416).
+  * debian/control:
+    - update standards version to 3.8.4.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 13 Mar 2010 12:12:58 +0100
+
 thunar-volman (0.3.80-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/thunar-volman/debian/control
===================================================================
--- goodies/trunk/thunar-volman/debian/control	2010-03-11 19:07:57 UTC (rev 3907)
+++ goodies/trunk/thunar-volman/debian/control	2010-03-13 11:13:18 UTC (rev 3908)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), cdbs, libthunar-vfs-1-dev (>= 1.0.0),
  libdbus-glib-1-dev, libexo-0.3-dev (>= 0.3.100), chrpath, libxml-parser-perl,
  libgtk2.0-dev 
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-volman/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-volman/
 

Added: goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
===================================================================
--- goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch	                        (rev 0)
+++ goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch	2010-03-13 11:13:18 UTC (rev 3908)
@@ -0,0 +1,39 @@
+diff --git a/thunar-volman/tvm-crypto-volume.c b/thunar-volman/tvm-crypto-volume.c
+index 550089e..2f595d3 100644
+--- a/thunar-volman/tvm-crypto-volume.c
++++ b/thunar-volman/tvm-crypto-volume.c
+@@ -257,6 +257,13 @@ tvm_crypto_volume_dbus_call_done (DBusPendingCall *call,
+   gtk_main_quit();
+ }
+ 
++static gboolean 
++get_udi_again (gpointer user_data)
++{
++  gtk_main_quit();
++  return FALSE;
++}
++
+ static gchar *
+ tvm_crypto_volume_mount_install_crypto_volume (LibHalContext *context,
+ 				 const gchar *udi, 
+@@ -388,8 +395,19 @@ oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+     }
+   else
+     {
++      gint num_tries = 0;
+       dbus_message_unref (result);
+-      plain_udi = libhal_volume_crypto_get_clear_volume_udi (context, volume);
++      while (plain_udi == NULL && num_tries < 3) {
++        plain_udi = libhal_volume_crypto_get_clear_volume_udi (context, volume);
++        if (plain_udi == NULL) {
++          /* asking for the plain UDI too quickly may get a NULL one. Let's try
++           * again after one second. */
++          g_timeout_add_seconds(1, get_udi_again, NULL);
++          gtk_main();
++        }
++        num_tries++;
++        g_debug("try %d, plain udi %s", num_tries, plain_udi);
++      }
+     }
+ 
+ out: