From f70df65f689ef6b8c59c422262ee098b02f09f09 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sat, 14 Mar 2009 00:42:09 +0000 Subject: [PATCH] - Fix a couple of warnings in the CUPS/BlueZ 4.x patch --- bluez-port-cups-to-bluez4.patch | 4 ++-- bluez.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bluez-port-cups-to-bluez4.patch b/bluez-port-cups-to-bluez4.patch index 65f7585..d737a8a 100644 --- a/bluez-port-cups-to-bluez4.patch +++ b/bluez-port-cups-to-bluez4.patch @@ -122,7 +122,7 @@ index d8b899e..002c96a 100644 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 @@ index d8b899e..002c96a 100644 - 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); diff --git a/bluez.spec b/bluez.spec index 2e0457c..81502df 100644 --- a/bluez.spec +++ b/bluez.spec @@ -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 @@ fi %{_libdir}/alsa-lib/*.so %changelog +* Sat Mar 14 2009 - Bastien Nocera - 4.32-10 +- Fix a couple of warnings in the CUPS/BlueZ 4.x patch + * Fri Mar 13 2009 - Bastien Nocera - 4.32-9 - Switch Wacom Bluetooth tablet to mode 2