summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/connman/connman-gnome
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-08-31 14:47:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 19:44:53 +0100
commit38589c37923ecfe34f1dbd5f12d89d55dfb11e2a (patch)
tree6c306e5c22b35bbafcedf8a42fbabce2ce649717 /meta/recipes-connectivity/connman/connman-gnome
parent5c9ae426a058908be2e43d249c284e122b8a5444 (diff)
downloadopenembedded-core-38589c37923ecfe34f1dbd5f12d89d55dfb11e2a.tar.gz
openembedded-core-38589c37923ecfe34f1dbd5f12d89d55dfb11e2a.tar.bz2
openembedded-core-38589c37923ecfe34f1dbd5f12d89d55dfb11e2a.tar.xz
openembedded-core-38589c37923ecfe34f1dbd5f12d89d55dfb11e2a.zip
connman-gnome: Fix WiFi security display issue
Latest connman-0.75 change the WiFi security type, causing the incompatibility of connman-gnome. Fix connman-gnome accordingly to show the correct security informtion. [YOCTO #1343] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman-gnome')
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/security-type.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/security-type.patch b/meta/recipes-connectivity/connman/connman-gnome/security-type.patch
new file mode 100644
index 000000000..a75d696f0
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/security-type.patch
@@ -0,0 +1,41 @@
+From ec36df9d1fbb6dcbf0d1e79245ffe213049ecd5a Mon Sep 17 00:00:00 2001
+From: Dongxiao Xu <dongxiao.xu@intel.com>
+Date: Wed, 3 Aug 2011 14:33:07 +0800
+Subject: [PATCH] connman-dbus: fix security type mismatch
+
+Latest connman change the Security type to be array{String}, fix
+connman-gnome accordingly.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+---
+ common/connman-dbus.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+Upstream-Status: Pending
+
+diff --git a/common/connman-dbus.c b/common/connman-dbus.c
+index 0f4e1db..0ac8ed5 100644
+--- a/common/connman-dbus.c
++++ b/common/connman-dbus.c
+@@ -384,7 +384,8 @@ static void service_changed(DBusGProxy *proxy, const char *property,
+ gtk_tree_store_set(store, &iter,
+ CONNMAN_COLUMN_FAVORITE, favorite, -1);
+ } else if (g_str_equal(property, "Security") == TRUE) {
+- const char *security = value ? g_value_get_string(value) : NULL;
++ const char **array = value ? g_value_get_boxed(value) : NULL;
++ const char *security = g_strjoinv(" ", array);
+ gtk_tree_store_set(store, &iter,
+ CONNMAN_COLUMN_SECURITY, security,
+ -1);
+@@ -487,7 +488,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash,
+ strength = value ? g_value_get_uchar(value) : 0;
+
+ value = g_hash_table_lookup(hash, "Security");
+- security = value ? g_value_get_string(value) : NULL;
++ security = value ? g_strjoinv(" ", g_value_get_boxed(value)) : NULL;
+
+ value = g_hash_table_lookup(hash, "PassPhrase");
+ passphrase = value ? g_value_get_string(value) : NULL;
+--
+1.7.1
+