[oe-commits] Stanislav Brabec : bluez-gnome: Fix crash on pairing configured rfcomm device. Typo fix.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9298697cbf536b2d1db9b6c720dfab34758adbf6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9298697cbf536b2d1db9b6c720dfab34758adbf6

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Wed Sep 16 19:40:17 2009 +0000

bluez-gnome: Fix crash on pairing configured rfcomm device. Typo fix.

---

 .../add-device-from-rfcomm-crash.patch             |   15 +++++++++++++
 recipes/bluez/bluez-gnome-1.8/cs-typo.patch        |   23 ++++++++++++++++++++
 recipes/bluez/bluez-gnome_1.8.bb                   |    5 +++-
 3 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/recipes/bluez/bluez-gnome-1.8/add-device-from-rfcomm-crash.patch b/recipes/bluez/bluez-gnome-1.8/add-device-from-rfcomm-crash.patch
new file mode 100644
index 0000000..825b84f
--- /dev/null
+++ b/recipes/bluez/bluez-gnome-1.8/add-device-from-rfcomm-crash.patch
@@ -0,0 +1,15 @@
+Fix for crash after access to the configured, but not yet paired RFCOMM device.
+http://www.spinics.net/lists/linux-bluetooth/msg03299.html
+Index: bluez-gnome-1.8/common/bluetooth-client.c
+===================================================================
+--- bluez-gnome-1.8.orig/common/bluetooth-client.c
++++ bluez-gnome-1.8/common/bluetooth-client.c
+@@ -330,7 +330,7 @@ static void add_device(DBusGProxy *adapt
+ 		name = value ? g_value_get_string(value) : NULL;
+ 
+ 		value = g_hash_table_lookup(hash, "Class");
+-		type = class_to_type(g_value_get_uint(value));
++		type = value ? class_to_type(g_value_get_uint(value)) : BLUETOOTH_TYPE_ANY;
+ 
+ 		value = g_hash_table_lookup(hash, "Icon");
+ 		icon = value ? g_value_get_string(value) : "bluetooth";
diff --git a/recipes/bluez/bluez-gnome-1.8/cs-typo.patch b/recipes/bluez/bluez-gnome-1.8/cs-typo.patch
new file mode 100644
index 0000000..0bb28ea
--- /dev/null
+++ b/recipes/bluez/bluez-gnome-1.8/cs-typo.patch
@@ -0,0 +1,23 @@
+https://bugs.launchpad.net/bugs/427412
+Index: bluez-gnome-1.8/po/cs.po
+===================================================================
+--- bluez-gnome-1.8.orig/po/cs.po
++++ bluez-gnome-1.8/po/cs.po
+@@ -262,7 +262,7 @@
+ #: ../applet/main.c:110 ../applet/main.c:141 ../applet/main.c:204
+ #: ../applet/agent.c:685 ../applet/agent.c:726 ../applet/agent.c:871
+ msgid "Bluetooth device"
+-msgstr "Bluetooth zářízení"
++msgstr "Bluetooth zařízení"
+ 
+ #: ../applet/main.c:137
+ #, c-format
+@@ -295,7 +295,7 @@
+ 
+ #: ../applet/main.c:529
+ msgid "A Bluetooth manager for the GNOME desktop"
+-msgstr "Správce bluetooth pro GNOME"
++msgstr "Správce Bluetooth pro GNOME"
+ 
+ #: ../applet/main.c:532 ../analyzer/dialog.c:128
+ msgid "translator-credits"
diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb
index 4756cf1..43568e4 100644
--- a/recipes/bluez/bluez-gnome_1.8.bb
+++ b/recipes/bluez/bluez-gnome_1.8.bb
@@ -1,10 +1,13 @@
 DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
+PR = "r1"
 
 DEPENDS = "dbus-glib gconf libnotify gtk+"
 RRECOMMENDS = "gnome-icon-theme"
 
-SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz"
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz \
+	   file://add-device-from-rfcomm-crash.patch;patch=1 \
+	   file://cs-typo.patch;patch=1"
 
 inherit autotools pkgconfig gconf mime