From f7f06cd55ac21ffa4c5b9be72d7e04cf8e995830 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Apr 03 2009 17:36:45 +0000
Subject: - Don't crash when audio devices are registered and the adapter is removed


---

diff --git a/bluez-fix-audio-service-crasher.patch b/bluez-fix-audio-service-crasher.patch
new file mode 100644
index 0000000..e7ab0f7
--- /dev/null
+++ b/bluez-fix-audio-service-crasher.patch
@@ -0,0 +1,13 @@
+diff --git a/audio/device.c b/audio/device.c
+index aeca576..f66cd61 100644
+--- a/audio/device.c
++++ b/audio/device.c
+@@ -617,5 +617,8 @@ void audio_device_unregister(struct audio_device *device)
+ 	if (device->control)
+ 		control_unregister(device);
+ 
++	g_dbus_unregister_interface(device->conn, device->path,
++						AUDIO_INTERFACE);
++
+ 	device_free(device);
+ }
diff --git a/bluez.spec b/bluez.spec
index 530db69..b9ce099 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -14,6 +14,8 @@ Patch1: bluez-utils-oui-usage.patch
 Patch2: bluez-try-utf8-harder.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1754
 Patch3: bluez-activate-wacom-mode2.patch
+# http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=457056310229911e820357470ee8fb30c82516da
+Patch4: bluez-fix-audio-service-crasher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -102,6 +104,7 @@ use in Bluetooth applications.
 %patch1 -p0 -b .oui
 %patch2 -p1 -b .non-utf8-name
 %patch3 -p1 -b .wacom
+%patch4 -p1 -b .audio-service-crasher
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -194,6 +197,10 @@ fi
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera@redhat.com> - 4.34-2
+- Don't crash when audio devices are registered and the adapter
+  is removed
+
 * Sun Mar 29 2009 - Bastien Nocera <bnocera@redhat.com> - 4.34-1
 - Update to 4.34