[Pkg-utopia-commits] r292 - in
packages/experimental/gnome-volume-manager/debian: . patches
Sjoerd Simons
sjoerd at costa.debian.org
Sat Aug 27 21:39:05 UTC 2005
Author: sjoerd
Date: 2005-08-27 21:39:04 +0000 (Sat, 27 Aug 2005)
New Revision: 292
Removed:
packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch
packages/experimental/gnome-volume-manager/debian/patches/02_pmount.patch
packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch
packages/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch
packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch
packages/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch
packages/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch
packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch
packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch
Modified:
packages/experimental/gnome-volume-manager/debian/changelog
Log:
Dropped a lot of patched
Modified: packages/experimental/gnome-volume-manager/debian/changelog
===================================================================
--- packages/experimental/gnome-volume-manager/debian/changelog 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/changelog 2005-08-27 21:39:04 UTC (rev 292)
@@ -1,8 +1,18 @@
gnome-volume-manager (1.3.6-1) experimental; urgency=low
- * New upstream release
+ * New upstream release
+ * Dropped patches that are fixed upstream
+ + debian/patches/01_browse_fixup.patch
+ + debian/patches/02_pmount.patch
+ + debian/patches/04_reconnect_on_dbus_exit.patch
+ + debian/patches/05_mount_at_start.patch
+ + debian/patches/07_dialogs_info.patch
+ + debian/patches/08_photographss_typo.patch
+ + debian/patches/09_nautilus_path.patch
+ + debian/patches/10_improve_mounting.patch
+ + debian/patches/11_track_cdrom_changes.patch
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 27 Aug 2005 23:15:53 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 27 Aug 2005 23:36:55 +0200
gnome-volume-manager (1.3.1-1) experimental; urgency=low
Deleted: packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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/experimental/gnome-volume-manager/debian/patches/02_pmount.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/02_pmount.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/02_pmount.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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 {
Deleted: packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -1,34 +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 14:42:20.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c 2005-06-22 14:45:27.000000000 +0200
-@@ -1153,6 +1153,8 @@
- char **volumes;
- char *udi;
- char *device_file;
-+ char *drive_udi = NULL;
-+ gboolean do_mount;
- DBusError error;
-
- if (!config.automount_media)
-@@ -1188,6 +1190,21 @@
- NULL),
- "filesystem") != 0)
- continue;
-+ drive_udi = libhal_device_get_property_string(ctx, udi, "info.parent", NULL);
-+
-+ do_mount = TRUE;
-+ if (libhal_device_property_exists(ctx, drive_udi, "storage.hotpluggable", NULL) &&
-+ libhal_device_get_property_bool(ctx, drive_udi, "storage.hotpluggable", NULL)) {
-+ do_mount = config.automount_drives;
-+ } else if (
-+ libhal_device_property_exists(ctx, drive_udi, "storage.removable", NULL) &&
-+ libhal_device_get_property_bool(ctx, drive_udi, "storage.removable", NULL)) {
-+ do_mount = config.automount_media;
-+ }
-+ libhal_free_string(drive_udi);
-+
-+ if (!do_mount) continue;
-+
-
- device_file = libhal_device_get_property_string (ctx, udi,
- "block.device",
Deleted: packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -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;
Deleted: packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -1,162 +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 15:33:28.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c 2005-06-22 15:42:37.000000000 +0200
-@@ -488,6 +488,30 @@
- libhal_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 = libhal_device_get_property_string(ctx, udi, "info.parent", NULL);
-+ if (libhal_device_property_exists (hal_ctx, parent,
-+ "storage.automount_enabled_hint", NULL)) {
-+ ret =
-+ !libhal_device_get_property_bool (hal_ctx, parent,
-+ "storage.automount_enabled_hint", NULL);
-+ }
-+ if (libhal_device_property_exists (hal_ctx, udi,
-+ "storage.automount_enabled_hint", NULL)) {
-+ ret =
-+ !libhal_device_get_property_bool (hal_ctx, udi,
-+ "storage.automount_enabled_hint", NULL);
-+ }
-+ libhal_free_string(parent);
-+ return ret;
-+}
-+
- /*
- * gvm_device_mount_finished - called back when mount finished.
- *
-@@ -627,25 +651,49 @@
- * @return TRUE iff the mount was succesful
- */
- static gboolean
--gvm_device_mount (const char *udi)
-+gvm_device_mount (const char *udi, gboolean run_policy)
- {
- char *argv[3];
- GError *error = NULL;
- gint exit_status;
- gchar *fsusage = NULL;
-+ 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 (!libhal_device_property_exists (hal_ctx, udi, "volume.is_mounted", NULL)||
-+ libhal_device_get_property_bool (hal_ctx, udi, "volume.is_mounted", NULL)) {
-+ dbg("%s already mounted, not mounting again\n", udi);
-+ return FALSE;
-+ }
-
- if (libhal_device_property_exists (hal_ctx, udi, "volume.fsusage", NULL)) {
- fsusage =
- libhal_device_get_property_string (hal_ctx, udi, "volume.fsusage", NULL);
-+ } else {
-+ return FALSE;
- }
-
- /* Check for encrypted device */
-- if (fsusage && !g_strcasecmp(fsusage, "crypto")) {
-+ if (!g_strcasecmp(fsusage, "crypto")) {
- dbg ("encrypted volume found\n");
- gvm_device_mount_encrypted (udi);
-+ if (run_policy) {
-+ mounted_volumes_policy_queue =
-+ g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-+ }
- libhal_free_string(fsusage);
- return TRUE;
- }
-+ if (g_strcasecmp(fsusage, "filesystem")) {
-+ dbg("%s isn't a filesystem\n", udi);
-+ libhal_free_string(fsusage);
-+ return FALSE;
-+ }
- libhal_free_string(fsusage);
-
- argv[0] = BIN_MOUNT;
-@@ -657,8 +705,16 @@
- warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
- return FALSE;
- }
--
-- return (exit_status == 0);
-+ if (exit_status == 0) {
-+ ret = TRUE;
-+ /* add to list of all volumes mounted during lifetime */
-+ all_mounted_volumes = g_slist_append (all_mounted_volumes, g_strdup (udi));
-+ if (run_policy) {
-+ mounted_volumes_policy_queue =
-+ g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-+ }
-+ }
-+ return ret;
- }
-
- /*
-@@ -755,7 +811,7 @@
-
- switch (action) {
- case MOUNT:
-- gvm_device_mount (udi);
-+ gvm_device_mount (udi, TRUE);
- mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- break;
- case PLAY:
-@@ -858,7 +914,7 @@
- gvm_ask_mixed (udi);
- } else if (has_data) {
- if (config.automount_media) {
-- gvm_device_mount (udi);
-+ gvm_device_mount (udi, TRUE);
- mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- }
- } else if (is_blank) {
-@@ -925,7 +981,7 @@
- dbg ("Added: %s\n", device);
-
- if (config.automount_drives) {
-- gvm_device_mount (udi);
-+ gvm_device_mount (udi, TRUE);
- mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- }
- }
-@@ -994,8 +1050,7 @@
- dbg ("Added: %s\n", device);
-
- if (config.automount_drives) {
-- gvm_device_mount (udi);
-- mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+ gvm_device_mount (udi, TRUE);
- }
-
- out:
-@@ -1072,10 +1127,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,
- g_ascii_strcasecmp);
-@@ -1368,7 +1419,7 @@
-
- dbg ("mount_all: mounting %s\n", device_file);
-
-- gvm_device_mount (udi);
-+ gvm_device_mount (udi, FALSE);
-
- libhal_free_string (device_file);
- } else {
Deleted: packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch 2005-08-27 21:17:58 UTC (rev 291)
+++ packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch 2005-08-27 21:39:04 UTC (rev 292)
@@ -1,55 +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 13:59:04.000000000 +0200
-+++ gnome-volume-manager-1.3.1/src/manager.c 2005-06-22 14:08:15.000000000 +0200
-@@ -873,6 +873,7 @@
- dbus_bool_t has_data;
- dbus_bool_t is_blank;
- DBusError error;
-+ GSList *i;
-
- dbus_error_init (&error);
- has_audio = libhal_device_get_property_bool (hal_ctx, udi,
-@@ -898,10 +899,21 @@
- warn ("cannot get block.device: %s\n", error.message);
- if (dbus_error_is_set (&error))
- dbus_error_free (&error);
--
- 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) {
-@@ -1064,7 +1076,20 @@
- 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.
More information about the Pkg-utopia-commits
mailing list