diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-connectivity/connman/connman-gnome | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman-gnome')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch | 186 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png | bin | 0 -> 490 bytes | |||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png | bin | 0 -> 496 bytes | |||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png | bin | 0 -> 492 bytes | |||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png | bin | 0 -> 470 bytes | |||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png | bin | 0 -> 419 bytes | |||
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch | 36 |
8 files changed, 257 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch b/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch new file mode 100644 index 0000000000..4f36b95601 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 5907a23ad2f49702960a33f9e2039552673eabc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
3 | Date: Mon, 17 Dec 2012 14:01:18 +0200 | ||
4 | Subject: [PATCH] Removed icon from connman-gnome "about" applet | ||
5 | |||
6 | The connman-gnome "about" applet showed a picture that | ||
7 | can not be displayed. There is no designated picture | ||
8 | in connman-gnome to be used in the about section, so | ||
9 | it was removed. | ||
10 | |||
11 | [OE-Core #2509] | ||
12 | |||
13 | Upstream-Status : Pending | ||
14 | |||
15 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
16 | --- | ||
17 | applet/main.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/applet/main.c b/applet/main.c | ||
21 | index f12d371..c7b3c7f 100644 | ||
22 | --- a/applet/main.c | ||
23 | +++ b/applet/main.c | ||
24 | @@ -212,7 +212,7 @@ static void about_callback(GtkWidget *item, gpointer user_data) | ||
25 | "comments", _("A connection manager for the GNOME desktop"), | ||
26 | "authors", authors, | ||
27 | "translator-credits", _("translator-credits"), | ||
28 | - "logo-icon-name", "network-wireless", NULL); | ||
29 | + NULL); | ||
30 | } | ||
31 | |||
32 | static void settings_callback(GtkWidget *item, gpointer user_data) | ||
33 | -- | ||
34 | 1.7.9.5 | ||
35 | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch new file mode 100644 index 0000000000..0be516f054 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch | |||
@@ -0,0 +1,186 @@ | |||
1 | connman-gnome: fix dbus interface name | ||
2 | |||
3 | This patch resolves following error: | ||
4 | |||
5 | "connman-dbus.xml": "connman" is not a valid D-Bus interface name | ||
6 | |||
7 | https://502552.bugs.gentoo.org/attachment.cgi?id=380652 | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
12 | --- | ||
13 | common/connman-client.c | 24 ++++++++++++------------ | ||
14 | common/connman-client.h | 4 ++-- | ||
15 | common/connman-dbus.c | 6 +++--- | ||
16 | common/connman-dbus.xml | 2 +- | ||
17 | 4 files changed, 18 insertions(+), 18 deletions(-) | ||
18 | |||
19 | diff --git a/common/connman-client.c b/common/connman-client.c | ||
20 | index c55e25c..9d818b2 100644 | ||
21 | --- a/common/connman-client.c | ||
22 | +++ b/common/connman-client.c | ||
23 | @@ -289,7 +289,7 @@ gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, | ||
24 | |||
25 | g_value_init(&value, DBUS_TYPE_G_DICTIONARY); | ||
26 | g_value_set_boxed(&value, ipv4); | ||
27 | - ret = connman_set_property(proxy, "IPv4.Configuration", &value, NULL); | ||
28 | + ret = net_connman_set_property(proxy, "IPv4.Configuration", &value, NULL); | ||
29 | |||
30 | g_object_unref(proxy); | ||
31 | |||
32 | @@ -317,7 +317,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, | ||
33 | g_value_set_boolean(&value, powered); | ||
34 | |||
35 | error = NULL; | ||
36 | - connman_set_property(proxy, "Powered", &value, &error); | ||
37 | + net_connman_set_property(proxy, "Powered", &value, &error); | ||
38 | if( error ) | ||
39 | fprintf (stderr, "error: %s\n", error->message); | ||
40 | |||
41 | @@ -325,7 +325,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, | ||
42 | } | ||
43 | |||
44 | void connman_client_scan(ConnmanClient *client, const gchar *device, | ||
45 | - connman_scan_reply callback, gpointer user_data) | ||
46 | + net_connman_scan_reply callback, gpointer user_data) | ||
47 | { | ||
48 | ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); | ||
49 | DBusGProxy *proxy; | ||
50 | @@ -339,7 +339,7 @@ void connman_client_scan(ConnmanClient *client, const gchar *device, | ||
51 | if (proxy == NULL) | ||
52 | return; | ||
53 | |||
54 | - connman_scan_async(proxy, callback, user_data); | ||
55 | + net_connman_scan_async(proxy, callback, user_data); | ||
56 | |||
57 | g_object_unref(proxy); | ||
58 | } | ||
59 | @@ -353,7 +353,7 @@ gboolean connman_client_get_offline_status(ConnmanClient *client) | ||
60 | |||
61 | DBG("client %p", client); | ||
62 | |||
63 | - ret = connman_get_properties(priv->manager, &hash, NULL); | ||
64 | + ret = net_connman_get_properties(priv->manager, &hash, NULL); | ||
65 | |||
66 | if (ret == FALSE) | ||
67 | goto done; | ||
68 | @@ -375,7 +375,7 @@ void connman_client_set_offlinemode(ConnmanClient *client, gboolean status) | ||
69 | g_value_init(&value, G_TYPE_BOOLEAN); | ||
70 | g_value_set_boolean(&value, status); | ||
71 | |||
72 | - connman_set_property(priv->manager, "OfflineMode", &value, NULL); | ||
73 | + net_connman_set_property(priv->manager, "OfflineMode", &value, NULL); | ||
74 | } | ||
75 | |||
76 | static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, | ||
77 | @@ -398,7 +398,7 @@ static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, | ||
78 | return TRUE; | ||
79 | |||
80 | if (type == CONNMAN_TYPE_WIFI) | ||
81 | - connman_disconnect(proxy, NULL); | ||
82 | + net_connman_disconnect(proxy, NULL); | ||
83 | |||
84 | g_object_unref(proxy); | ||
85 | |||
86 | @@ -422,13 +422,13 @@ void connman_client_connect(ConnmanClient *client, const gchar *network) | ||
87 | if (proxy == NULL) | ||
88 | return; | ||
89 | |||
90 | - connman_connect(proxy, NULL); | ||
91 | + net_connman_connect(proxy, NULL); | ||
92 | |||
93 | g_object_unref(proxy); | ||
94 | } | ||
95 | |||
96 | void connman_client_connect_async(ConnmanClient *client, const gchar *network, | ||
97 | - connman_connect_reply callback, gpointer userdata) | ||
98 | + net_connman_connect_reply callback, gpointer userdata) | ||
99 | { | ||
100 | ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); | ||
101 | DBusGProxy *proxy; | ||
102 | @@ -446,7 +446,7 @@ void connman_client_connect_async(ConnmanClient *client, const gchar *network, | ||
103 | if (proxy == NULL) | ||
104 | goto done; | ||
105 | |||
106 | - connman_connect_async(proxy, callback, userdata); | ||
107 | + net_connman_connect_async(proxy, callback, userdata); | ||
108 | |||
109 | done: | ||
110 | return; | ||
111 | @@ -476,7 +476,7 @@ void connman_client_disconnect(ConnmanClient *client, const gchar *network) | ||
112 | if (proxy == NULL) | ||
113 | return; | ||
114 | |||
115 | - connman_disconnect(proxy, NULL); | ||
116 | + net_connman_disconnect(proxy, NULL); | ||
117 | |||
118 | g_object_unref(proxy); | ||
119 | } | ||
120 | @@ -532,7 +532,7 @@ void connman_client_remove(ConnmanClient *client, const gchar *network) | ||
121 | if (proxy == NULL) | ||
122 | return; | ||
123 | |||
124 | - connman_remove(proxy, NULL); | ||
125 | + net_connman_remove(proxy, NULL); | ||
126 | |||
127 | g_object_unref(proxy); | ||
128 | } | ||
129 | diff --git a/common/connman-client.h b/common/connman-client.h | ||
130 | index 9e2e6d5..98241de 100644 | ||
131 | --- a/common/connman-client.h | ||
132 | +++ b/common/connman-client.h | ||
133 | @@ -70,13 +70,13 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, | ||
134 | gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, | ||
135 | struct ipv4_config *ipv4_config); | ||
136 | void connman_client_scan(ConnmanClient *client, const gchar *device, | ||
137 | - connman_scan_reply callback, gpointer user_data); | ||
138 | + net_connman_scan_reply callback, gpointer user_data); | ||
139 | |||
140 | void connman_client_connect(ConnmanClient *client, const gchar *network); | ||
141 | void connman_client_disconnect(ConnmanClient *client, const gchar *network); | ||
142 | gchar *connman_client_get_security(ConnmanClient *client, const gchar *network); | ||
143 | void connman_client_connect_async(ConnmanClient *client, const gchar *network, | ||
144 | - connman_connect_reply callback, gpointer userdata); | ||
145 | + net_connman_connect_reply callback, gpointer userdata); | ||
146 | void connman_client_set_remember(ConnmanClient *client, const gchar *network, | ||
147 | gboolean remember); | ||
148 | |||
149 | diff --git a/common/connman-dbus.c b/common/connman-dbus.c | ||
150 | index b82b3e1..543eb43 100644 | ||
151 | --- a/common/connman-dbus.c | ||
152 | +++ b/common/connman-dbus.c | ||
153 | @@ -655,15 +655,15 @@ DBusGProxy *connman_dbus_create_manager(DBusGConnection *conn, | ||
154 | |||
155 | DBG("getting manager properties"); | ||
156 | |||
157 | - connman_get_properties_async(proxy, manager_properties, store); | ||
158 | + net_connman_get_properties_async(proxy, manager_properties, store); | ||
159 | |||
160 | DBG("getting technologies"); | ||
161 | |||
162 | - connman_get_technologies_async(proxy, manager_technologies, store); | ||
163 | + net_connman_get_technologies_async(proxy, manager_technologies, store); | ||
164 | |||
165 | DBG("getting services"); | ||
166 | |||
167 | - connman_get_services_async(proxy, manager_services, store); | ||
168 | + net_connman_get_services_async(proxy, manager_services, store); | ||
169 | |||
170 | return proxy; | ||
171 | } | ||
172 | diff --git a/common/connman-dbus.xml b/common/connman-dbus.xml | ||
173 | index 56b9582..0199d52 100644 | ||
174 | --- a/common/connman-dbus.xml | ||
175 | +++ b/common/connman-dbus.xml | ||
176 | @@ -1,7 +1,7 @@ | ||
177 | <?xml version="1.0" encoding="UTF-8" ?> | ||
178 | |||
179 | <node name="/"> | ||
180 | - <interface name="connman"> | ||
181 | + <interface name="net.connman"> | ||
182 | <method name="GetProperties"> | ||
183 | <arg type="a{sv}" direction="out"/> | ||
184 | </method> | ||
185 | -- | ||
186 | 1.9.1 | ||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png new file mode 100644 index 0000000000..33247c1e2d --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png | |||
Binary files differ | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png new file mode 100644 index 0000000000..a94fb952ff --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png | |||
Binary files differ | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png new file mode 100644 index 0000000000..b5eb405a90 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png | |||
Binary files differ | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png new file mode 100644 index 0000000000..be54419fa7 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png | |||
Binary files differ | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png new file mode 100644 index 0000000000..1c40ac9a10 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png | |||
Binary files differ | |||
diff --git a/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch new file mode 100644 index 0000000000..0421cda0b2 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | In networks that don't have a DHCP server configured, ipv4 address | ||
2 | allocation fails and the ipv4 structure doesn't get populated. When | ||
3 | the GUI is trying to read the ipv4_config.method field to see whether | ||
4 | it contains "dhcp" string, a segmentation fault is generated. | ||
5 | |||
6 | Ethernet manual configuration behavior remains unchanged after this fix. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> | ||
11 | Index: git/properties/ethernet.c | ||
12 | =================================================================== | ||
13 | --- git.orig/properties/ethernet.c | ||
14 | +++ git/properties/ethernet.c | ||
15 | @@ -194,7 +194,7 @@ void add_ethernet_service(GtkWidget *mai | ||
16 | |||
17 | data->button = button; | ||
18 | |||
19 | - if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) | ||
20 | + if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) | ||
21 | update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP); | ||
22 | else | ||
23 | update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL); | ||
24 | Index: git/properties/wifi.c | ||
25 | =================================================================== | ||
26 | --- git.orig/properties/wifi.c | ||
27 | +++ git/properties/wifi.c | ||
28 | @@ -230,7 +230,7 @@ static void wifi_ipconfig(GtkWidget *tab | ||
29 | |||
30 | data->ipv4_config = ipv4_config; | ||
31 | |||
32 | - if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) | ||
33 | + if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) | ||
34 | update_wifi_ipv4(data, CONNMAN_POLICY_DHCP); | ||
35 | else | ||
36 | update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL); | ||