rpms/gnome-volume-manager/devel gnome-volume-manager-1.5.7-array-pointer-fix.patch, NONE, 1.1 gnome-volume-manager.spec, 1.26, 1.27

[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-serv14930

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	gnome-volume-manager-1.5.7-array-pointer-fix.patch 
Log Message:
- Added a patch to fix an array being passed to dbus


gnome-volume-manager-1.5.7-array-pointer-fix.patch:
 manager.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE gnome-volume-manager-1.5.7-array-pointer-fix.patch ---
--- 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);


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-volume-manager.spec	21 Dec 2005 03:51:55 -0000	1.26
+++ gnome-volume-manager.spec	5 Jan 2006 01:58:47 -0000	1.27
@@ -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 @@
 # 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 @@
 %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 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Wed Jan 04 2006 John (J5) Palmieri <johnp at redhat.com> - 1.5.7-2
+- Added a patch to fix an array being passed to dbus
+
 * Thu Dec 20 2005 Matthias Clasen <mclasen at redhat.com> - 1.5.7-1
 - Update to 1.5.7