From 8350a263b8a109ca5df6d0fe9003eb9b39f8fc0d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Nov 06 2009 18:57:58 +0000
Subject: - Fix error when Samsung headset sends us its battery status


---

diff --git a/0001-Avoid-errors-when-audio-headset-tells-us-its-battery.patch b/0001-Avoid-errors-when-audio-headset-tells-us-its-battery.patch
new file mode 100644
index 0000000..d01a296
--- /dev/null
+++ b/0001-Avoid-errors-when-audio-headset-tells-us-its-battery.patch
@@ -0,0 +1,37 @@
+From 6e9f62f7251086f09d476d3fce9090e3d22acf63 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 6 Nov 2009 18:49:53 +0000
+Subject: [PATCH] Avoid errors when audio headset tells us its battery charge
+
+Like the Samsung WEP470 does.
+---
+ audio/headset.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/audio/headset.c b/audio/headset.c
+index cf1ae61..36a84c2 100644
+--- a/audio/headset.c
++++ b/audio/headset.c
+@@ -1132,6 +1132,11 @@ static int nr_and_ec(struct audio_device *device, const char *buf)
+ 	return 0;
+ }
+ 
++static int battery_event(struct audio_device *device, const char *buf)
++{
++	return 0;
++}
++
+ static struct event event_callbacks[] = {
+ 	{ "ATA", answer_call },
+ 	{ "ATD", dial_number },
+@@ -1152,6 +1157,7 @@ static struct event event_callbacks[] = {
+ 	{ "AT+CCWA", call_waiting_notify },
+ 	{ "AT+COPS", operator_selection },
+ 	{ "AT+NREC", nr_and_ec },
++	{ "AT+CBC", battery_event },
+ 	{ 0 }
+ };
+ 
+-- 
+1.6.5.2
+
diff --git a/bluez.spec b/bluez.spec
index 305a5b3..4715d34 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.57
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -23,6 +23,8 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3774
+Patch6: 0001-Avoid-errors-when-audio-headset-tells-us-its-battery.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -273,6 +275,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Fri Nov 06 2009 Bastien Nocera <bnocera@redhat.com> 4.57-3
+- Fix error when Samsung headset sends us its battery status
+
 * Mon Nov 02 2009 Bastien Nocera <bnocera@redhat.com> 4.57-2
 - Move the rfcomm.conf to the compat package, otherwise
    the comments at the top of it are confusing