rpms/bluez/F-11 0001-Don-t-abort-cups-backend-on-property-change.patch, NONE, 1.1 0002-Actually-read-the-CreateDevice-reply.patch, NONE, 1.1 bluez.spec, 1.68, 1.69

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3168

Modified Files:
	bluez.spec 
Added Files:
	0001-Don-t-abort-cups-backend-on-property-change.patch 
	0002-Actually-read-the-CreateDevice-reply.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-4
- Fix cups discovery the first time we discover a device


0001-Don-t-abort-cups-backend-on-property-change.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Don-t-abort-cups-backend-on-property-change.patch ---
>From 35ffd5a6dafd7e38c7d8c9502608314a44919302 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:23:39 +0100
Subject: [PATCH 1/2] Don't abort cups backend on property change

Make sure the cups backend doesn't abort when trying to
access a property that's not Discovering.
---
 cups/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 2fbfe7e..9c24734 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -506,6 +506,9 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *me
 
 		dbus_message_iter_init(message, &iter);
 		dbus_message_iter_get_basic(&iter, &name);
+		if (name == NULL ||
+		    strcmp(name, "Discovering") != 0)
+		    	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 		dbus_message_iter_next(&iter);
 		dbus_message_iter_recurse(&iter, &value_iter);
 		dbus_message_iter_get_basic(&value_iter, &discovering);
-- 
1.6.2.5


0002-Actually-read-the-CreateDevice-reply.patch:
 main.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0002-Actually-read-the-CreateDevice-reply.patch ---
>From b29e1cb433454391da92720c3ff87373d9d60500 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:24:58 +0100
Subject: [PATCH 2/2] Actually read the CreateDevice reply

Fixes aborts when the printer isn't a known device.
---
 cups/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 9c24734..ba9864f 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -371,9 +371,9 @@ static void remote_device_found(const char *adapter, const char *bdaddr, const c
 
 		if (!reply)
 			return;
-	} else {
-		if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE)
-			return;
+	}
+	if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE) {
+		return;
 	}
 
 	id = device_get_ieee1284_id(adapter, object_path);
-- 
1.6.2.5



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- bluez.spec	3 Aug 2009 14:08:48 -0000	1.68
+++ bluez.spec	11 Aug 2009 11:38:34 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=507572
 Patch5: cups-less-errors.patch
+Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
+Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -107,6 +109,8 @@ use in Bluetooth applications.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cups-less-errors
+%patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -201,6 +205,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-4
+- Fix cups discovery the first time we discover a device
+
 * Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-3
 - Fix hid2hci rules location