[Pkg-utopia-commits] r250 - packages/unstable/gnome-volume-manager/debian/patches

Sjoerd Simons sjoerd at costa.debian.org
Mon May 1 17:56:06 UTC 2006


Author: sjoerd
Date: 2005-06-22 10:36:44 +0000 (Wed, 22 Jun 2005)
New Revision: 250

Added:
   packages/unstable/gnome-volume-manager/debian/patches/03_browse_fixup.patch
   packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch
   packages/unstable/gnome-volume-manager/debian/patches/10_improve_mounting.patch
   packages/unstable/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch
   packages/unstable/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch
   packages/unstable/gnome-volume-manager/debian/patches/12_no_autorun.patch
   packages/unstable/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch
   packages/unstable/gnome-volume-manager/debian/patches/20_specify_programs.patch
   packages/unstable/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch
Removed:
   packages/unstable/gnome-volume-manager/debian/patches/01_browse_fixup.patch
   packages/unstable/gnome-volume-manager/debian/patches/02_pmount.patch
   packages/unstable/gnome-volume-manager/debian/patches/03_kernel_hint.patch
   packages/unstable/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch
   packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch
   packages/unstable/gnome-volume-manager/debian/patches/06_pmount_crypt.patch
   packages/unstable/gnome-volume-manager/debian/patches/07_dialogs_info.patch
   packages/unstable/gnome-volume-manager/debian/patches/08_photographss_typo.patch
   packages/unstable/gnome-volume-manager/debian/patches/09_nautilus_path.patch
   packages/unstable/gnome-volume-manager/debian/patches/25_improve_mounting.patch
   packages/unstable/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch
   packages/unstable/gnome-volume-manager/debian/patches/34_compiler_warnings.patch
   packages/unstable/gnome-volume-manager/debian/patches/40_no_autorun.patch
Modified:
   packages/unstable/gnome-volume-manager/debian/patches/00_set_defaults.patch
Log:
Undo changed committed to the wrong branch.. OOPS

Modified: packages/unstable/gnome-volume-manager/debian/patches/00_set_defaults.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/00_set_defaults.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/00_set_defaults.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,6 +1,6 @@
-diff -ruN gnome-volume-manager-1.3.1-old/gnome-volume-manager.schemas.in gnome-volume-manager-1.3.1/gnome-volume-manager.schemas.in
---- gnome-volume-manager-1.3.1-old/gnome-volume-manager.schemas.in	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/gnome-volume-manager.schemas.in	2005-04-13 14:06:19.798155728 +0200
+diff -ruN gnome-volume-manager-1.2.1-old/gnome-volume-manager.schemas.in gnome-volume-manager-1.2.1/gnome-volume-manager.schemas.in
+--- gnome-volume-manager-1.2.1-old/gnome-volume-manager.schemas.in	2005-03-30 23:05:15.000000000 +0200
++++ gnome-volume-manager-1.2.1/gnome-volume-manager.schemas.in	2005-04-29 12:30:46.000000000 +0200
 @@ -29,7 +29,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
          <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>

Deleted: packages/unstable/gnome-volume-manager/debian/patches/01_browse_fixup.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/01_browse_fixup.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/01_browse_fixup.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,70 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-03-31 18:27:07.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-04-13 14:08:36.049442384 +0200
-@@ -257,31 +257,32 @@
- /*
-  * gvm_check_dvd - is this a Video DVD?  If so, do something about it.
-  *
-- * Returns TRUE if this was a Video DVD and FALSE otherwise.
-+ * Returns TRUE if the Video DVD action was taken and FALSE otherwise.
-  */
- static gboolean
- gvm_check_dvd (const char *device, const char *mount_point, const char *udi)
- {
- 	char *path;
--	gboolean retval;
-+	gboolean isdvd;
- 
- 	path = g_build_path (G_DIR_SEPARATOR_S, mount_point, "video_ts", NULL);
--	retval = g_file_test (path, G_FILE_TEST_IS_DIR);
-+	isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
- 	g_free (path);
- 
- 	/* try the other name, if needed */
--	if (retval == FALSE) {
-+	if (isdvd == FALSE) {
- 		path = g_build_path (G_DIR_SEPARATOR_S, mount_point,
- 				     "VIDEO_TS", NULL);
--		retval = g_file_test (path, G_FILE_TEST_IS_DIR);
-+		isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
- 		g_free (path);
- 	}
- 
--	if (retval && config.autoplay_dvd)
-+	if (isdvd && config.autoplay_dvd) {
- 		gvm_run_command (device, config.autoplay_dvd_command,
- 				 mount_point, udi);
--
--	return retval;
-+    return TRUE;
-+  }
-+  return FALSE;
- }
- 
- /*
-@@ -289,7 +290,8 @@
-  * unit from a digital camera (e.g., a compact flash card).  If it is, then
-  * ask the user if he wants to import the photos.
-  *
-- * Returns TRUE if there were photos on this device, FALSE otherwise
-+ * Returns TRUE if there were photos on this device were imported, 
-+ * FALSE otherwise
-  *
-  * FIXME: Should probably not prompt the user and just do it automatically.
-  *        This now makes sense, as gphoto added an import mode.
-@@ -308,7 +310,6 @@
- 	if (!g_file_test (dcim_path, G_FILE_TEST_IS_DIR))
- 		goto out;
- 
--	retval = TRUE;
- 	dbg ("Photos detected: %s\n", dcim_path);
- 
- 	/* add the "content.photos" capability to this device */
-@@ -322,6 +323,7 @@
- 	}
- 
- 	if (config.autophoto) {
-+		retval=TRUE;
- 		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
- 						GTK_BUTTONS_NONE,
- 						_("Import photos from device?"));

Deleted: packages/unstable/gnome-volume-manager/debian/patches/02_pmount.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/02_pmount.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/02_pmount.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,99 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/src/gvm.h gnome-volume-manager-1.3.1/src/gvm.h
---- gnome-volume-manager-1.3.1-old/src/gvm.h	2004-08-13 19:11:56.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/gvm.h	2005-05-13 14:31:12.000000000 +0200
-@@ -32,6 +32,12 @@
- 
- #define CLIPBOARD_NAME		"GVM_SELECTION"
- 
-+/* override BIN_MOUNT and BIN_UMOUNT from autoconf to pmount */
-+#undef BIN_MOUNT
-+#undef BIN_UMOUNT
-+#define BIN_MOUNT "/usr/bin/pmount-hal"
-+#define BIN_UMOUNT "/usr/bin/pumount"
-+
- extern gboolean gvm_get_clipboard (void);
- 
- #endif	/* _GVM_H */
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-05-13 14:30:49.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-05-13 14:30:49.000000000 +0200
-@@ -485,22 +485,19 @@
- }
- 
- /*
-- * gvm_device_mount - use BIN_MOUNT to mount the given device node.
-- *
-- * Note that this requires that the given device node is in /etc/fstab.  This
-- * is intentional.
-+ * gvm_device_mount - use BIN_MOUNT to mount the given device.
-  *
-  * @return TRUE iff the mount was succesful
-  */
- static gboolean
--gvm_device_mount (char *device)
-+gvm_device_mount (const char *udi)
- {
- 	char *argv[3];
- 	GError *error = NULL;
- 	gint exit_status;
- 
- 	argv[0] = BIN_MOUNT;
--	argv[1] = device;
-+	argv[1] = udi;
- 	argv[2] = NULL;
- 
- 	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL,
-@@ -533,7 +530,7 @@
- 
- 	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL,
- 			   NULL, NULL, NULL, &exit_status, &error)) {
--		warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
-+		warn ("failed to exec " BIN_UMOUNT ": %s\n", error->message);
- 		return FALSE;
- 	}
- 
-@@ -606,7 +603,7 @@
- 
- 	switch (action) {
- 	case MOUNT:
--		gvm_device_mount (device);
-+		gvm_device_mount (udi);
- 		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		break;
- 	case PLAY:
-@@ -709,7 +706,7 @@
- 		gvm_ask_mixed (udi);
- 	} else if (has_data) {
- 		if (config.automount_media) {
--			gvm_device_mount (device);
-+			gvm_device_mount (udi);
- 			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		}
- 	} else if (is_blank) {
-@@ -776,7 +773,7 @@
- 		dbg ("Added: %s\n", device);
- 		
- 		if (config.automount_drives) {
--			gvm_device_mount (device);
-+			gvm_device_mount (udi);
- 			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		}
- 	}
-@@ -845,7 +842,7 @@
- 	dbg ("Added: %s\n", device);
- 	
- 	if (config.automount_drives) {
--		gvm_device_mount (device);
-+		gvm_device_mount (udi);
- 		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 	}
- 	
-@@ -1131,7 +1128,7 @@
- 
- 			dbg ("mount_all: mounting %s\n", device_file);
- 
--			gvm_device_mount (device_file);
-+			gvm_device_mount (udi);
- 
- 			libhal_free_string (device_file);
- 		} else {

Copied: packages/unstable/gnome-volume-manager/debian/patches/03_browse_fixup.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/03_browse_fixup.patch)

Deleted: packages/unstable/gnome-volume-manager/debian/patches/03_kernel_hint.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/03_kernel_hint.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/03_kernel_hint.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,13 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/src/properties.c gnome-volume-manager-1.3.1/src/properties.c
---- gnome-volume-manager-1.3.1-old/src/properties.c	2005-03-31 18:27:07.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/properties.c	2005-04-13 14:54:00.994187816 +0200
-@@ -396,7 +396,8 @@
- 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- 							  _("The \"hald\" service is required but not currently "
- 							    "running. Enable the service and rerun this applet, "
--							    "or contact your system administrator."));
-+							    "or contact your system administrator. Note: You "
-+                                                            "need Linux kernel 2.6 for volume management to work."));
- 
- 		gtk_dialog_run (GTK_DIALOG (dialog));
- 		gtk_widget_destroy (dialog);

Deleted: packages/unstable/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,116 +0,0 @@
---- gnome-volume-manager-1.3.1.old/src/manager.c	
-+++ gnome-volume-manager-1.3.1/src/manager.c
-@@ -50,7 +50,8 @@
- #define NAUTILUS_COMMAND	 BIN_NAUTILUS" -n --no-desktop %m"
- 
- static struct gvm_configuration config;
--static LibHalContext *hal_ctx;
-+static LibHalContext *hal_ctx = NULL;
-+static DBusConnection *dbus_connection = NULL;
- 
- /** List of UDI's for volumes mounted by g-v-m that we need to apply policy to*/
- static GSList *mounted_volumes_policy_queue = NULL;
-@@ -969,6 +970,73 @@
- {
- }
- 
-+static LibHalContext * gvm_do_hal_init ();
-+
-+/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event.
-+ *
-+ * @param  data                 Context pointer
-+ * @return true if it should be tried again, false if success or failure.
-+ */
-+static gboolean
-+gvm_reconnect_to_hal (gpointer data __attribute__((__unused__)))
-+{
-+       static unsigned int retries = 0;
-+       DBusError error;
-+
-+       dbg ("Trying a reconnect ...\n");
-+       hal_ctx = gvm_do_hal_init ();
-+       if (hal_ctx != NULL) {
-+               dbg ("Reconnected OK.\n");
-+               retries = 0;
-+               return FALSE;
-+       } else if (dbus_connection){
-+               /* shut down dbus connection to try it again */
-+               dbus_connection_unref (dbus_connection);
-+               dbus_connection = NULL;
-+       }
-+
-+       /* Retry later if it failed. */
-+       if (retries++ < 100)
-+               return TRUE;
-+
-+       /* Too many retries; clean up and bail. */
-+       warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n");
-+       libhal_ctx_shutdown (hal_ctx, &error);
-+       libhal_ctx_free (hal_ctx);
-+       hal_ctx = NULL;
-+       gtk_main_quit ();
-+       return FALSE;
-+}
-+
-+/** Invoked by D-BUS to filter messages.
-+ *
-+ * @param  connection  D-BUS connection
-+ * @param  message     D-BUS message
-+ * @param  user_data   Context pointer
-+ */
-+static DBusHandlerResult
-+gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)),
-+                        DBusMessage *message,
-+                        void *user_data __attribute__((__unused__)))
-+{
-+       DBusError error;
-+       
-+       if (dbus_message_is_signal (message,
-+                                   DBUS_INTERFACE_LOCAL,
-+                                   "Disconnected")) {
-+               dbg("gvm_do_filter_dbus_msg: received Disconnected message\n");
-+               g_timeout_add(500, gvm_reconnect_to_hal, NULL);
-+               libhal_ctx_shutdown (hal_ctx, &error);
-+               libhal_ctx_free (hal_ctx);
-+               hal_ctx = NULL;
-+               dbus_connection_unref (dbus_connection);
-+               dbus_connection = NULL;
-+               return DBUS_HANDLER_RESULT_HANDLED;
-+       }
-+       else
-+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
- /** Integrate a dbus mainloop. 
-  *
-  *  @param  ctx                 LibHal context
-@@ -980,14 +1048,15 @@
- hal_mainloop_integration (LibHalContext *ctx, 
- 			   DBusError *error)
- {
--	DBusConnection *dbus_connection;
--
- 	dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error);
- 
- 	if (dbus_error_is_set (error))
- 		return FALSE;
-+
-+        dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
- 	
-         dbus_connection_setup_with_g_main (dbus_connection, NULL);
-+        dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL);
- 
- 	libhal_ctx_set_dbus_connection (ctx, dbus_connection);
- 	
-@@ -1154,6 +1223,11 @@
- 	char *udi;
- 	DBusError error;
- 
-+        if (ctx == NULL) {
-+            warn("unmount_all: No hal connection! can't unmount volumes\n");
-+            return;
-+        }
-+
- 	dbg ("unmounting all volumes that we saw mounted in our life\n");
- 	dbus_error_init (&error);
- 	for (i = all_mounted_volumes; i != NULL; i = g_slist_next (i)) {

Deleted: packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,37 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-05-02 10:29:54.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-05-02 10:32:40.000000000 +0200
-@@ -971,9 +971,8 @@
- 	char **volumes;
- 	char *udi;
- 	char *device_file;
--
--	if (!config.automount_media)
--		return;
-+  char *drive_udi = NULL;
-+  gboolean do_mount;
- 
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {
-@@ -994,6 +993,21 @@
- 			    "filesystem") != 0)
- 			continue;
- 
-+    drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
-+
-+		do_mount = TRUE;
-+		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-+	      hal_device_get_property_bool(ctx, drive_udi, "storage.hotpluggable")) {
-+			do_mount = config.automount_drives;
-+		} else if (
-+        hal_device_property_exists(ctx, drive_udi, "storage.removable") &&
-+			  hal_device_get_property_bool(ctx, drive_udi, "storage.removable")) {
-+			do_mount = config.automount_media;
-+		} 
-+    hal_free_string(drive_udi);
-+    
-+    if (!do_mount) continue;
-+
- 		device_file = hal_device_get_property_string (ctx, udi,
- 							      "block.device");
- 

Copied: packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/06_mount_at_start.patch)

Deleted: packages/unstable/gnome-volume-manager/debian/patches/06_pmount_crypt.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/06_pmount_crypt.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/06_pmount_crypt.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,197 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/configure.in gnome-volume-manager-1.3.1/configure.in
---- gnome-volume-manager-1.3.1-old/configure.in	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/configure.in	2005-06-02 16:49:38.000000000 +0200
-@@ -82,7 +82,7 @@
- AC_PROG_INTLTOOL([0.27.2])
- AM_GLIB_GNU_GETTEXT
- 
--PKG_CHECK_MODULES(GVM, libgnomeui-2.0 dbus-glib-1 >= 0.31 hal >= 0.5.0 gtk+-2.0 >= 2.6.0)
-+PKG_CHECK_MODULES(GVM, libgnomeui-2.0 dbus-glib-1 >= 0.31 hal >= 0.5.0 gtk+-2.0 >= 2.6.0 libgksuui1.0 >= 1.0.0)
- AC_SUBST(GVM_CFLAGS)
- AC_SUBST(GVM_LIBS)
- 
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-06-02 16:48:57.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-06-02 16:49:11.000000000 +0200
-@@ -22,6 +22,8 @@
- #include <dbus/dbus-glib.h>
- #include <libhal.h>
- #include <signal.h>
-+#include <libgksuui1.0/gksuui.h>
-+#include <sys/wait.h>
- 
- #include "gvm.h"
- 
-@@ -599,6 +601,139 @@
- }
- 
- /*
-+ * gvm_device_mount_finished - called back when mount finished.
-+ *
-+ * This needs to close the pid, remove the FIFO (if given, that applies to
-+ * encrypted devices) and display an error message if the mount failed.
-+ */
-+void
-+gvm_device_mount_finished (GPid pid, gint status, const char* fifoname)
-+{
-+    g_spawn_close_pid (pid);
-+
-+    dbg ("gvm_device_mount_finished: mount process %i returned with %i\n", pid,
-+            status);
-+
-+    if (fifoname)
-+        unlink (fifoname);
-+
-+    if (!WIFEXITED(status)) {
-+        warn (BIN_MOUNT " did not exit normally\n");
-+        return;
-+    }
-+
-+    /* if we have an encryption secret, we display an error message
-+     * if the mount failed. */
-+    if (WEXITSTATUS(status) && fifoname) {
-+        GtkMessageDialog *dialog;
-+        dialog = gtk_message_dialog_new (NULL, 0,
-+                GTK_MESSAGE_ERROR,
-+                GTK_BUTTONS_CLOSE,
-+                _("Could not mount encrypted device. Did you supply a wrong passphrase?"));
-+        gtk_widget_show (GTK_WIDGET(dialog));
-+        g_signal_connect_swapped (dialog, "response",
-+                G_CALLBACK (gtk_widget_destroy), dialog);
-+    }
-+}
-+
-+/*
-+ * gvm_device_mount_encrypted_pwd_callback - Called from
-+ * gvm_device_mount_encrypted after the password dialog finished. Use BIN_MOUNT
-+ * to mount an encrypted given device.
-+ */
-+static void
-+gvm_device_mount_encrypted_pwd_callback (GksuuiDialog* dialog, gint response,
-+        char *udi)
-+{
-+    char *argv[5] = {BIN_MOUNT, udi, "--passphrase", NULL, NULL};
-+    GError *error = NULL;
-+    char* fifoname = NULL;
-+    FILE* fifo = NULL;
-+    GPid mount_pid;
-+    char* passphrase = NULL;
-+
-+    if (!udi) {
-+        warn ("gvm_device_mount_encrypted_pwd_callback: udi == NULL!\n");
-+        return;
-+    }
-+    if (!dialog) {
-+        warn ("gvm_device_mount_encrypted_pwd_callback: dialog == NULL!\n");
-+        return;
-+    }
-+
-+    /* Check whether we got a passphrase */
-+    if (response == GTK_RESPONSE_OK)
-+        passphrase = gksuui_dialog_get_password (dialog);
-+    gtk_widget_destroy (GTK_WIDGET (dialog));
-+    if (!passphrase)
-+        return;
-+
-+    /* Create a private temporary FIFO */
-+    for (;;) {
-+        fifoname = tmpnam(NULL);
-+        if (!fifoname) {
-+            warn ("gvm_device_mount_encrypted: cannot create a temporary name\n");
-+            return;
-+        }
-+
-+        int result = mkfifo (fifoname, 0700);
-+        if (result == 0)
-+            break;
-+        if (errno != EEXIST) {
-+            warn ("gvm_device_mount_encrypted: cannot create fifo: %s\n",
-+                    strerror (errno));
-+            return;
-+        }
-+    }
-+    argv[3] = fifoname;
-+
-+    /* Call the mount process asynchronously */
-+    if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL,
-+                NULL, &mount_pid, &error)) {
-+        warn ("gvm_device_mount_encrypted: could not execute " BIN_MOUNT ": %s\n",
-+                error->message);
-+        return;
-+    }
-+
-+    /* When mounting finishes, call the clean up and error handling
-+     * callback. */
-+    g_child_watch_add (mount_pid, gvm_device_mount_finished, fifoname);
-+
-+    /* now the mount process runs, write the secret into the FIFO;
-+     * this blocks until the pmount child opens the fifo */
-+    fifo = fopen (fifoname, "w");
-+    if (fifo)
-+        fputs (passphrase, fifo);
-+    else {
-+        warn ("gvm_device_mount_encrypted: cannot open fifo: %s\n",
-+                strerror (errno));
-+        unlink (fifoname);
-+    }
-+    free (passphrase);
-+    fclose (fifo);
-+    free (udi);
-+}
-+
-+/*
-+ * gvm_device_mount_encrypted - create a passphrase dialog for an encrypted
-+ * dialog and set up gvm_device_mount_encrypted_pwd_callback() as a callback.
-+ *
-+ * @return TRUE iff the mount was succesful
-+ */
-+static void
-+gvm_device_mount_encrypted (const char *udi)
-+{
-+    GksuuiDialog *dialog = GKSUUI_DIALOG (gksuui_dialog_new());
-+    gtk_window_set_title (GTK_WINDOW(dialog), _("Encrypted volume detected"));
-+    gksuui_dialog_set_message (dialog,  _("A passphrase is required to decrypt this volume"));
-+
-+    g_signal_connect (dialog, "response", 
-+            G_CALLBACK (gvm_device_mount_encrypted_pwd_callback), g_strdup (udi));
-+
-+    gtk_widget_show_all (GTK_WIDGET(dialog));
-+}
-+
-+/*
-  * gvm_device_mount - use BIN_MOUNT to mount the given device.
-  *
-  * @return TRUE iff the mount was succesful
-@@ -615,6 +750,14 @@
-             return FALSE;
-         }
- 
-+        /* Check for encrypted device */
-+        if (libhal_device_property_exists (hal_ctx, udi, "volume.fsusage", NULL) &&
-+                g_strcasecmp(libhal_device_get_property_string (hal_ctx, udi,
-+                        "volume.fsusage", NULL), "crypto") == 0) {
-+            dbg ("encrypted volume found\n");
-+            gvm_device_mount_encrypted (udi);
-+        }
-+
- 	argv[0] = BIN_MOUNT;
- 	argv[1] = udi;
- 	argv[2] = NULL;
-@@ -1300,11 +1443,15 @@
- 		/* only mount if the block device got a sensible filesystem */
- 		if (!libhal_device_property_exists (ctx, udi, 
- 						    "volume.fsusage",
--						    NULL) ||
-+						    NULL) || (
-+		    strcmp (libhal_device_get_property_string (ctx, udi, 
-+							       "volume.fsusage",
-+							       NULL), 
-+			    "filesystem") != 0 &&
- 		    strcmp (libhal_device_get_property_string (ctx, udi, 
- 							       "volume.fsusage",
- 							       NULL), 
--			    "filesystem") != 0) 
-+			    "crypto") != 0))
- 			continue;
- 
- 		device_file = libhal_device_get_property_string (ctx, udi,

Deleted: packages/unstable/gnome-volume-manager/debian/patches/07_dialogs_info.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/07_dialogs_info.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/07_dialogs_info.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,39 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-05-31 13:42:18.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-05-31 13:43:31.000000000 +0200
-@@ -340,7 +340,7 @@
- 	gboolean retval;
- 
- 	askme = gtk_message_dialog_new (NULL,
--					0, GTK_MESSAGE_WARNING,
-+					0, GTK_MESSAGE_INFO,
- 					GTK_BUTTONS_NONE,
- 					_("Run command from inserted media?"));
- 
-@@ -440,7 +440,7 @@
- 
- 	if (config.autophoto) {
- 		retval=TRUE;
--		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
-+		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
- 						GTK_BUTTONS_NONE,
- 						_("Import photos from device?"));
- 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (askme),
-@@ -488,7 +488,7 @@
- 	dbg ("Camera detected: %s\n", udi);
- 
- 	if (config.autophoto) {
--		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
-+		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
- 						GTK_BUTTONS_NONE,
- 						_("Import photos from camera?"));
- 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (askme),
-@@ -771,7 +771,7 @@
- 		GtkWidget *askme;
- 
- 		askme = gtk_message_dialog_new (NULL, 0,
--						GTK_MESSAGE_WARNING,
-+						GTK_MESSAGE_INFO,
- 						GTK_BUTTONS_NONE,
- 						_("Browse files or play tracks from disc?"));
- 

Deleted: packages/unstable/gnome-volume-manager/debian/patches/08_photographss_typo.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/08_photographss_typo.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/08_photographss_typo.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,60 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/po/cs.po gnome-volume-manager-1.3.1/po/cs.po
---- gnome-volume-manager-1.3.1-old/po/cs.po	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/po/cs.po	2005-05-31 13:49:36.000000000 +0200
-@@ -296,7 +296,7 @@
- #: src/manager.c:378
- msgid ""
- "There are photos on the plugged-in camera. Would you like to import these "
--"photographss into your album?"
-+"photographs into your album?"
- msgstr "Na vašem připojeném fotoaparátu jsou fotografie. Chcete tyto fotografie importovat do vašeho alba?"
- 
- #: src/manager.c:584
-diff -ruN gnome-volume-manager-1.3.1-old/po/en_CA.po gnome-volume-manager-1.3.1/po/en_CA.po
---- gnome-volume-manager-1.3.1-old/po/en_CA.po	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/po/en_CA.po	2005-05-31 13:49:36.000000000 +0200
-@@ -296,7 +296,7 @@
- #: ../src/manager.c:378
- msgid ""
- "There are photos on the plugged-in camera. Would you like to import these "
--"photographss into your album?"
-+"photographs into your album?"
- msgstr ""
- "There are photos on the plugged-in camera. Would you like to import these "
- "photographs into your album?"
-diff -ruN gnome-volume-manager-1.3.1-old/po/nb.po gnome-volume-manager-1.3.1/po/nb.po
---- gnome-volume-manager-1.3.1-old/po/nb.po	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/po/nb.po	2005-05-31 13:49:36.000000000 +0200
-@@ -284,7 +284,7 @@
- #: ../src/manager.c:378
- msgid ""
- "There are photos on the plugged-in camera. Would you like to import these "
--"photographss into your album?"
-+"photographs into your album?"
- msgstr ""
- "Det finnes bilder på kameraet som ble koblet til. Vil du importere disse "
- "bildene til ditt fotoalbum?"
-diff -ruN gnome-volume-manager-1.3.1-old/po/no.po gnome-volume-manager-1.3.1/po/no.po
---- gnome-volume-manager-1.3.1-old/po/no.po	2005-03-31 18:27:06.000000000 +0200
-+++ gnome-volume-manager-1.3.1/po/no.po	2005-05-31 13:49:36.000000000 +0200
-@@ -284,7 +284,7 @@
- #: ../src/manager.c:378
- msgid ""
- "There are photos on the plugged-in camera. Would you like to import these "
--"photographss into your album?"
-+"photographs into your album?"
- msgstr ""
- "Det finnes bilder på kameraet som ble koblet til. Vil du importere disse "
- "bildene til ditt fotoalbum?"
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-05-31 13:48:33.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-05-31 13:49:06.000000000 +0200
-@@ -495,7 +495,7 @@
- 				"%s",
- 				_("There are photos on the plugged-in camera. "
- 				  "Would you like to import these "
--				  "photographss into your album?"));
-+				  "photographs into your album?"));
- 		gtk_dialog_add_buttons (GTK_DIALOG (askme),
- 					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- 					_("_Import Photos"), IMPORT,

Deleted: packages/unstable/gnome-volume-manager/debian/patches/09_nautilus_path.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/09_nautilus_path.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/09_nautilus_path.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,11 +0,0 @@
-diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
---- gnome-volume-manager-1.3.1-old/src/manager.c	2005-06-22 09:52:56.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c	2005-06-22 09:53:24.000000000 +0200
-@@ -49,6 +49,7 @@
- 
- #define warn(fmt,arg...) g_warning("%s/%d: " fmt,__FILE__,__LINE__,##arg)
- 
-+#define BIN_NAUTILUS "/usr/bin/nautilus"
- #define NAUTILUS_COMMAND	 BIN_NAUTILUS" -n --no-desktop %m"
- 
- static struct gvm_configuration config;

Copied: packages/unstable/gnome-volume-manager/debian/patches/10_improve_mounting.patch (from rev 219, packages/unstable/gnome-volume-manager/debian/patches/25_improve_mounting.patch)

Copied: packages/unstable/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch)

Copied: packages/unstable/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch (from rev 219, packages/unstable/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch)

Copied: packages/unstable/gnome-volume-manager/debian/patches/12_no_autorun.patch (from rev 219, packages/unstable/gnome-volume-manager/debian/patches/40_no_autorun.patch)

Copied: packages/unstable/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch)

Copied: packages/unstable/gnome-volume-manager/debian/patches/20_specify_programs.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/20_specify_programs.patch)

Deleted: packages/unstable/gnome-volume-manager/debian/patches/25_improve_mounting.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/25_improve_mounting.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/25_improve_mounting.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,164 +0,0 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c	2004-11-19 13:27:47.299259000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-19 14:11:09.564039480 +0100
-@@ -491,6 +491,27 @@
- 	hal_free_string (mount_point);
- }
- 
-+/* Returns true if the storage policy indicates this should be manually 
-+ * mounted */
-+static gboolean
-+gvm_is_manual_mount(LibHalContext *ctx, const char *udi) {
-+  gchar *parent;
-+  gboolean ret = FALSE;
-+
-+  parent = hal_device_get_property_string(ctx, udi, "info.parent");
-+  if (hal_device_property_exists (hal_ctx, parent, 
-+                                  "storage.automount_enabled_hint")) {
-+      ret = !hal_device_get_property_bool (hal_ctx, parent,
-+                                          "storage.automount_enabled_hint");
-+  }
-+  if (hal_device_property_exists (hal_ctx, udi, 
-+                                  "storage.automount_enabled_hint")) {
-+      ret = !hal_device_get_property_bool (hal_ctx, udi,
-+                                          "storage.automount_enabled_hint");
-+  }
-+  return ret;
-+}
-+
- /*
-  * gvm_device_mount - use BIN_MOUNT to mount the given device node.
-  *
-@@ -500,9 +521,47 @@
-  * @return TRUE iff the mount was succesful
-  */
- static gboolean
--gvm_device_mount (const char *udi, const char *device)
-+gvm_device_mount (const char *udi, const char *device, gboolean run_policy)
- {
--  return (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
-+    gboolean ret = FALSE;
-+    /* don't attempt to mount if the automount_hint is false */
-+    if (gvm_is_manual_mount(hal_ctx, udi)) {
-+      dbg("%s has storage.automount_enabled_hint == false, not mounting\n"
-+          , udi);
-+      return FALSE;
-+    }
-+		/* don't attempt to mount already mounted volumes */
-+		if (!hal_device_property_exists (hal_ctx, udi, 
-+						"volume.is_mounted") ||
-+		    hal_device_get_property_bool (hal_ctx, udi, 
-+						  "volume.is_mounted")) {
-+        dbg("%s already mounted, not mounting again\n", udi);
-+			return FALSE;
-+    }
-+
-+		/* only mount if the block device got a sensible filesystem 
-+     * or when hal couldn't detect the filesystem */
-+		if (!hal_device_property_exists (hal_ctx, udi, 
-+						"volume.fsusage") ||
-+		    (strcmp (hal_device_get_property_string (hal_ctx, udi, 
-+							    "volume.fsusage"), "filesystem") != 0 
-+         && strcmp (hal_device_get_property_string (hal_ctx, udi,
-+                               "volume.fsusage"), "") != 0)) {
-+        dbg("%s isn't a filesystem\n", udi);
-+      return FALSE;
-+    }
-+
-+    ret = (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
-+    if (ret) {
-+  		/* add to list of all volumes mounted during lifetime */
-+  		all_mounted_volumes = 
-+         g_slist_append (all_mounted_volumes, g_strdup (udi));
-+    }
-+    if (ret && run_policy) {
-+		  mounted_volumes_policy_queue = 
-+        g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-+    }
-+    return ret;
- }
- 
- /*
-@@ -572,8 +631,7 @@
- 
- 	switch (action) {
- 	case MOUNT:
--		gvm_device_mount (udi, device);
--		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+		gvm_device_mount (udi, device, TRUE);
- 		break;
- 	case PLAY:
- 		gvm_run_cdplayer (device, device, udi);
-@@ -649,8 +707,7 @@
- 		gvm_ask_mixed (udi);
- 	} else if (has_data) {
- 		if (config.automount_media) {
--			gvm_device_mount (udi, device);
--			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+			gvm_device_mount (udi, device, TRUE);
- 		}
- 	} else if (is_blank) {
- 		if (gvm_device_is_writer (drive_udi))
-@@ -707,8 +764,7 @@
- 		dbg ("Added: %s\n", device);
- 		
- 		if (config.automount_drives) {
--			gvm_device_mount (udi, device);
--			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+			gvm_device_mount (udi, device, TRUE);
- 		}
- 	}
- 
-@@ -771,8 +827,7 @@
- 	dbg ("Added: %s\n", device);
- 	
- 	if (config.automount_drives) {
--		gvm_device_mount (udi, device);
--		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+		gvm_device_mount (udi, device, TRUE);
- 	}
- 	
- out:
-@@ -845,10 +900,6 @@
- 
- 		dbg ("Mounted: %s\n", udi);
- 
--		/* add to list of all volumes mounted during lifetime */
--		all_mounted_volumes = g_slist_append (all_mounted_volumes,
--						      g_strdup (udi));
--
- 		policy_udi = g_slist_find_custom (mounted_volumes_policy_queue, 
- 						  udi, 
- 						  (GCompareFunc)g_ascii_strcasecmp);
-@@ -1022,22 +1073,6 @@
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {
- 		udi = volumes [i];
--
--		/* don't attempt to mount already mounted volumes */
--		if (!hal_device_property_exists (ctx, udi, 
--						"volume.is_mounted") ||
--		    hal_device_get_property_bool (ctx, udi, 
--						  "volume.is_mounted"))
--			continue;
--
--		/* only mount if the block device got a sensible filesystem */
--		if (!hal_device_property_exists (ctx, udi, 
--						"volume.fsusage") ||
--		    strcmp (hal_device_get_property_string (ctx, udi, 
--							    "volume.fsusage"), 
--			    "filesystem") != 0)
--			continue;
--
-     drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
- 
- 		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-@@ -1059,7 +1094,7 @@
- 
- 			dbg ("mount_all: mounting %s\n", device_file);
- 
--			gvm_device_mount (udi, device_file);
-+			gvm_device_mount (udi, device_file, FALSE);
- 
- 			hal_free_string (device_file);
- 		} else

Copied: packages/unstable/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch (from rev 218, packages/unstable/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch)

Deleted: packages/unstable/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,64 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c	2005-02-23 15:54:46.000000000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c	2005-02-23 15:55:55.000000000 +0100
-@@ -678,11 +678,9 @@
-     }
- 
-     ret = (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
--    if (ret) {
-   		/* add to list of all volumes mounted during lifetime */
-   		all_mounted_volumes = 
-          g_slist_append (all_mounted_volumes, g_strdup (udi));
--    }
-     if (ret && run_policy) {
- 		  mounted_volumes_policy_queue = 
-         g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-@@ -815,6 +813,7 @@
- 	dbus_bool_t has_audio;
- 	dbus_bool_t has_data;
- 	dbus_bool_t is_blank;
-+	GSList *i;
- 
- 	has_audio = hal_device_get_property_bool (hal_ctx, udi,
- 						  "volume.disc.has_audio");
-@@ -831,6 +830,17 @@
- 		goto out;
- 	}
- 
-+        /* check whether we already saw the insertion/change of this device
-+         * without a removal; this happens on HAL restarts */
-+        for (i=all_mounted_volumes; i != NULL; i = g_slist_next (i))
-+                if (strcmp (udi, (const char *)i->data) == 0) {
-+                    dbg ("Detected change event on already handled device, probably due to a hald restart\n");
-+                    goto out;
-+                }
-+
-+        /* add to the list of mounted volumes */
-+        all_mounted_volumes = g_slist_append (all_mounted_volumes, g_strdup (udi));
-+
- 	if (has_audio && (!has_data)) {
- 		gvm_run_cdplayer (device, device, udi);
- 	} else if (has_audio && has_data) {
-@@ -974,7 +984,22 @@
- hal_device_removed (LibHalContext *ctx __attribute__((__unused__)), 
- 		    const char *udi)
- {
-+	GSList *i;
-+	GSList *next;
-+
- 	dbg ("Device removed: %s\n", udi);
-+        /* remove from list of all volumes mounted during lifetime */
-+
-+        for (i=all_mounted_volumes; i != NULL; i = next) {
-+                next = g_slist_next (i);
-+                if (strcmp (udi, (const char *)i->data) == 0) {
-+                        g_free (i->data);
-+                        all_mounted_volumes = 
-+                                g_slist_delete_link (
-+                                        all_mounted_volumes, i);
-+                        break;
-+                }
-+        }
- }
- 
- /** Invoked when device in the Global Device List acquires a new capability.

Deleted: packages/unstable/gnome-volume-manager/debian/patches/34_compiler_warnings.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/34_compiler_warnings.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/34_compiler_warnings.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,29 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-04-29 12:39:34.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-04-29 12:48:20.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <gdk/gdkx.h>
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
- #include <libhal.h>
- #include <signal.h>
- 
-@@ -155,7 +156,6 @@
- gvm_parse_command(const char *device, const char *command, 
-                   const char *path, const char *udi) {
- 	gchar *new_command;
--	GError *error = NULL;
- 	GString *exec = g_string_new (NULL);
- 	char *p, *q;
-   gchar *result, *tmp;
-@@ -279,8 +279,7 @@
- 					GTK_BUTTONS_NONE,
- 					_("Run command from inserted media?"));
- 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (askme),
--						  "%s", _("Do you want to run "
--						  "the file \"%s?\""));
-+						  _("Do you want to run the file \"%s?\""), path);
- 	gtk_dialog_add_buttons (GTK_DIALOG (askme),
- 				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- 				_("_Run Command"), GTK_RESPONSE_ACCEPT,

Deleted: packages/unstable/gnome-volume-manager/debian/patches/40_no_autorun.patch
===================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/40_no_autorun.patch	2005-06-22 10:32:28 UTC (rev 249)
+++ packages/unstable/gnome-volume-manager/debian/patches/40_no_autorun.patch	2005-06-22 10:36:44 UTC (rev 250)
@@ -1,212 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade gnome-volume-manager-1.1.3/gnome-volume-properties.glade
---- gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade	2005-01-23 23:11:02.000000000 +0100
-+++ gnome-volume-manager-1.1.3/gnome-volume-properties.glade	2005-02-12 19:57:50.560900586 +0100
-@@ -182,25 +182,6 @@
- 			      <property name="fill">False</property>
- 			    </packing>
- 			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autorun_cb">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Auto-run programs on new drives and media</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
-@@ -357,6 +338,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_cdr_entry">
-@@ -367,7 +349,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -581,6 +563,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_cda_entry">
-@@ -591,7 +574,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -773,6 +756,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_dvd_entry">
-@@ -783,7 +767,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -965,6 +949,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_photo_entry">
-@@ -975,7 +960,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c	2005-02-12 19:57:50.366896000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c	2005-02-12 19:57:50.562900632 +0100
-@@ -462,7 +462,7 @@
- 
- 	if (gvm_check_photos (udi, device, mount_point))
- 		goto out;
--
-+/*
- 	if (config.autorun == TRUE && config.autorun_path) {
- 		char **autorun_fns;
- 		int i;
-@@ -500,7 +500,7 @@
- 
- 		g_strfreev (autorun_fns);
- 	}
--	
-+*/
- 	if ((config.autobrowse == TRUE) && (autorun_succeeded == FALSE)) {
- 		gvm_run_command (device, NAUTILUS_COMMAND, mount_point, udi);
- 	}
-diff -ruN gnome-volume-manager-1.1.3-old/src/properties.c gnome-volume-manager-1.1.3/src/properties.c
---- gnome-volume-manager-1.1.3-old/src/properties.c	2005-02-12 19:57:50.432897000 +0100
-+++ gnome-volume-manager-1.1.3/src/properties.c	2005-02-12 19:59:23.414029155 +0100
-@@ -36,7 +36,7 @@
- GtkWidget *automount_drives_cb;
- GtkWidget *automount_media_cb;
- GtkWidget *autobrowse_cb;
--GtkWidget *autorun_cb;
-+//GtkWidget *autorun_cb;
- GtkWidget *autoplay_cda_cb;
- GtkWidget *command_cda_hbox;
- GtkWidget *command_cda_entry;
-@@ -65,8 +65,8 @@
- static void
- set_sensitivity (void)
- {
--	gtk_widget_set_sensitive (autorun_cb,
--			config.automount_media || config.automount_drives);
-+/*	gtk_widget_set_sensitive (autorun_cb,
-+			config.automount_media || config.automount_drives); */
- 	gtk_widget_set_sensitive (command_cda_hbox, config.autoplay_cda);
- 	gtk_widget_set_sensitive (command_cdr_hbox, config.autoburn_cdr);
- 	gtk_widget_set_sensitive (command_dvd_hbox, config.autoplay_dvd);
-@@ -85,8 +85,8 @@
- 			       config.automount_media, NULL);
- 	gconf_client_set_bool (config.client, GCONF_ROOT "autobrowse",
- 			       config.autobrowse, NULL);
--	gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
--			       config.autorun, NULL);
-+/*	gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
-+			       config.autorun, NULL); */
- 	gconf_client_set_bool (config.client, GCONF_ROOT "autoburn_cdr",
- 			       config.autoburn_cdr, NULL);
- 	gconf_client_set_string (config.client,
-@@ -120,7 +120,7 @@
- 			(automount_media_cb)->active;
- 	config.autobrowse = GTK_TOGGLE_BUTTON
- 			(autobrowse_cb)->active;
--	config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active;
-+/*	config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active; */
- 	config.autoburn_cdr = GTK_TOGGLE_BUTTON (autoburn_cdr_cb)->active;
- 	config.autoplay_cda = GTK_TOGGLE_BUTTON (autoplay_cda_cb)->active;
- 	config.autoplay_dvd = GTK_TOGGLE_BUTTON (autoplay_dvd_cb)->active;
-@@ -170,7 +170,7 @@
- 	GError *error = NULL;
- 
- 	if (!(config.automount_drives || config.automount_media 
--			|| config.autobrowse || config.autorun 
-+			|| config.autobrowse /* || config.autorun */
- 			|| config.autoplay_cda || config.autoplay_dvd 
- 			|| config.autophoto) || check_clipboard ()) 
- 		return;
-@@ -209,8 +209,8 @@
- 				      config.automount_media);
- 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autobrowse_cb),
- 				      config.autobrowse);
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
--				      config.autorun);
-+/*	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
-+				      config.autorun); */
- 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autoplay_cda_cb),
- 				      config.autoplay_cda);
- 
-@@ -252,8 +252,8 @@
- 			GCONF_ROOT "automount_media", NULL);
- 	config.autobrowse = gconf_client_get_bool (config.client,
- 			GCONF_ROOT "autobrowse", NULL);
--	config.autorun = gconf_client_get_bool (config.client,
--			GCONF_ROOT "autorun", NULL);
-+/*	config.autorun = gconf_client_get_bool (config.client,
-+			GCONF_ROOT "autorun", NULL); */
- 	config.autoplay_cda = gconf_client_get_bool (config.client,
- 			GCONF_ROOT "autoplay_cda", NULL);
- 	config.autoplay_cda_command =
-@@ -434,7 +434,7 @@
- 	automount_drives_cb = glade_xml_get_widget (xml, "automount_drives_cb");
- 	automount_media_cb = glade_xml_get_widget (xml, "automount_media_cb");
- 	autobrowse_cb = glade_xml_get_widget (xml, "autobrowse_cb");
--	autorun_cb = glade_xml_get_widget (xml, "autorun_cb");
-+/*	autorun_cb = glade_xml_get_widget (xml, "autorun_cb"); */
- 
- 	autoplay_cda_cb = glade_xml_get_widget (xml, "autoplay_cda_cb");
- 	command_cda_entry = glade_xml_get_widget (xml, "command_cda_entry");
-@@ -485,8 +485,8 @@
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);
- 	gtk_signal_connect (GTK_OBJECT (autobrowse_cb), "toggled",
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);
--	gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
--			    GTK_SIGNAL_FUNC (signal_response), NULL);
-+/*	gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
-+			    GTK_SIGNAL_FUNC (signal_response), NULL); */
- 
- 	gtk_signal_connect (GTK_OBJECT (autoplay_cda_cb), "toggled",
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);




More information about the Pkg-utopia-commits mailing list