diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-04-15 03:01:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-15 10:28:38 +0100 |
commit | d979ee01b51c5e53cd38228659ff67c780f7efe4 (patch) | |
tree | 29cd8d1f9a2e36ae3ead9b786188f1ea58797a1a /meta/recipes-connectivity/connman/connman-gnome/security-type.patch | |
parent | 9ff001cba1196b91be16ff9290919de820a2d44c (diff) | |
download | poky-d979ee01b51c5e53cd38228659ff67c780f7efe4.tar.gz |
connman-gnome: connman 0.79 API fixes
Fix connman-gnome to work with connman 0.79, which made a number of
fairly serious DBus API changes. Also switch over to the newly
repopulated git repo on kernel.org in which the two previous patches
have been merged.
Fixes [YOCTO #2202].
(From OE-Core rev: 82744f56f8bfbdcc303034dee3d6e188cf8180b1)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman-gnome/security-type.patch')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/security-type.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/security-type.patch b/meta/recipes-connectivity/connman/connman-gnome/security-type.patch deleted file mode 100644 index a75d696f05..0000000000 --- a/meta/recipes-connectivity/connman/connman-gnome/security-type.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
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 | |||