Network Manager Applet

Merge lp:~sil2100/network-manager-applet/merge_1.0.10 into lp:~network-manager/network-manager-applet/ubuntu

  1. merge_1.0.10
  2. Merge into ubuntu
Proposed by Łukasz Zemczak
Status: Merged
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~sil2100/network-manager-applet/merge_1.0.10
Merge into: lp:~network-manager/network-manager-applet/ubuntu
Diff against target: 624 lines (+132/-96)
8 files modified
debian/changelog (+59/-0)
debian/patches/Allow-to-create-connections-without-admin-privileges.patch (+63/-63)
debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch (+1/-1)
debian/patches/Force-online-state-with-unmanaged-devices.patch (+1/-1)
debian/patches/applet_adhoc_use_wpa_rsn_part1.patch (+4/-4)
debian/patches/series (+1/-1)
debian/patches/ubuntu_dont_autostart_under_GNOME.patch (+0/-26)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~sil2100/network-manager-applet/merge_1.0.10
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+281844@code.launchpad.net

Commit message

Merge 1.0.10 from Debian, include mitya57's change for drop of an unused patch.

Description of the change

Merge 1.0.10 from Debian, include mitya57's change for drop of an unused patch.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-16 16:49:08 +0000
3+++ debian/changelog 2016-01-07 14:38:54 +0000
4@@ -1,3 +1,62 @@
5+network-manager-applet (1.0.10-1ubuntu1) xenial; urgency=low
6+
7+ [ Łukasz 'sil2100' Zemczak ]
8+ * Merge from Debian unstable. Remaining changes:
9+ - lp341684_device_sensitive_disconnect_notify.patch: show correct
10+ notification messages for disconnect events, to be in line with the other
11+ *connect*text patches.
12+ - lp460144_correctly_update_notification.patch: cleaner notification
13+ messages, and allow for messages to be updated instead of cleared.
14+ - applet-wifi-menu-before-vpn.patch: show Create New and Connect to Hidden
15+ wifi menu items with the other Wifi items, rather than separated by
16+ the VPN menus.
17+ - nm-applet-use-indicator.patch: patch to support showing nm-applet as an
18+ appindicator in Unity.
19+ - position_dialogs_to_center_of_the_screen.patch: position dialogs to the
20+ center of the screen.
21+ - make_menu_items_insensitive_based_on_permissions.patch,
22+ hide_policy_items_env_var.patch: provide a method to desensitize or hide
23+ menu items which are useless given the current policykit policy level of
24+ the user.
25+ - applet_adhoc_use_wpa_rsn_part1.patch: enable Ad-Hoc using WPA RSN.
26+ - lp1048516_dont_req_keyring_in_greeter.patch: don't try to load the
27+ keyring if the user has no permissions to edit their own connections.
28+ - lp1048520_delay_pin_dialog_in_greeter.patch: only ask for PIN entry when
29+ a connection is being established rather than when a modem is detected.
30+ - rebuild_menu_after_init.patch: force a rebuild of the menu to avoid it
31+ staying empty on login.
32+ - ubuntu_dont_autostart_under_GNOME.patch
33+ - hide_virtual_devices.patch: updated to no longer show
34+ - debian/rules: ship extra icons, use --enable-indicators, export
35+ translations for Launchpad and fail if any files are missing from
36+ .install files, or not being installed.
37+ - debian/control: Build-Depend on dh-translations, libappindicator3-dev,
38+ update package descriptions, add Breaks against gnome-bluetooth (<< 3.0),
39+ switch gnome-icon-theme to adwaita-icon-theme, don't build the migration
40+ helper
41+
42+ [ Dmitry Shachnev ]
43+ * Drop ubuntu_dont_autostart_under_GNOME.patch. The latest release has
44+ GNOME in NotShowIn list, so that patch does not make any sense.
45+
46+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Thu, 07 Jan 2016 12:14:44 +0100
47+
48+network-manager-applet (1.0.10-1) unstable; urgency=medium
49+
50+ * New upstream release.
51+ * Rebase patches.
52+ * Use dh_autoreconf --as-needed to avoid unnecessary shlibs dependencies.
53+
54+ -- Michael Biebl <biebl@debian.org> Thu, 24 Dec 2015 01:18:49 +0100
55+
56+network-manager-applet (1.0.8-1) unstable; urgency=medium
57+
58+ * New upstream release.
59+ * Refresh patches.
60+ * Disable migration tool for NM <= 0.8 settings.
61+
62+ -- Michael Biebl <biebl@debian.org> Fri, 20 Nov 2015 18:35:54 +0100
63+
64 network-manager-applet (1.0.6-2ubuntu4) xenial; urgency=medium
65
66 * debian/control, debian/n-m-g.install, debian/rules:
67
68=== modified file 'debian/patches/Allow-to-create-connections-without-admin-privileges.patch'
69--- debian/patches/Allow-to-create-connections-without-admin-privileges.patch 2015-11-30 18:04:54 +0000
70+++ debian/patches/Allow-to-create-connections-without-admin-privileges.patch 2016-01-07 14:38:54 +0000
71@@ -103,10 +103,10 @@
72 * Dialog Of Doom.
73 */
74 diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
75-index 41711d9..521dbc6 100644
76+index cda5978..8a3cae2 100644
77 --- a/src/connection-editor/ce-page.h
78 +++ b/src/connection-editor/ce-page.h
79-@@ -48,6 +48,7 @@ typedef void (*PageNewConnectionFunc) (GtkWindow *parent,
80+@@ -49,6 +49,7 @@ typedef void (*PageNewConnectionFunc) (GtkWindow *parent,
81 const char *detail,
82 NMRemoteSettings *settings,
83 PageNewConnectionResultFunc result_func,
84@@ -135,10 +135,10 @@
85 }
86
87 diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
88-index 799ea94..966625c 100644
89+index 0dffd9d..45a86d0 100644
90 --- a/src/connection-editor/page-bond.c
91 +++ b/src/connection-editor/page-bond.c
92-@@ -610,6 +610,7 @@ bond_connection_new (GtkWindow *parent,
93+@@ -611,6 +611,7 @@ bond_connection_new (GtkWindow *parent,
94 const char *detail,
95 NMRemoteSettings *settings,
96 PageNewConnectionResultFunc result_func,
97@@ -147,10 +147,10 @@
98 {
99 NMConnection *connection;
100 diff --git a/src/connection-editor/page-bond.h b/src/connection-editor/page-bond.h
101-index dcc8e1f..3844869 100644
102+index fdaa97e..c77ad44 100644
103 --- a/src/connection-editor/page-bond.h
104 +++ b/src/connection-editor/page-bond.h
105-@@ -56,6 +56,7 @@ void bond_connection_new (GtkWindow *parent,
106+@@ -57,6 +57,7 @@ void bond_connection_new (GtkWindow *parent,
107 const char *detail,
108 NMRemoteSettings *settings,
109 PageNewConnectionResultFunc result_func,
110@@ -159,10 +159,10 @@
111
112 #endif /* __PAGE_BOND_H__ */
113 diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
114-index 1ffcb1f..34ff9af 100644
115+index a159993..9ab6640 100644
116 --- a/src/connection-editor/page-bridge.c
117 +++ b/src/connection-editor/page-bridge.c
118-@@ -294,6 +294,7 @@ bridge_connection_new (GtkWindow *parent,
119+@@ -296,6 +296,7 @@ bridge_connection_new (GtkWindow *parent,
120 const char *detail,
121 NMRemoteSettings *settings,
122 PageNewConnectionResultFunc result_func,
123@@ -171,10 +171,10 @@
124 {
125 NMConnection *connection;
126 diff --git a/src/connection-editor/page-bridge.h b/src/connection-editor/page-bridge.h
127-index fa6d927..4bd0b95 100644
128+index 1fe4e5f..4ad1991 100644
129 --- a/src/connection-editor/page-bridge.h
130 +++ b/src/connection-editor/page-bridge.h
131-@@ -56,6 +56,7 @@ void bridge_connection_new (GtkWindow *parent,
132+@@ -57,6 +57,7 @@ void bridge_connection_new (GtkWindow *parent,
133 const char *detail,
134 NMRemoteSettings *settings,
135 PageNewConnectionResultFunc result_func,
136@@ -183,10 +183,10 @@
137
138 #endif /* __PAGE_BRIDGE_H__ */
139 diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
140-index c327979..a38f333 100644
141+index c06dfff..21e2897 100644
142 --- a/src/connection-editor/page-dsl.c
143 +++ b/src/connection-editor/page-dsl.c
144-@@ -221,6 +221,7 @@ dsl_connection_new (GtkWindow *parent,
145+@@ -223,6 +223,7 @@ dsl_connection_new (GtkWindow *parent,
146 const char *detail,
147 NMRemoteSettings *settings,
148 PageNewConnectionResultFunc result_func,
149@@ -195,10 +195,10 @@
150 {
151 NMConnection *connection;
152 diff --git a/src/connection-editor/page-dsl.h b/src/connection-editor/page-dsl.h
153-index 514699a..656e3c6 100644
154+index f3b0b30..74e3734 100644
155 --- a/src/connection-editor/page-dsl.h
156 +++ b/src/connection-editor/page-dsl.h
157-@@ -58,6 +58,7 @@ void dsl_connection_new (GtkWindow *parent,
158+@@ -59,6 +59,7 @@ void dsl_connection_new (GtkWindow *parent,
159 const char *detail,
160 NMRemoteSettings *settings,
161 PageNewConnectionResultFunc callback,
162@@ -207,10 +207,10 @@
163
164 #endif /* __PAGE_DSL_H__ */
165 diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
166-index 451ee22..9372c1e 100644
167+index d10e2ae..db50e19 100644
168 --- a/src/connection-editor/page-ethernet.c
169 +++ b/src/connection-editor/page-ethernet.c
170-@@ -377,6 +377,7 @@ ethernet_connection_new (GtkWindow *parent,
171+@@ -379,6 +379,7 @@ ethernet_connection_new (GtkWindow *parent,
172 const char *detail,
173 NMRemoteSettings *settings,
174 PageNewConnectionResultFunc result_func,
175@@ -219,10 +219,10 @@
176 {
177 NMConnection *connection;
178 diff --git a/src/connection-editor/page-ethernet.h b/src/connection-editor/page-ethernet.h
179-index 4dd4a5c..55ade9b 100644
180+index edc331d..1cf6ad1 100644
181 --- a/src/connection-editor/page-ethernet.h
182 +++ b/src/connection-editor/page-ethernet.h
183-@@ -58,6 +58,7 @@ void ethernet_connection_new (GtkWindow *parent,
184+@@ -59,6 +59,7 @@ void ethernet_connection_new (GtkWindow *parent,
185 const char *detail,
186 NMRemoteSettings *settings,
187 PageNewConnectionResultFunc result_func,
188@@ -231,10 +231,10 @@
189
190 #endif /* __PAGE_ETHERNET_H__ */
191 diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
192-index 19560a2..bb9335e 100644
193+index a3c8a32..5688556 100644
194 --- a/src/connection-editor/page-infiniband.c
195 +++ b/src/connection-editor/page-infiniband.c
196-@@ -253,6 +253,7 @@ infiniband_connection_new (GtkWindow *parent,
197+@@ -255,6 +255,7 @@ infiniband_connection_new (GtkWindow *parent,
198 const char *detail,
199 NMRemoteSettings *settings,
200 PageNewConnectionResultFunc result_func,
201@@ -243,10 +243,10 @@
202 {
203 NMConnection *connection;
204 diff --git a/src/connection-editor/page-infiniband.h b/src/connection-editor/page-infiniband.h
205-index e895a98..97bff3b 100644
206+index af6d7aa..9a90fcb 100644
207 --- a/src/connection-editor/page-infiniband.h
208 +++ b/src/connection-editor/page-infiniband.h
209-@@ -56,6 +56,7 @@ void infiniband_connection_new (GtkWindow *parent,
210+@@ -57,6 +57,7 @@ void infiniband_connection_new (GtkWindow *parent,
211 const char *detail,
212 NMRemoteSettings *settings,
213 PageNewConnectionResultFunc result_func,
214@@ -255,10 +255,10 @@
215
216 #endif /* __PAGE_INFINIBAND_H__ */
217 diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
218-index ef24184..df3d316 100644
219+index 541a364..da0d404 100644
220 --- a/src/connection-editor/page-mobile.c
221 +++ b/src/connection-editor/page-mobile.c
222-@@ -452,6 +452,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
223+@@ -454,6 +454,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
224 NMConnection *connection = NULL;
225
226 if (!canceled && method) {
227@@ -266,7 +266,7 @@
228 NMSetting *type_setting;
229 const char *ctype = NULL;
230 char *detail = NULL;
231-@@ -465,6 +466,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
232+@@ -467,6 +468,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
233 NM_SETTING_GSM_NUMBER, "*99#",
234 NM_SETTING_GSM_USERNAME, method->username,
235 NM_SETTING_GSM_PASSWORD, method->password,
236@@ -274,7 +274,7 @@
237 NM_SETTING_GSM_APN, method->gsm_apn,
238 NULL);
239 break;
240-@@ -476,6 +478,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
241+@@ -478,6 +480,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
242 NM_SETTING_CDMA_NUMBER, "#777",
243 NM_SETTING_GSM_USERNAME, method->username,
244 NM_SETTING_GSM_PASSWORD, method->password,
245@@ -282,7 +282,7 @@
246 NULL);
247 break;
248 default:
249-@@ -490,6 +493,13 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
250+@@ -492,6 +495,13 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
251 connection = ce_page_new_connection (detail, ctype, FALSE, info->settings, info->user_data);
252 g_free (detail);
253
254@@ -296,7 +296,7 @@
255 nm_connection_add_setting (connection, type_setting);
256 nm_connection_add_setting (connection, nm_setting_ppp_new ());
257 }
258-@@ -514,6 +524,7 @@ mobile_connection_new (GtkWindow *parent,
259+@@ -516,6 +526,7 @@ mobile_connection_new (GtkWindow *parent,
260 const char *detail,
261 NMRemoteSettings *settings,
262 PageNewConnectionResultFunc result_func,
263@@ -305,10 +305,10 @@
264 {
265 NMAMobileWizard *wizard;
266 diff --git a/src/connection-editor/page-mobile.h b/src/connection-editor/page-mobile.h
267-index ab2903c..bc5b479 100644
268+index d370ca4..3196d87 100644
269 --- a/src/connection-editor/page-mobile.h
270 +++ b/src/connection-editor/page-mobile.h
271-@@ -58,6 +58,7 @@ void mobile_connection_new (GtkWindow *parent,
272+@@ -59,6 +59,7 @@ void mobile_connection_new (GtkWindow *parent,
273 const char *detail,
274 NMRemoteSettings *settings,
275 PageNewConnectionResultFunc result_func,
276@@ -317,10 +317,10 @@
277
278 #endif /* __PAGE_MOBILE_H__ */
279 diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
280-index 9efa43d..786c0fa 100644
281+index 700f87d..742f1e9 100644
282 --- a/src/connection-editor/page-team.c
283 +++ b/src/connection-editor/page-team.c
284-@@ -367,6 +367,7 @@ team_connection_new (GtkWindow *parent,
285+@@ -369,6 +369,7 @@ team_connection_new (GtkWindow *parent,
286 const char *detail,
287 NMRemoteSettings *settings,
288 PageNewConnectionResultFunc result_func,
289@@ -329,10 +329,10 @@
290 {
291 NMConnection *connection;
292 diff --git a/src/connection-editor/page-team.h b/src/connection-editor/page-team.h
293-index d1936b3..91d9df3 100644
294+index e3cb133..f637459 100644
295 --- a/src/connection-editor/page-team.h
296 +++ b/src/connection-editor/page-team.h
297-@@ -55,6 +55,7 @@ void team_connection_new (GtkWindow *parent,
298+@@ -56,6 +56,7 @@ void team_connection_new (GtkWindow *parent,
299 const char *detail,
300 NMRemoteSettings *settings,
301 PageNewConnectionResultFunc result_func,
302@@ -341,10 +341,10 @@
303
304 #endif /* __PAGE_TEAM_H__ */
305 diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
306-index 1a8c6b6..d41e38a 100644
307+index 3f24fc7..e733cd4 100644
308 --- a/src/connection-editor/page-vlan.c
309 +++ b/src/connection-editor/page-vlan.c
310-@@ -673,6 +673,7 @@ vlan_connection_new (GtkWindow *parent,
311+@@ -698,6 +698,7 @@ vlan_connection_new (GtkWindow *parent,
312 const char *detail,
313 NMRemoteSettings *settings,
314 PageNewConnectionResultFunc result_func,
315@@ -353,10 +353,10 @@
316 {
317 NMConnection *connection;
318 diff --git a/src/connection-editor/page-vlan.h b/src/connection-editor/page-vlan.h
319-index 0e66a06..c7969aa 100644
320+index 80c73c0..2e46230 100644
321 --- a/src/connection-editor/page-vlan.h
322 +++ b/src/connection-editor/page-vlan.h
323-@@ -56,6 +56,7 @@ void vlan_connection_new (GtkWindow *parent,
324+@@ -57,6 +57,7 @@ void vlan_connection_new (GtkWindow *parent,
325 const char *detail,
326 NMRemoteSettings *settings,
327 PageNewConnectionResultFunc result_func,
328@@ -365,10 +365,10 @@
329
330 #endif /* __PAGE_VLAN_H__ */
331 diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
332-index 004a260..5c0c8b5 100644
333+index 6596c0e..faeb3d7 100644
334 --- a/src/connection-editor/page-vpn.c
335 +++ b/src/connection-editor/page-vpn.c
336-@@ -253,6 +253,7 @@ vpn_connection_import (GtkWindow *parent,
337+@@ -255,6 +255,7 @@ vpn_connection_import (GtkWindow *parent,
338 const char *detail,
339 NMRemoteSettings *settings,
340 PageNewConnectionResultFunc result_func,
341@@ -376,7 +376,7 @@
342 gpointer user_data)
343 {
344 NewVpnInfo *info;
345-@@ -287,9 +288,11 @@ vpn_connection_new (GtkWindow *parent,
346+@@ -289,9 +290,11 @@ vpn_connection_new (GtkWindow *parent,
347 const char *detail,
348 NMRemoteSettings *settings,
349 PageNewConnectionResultFunc result_func,
350@@ -388,7 +388,7 @@
351 NMSetting *s_vpn;
352
353 if (!detail) {
354-@@ -315,6 +318,14 @@ vpn_connection_new (GtkWindow *parent,
355+@@ -317,6 +320,14 @@ vpn_connection_new (GtkWindow *parent,
356 FALSE,
357 settings,
358 user_data);
359@@ -404,10 +404,10 @@
360 g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, detail, NULL);
361 nm_connection_add_setting (connection, s_vpn);
362 diff --git a/src/connection-editor/page-vpn.h b/src/connection-editor/page-vpn.h
363-index 2339732..2164930 100644
364+index 7d74930..bc14dee 100644
365 --- a/src/connection-editor/page-vpn.h
366 +++ b/src/connection-editor/page-vpn.h
367-@@ -60,12 +60,14 @@ void vpn_connection_new (GtkWindow *parent,
368+@@ -61,12 +61,14 @@ void vpn_connection_new (GtkWindow *parent,
369 const char *detail,
370 NMRemoteSettings *settings,
371 PageNewConnectionResultFunc result_func,
372@@ -423,19 +423,19 @@
373
374 #endif /* __PAGE_VPN_H__ */
375 diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
376-index 8a25c64..9c56e4b 100644
377+index ac7cad2..36da755 100644
378 --- a/src/connection-editor/page-wifi.c
379 +++ b/src/connection-editor/page-wifi.c
380-@@ -33,6 +33,8 @@
381- #include <nm-device-wifi.h>
382+@@ -34,6 +34,8 @@
383 #include <nm-utils.h>
384
385+ #include "nm-connection-editor.h"
386 +#include "utils.h"
387 +
388 #include "page-wifi.h"
389
390 G_DEFINE_TYPE (CEPageWifi, ce_page_wifi, CE_TYPE_PAGE)
391-@@ -622,6 +624,7 @@ wifi_connection_new (GtkWindow *parent,
392+@@ -629,6 +631,7 @@ wifi_connection_new (GtkWindow *parent,
393 const char *detail,
394 NMRemoteSettings *settings,
395 PageNewConnectionResultFunc result_func,
396@@ -443,7 +443,7 @@
397 gpointer user_data)
398 {
399 NMConnection *connection;
400-@@ -632,6 +635,17 @@ wifi_connection_new (GtkWindow *parent,
401+@@ -639,6 +642,17 @@ wifi_connection_new (GtkWindow *parent,
402 TRUE,
403 settings,
404 user_data);
405@@ -462,10 +462,10 @@
406 g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
407 nm_connection_add_setting (connection, s_wifi);
408 diff --git a/src/connection-editor/page-wifi.h b/src/connection-editor/page-wifi.h
409-index c039b00..b89e589 100644
410+index eee167c..7a502a5 100644
411 --- a/src/connection-editor/page-wifi.h
412 +++ b/src/connection-editor/page-wifi.h
413-@@ -62,6 +62,7 @@ void wifi_connection_new (GtkWindow *parent,
414+@@ -63,6 +63,7 @@ void wifi_connection_new (GtkWindow *parent,
415 const char *detail,
416 NMRemoteSettings *settings,
417 PageNewConnectionResultFunc result_func,
418@@ -474,10 +474,10 @@
419
420 #endif /* __PAGE_WIFI_H__ */
421 diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
422-index 97c4d90..d8cf40c 100644
423+index ff88013..2be1c65 100644
424 --- a/src/connection-editor/page-wimax.c
425 +++ b/src/connection-editor/page-wimax.c
426-@@ -216,6 +216,7 @@ wimax_connection_new (GtkWindow *parent,
427+@@ -220,6 +220,7 @@ wimax_connection_new (GtkWindow *parent,
428 const char *detail,
429 NMRemoteSettings *settings,
430 PageNewConnectionResultFunc result_func,
431@@ -486,10 +486,10 @@
432 {
433 NMConnection *connection;
434 diff --git a/src/connection-editor/page-wimax.h b/src/connection-editor/page-wimax.h
435-index 6938284..91d937c 100644
436+index 4a40048..b2aa2a8 100644
437 --- a/src/connection-editor/page-wimax.h
438 +++ b/src/connection-editor/page-wimax.h
439-@@ -56,6 +56,7 @@ void wimax_connection_new (GtkWindow *parent,
440+@@ -57,6 +57,7 @@ void wimax_connection_new (GtkWindow *parent,
441 const char *detail,
442 NMRemoteSettings *settings,
443 PageNewConnectionResultFunc result_func,
444@@ -542,7 +542,7 @@
445
446 /* The Bluetooth settings */
447 diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
448-index ace323b..0916557 100644
449+index 396217b..36f3443 100644
450 --- a/src/libnm-gtk/nm-wifi-dialog.c
451 +++ b/src/libnm-gtk/nm-wifi-dialog.c
452 @@ -39,6 +39,7 @@
453@@ -553,7 +553,7 @@
454
455 G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
456
457-@@ -1203,6 +1204,9 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
458+@@ -1232,6 +1233,9 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
459 NM_SETTING_CONNECTION_UUID, uuid,
460 NULL);
461 g_free (uuid);
462@@ -628,10 +628,10 @@
463
464 typedef enum {
465 diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
466-index 2399ace..147f848 100644
467+index 0309042..402915f 100644
468 --- a/src/wireless-security/ws-wep-key.c
469 +++ b/src/wireless-security/ws-wep-key.c
470-@@ -147,6 +147,7 @@ static void
471+@@ -160,6 +160,7 @@ static void
472 fill_connection (WirelessSecurity *parent, NMConnection *connection)
473 {
474 WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
475@@ -639,7 +639,7 @@
476 NMSettingWirelessSecurity *s_wsec;
477 NMSettingSecretFlags secret_flags;
478 GtkWidget *widget, *passwd_entry;
479-@@ -173,6 +174,12 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
480+@@ -186,6 +187,12 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
481 NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type,
482 NULL);
483
484@@ -653,10 +653,10 @@
485 if (strlen (sec->keys[i]))
486 nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]);
487 diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
488-index 5cd658a..f6eaa27 100644
489+index 1495707..f45ab1c 100644
490 --- a/src/wireless-security/ws-wpa-psk.c
491 +++ b/src/wireless-security/ws-wpa-psk.c
492-@@ -97,12 +97,14 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
493+@@ -104,12 +104,14 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
494 WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent;
495 GtkWidget *widget, *passwd_entry;
496 const char *key;
497@@ -671,7 +671,7 @@
498 s_wireless = nm_connection_get_setting_wireless (connection);
499 g_assert (s_wireless);
500
501-@@ -118,6 +120,9 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
502+@@ -125,6 +127,9 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
503 passwd_entry = widget;
504 key = gtk_entry_get_text (GTK_ENTRY (widget));
505 g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
506
507=== modified file 'debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch'
508--- debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch 2015-11-30 18:04:54 +0000
509+++ debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch 2016-01-07 14:38:54 +0000
510@@ -8,7 +8,7 @@
511 2 files changed, 3 insertions(+), 1 deletion(-)
512
513 diff --git a/configure.ac b/configure.ac
514-index 266bff6..9482a69 100644
515+index c25c41a..fa69621 100644
516 --- a/configure.ac
517 +++ b/configure.ac
518 @@ -146,6 +146,8 @@ case "${with_bluetooth}" in
519
520=== modified file 'debian/patches/Force-online-state-with-unmanaged-devices.patch'
521--- debian/patches/Force-online-state-with-unmanaged-devices.patch 2015-11-30 18:04:54 +0000
522+++ debian/patches/Force-online-state-with-unmanaged-devices.patch 2016-01-07 14:38:54 +0000
523@@ -12,7 +12,7 @@
524 1 file changed, 4 insertions(+)
525
526 diff --git a/src/applet.c b/src/applet.c
527-index 39ea8e4..0a1043b 100644
528+index 7a79622..69e9870 100644
529 --- a/src/applet.c
530 +++ b/src/applet.c
531 @@ -2952,6 +2952,10 @@ applet_update_icon (gpointer user_data)
532
533=== modified file 'debian/patches/applet_adhoc_use_wpa_rsn_part1.patch'
534--- debian/patches/applet_adhoc_use_wpa_rsn_part1.patch 2015-10-07 03:56:07 +0000
535+++ debian/patches/applet_adhoc_use_wpa_rsn_part1.patch 2016-01-07 14:38:54 +0000
536@@ -41,8 +41,8 @@
537 ws_wpa_psk = ws_wpa_psk_new (connection, FALSE);
538 if (ws_wpa_psk) {
539 add_security_item (self, WIRELESS_SECURITY (ws_wpa_psk), sec_model,
540-- &iter, _("WPA & WPA2 Personal"), FALSE);
541-+ &iter, _("WPA & WPA2 Personal"), TRUE);
542+- &iter, _("WPA & WPA2 Personal"), FALSE, TRUE);
543++ &iter, _("WPA & WPA2 Personal"), TRUE, TRUE);
544 if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == NMU_SEC_WPA2_PSK)))
545 active = item;
546 item++;
547@@ -51,12 +51,12 @@
548 g_assert (s_wireless);
549
550 - /* Kernel Ad-Hoc WPA support is busted; it creates open networks. Disable
551-- * WPA when Ad-Hoc is selected. set_sensitive() will pick up priv->adhoc
552+- * WPA when Ad-Hoc is selected. set_sensitive() will pick up priv->mode
553 - * and do the right thing.
554 - */
555 mode = nm_setting_wireless_get_mode (s_wireless);
556 if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0)
557- priv->adhoc = TRUE;
558+ priv->mode = NM_802_11_MODE_ADHOC;
559 Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
560 ===================================================================
561 --- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wifi-dialog.c
562
563=== modified file 'debian/patches/series'
564--- debian/patches/series 2015-11-30 18:04:54 +0000
565+++ debian/patches/series 2016-01-07 14:38:54 +0000
566@@ -1,6 +1,7 @@
567 Allow-to-create-connections-without-admin-privileges.patch
568 Force-online-state-with-unmanaged-devices.patch
569 Don-t-hard-code-gnome-bluetooth-plugin-directory.patch
570+# Ubuntu patches
571 lp341684_device_sensitive_disconnect_notify.patch
572 lp460144_correctly_update_notification.patch
573 applet-wifi-menu-before-vpn.patch
574@@ -12,5 +13,4 @@
575 lp1048516_dont_req_keyring_in_greeter.patch
576 lp1048520_delay_pin_dialog_in_greeter.patch
577 rebuild_menu_after_init.patch
578-ubuntu_dont_autostart_under_GNOME.patch
579 hide_virtual_devices.patch
580
581=== removed file 'debian/patches/ubuntu_dont_autostart_under_GNOME.patch'
582--- debian/patches/ubuntu_dont_autostart_under_GNOME.patch 2015-01-27 01:15:32 +0000
583+++ debian/patches/ubuntu_dont_autostart_under_GNOME.patch 1970-01-01 00:00:00 +0000
584@@ -1,26 +0,0 @@
585-From d6ffe34dc092926fb949449c182e8f27722b6b8b Mon Sep 17 00:00:00 2001
586-From: Dan Winship <danw@gnome.org>
587-Date: Mon, 29 Jul 2013 13:24:15 +0000
588-Subject: Update .desktop files
589-
590-Don't autostart nm-applet in GNOME any more.
591-
592-Update bugzilla info for new components
593-
594-https://bugzilla.gnome.org/show_bug.cgi?id=705074
595----
596-(limited to 'nm-applet.desktop.in')
597-
598----
599- nm-applet.desktop.in | 1 +
600- 1 file changed, 1 insertion(+)
601-
602-Index: b/nm-applet.desktop.in
603-===================================================================
604---- a/nm-applet.desktop.in
605-+++ b/nm-applet.desktop.in
606-@@ -11,3 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
607- X-GNOME-Bugzilla-Product=NetworkManager
608- X-GNOME-Bugzilla-Component=nm-applet
609- X-GNOME-UsesNotifications=true
610-+AutostartCondition=GNOME3 unless-session gnome
611
612=== modified file 'debian/rules'
613--- debian/rules 2015-12-16 16:48:50 +0000
614+++ debian/rules 2016-01-07 14:38:54 +0000
615@@ -7,6 +7,9 @@
616 %:
617 dh $@ --with autoreconf,translations,gir
618
619+override_dh_autoreconf:
620+ dh_autoreconf --as-needed
621+
622 override_dh_auto_configure:
623 dh_auto_configure -- \
624 --libexecdir=/usr/lib/NetworkManager \

Subscribers

People subscribed via source and target branches