corrected patch for gnome-volume-manager-1.5.7

["Joseph E. Sacco, Ph.D." <joseph_sacco comcast net>]

Use this patch to build gnome-volume-manager-1.5.7

-Joseph

-- 
joseph_sacco [at] comcast [dot] net

--- gnome-volume-manager-1.5.7/gnome-volume-manager.schemas.in-	2005-12-19 21:03:00.000000000 -0500
+++ gnome-volume-manager-1.5.7/gnome-volume-manager.schemas.in	2005-12-19 21:05:32.000000000 -0500
@@ -29,7 +29,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
         <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
         <type>bool</type>
-        <default>true</default>
+        <default>false</default>
         <locale name="C">
           <short>Autorun nautilus</short>
           <long>Open nautilus on removeable media insert.</long>
@@ -180,7 +180,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
 	<type>string</type>
-	<default></default>
+	<default>gthumb</default>
 	<locale name="C">
 	  <short>Photo management command</short>
 	  <long>Command to run when a digital camera is connected or media 
@@ -204,7 +204,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoipod_command</key>
 	<applyto>/desktop/gnome/volume_manager/autoipod_command</applyto>
 	<type>string</type>
-	<default></default>
+	<default>gtkpod</default>
 	<locale name="C">
 	  <short>iPod sync command</short>
 	  <long>Command to run when an iPod is connected.</long>
--- gnome-volume-manager-1.5.7/src/manager.c.orig	2005-12-19 15:14:54.000000000 -0500
+++ gnome-volume-manager-1.5.7/src/manager.c	2006-01-04 21:39:12.000000000 -0500
@@ -1243,7 +1243,8 @@
 	dbus_uint64_t size;
 	int noptions = 0;
 	DBusError error;
-	
+	char **poptions;
+		
 	dbg ("mounting %s...\n", udi);
 	
 	if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
@@ -1261,9 +1262,10 @@
 	if (size <= (256 * 1024 * 1024))
 		options[noptions++] = "sync";
 	options[noptions] = NULL;
-	
+
+	poptions = options;
 	if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype,
-				       DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, noptions,
+				       DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions,
 				       DBUS_TYPE_INVALID)) {
 		dbg ("mount failed for %s: could not append args to dbus message\n", udi);
 		dbus_message_unref (dmesg);