[maemo-commits] [maemo-commits] r15290 - in projects/connectivity/bluez-utils-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-03-12 16:35:26 +0200 (Wed, 12 Mar 2008)
New Revision: 15290

Added:
   projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch
Modified:
   projects/connectivity/bluez-utils-debian/trunk/changelog
Log:
Add aptch for audio.conf parsing bug

Modified: projects/connectivity/bluez-utils-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/changelog	2008-03-11 15:01:12 UTC (rev 15289)
+++ projects/connectivity/bluez-utils-debian/trunk/changelog	2008-03-12 14:35:26 UTC (rev 15290)
@@ -1,3 +1,9 @@
+bluez-utils (3.28-0osso2) unstable; urgency=low
+
+  * Fix parsing of SCORouting setting when HFP is disabled. Fixes: NB#81554
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Wed, 12 Mar 2008 16:18:34 +0200
+
 bluez-utils (3.28-0osso1) unstable; urgency=low
 
   * New upstream version

Added: projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch	2008-03-11 15:01:12 UTC (rev 15289)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/007_sco_routing_fix.patch	2008-03-12 14:35:26 UTC (rev 15290)
@@ -0,0 +1,20 @@
+--- audio/manager.c	2008-03-05 22:18:02.000000000 +0200
++++ audio/manager.c	2008-03-12 16:15:53.000000000 +0200
+@@ -1594,6 +1594,8 @@
+ 	g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ 				(GIOFunc) ag_io_cb, NULL);
+ 
++	features = headset_config_init(config);
++
+ 	if (!hfp)
+ 		return 0;
+ 
+@@ -1603,8 +1605,6 @@
+ 	if (!hf_server)
+ 		return -1;
+ 
+-	features = headset_config_init(config);
+-
+ 	if (hfp_ag_record(&buf, chan, features) < 0) {
+ 		error("Unable to allocate new service record");
+ 		return -1;