diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-08-31 14:47:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:45:27 +0100 |
commit | e2ff50830bd35031252882465a362a25d0b5d41f (patch) | |
tree | 8b093c95eec823c0819d7611ac699f6fd9383ba5 /meta/recipes-connectivity/connman/connman-gnome | |
parent | c9767ea7ee2881da99fc178c6a097b35a62b3503 (diff) | |
download | poky-e2ff50830bd35031252882465a362a25d0b5d41f.tar.gz |
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]
(From OE-Core rev: 38589c37923ecfe34f1dbd5f12d89d55dfb11e2a)
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.patch | 41 |
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 0000000000..a75d696f05 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/security-type.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From ec36df9d1fbb6dcbf0d1e79245ffe213049ecd5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Dongxiao Xu <dongxiao.xu@intel.com> | ||
3 | Date: Wed, 3 Aug 2011 14:33:07 +0800 | ||
4 | Subject: [PATCH] connman-dbus: fix security type mismatch | ||
5 | |||
6 | Latest connman change the Security type to be array{String}, fix | ||
7 | connman-gnome accordingly. | ||
8 | |||
9 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
10 | --- | ||
11 | common/connman-dbus.c | 5 +++-- | ||
12 | 1 files changed, 3 insertions(+), 2 deletions(-) | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | diff --git a/common/connman-dbus.c b/common/connman-dbus.c | ||
17 | index 0f4e1db..0ac8ed5 100644 | ||
18 | --- a/common/connman-dbus.c | ||
19 | +++ b/common/connman-dbus.c | ||
20 | @@ -384,7 +384,8 @@ static void service_changed(DBusGProxy *proxy, const char *property, | ||
21 | gtk_tree_store_set(store, &iter, | ||
22 | CONNMAN_COLUMN_FAVORITE, favorite, -1); | ||
23 | } else if (g_str_equal(property, "Security") == TRUE) { | ||
24 | - const char *security = value ? g_value_get_string(value) : NULL; | ||
25 | + const char **array = value ? g_value_get_boxed(value) : NULL; | ||
26 | + const char *security = g_strjoinv(" ", array); | ||
27 | gtk_tree_store_set(store, &iter, | ||
28 | CONNMAN_COLUMN_SECURITY, security, | ||
29 | -1); | ||
30 | @@ -487,7 +488,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash, | ||
31 | strength = value ? g_value_get_uchar(value) : 0; | ||
32 | |||
33 | value = g_hash_table_lookup(hash, "Security"); | ||
34 | - security = value ? g_value_get_string(value) : NULL; | ||
35 | + security = value ? g_strjoinv(" ", g_value_get_boxed(value)) : NULL; | ||
36 | |||
37 | value = g_hash_table_lookup(hash, "PassPhrase"); | ||
38 | passphrase = value ? g_value_get_string(value) : NULL; | ||
39 | -- | ||
40 | 1.7.1 | ||
41 | |||