From f3d6e14535651b5e5ca910629513883fd2b8d670 Mon Sep 17 00:00:00 2001
From: John (J5) Palmieri <johnp@fedoraproject.org>
Date: Jan 05 2006 01:58:47 +0000
Subject: - Added a patch to fix an array being passed to dbus


---

diff --git a/gnome-volume-manager-1.5.7-array-pointer-fix.patch b/gnome-volume-manager-1.5.7-array-pointer-fix.patch
new file mode 100644
index 0000000..24e02c9
--- /dev/null
+++ b/gnome-volume-manager-1.5.7-array-pointer-fix.patch
@@ -0,0 +1,25 @@
+--- gnome-volume-manager-1.5.7/src/manager.c.array-pointer-fix	2006-01-04 20:38:50.000000000 -0500
++++ gnome-volume-manager-1.5.7/src/manager.c	2006-01-04 20:40:05.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);
diff --git a/gnome-volume-manager.spec b/gnome-volume-manager.spec
index 4dddf09..a3254a2 100644
--- a/gnome-volume-manager.spec
+++ b/gnome-volume-manager.spec
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.7
-Release: 1
+Release: 2 
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=320997
 Patch2: gnome-volume-manager-1.5.3-spew.patch
 #send upstream
+Patch3: gnome-volume-manager-1.5.7-array-pointer-fix.patch
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5.0
@@ -43,7 +44,7 @@ applications.
 %patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
 %patch2 -p1 -b .spew
-
+%patch3 -p1 -b .array-pointer-fix
 %build
 %configure
 make
@@ -80,6 +81,9 @@ done
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Wed Jan 04 2006 John (J5) Palmieri <johnp@redhat.com> - 1.5.7-2
+- Added a patch to fix an array being passed to dbus
+
 * Thu Dec 20 2005 Matthias Clasen <mclasen@redhat.com> - 1.5.7-1
 - Update to 1.5.7