rpms/bluez/devel bluez-port-cups-to-bluez4.patch, 1.1, 1.2 bluez.spec, 1.50, 1.51

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28768

Modified Files:
	bluez-port-cups-to-bluez4.patch bluez.spec 
Log Message:
* Sat Mar 14 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-10
- Fix a couple of warnings in the CUPS/BlueZ 4.x patch


bluez-port-cups-to-bluez4.patch:

Index: bluez-port-cups-to-bluez4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez-port-cups-to-bluez4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez-port-cups-to-bluez4.patch	9 Mar 2009 19:31:52 -0000	1.1
+++ bluez-port-cups-to-bluez4.patch	14 Mar 2009 00:42:09 -0000	1.2
@@ -122,7 +122,7 @@
  	const char *hcr_print = "00001126-0000-1000-8000-00805f9b34fb";
 -	char *xml, *id;
 +	const char *xml;
-+	char *id;
++	char *id = NULL;
  
  	/* Look for the service handle of the HCRP service */
 -	message = dbus_message_new_method_call("org.bluez", adapter,
@@ -152,7 +152,7 @@
 -		dbus_message_iter_next(&iter_array);
 +	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) {
 +		dbus_message_unref(reply);
-+		return FALSE;
++		return NULL;
  	}
  
 -	dbus_message_unref(reply);


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- bluez.spec	13 Mar 2009 18:08:38 -0000	1.50
+++ bluez.spec	14 Mar 2009 00:42:09 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.32
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -203,6 +203,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Mar 14 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-10
+- Fix a couple of warnings in the CUPS/BlueZ 4.x patch
+
 * Fri Mar 13 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-9
 - Switch Wacom Bluetooth tablet to mode 2