[Pkg-utopia-commits] r1404 - in packages/unstable/gnome-volume-manager/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-04-16 20:44:12 +0000 (Mon, 16 Apr 2007)
New Revision: 1404

Removed:
   packages/unstable/gnome-volume-manager/debian/patches/04_dont_unlock_unlocked_volumes.patch
Modified:
   packages/unstable/gnome-volume-manager/debian/changelog
Log:
Remove obsolete patch. Not needed anymore with gnome-mount.


Modified: packages/unstable/gnome-volume-manager/debian/changelog
===================================================================
--- packages/unstable/gnome-volume-manager/debian/changelog	2007-04-15 14:21:28 UTC (rev 1403)
+++ packages/unstable/gnome-volume-manager/debian/changelog	2007-04-16 20:44:12 UTC (rev 1404)
@@ -1,3 +1,11 @@
+gnome-volume-manager (2.17.0-2) experimental; urgency=low
+
+  * Upload to unstable.
+  * debian/patches/04_dont_unlock_unlocked_volumes.patch
+    - Removed. Not needed anymore with gnome-mount.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 16 Apr 2007 22:43:12 +0200
+
 gnome-volume-manager (2.17.0-1) experimental; urgency=low
 
   * New upstream release

Deleted: packages/unstable/gnome-volume-manager/debian/patches/04_dont_unlock_unlocked_volumes.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/04_dont_unlock_unlocked_volumes.patch	2007-04-15 14:21:28 UTC (rev 1403)
+++ packages/unstable/gnome-volume-manager/debian/patches/04_dont_unlock_unlocked_volumes.patch	2007-04-16 20:44:12 UTC (rev 1404)
@@ -1,32 +0,0 @@
---- gnome-volume-manager-1.5.15/src/manager.c	2007-03-14 15:41:05.000000000 +0100
-+++ gnome-volume-manager-1.5.15.patched/src/manager.c	2007-03-14 15:39:24.000000000 +0100
-@@ -1667,6 +1667,18 @@
-     free (udi);
- }
- 
-+static gboolean
-+crypto_unlocked(const char *udi) {
-+	char **devices = NULL;
-+	int num = 0;
-+
-+	devices = libhal_manager_find_device_string_match(hal_ctx,
-+	              "volume.crypto_luks.clear.backing_volume",
-+	              udi, &num, NULL);
-+	libhal_free_string_array(devices);
-+	return num > 0;
-+}
-+
- /*
-  * gvm_device_mount_encrypted - create a passphrase dialog for an encrypted
-  * dialog and set up gvm_device_mount_encrypted_pwd_callback() as a callback.
-@@ -1678,6 +1691,10 @@
- {
-     GksuuiDialog *dialog = GKSUUI_DIALOG (gksuui_dialog_new());
-     gtk_window_set_title (GTK_WINDOW(dialog), _("Encrypted volume detected"));
-+    if (crypto_unlocked(udi)) {
-+      dbg("Not trying to mount unlocked volume\n");
-+      return;
-+    }
- 
-     /* if cryptsetup is not available, tell user about it */
-     if (access ("/sbin/cryptsetup", X_OK) < 0) {