diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-08-06 22:17:43 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-24 13:51:36 +0200 |
commit | 555a0355c05965632d90846ea01e3e9edbdd91e0 (patch) | |
tree | 8875ac690b7fa221ca359fd7f82257233f95a193 /meta-gnome/recipes-connectivity | |
parent | a2fcedbe20664d5be5e8c00ece3e2f95e8f2b1a3 (diff) | |
download | meta-openembedded-555a0355c05965632d90846ea01e3e9edbdd91e0.tar.gz |
network-manager-applet: update to 1.0.4
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity')
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch | 28 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.4.bb (renamed from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb) | 4 |
2 files changed, 18 insertions, 14 deletions
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch index d0506b2e8..db7878e89 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch | |||
@@ -8,11 +8,11 @@ Upstream-Status: Pending [1] | |||
8 | [1] https://bugzilla.gnome.org/show_bug.cgi?id=734589 | 8 | [1] https://bugzilla.gnome.org/show_bug.cgi?id=734589 |
9 | --- | 9 | --- |
10 | src/connection-editor/ce-page-wifi.ui | 3 +++ | 10 | src/connection-editor/ce-page-wifi.ui | 3 +++ |
11 | src/connection-editor/page-wifi.c | 46 ++++++++++++++++++++--------------- | 11 | src/connection-editor/page-wifi.c | 48 ++++++++++++++++++++--------------- |
12 | 2 files changed, 30 insertions(+), 19 deletions(-) | 12 | 2 files changed, 31 insertions(+), 20 deletions(-) |
13 | 13 | ||
14 | diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui | 14 | diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui |
15 | index e2e544b..b8b27c1 100644 | 15 | index a7b8f20..0bd9130 100644 |
16 | --- a/src/connection-editor/ce-page-wifi.ui | 16 | --- a/src/connection-editor/ce-page-wifi.ui |
17 | +++ b/src/connection-editor/ce-page-wifi.ui | 17 | +++ b/src/connection-editor/ce-page-wifi.ui |
18 | @@ -50,6 +50,9 @@ | 18 | @@ -50,6 +50,9 @@ |
@@ -26,11 +26,11 @@ index e2e544b..b8b27c1 100644 | |||
26 | </object> | 26 | </object> |
27 | <object class="GtkTable" id="WifiPage"> | 27 | <object class="GtkTable" id="WifiPage"> |
28 | diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c | 28 | diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c |
29 | index d0a5617..17db2fa 100644 | 29 | index 8a25c64..e4b4df1 100644 |
30 | --- a/src/connection-editor/page-wifi.c | 30 | --- a/src/connection-editor/page-wifi.c |
31 | +++ b/src/connection-editor/page-wifi.c | 31 | +++ b/src/connection-editor/page-wifi.c |
32 | @@ -59,6 +59,12 @@ typedef struct { | 32 | @@ -58,6 +58,12 @@ typedef struct { |
33 | gboolean disposed; | 33 | int last_channel; |
34 | } CEPageWifiPrivate; | 34 | } CEPageWifiPrivate; |
35 | 35 | ||
36 | +enum { | 36 | +enum { |
@@ -42,7 +42,7 @@ index d0a5617..17db2fa 100644 | |||
42 | static void | 42 | static void |
43 | wifi_private_init (CEPageWifi *self) | 43 | wifi_private_init (CEPageWifi *self) |
44 | { | 44 | { |
45 | @@ -244,22 +250,16 @@ mode_combo_changed_cb (GtkComboBox *combo, | 45 | @@ -245,23 +251,17 @@ mode_combo_changed_cb (GtkComboBox *combo, |
46 | CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); | 46 | CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); |
47 | CEPage *parent = CE_PAGE (self); | 47 | CEPage *parent = CE_PAGE (self); |
48 | GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label; | 48 | GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label; |
@@ -65,11 +65,13 @@ index d0a5617..17db2fa 100644 | |||
65 | widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label")); | 65 | widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label")); |
66 | 66 | ||
67 | - if (adhoc) { | 67 | - if (adhoc) { |
68 | - /* For Ad-Hoc show Band and Channel */ | ||
68 | + if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) { | 69 | + if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) { |
69 | /* For Ad-Hoc show Band and Channel */ | 70 | + /* For Ad-Hoc/AP show Band and Channel */ |
70 | gtk_widget_show (widget_band_label); | 71 | gtk_widget_show (widget_band_label); |
71 | gtk_widget_show (GTK_WIDGET (priv->band)); | 72 | gtk_widget_show (GTK_WIDGET (priv->band)); |
72 | @@ -283,12 +283,13 @@ mode_combo_changed_cb (GtkComboBox *combo, | 73 | gtk_widget_show (widget_chan_label); |
74 | @@ -284,12 +284,13 @@ mode_combo_changed_cb (GtkComboBox *combo, | ||
73 | gtk_widget_show (GTK_WIDGET (priv->bssid)); | 75 | gtk_widget_show (GTK_WIDGET (priv->bssid)); |
74 | } | 76 | } |
75 | 77 | ||
@@ -104,14 +106,15 @@ index d0a5617..17db2fa 100644 | |||
104 | mode_combo_changed_cb (priv->mode, self); | 106 | mode_combo_changed_cb (priv->mode, self); |
105 | g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self); | 107 | g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self); |
106 | g_free (mode); | 108 | g_free (mode); |
107 | @@ -510,14 +514,18 @@ ui_to_setting (CEPageWifi *self) | 109 | @@ -506,6 +510,7 @@ ui_to_setting (CEPageWifi *self) |
108 | GByteArray *bssid = NULL; | 110 | GByteArray *bssid = NULL; |
109 | GByteArray *device_mac = NULL; | 111 | GByteArray *device_mac = NULL; |
110 | GByteArray *cloned_mac = NULL; | 112 | GByteArray *cloned_mac = NULL; |
111 | + gint wifi_mode; | 113 | + gint wifi_mode; |
114 | char *ifname = NULL; | ||
112 | const char *mode; | 115 | const char *mode; |
113 | const char *band; | 116 | const char *band; |
114 | GtkWidget *entry; | 117 | @@ -516,8 +521,11 @@ ui_to_setting (CEPageWifi *self) |
115 | 118 | ||
116 | ssid = ce_page_wifi_get_ssid (self); | 119 | ssid = ce_page_wifi_get_ssid (self); |
117 | 120 | ||
@@ -125,4 +128,5 @@ index d0a5617..17db2fa 100644 | |||
125 | mode = "infrastructure"; | 128 | mode = "infrastructure"; |
126 | 129 | ||
127 | -- | 130 | -- |
128 | 1.9.1 | 131 | 2.1.0 |
132 | |||
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.4.bb index 210b5b2b0..d5e106c99 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.4.bb | |||
@@ -12,8 +12,8 @@ SRC_URI += " \ | |||
12 | file://0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \ | 12 | file://0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \ |
13 | file://0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \ | 13 | file://0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \ |
14 | " | 14 | " |
15 | SRC_URI[archive.md5sum] = "5b2a8baa6b038b3e55e5444ff321e80d" | 15 | SRC_URI[archive.md5sum] = "7fc2ed3f0c46ed41ddabe99d51513b1c" |
16 | SRC_URI[archive.sha256sum] = "760af85b43fa5bcf74b96f899a6d4c1d5e9445e5eb63088c49e5164bbf88d9a9" | 16 | SRC_URI[archive.sha256sum] = "2cc26f03d0011d2a067bd5205dc0c17d5aa0470020a8c36d319ae10e5728af72" |
17 | 17 | ||
18 | PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth" | 18 | PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth" |
19 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1,--without-modem-manager-1,modemmanager" | 19 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1,--without-modem-manager-1,modemmanager" |