rpms/gnome-volume-manager/devel gvm-no-mount-ui-on-startup.patch, NONE, 1.1 gnome-volume-manager.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31936

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	gvm-no-mount-ui-on-startup.patch 
Log Message:
- Add the no-ui patch from upstream. Next release should have this.


gvm-no-mount-ui-on-startup.patch:
 manager.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE gvm-no-mount-ui-on-startup.patch ---
Index: src/manager.c
===================================================================
RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
retrieving revision 1.115
diff -u -p -r1.115 manager.c
--- src/manager.c	12 Jan 2006 21:33:50 -0000	1.115
+++ src/manager.c	17 Jan 2006 17:31:23 -0000
@@ -1291,7 +1291,7 @@ gvm_device_mounted (const char *udi)
  * @return TRUE iff the mount was succesful
  */
 static gboolean
-gvm_device_mount (const char *udi, int apply_policy)
+gvm_device_mount (const char *udi, int apply_policy, gboolean no_ui)
 {
 	char *mount_point, *fstype, *options[2], **poptions;
 	struct _MountPolicy *policy;
@@ -1315,8 +1315,12 @@ gvm_device_mount (const char *udi, int a
 		policy->apply = apply_policy;
 		
 		g_hash_table_insert (mount_table, policy->udi, policy);
-		
-		command = g_strdup_printf ("%s --hal-udi=%%h", gnome_mount);
+
+		if (no_ui) {
+			command = g_strdup_printf ("%s --no-ui --hal-udi=%%h", gnome_mount);
+		} else {
+			command = g_strdup_printf ("%s --hal-udi=%%h", gnome_mount);
+		}
 		retval = gvm_run_command (command, udi, NULL, NULL);
 		g_free (command);
 		
@@ -1456,7 +1460,7 @@ cda_extra_cb (GvmPromptCtx *ctx, int act
 	switch (action) {
 	case GVM_RESPONSE_BROWSE:
 		if (!gvm_udi_is_subfs_mount (ctx->udi))
-			gvm_device_mount (ctx->udi, TRUE);
+			gvm_device_mount (ctx->udi, TRUE, FALSE);
 		break;
 	case GVM_RESPONSE_PLAY:
 		gvm_run_cdplayer (ctx->udi, ctx->device, NULL);
@@ -1491,7 +1495,7 @@ gvm_ask_mixed (const char *udi)
 		gvm_prompt (ctx, 0, NULL);
 	} else if (config.automount_media) {
 		if (!gvm_udi_is_subfs_mount (udi))
-			gvm_device_mount (udi, TRUE);
+			gvm_device_mount (udi, TRUE, FALSE);
 	} else if (config.autoplay_cda) {
 		gvm_run_cdplayer (udi, device, NULL);
 	}
@@ -1626,7 +1630,7 @@ gvm_cdrom_policy (const char *udi)
 		gvm_ask_mixed (udi);
 	} else if (has_data) {
 		if (config.automount_media && !gvm_udi_is_subfs_mount (udi))
-			gvm_device_mount (udi, TRUE);
+			gvm_device_mount (udi, TRUE, FALSE);
 	} else if (is_blank) {
 		if ((type = gvm_cdrom_media_is_writable (udi)))
 			gvm_run_cdburner (udi, type, device, NULL);
@@ -1784,7 +1788,7 @@ block_device_added (const char *udi, con
 	if (config.automount_drives && mountable) {
 		if (!gvm_udi_is_subfs_mount (udi)) {
 			if (gvm_automount_enabled (udi)) {
-				gvm_device_mount (udi, TRUE);
+				gvm_device_mount (udi, TRUE, FALSE);
 			} else {
 				dbg ("storage.automount_enabled_hint set to false on %s, not mounting\n", udi);
 			}
@@ -2340,7 +2344,8 @@ mount_all (LibHalContext *ctx)
 		/* mount the device */
 		if ((dev = libhal_device_get_property_string (ctx, udi, "block.device", &error))) {
 			dbg ("mount_all: mounting %s\n", dev);
-			gvm_device_mount (udi, FALSE);
+			/* don't make the mount program put up error dialogs */
+			gvm_device_mount (udi, FALSE, TRUE);
 			libhal_free_string (dev);
 		} else {
 			warn ("mount_all: no device for udi=%s: %s", udi, error.message);


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-volume-manager.spec	13 Jan 2006 23:24:36 -0000	1.28
+++ gnome-volume-manager.spec	18 Jan 2006 18:38:04 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.9
-Release: 1 
+Release: 2 
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 Source4: cdda-url-handler.schemas
 Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
 Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch
+Patch2: gvm-no-mount-ui-on-startup.patch 
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5.0
@@ -39,6 +40,8 @@
 %setup -q
 %patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
+%patch2 -p0 -b .no-ui
+
 %build
 %configure
 make
@@ -75,6 +78,9 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.5.9-2
+- Add the no-ui patch from upstream. Next release should have this.
+
 * Fri Jan 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.9-1
 - Update to 1.5.9