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/0006-Fix-status-descriptions-in-properties-tree.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/0006-Fix-status-descriptions-in-properties-tree.patch')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/0006-Fix-status-descriptions-in-properties-tree.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/0006-Fix-status-descriptions-in-properties-tree.patch b/meta/recipes-connectivity/connman/connman-gnome/0006-Fix-status-descriptions-in-properties-tree.patch new file mode 100644 index 0000000000..99a2df81d2 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/0006-Fix-status-descriptions-in-properties-tree.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From ce510179cba98c906974bdbd6bda2b586b6058c1 Mon Sep 17 00:00:00 2001 | ||
2 | Message-Id: <ce510179cba98c906974bdbd6bda2b586b6058c1.1334369310.git.paul.eggleton@linux.intel.com> | ||
3 | In-Reply-To: <cover.1334369310.git.paul.eggleton@linux.intel.com> | ||
4 | References: <cover.1334369310.git.paul.eggleton@linux.intel.com> | ||
5 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
6 | Date: Sat, 14 Apr 2012 02:39:15 +0100 | ||
7 | Subject: [PATCH 6/6] Fix status descriptions in properties tree | ||
8 | |||
9 | * configurating -> configuring | ||
10 | * connnected -> connected | ||
11 | * Use i18n wrappers | ||
12 | |||
13 | Upstream-Status: Submitted | ||
14 | |||
15 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
16 | --- | ||
17 | properties/main.c | 6 +++--- | ||
18 | 1 files changed, 3 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/properties/main.c b/properties/main.c | ||
21 | index e266f03..c05f443 100644 | ||
22 | --- a/properties/main.c | ||
23 | +++ b/properties/main.c | ||
24 | @@ -332,12 +332,12 @@ static void device_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, | ||
25 | /* Show the AP name */ | ||
26 | title = N_(name); | ||
27 | if (g_str_equal(state, "association") == TRUE) | ||
28 | - state = "associating..."; | ||
29 | + state = _("associating..."); | ||
30 | else if (g_str_equal(state, "configuration") == TRUE) | ||
31 | - state = "configurating..."; | ||
32 | + state = _("configuring..."); | ||
33 | else if (g_str_equal(state, "ready") == TRUE || | ||
34 | g_str_equal(state, "online") == TRUE) | ||
35 | - state = "connnected"; | ||
36 | + state = _("connected"); | ||
37 | else | ||
38 | state = ""; | ||
39 | markup = g_strdup_printf(" %s\n %s", title, state); | ||
40 | -- | ||
41 | 1.7.5.4 | ||
42 | |||