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

Proposed by Łukasz Zemczak on 2015-11-30
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2015-12-02
Approved revision: 468
Merged at revision: 467
Proposed branch: lp:~sil2100/network-manager-applet/merge_1.0.6_debian
Merge into: lp:~network-manager/network-manager-applet/ubuntu
Diff against target: 2479 lines (+1173/-967)
16 files modified
debian/changelog (+252/-4)
debian/control (+60/-67)
debian/gbp.conf (+1/-0)
debian/gir1.2-nmgtk-1.0.install (+1/-1)
debian/libnm-gtk0.symbols (+9/-8)
debian/network-manager-gnome.README.Debian (+5/-0)
debian/network-manager-gnome.manpages (+0/-1)
debian/network-manager-gnome.postinst (+10/-0)
debian/nm-applet.sgml (+0/-100)
debian/patches/11-user-connections.patch (+0/-698)
debian/patches/Allow-to-create-connections-without-admin-privileges.patch (+683/-0)
debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch (+35/-0)
debian/patches/Force-online-state-with-unmanaged-devices.patch (+28/-0)
debian/patches/nm-applet-use-indicator.patch (+84/-83)
debian/patches/series (+3/-1)
debian/rules (+2/-4)
To merge this branch: bzr merge lp:~sil2100/network-manager-applet/merge_1.0.6_debian
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-11-30 Approve on 2015-12-02
Review via email: mp+279012@code.launchpad.net

Commit message

Propose a merge of 1.0.6 from Debian. Remove unneeded patches, modify changelog, carry over required changes.

Description of the change

Propose a merge of 1.0.6 from Debian. Remove unneeded patches, modify changelog, carry over required changes.

Example package built in a local PPA here:
https://launchpad.net/~sil2100/+archive/ubuntu/testing/+sourcepub/5731167/+listing-archive-extra

Compared .deb's with existing ones and contents look sane.

To post a comment you must log in.
468. By Łukasz Zemczak on 2015-12-01

Remove the 11-user-connections.patch patch as it's not applied anymore (it's merged from debian now)

Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good!

review: Approve
469. By Łukasz Zemczak on 2015-12-02

Remove one more file that's not used anymore - nm-applet.sgml.

Łukasz Zemczak (sil2100) wrote :

Sorry for the post-approve file removal. This file was not used anywhere and I didn't want to leave any leftovers. Thanks for the review, publishing in a moment!

470. By Łukasz Zemczak on 2015-12-02

One more file not needed.

471. By Łukasz Zemczak on 2015-12-02

Re-release.

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-10-07 09:23:09 +0000
3+++ debian/changelog 2015-12-02 15:57:13 +0000
4@@ -1,6 +1,67 @@
5-network-manager-applet (1.0.4-0ubuntu1) wily; urgency=medium
6-
7- * New upstream release
8+network-manager-applet (1.0.6-2ubuntu2) xenial; urgency=low
9+
10+ * Merge from Debian unstable. Remaining changes:
11+ - lp341684_device_sensitive_disconnect_notify.patch: show correct
12+ notification messages for disconnect events, to be in line with the other
13+ *connect*text patches.
14+ - lp460144_correctly_update_notification.patch: cleaner notification
15+ messages, and allow for messages to be updated instead of cleared.
16+ - applet-wifi-menu-before-vpn.patch: show Create New and Connect to Hidden
17+ wifi menu items with the other Wifi items, rather than separated by
18+ the VPN menus.
19+ - nm-applet-use-indicator.patch: patch to support showing nm-applet as an
20+ appindicator in Unity.
21+ - position_dialogs_to_center_of_the_screen.patch: position dialogs to the
22+ center of the screen.
23+ - make_menu_items_insensitive_based_on_permissions.patch,
24+ hide_policy_items_env_var.patch: provide a method to desensitize or hide
25+ menu items which are useless given the current policykit policy level of
26+ the user.
27+ - applet_adhoc_use_wpa_rsn_part1.patch: enable Ad-Hoc using WPA RSN.
28+ - lp1048516_dont_req_keyring_in_greeter.patch: don't try to load the
29+ keyring if the user has no permissions to edit their own connections.
30+ - lp1048520_delay_pin_dialog_in_greeter.patch: only ask for PIN entry when
31+ a connection is being established rather than when a modem is detected.
32+ - rebuild_menu_after_init.patch: force a rebuild of the menu to avoid it
33+ staying empty on login.
34+ - ubuntu_dont_autostart_under_GNOME.patch
35+ - hide_virtual_devices.patch: updated to no longer show
36+ - debian/rules: ship extra icons, use --enable-indicators, export
37+ translations for Launchpad and fail if any files are missing from
38+ .install files, or not being installed.
39+ - debian/control: Build-Depend on dh-translations, libappindicator3-dev,
40+ update package descriptions, add Breaks against gnome-bluetooth (<< 3.0).
41+
42+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Wed, 25 Nov 2015 17:05:02 +0100
43+
44+network-manager-applet (1.0.6-2) unstable; urgency=medium
45+
46+ * Fix crash in nm-connection-editor when importing existing VPN config.
47+ (Closes: #726935)
48+
49+ -- Michael Biebl <biebl@debian.org> Mon, 07 Sep 2015 06:26:02 +0200
50+
51+network-manager-applet (1.0.6-1) unstable; urgency=medium
52+
53+ * New upstream release.
54+ * Refresh patches.
55+ * Update symbols file, the symbols introduced in 1.0.4 now use symbol
56+ versioning.
57+
58+ -- Michael Biebl <biebl@debian.org> Fri, 28 Aug 2015 17:21:30 +0200
59+
60+network-manager-applet (1.0.4-1) unstable; urgency=medium
61+
62+ * New upstream release.
63+ * Make no-patch-numbers the default for gbp pq to avoid unnecessary noise.
64+ * Refresh patches.
65+ * Update symbols file for libnm-gtk0.
66+
67+ -- Michael Biebl <biebl@debian.org> Wed, 29 Jul 2015 01:08:38 +0200
68+
69+network-manager-applet (1.0.4-0ubuntu1) xenial; urgency=medium
70+
71+ * New upstream release (LP: #1467267)
72 * debian/control:
73 - Bump build-depends on libnm-util-dev, libnm-glib-dev, libnm-glib-vpn-dev,
74 network-manager-dev
75@@ -14,7 +75,39 @@
76 * debian/patches/nm-applet-fix-shell-version.patch:
77 - No longer applicable
78
79- -- Robert Ancell <robert.ancell@canonical.com> Wed, 07 Oct 2015 15:08:47 +1300
80+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 28 Oct 2015 09:02:20 +1300
81+
82+network-manager-applet (1.0.2-1) unstable; urgency=medium
83+
84+ * New upstream release.
85+ * Rebase patches.
86+
87+ -- Michael Biebl <biebl@debian.org> Tue, 05 May 2015 23:16:53 +0200
88+
89+network-manager-applet (1.0.0-3) unstable; urgency=medium
90+
91+ * Upload to unstable.
92+
93+ -- Michael Biebl <biebl@debian.org> Mon, 27 Apr 2015 16:43:02 +0200
94+
95+network-manager-applet (1.0.0-2) experimental; urgency=medium
96+
97+ * Install typelib files into multiarch paths now that gobject-introspection
98+ supports that.
99+ * Mark dev and gir packages as Multi-Arch: same.
100+
101+ -- Michael Biebl <biebl@debian.org> Mon, 09 Feb 2015 00:49:43 +0100
102+
103+network-manager-applet (1.0.0-1) experimental; urgency=medium
104+
105+ * New upstream release.
106+ * Rebase patches.
107+ * Bump dependency on network-manager and related dev packages to (>= 1.0.0).
108+ * Bump Standards-Version to 3.9.6. No further changes.
109+ * Update Vcs-Browser URL to use cgit and https.
110+ * Update Homepage URL to use https.
111+
112+ -- Michael Biebl <biebl@debian.org> Mon, 02 Feb 2015 13:40:08 +0100
113
114 network-manager-applet (0.9.10.1-0ubuntu7) wily; urgency=medium
115
116@@ -95,6 +188,80 @@
117
118 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 26 Jan 2015 23:08:58 -0500
119
120+network-manager-applet (0.9.10.0-2) unstable; urgency=medium
121+
122+ * Disable bluetooth support. The gnome-bluetooth plugin no longer builds
123+ with gnome-bluetooth 3.12. But this plugin is really only useful for DUN
124+ which with bluez 5 isn't supported (yet).
125+ PAN support should still be functional.
126+
127+ -- Michael Biebl <biebl@debian.org> Wed, 16 Jul 2014 01:31:23 +0200
128+
129+network-manager-applet (0.9.10.0-1) unstable; urgency=medium
130+
131+ * New upstream release.
132+ * Update Build-Depends as per configure.ac.
133+ * Drop obsolete --with-gtkver configure switch.
134+ * Refresh patches.
135+ * Update symbols file. A few deprecated symbols were dropped which were used
136+ in older versions of network-manager-gnome, so add a versioned Breaks.
137+ * Exclude libtool .la files and static libraries from list-missing.
138+
139+ -- Michael Biebl <biebl@debian.org> Thu, 10 Jul 2014 07:32:44 +0200
140+
141+network-manager-applet (0.9.8.10-1) unstable; urgency=medium
142+
143+ * New upstream release.
144+ * Update patches.
145+ * Tighten Build-Depends on libgnome-bluetooth-dev to (<< 3.11.0).
146+ The bluetooth widget no longer builds with newer gnome-bluetooth since the
147+ plugin API was removed.
148+
149+ -- Michael Biebl <biebl@debian.org> Thu, 01 May 2014 14:22:42 +0200
150+
151+network-manager-applet (0.9.8.8-5) unstable; urgency=medium
152+
153+ * Use valid paths when loading the org.gnome.nm-applet.eap schema.
154+ We were missing a trailing '/'. Newer glib versions validate the path more
155+ strictly, leading to an assert.
156+
157+ -- Michael Biebl <biebl@debian.org> Fri, 04 Apr 2014 17:51:38 +0200
158+
159+network-manager-applet (0.9.8.8-4) unstable; urgency=medium
160+
161+ * Drop dbus reload from postinst. The dbus package uses a file trigger
162+ nowadays to automatically reload its configuration.
163+ * Use the paths specified in the VPN .name files.
164+ Since LIBDIR of nm-applet and the VPN plugins aren't necessarily the
165+ same, use the paths as specified by the VPN plugins and only
166+ reconstruct the path if it is not absolute or we fail to load the plugin.
167+
168+ -- Michael Biebl <biebl@debian.org> Tue, 01 Apr 2014 21:41:36 +0200
169+
170+network-manager-applet (0.9.8.8-3) unstable; urgency=medium
171+
172+ * Bump debhelper compatibility level to 9.
173+ * Determine gnome-bluetooth plugin directory using libdir from
174+ gnome-bluetooth-1.0.pc.
175+ * Convert to multi-arch. Mark libnm-gtk0 as M-A: same, libnm-gtk-common as
176+ M-A: foreign.
177+ * Rely on dh v9 to set flags from dpkg-buildflags.
178+
179+ -- Michael Biebl <biebl@debian.org> Tue, 01 Apr 2014 16:23:05 +0200
180+
181+network-manager-applet (0.9.8.8-2) unstable; urgency=medium
182+
183+ * Enable ModemManager1 interface support. (Closes: #711968)
184+
185+ -- Michael Biebl <biebl@debian.org> Thu, 27 Mar 2014 16:50:18 +0100
186+
187+network-manager-applet (0.9.8.8-1) unstable; urgency=medium
188+
189+ * New upstream release.
190+ * Bump Standards-Version to 3.9.5.
191+
192+ -- Michael Biebl <biebl@debian.org> Tue, 18 Mar 2014 11:17:48 +0100
193+
194 network-manager-applet (0.9.8.8-0ubuntu9) vivid; urgency=medium
195
196 * Switch gnome-icon-theme to adwaita-icon-theme, which is its
197@@ -513,6 +680,16 @@
198
199 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 19 Nov 2012 14:46:29 -0500
200
201+network-manager-applet (0.9.6.2-1) experimental; urgency=low
202+
203+ * New upstream release.
204+ * Bump Build-Depends on libnm-*-dev and network-manager-dev to (>= 0.9.6).
205+ * Bump Depends on network-manager to (>= 0.9.6).
206+ * debian/patches/01-fix-crash-in-migration-wizard.patch: Removed, merged
207+ upstream.
208+
209+ -- Michael Biebl <biebl@debian.org> Tue, 11 Sep 2012 23:06:31 +0200
210+
211 network-manager-applet (0.9.6.2-0ubuntu6) quantal; urgency=low
212
213 * debian/patches/git_indicate_hspa+_lte_tech_dbe3b12.patch: add indications
214@@ -2140,6 +2317,75 @@
215
216 -- Alexander Sack <asac@ubuntu.com> Tue, 17 Feb 2009 16:06:09 +0100
217
218+network-manager-applet (0.7.0-2) experimental; urgency=low
219+
220+ * debian/patches/01-dbus_access_nm_applet.patch
221+ - Remove bare send_interface directives to avoid non-deterministic allow
222+ messages with no interface. (Closes: #510728)
223+ - Do not allow unpriviledged processes to ask for a users' connections.
224+ - Allow introspection by default.
225+ * debian/control
226+ - Wrap build dependencies.
227+ - Bump build dependency on debhelper to (>= 7).
228+ * debian/compat
229+ - Bump to debhelper v7 compat mode.
230+
231+ -- Michael Biebl <biebl@debian.org> Sat, 14 Feb 2009 16:16:35 +0100
232+
233+network-manager-applet (0.7.0-1) experimental; urgency=low
234+
235+ * New upstream release.
236+ - Notification popups can be disabled. (Closes: #446963)
237+ - Notification applet correctly handles panel restarts. (Closes:# 458332)
238+ - The nm-editor tool has been replaced by nm-connection-editor.
239+ (Closes: #494148, #482107, #485651)
240+ - Show the correct configuration for WPA Enterprise setups in
241+ nm-connection-editor (Closes: #480039)
242+
243+ [ Sjoerd Simons ]
244+ * debian/patches/02-nm-api-update.patch:
245+ - Removed. Fixed upstream
246+ * debian/control: Tighten build-depends on nm related libraries
247+
248+ [ Michael Biebl ]
249+ * debian/copyright
250+ - More updates to the copyright file. The polkit-helper bits are licensed
251+ under the LGPL.
252+ * debian/control
253+ - Add network-manager-pptp-gnome to Suggests.
254+
255+ -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 06:50:06 +0100
256+
257+network-manager-applet (0.7.0~svn953-1) experimental; urgency=low
258+
259+ [ Michael Biebl ]
260+ * Switch to quilt patch management system.
261+ * debian/rules
262+ - Set libexecdir to /usr/lib/NetworkManager, so nm-applet and
263+ nm-connection-editor automatically find the VPN GUI plugins.
264+ * debian/control:
265+ - Bump Standards-Version to 3.8.0. No further changes.
266+ - Demote Recommends on VPN plugins to Suggests.
267+ - Bump Depends on network-manager to (>= 0.7).
268+ - Add Build-Depends on libpolkit-gnome-dev.
269+ - Add Recommends on policykit-gnome. This package is required if you want
270+ to manage system connections.
271+ * debian/patches/01-dbus_access_nm_applet.patch: Updated
272+ * Removed obsolete patches:
273+ - debian/patches/02-hal_deprecated_keys.patch
274+ - debian/patches/03-nm_editor_category.patch
275+ * debian/copyright: Revised for the latest changes.
276+
277+ [ Simon McVittie ]
278+ * Newer svn snapshot
279+
280+ [ Sjoerd Simons ]
281+ * debian/patches/02-nm-api-udate.patch
282+ - Added. cope with a small NM 0.7 api change
283+ * debian/control: Build-Depend on nm-glib dev packages with new api
284+
285+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 18 Oct 2008 21:40:05 +0100
286+
287 network-manager-applet (0.7-0ubuntu2) jaunty; urgency=low
288
289 * fix LP: #295788 - Network Configuration menu item should also be
290@@ -2520,6 +2766,7 @@
291 * Add debian/watch to track new upstream releases.
292
293 -- Michael Biebl <biebl@debian.org> Mon, 27 Aug 2007 08:03:06 +0200
294+
295 network-manager-applet (0.6.5-0ubuntu11) hardy; urgency=low
296
297 * apply patch to drop gnome-runtime dependencies (LP: #136945) - patch by Jani
298@@ -2638,3 +2885,4 @@
299 to network-manager package due to bad source splitting
300
301 -- Anthony Mercatante <tonio@ubuntu.com> Fri, 15 Jun 2007 12:46:22 +0200
302+
303
304=== modified file 'debian/control'
305--- debian/control 2015-10-07 03:56:07 +0000
306+++ debian/control 2015-12-02 15:57:13 +0000
307@@ -4,59 +4,53 @@
308 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
309 XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
310 Uploaders: Michael Biebl <biebl@debian.org>
311-Build-Depends:
312- debhelper (>= 9),
313- autotools-dev,
314- dh-autoreconf,
315- gnome-common,
316- intltool,
317- docbook-to-man,
318- libdbus-glib-1-dev (>= 0.74),
319- libgnome-keyring-dev,
320- libsecret-1-dev,
321- libgtk-3-dev (>= 3.4),
322- libglib2.0-dev (>= 2.32),
323- libgconf2-dev,
324- libnotify-dev (>= 0.7),
325- libnm-util-dev (>= 1.0.0),
326- libnm-glib-dev (>= 1.0.0),
327- libnm-glib-vpn-dev (>= 1.0.0),
328- network-manager-dev (>= 1.0.0),
329- libmm-glib-dev,
330- libgudev-1.0-dev (>= 147),
331- iso-codes,
332- libgirepository1.0-dev,
333- dh-translations,
334- libappindicator3-dev,
335- gobject-introspection
336-Standards-Version: 3.9.5
337+Build-Depends: debhelper (>= 9),
338+ autotools-dev,
339+ dh-autoreconf,
340+ gnome-common,
341+ intltool,
342+ libdbus-glib-1-dev (>= 0.74),
343+ libgnome-keyring-dev,
344+ libsecret-1-dev,
345+ libgtk-3-dev (>= 3.4),
346+ libglib2.0-dev (>= 2.32),
347+ libgconf2-dev,
348+ libnotify-dev (>= 0.7),
349+ libnm-util-dev (>= 1.0.0),
350+ libnm-glib-dev (>= 1.0.0),
351+ libnm-glib-vpn-dev (>= 1.0.0),
352+ network-manager-dev (>= 1.0.0),
353+ libmm-glib-dev,
354+ libgudev-1.0-dev (>= 147),
355+ iso-codes,
356+ libgirepository1.0-dev,
357+ dh-translations,
358+ libappindicator3-dev,
359+ gobject-introspection
360+Standards-Version: 3.9.6
361 Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager-applet/ubuntu
362-Homepage: http://www.gnome.org/projects/NetworkManager/
363+Homepage: https://www.gnome.org/projects/NetworkManager/
364
365 Package: network-manager-gnome
366 Architecture: linux-any
367 Section: gnome
368 Pre-Depends: ${misc:Pre-Depends}
369-Depends:
370- ${shlibs:Depends},
371- ${misc:Depends},
372- libnm-gtk0 (= ${binary:Version}),
373- network-manager (>= 0.9.10),
374- policykit-1-gnome,
375- adwaita-icon-theme,
376- dbus-x11
377-Recommends:
378- notification-daemon,
379- gnome-keyring,
380- mobile-broadband-provider-info,
381- iso-codes
382-Suggests:
383- network-manager-openconnect-gnome,
384- network-manager-openvpn-gnome,
385- network-manager-vpnc-gnome,
386- network-manager-pptp-gnome
387-Breaks:
388- gnome-bluetooth (<< 3.0)
389+Depends: ${shlibs:Depends},
390+ ${misc:Depends},
391+ libnm-gtk0 (= ${binary:Version}),
392+ network-manager (>= 1.0.0),
393+ policykit-1-gnome,
394+ gnome-icon-theme,
395+ dbus-x11
396+Recommends: notification-daemon,
397+ gnome-keyring,
398+ mobile-broadband-provider-info,
399+ iso-codes
400+Suggests: network-manager-openconnect-gnome,
401+ network-manager-openvpn-gnome,
402+ network-manager-vpnc-gnome,
403+ network-manager-pptp-gnome
404+Breaks: gnome-bluetooth (<< 3.0)
405 Description: network management framework (GNOME frontend)
406 NetworkManager is a system network service that manages your network devices
407 and connections, attempting to keep active network connectivity when
408@@ -75,10 +69,10 @@
409 Architecture: linux-any
410 Multi-Arch: same
411 Section: libs
412-Depends:
413- ${shlibs:Depends},
414- ${misc:Depends},
415- libnm-gtk-common (= ${source:Version})
416+Pre-Depends: ${misc:Pre-Depends}
417+Depends: ${shlibs:Depends},
418+ ${misc:Depends},
419+ libnm-gtk-common (= ${source:Version})
420 Breaks: network-manager-gnome (<< 0.9.10.0)
421 Description: network management framework (GNOME dialogs for wifi and mobile)
422 NetworkManager is a system network service that manages your network devices
423@@ -93,8 +87,7 @@
424 Architecture: all
425 Multi-Arch: foreign
426 Section: libs
427-Depends:
428- ${misc:Depends}
429+Depends: ${misc:Depends}
430 Description: network management framework (common files for wifi and mobile)
431 NetworkManager is a system network service that manages your network devices
432 and connections, attempting to keep active network connectivity when
433@@ -106,17 +99,17 @@
434
435 Package: libnm-gtk-dev
436 Architecture: linux-any
437+Multi-Arch: same
438 Section: libdevel
439-Depends:
440- ${shlibs:Depends},
441- ${misc:Depends},
442- libnm-gtk0 (= ${binary:Version}),
443- gir1.2-nmgtk-1.0 (= ${binary:Version}),
444- network-manager-dev (>= 0.9),
445- libnm-util-dev (>= 0.9),
446- libnm-glib-dev (>= 0.9),
447- libgtk-3-dev,
448- libdbus-glib-1-dev
449+Depends: ${shlibs:Depends},
450+ ${misc:Depends},
451+ libnm-gtk0 (= ${binary:Version}),
452+ gir1.2-nmgtk-1.0 (= ${binary:Version}),
453+ network-manager-dev (>= 1.0.0),
454+ libnm-util-dev (>= 1.0.0),
455+ libnm-glib-dev (>= 1.0.0),
456+ libgtk-3-dev,
457+ libdbus-glib-1-dev
458 Description: network management framework (dialogs development libraries)
459 NetworkManager is a system network service that manages your network devices
460 and connections, attempting to keep active network connectivity when
461@@ -130,10 +123,10 @@
462 Package: gir1.2-nmgtk-1.0
463 Section: introspection
464 Architecture: linux-any
465-Depends:
466- ${gir:Depends},
467- ${shlibs:Depends},
468- ${misc:Depends}
469+Multi-Arch: same
470+Depends: ${gir:Depends},
471+ ${shlibs:Depends},
472+ ${misc:Depends}
473 Description: GObject introspection data for libnm-gtk
474 NetworkManager is a system network service that manages your network devices
475 and connections, attempting to keep active network connectivity when
476
477=== modified file 'debian/gbp.conf'
478--- debian/gbp.conf 2014-01-07 03:29:35 +0000
479+++ debian/gbp.conf 2015-12-02 15:57:13 +0000
480@@ -1,3 +1,4 @@
481 [DEFAULT]
482 pristine-tar = True
483+patch-numbers = False
484 debian-branch = master
485
486=== modified file 'debian/gir1.2-nmgtk-1.0.install'
487--- debian/gir1.2-nmgtk-1.0.install 2015-01-27 01:15:32 +0000
488+++ debian/gir1.2-nmgtk-1.0.install 2015-12-02 15:57:13 +0000
489@@ -1,1 +1,1 @@
490-usr/lib/*/girepository-1.0/ usr/lib/
491+usr/lib/*/girepository-1.0/
492
493=== modified file 'debian/libnm-gtk0.symbols'
494--- debian/libnm-gtk0.symbols 2015-10-07 09:23:09 +0000
495+++ debian/libnm-gtk0.symbols 2015-12-02 15:57:13 +0000
496@@ -1,4 +1,5 @@
497 libnm-gtk.so.0 libnm-gtk0 #MINVER#
498+ libnm_gtk_1_0_6@libnm_gtk_1_0_6 1.0.6
499 nma_country_info_get_country_code@Base 0.9.7.995
500 nma_country_info_get_country_name@Base 0.9.7.995
501 nma_country_info_get_providers@Base 0.9.7.995
502@@ -42,15 +43,15 @@
503 nma_utils_get_device_product@Base 0.9.7.995
504 nma_utils_get_device_type_name@Base 0.9.7.995
505 nma_utils_get_device_vendor@Base 0.9.7.995
506- nma_utils_menu_to_secret_flags@Base 1.0.4
507- nma_utils_setup_password_storage@Base 1.0.4
508- nma_utils_update_password_storage@Base 1.0.4
509+ nma_utils_menu_to_secret_flags@libnm_gtk_1_0_6 1.0.6
510+ nma_utils_setup_password_storage@libnm_gtk_1_0_6 1.0.6
511+ nma_utils_update_password_storage@libnm_gtk_1_0_6 1.0.6
512 nma_vpn_password_dialog_focus_password@Base 0.9.10.0
513 nma_vpn_password_dialog_focus_password_secondary@Base 0.9.10.0
514- nma_vpn_password_dialog_focus_password_ternary@Base 1.0.4
515+ nma_vpn_password_dialog_focus_password_ternary@libnm_gtk_1_0_6 1.0.6
516 nma_vpn_password_dialog_get_password@Base 0.9.10.0
517 nma_vpn_password_dialog_get_password_secondary@Base 0.9.10.0
518- nma_vpn_password_dialog_get_password_ternary@Base 1.0.4
519+ nma_vpn_password_dialog_get_password_ternary@libnm_gtk_1_0_6 1.0.6
520 nma_vpn_password_dialog_get_type@Base 0.9.10.0
521 nma_vpn_password_dialog_new@Base 0.9.10.0
522 nma_vpn_password_dialog_run_and_block@Base 0.9.10.0
523@@ -58,11 +59,11 @@
524 nma_vpn_password_dialog_set_password_label@Base 0.9.10.0
525 nma_vpn_password_dialog_set_password_secondary@Base 0.9.10.0
526 nma_vpn_password_dialog_set_password_secondary_label@Base 0.9.10.0
527- nma_vpn_password_dialog_set_password_ternary@Base 1.0.4
528- nma_vpn_password_dialog_set_password_ternary_label@Base 1.0.4
529+ nma_vpn_password_dialog_set_password_ternary@libnm_gtk_1_0_6 1.0.6
530+ nma_vpn_password_dialog_set_password_ternary_label@libnm_gtk_1_0_6 1.0.6
531 nma_vpn_password_dialog_set_show_password@Base 0.9.10.0
532 nma_vpn_password_dialog_set_show_password_secondary@Base 0.9.10.0
533- nma_vpn_password_dialog_set_show_password_ternary@Base 1.0.4
534+ nma_vpn_password_dialog_set_show_password_ternary@libnm_gtk_1_0_6 1.0.6
535 nma_wifi_dialog_get_connection@Base 0.9.6.4
536 nma_wifi_dialog_get_nag_ignored@Base 0.9.6.4
537 nma_wifi_dialog_get_type@Base 0.9.6.4
538
539=== modified file 'debian/network-manager-gnome.README.Debian'
540--- debian/network-manager-gnome.README.Debian 2011-05-05 20:36:27 +0000
541+++ debian/network-manager-gnome.README.Debian 2015-12-02 15:57:13 +0000
542@@ -1,6 +1,11 @@
543 network-manager-gnome provides a Notification Area applet called nm-applet for
544 conveniently choosing wired and wireless networks in GNOME, KDE and XFCE.
545
546+network-manager-gnome (by virtue of the fact it uses network-manager)
547+requires users to be in the group 'netdev' for it to work. If users aren't
548+in the group 'netdev' then it won't automatically appear, and work, in the
549+Notification Area.
550+
551 network-manager-gnome uses network-manager. Please see the
552 network-mananger documentation in
553 /usr/share/doc/network-manager/README.Debian for further information.
554
555=== removed file 'debian/network-manager-gnome.manpages'
556--- debian/network-manager-gnome.manpages 2011-05-05 20:40:26 +0000
557+++ debian/network-manager-gnome.manpages 1970-01-01 00:00:00 +0000
558@@ -1,1 +0,0 @@
559-debian/nm-applet.1
560
561=== added file 'debian/network-manager-gnome.postinst'
562--- debian/network-manager-gnome.postinst 1970-01-01 00:00:00 +0000
563+++ debian/network-manager-gnome.postinst 2015-12-02 15:57:13 +0000
564@@ -0,0 +1,10 @@
565+#!/bin/sh
566+
567+set -e
568+
569+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 0.9.0-2 ; then
570+ [ -x /usr/share/update-notifier/notify-reboot-required ] && \
571+ /usr/share/update-notifier/notify-reboot-required || true
572+fi
573+
574+#DEBHELPER#
575
576=== removed file 'debian/nm-applet.sgml'
577--- debian/nm-applet.sgml 2011-05-05 20:40:26 +0000
578+++ debian/nm-applet.sgml 1970-01-01 00:00:00 +0000
579@@ -1,100 +0,0 @@
580-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
581-
582-<!-- Process this file with docbook-to-man to generate an nroff manual
583- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
584- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
585- less'. A typical entry in a Makefile or Makefile.am is:
586-
587-manpage.1: manpage.sgml
588- docbook-to-man $< > $@
589-
590-
591- The docbook-to-man binary is found in the docbook-to-man package.
592- Please remember that if you create the nroff version in one of the
593- debian/rules file targets (such as build), you will need to include
594- docbook-to-man in your Build-Depends control field.
595-
596- -->
597-
598- <!-- Please adjust the date whenever revising the manpage. -->
599- <!ENTITY date "<date>8 February, 2006</date>">
600- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
601- allowed: see man(7), man(1). -->
602- <!ENTITY package "nm-applet">
603- <!ENTITY gnu "<acronym>GNU</acronym>">
604- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
605-]>
606-
607-<refentry>
608- <refentryinfo>
609- <address>
610- <email>giskard@autistici.org</email>;
611- </address>
612- <author>
613- <firstname>Riccardo</firstname>
614- <surname>Setti</surname>
615- </author>
616- <copyright>
617- <year>2006</year>
618- <holder>Riccardo Setti</holder>
619- </copyright>
620- &date;
621- </refentryinfo>
622- <refmeta>
623- <refentrytitle>nm-applet</refentrytitle>
624- <manvolnum>1</manvolnum>
625- </refmeta>
626- <refnamediv>
627- <refname>&package;</refname>
628-
629- <refpurpose>Network management framework</refpurpose>
630- </refnamediv>
631- <refsynopsisdiv>
632- <cmdsynopsis>
633- <command>&package;</command>
634- </cmdsynopsis>
635- </refsynopsisdiv>
636- <refsect1>
637- <title>DESCRIPTION</title>
638-
639- <para><command>&package;</command> is the GNOME front-end for NetworkManager</para>
640- <para>It is a systray applet which will display an icon in GNOME's notification area but it
641- also works for other desktop environments which provide a systray like KDE or XFCE.</para>
642- <para><command>&package;</command> shows a list of available networks and allows you to easily switch between them. For encrypted networks it
643- will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to
644- type them again.</para>
645- </refsect1>
646- <refsect1>
647- <title>SEE ALSO</title>
648-
649- <para>NetworkManager(8), nm-tool(1)</para>
650-
651- <para>More Information about NetworkManager can be found at
652- http://www.gnome.org/projects/NetworkManager/ .</para>
653- </refsect1>
654- <refsect1>
655- <title>AUTHOR</title>
656-
657- <para>This manual page was written by Riccardo Setti <email>giskard@autistici.org</email> for
658- the <productname>Debian</productname> system.
659- </para>
660-
661- </refsect1>
662-</refentry>
663-
664-<!-- Keep this comment at the end of the file
665-Local variables:
666-mode: sgml
667-sgml-omittag:t
668-sgml-shorttag:t
669-sgml-minimize-attributes:nil
670-sgml-always-quote-attributes:t
671-sgml-indent-step:2
672-sgml-indent-data:t
673-sgml-parent-document:nil
674-sgml-default-dtd-file:nil
675-sgml-exposed-tags:nil
676-sgml-local-catalogs:nil
677-sgml-local-ecat-files:nil
678-End:
679--->
680
681=== removed file 'debian/patches/11-user-connections.patch'
682--- debian/patches/11-user-connections.patch 2015-10-07 09:18:50 +0000
683+++ debian/patches/11-user-connections.patch 1970-01-01 00:00:00 +0000
684@@ -1,698 +0,0 @@
685-From: Josselin Mouette <joss@debian.org>
686-Subject: Set passwords as agent-owned when they need to, to allow users
687- without modify.system permissions to easily configure their connections.
688-Last-Update: 2014-03-18
689-
690----
691- src/applet-device-wifi.c | 25 +++++++++++++++++++++++++
692- src/connection-editor/ce-page.h | 1 +
693- src/connection-editor/new-connection.c | 2 ++
694- src/connection-editor/page-bond.c | 1 +
695- src/connection-editor/page-bond.h | 1 +
696- src/connection-editor/page-bridge.c | 1 +
697- src/connection-editor/page-bridge.h | 1 +
698- src/connection-editor/page-dsl.c | 1 +
699- src/connection-editor/page-dsl.h | 1 +
700- src/connection-editor/page-ethernet.c | 1 +
701- src/connection-editor/page-ethernet.h | 1 +
702- src/connection-editor/page-infiniband.c | 1 +
703- src/connection-editor/page-infiniband.h | 1 +
704- src/connection-editor/page-mobile.c | 11 +++++++++++
705- src/connection-editor/page-mobile.h | 1 +
706- src/connection-editor/page-vlan.c | 1 +
707- src/connection-editor/page-vlan.h | 1 +
708- src/connection-editor/page-vpn.c | 11 +++++++++++
709- src/connection-editor/page-vpn.h | 2 ++
710- src/connection-editor/page-wifi.c | 14 ++++++++++++++
711- src/connection-editor/page-wifi.h | 1 +
712- src/connection-editor/page-wimax.c | 1 +
713- src/connection-editor/page-wimax.h | 1 +
714- src/gnome-bluetooth/nma-bt-device.c | 5 +++++
715- src/libnm-gtk/nm-wifi-dialog.c | 4 ++++
716- src/mobile-helpers.c | 3 +++
717- src/utils/utils.c | 7 +++++++
718- src/utils/utils.h | 3 +++
719- src/wireless-security/ws-wep-key.c | 7 +++++++
720- src/wireless-security/ws-wpa-psk.c | 5 +++++
721- 30 files changed, 116 insertions(+)
722-
723-Index: network-manager-applet-1.0.4/src/applet-device-wifi.c
724-===================================================================
725---- network-manager-applet-1.0.4.orig/src/applet-device-wifi.c
726-+++ network-manager-applet-1.0.4/src/applet-device-wifi.c
727-@@ -559,6 +559,7 @@ _do_new_auto_connection (NMApplet *apple
728- NMSettingWirelessSecurity *s_wsec = NULL;
729- NMSetting8021x *s_8021x = NULL;
730- const GByteArray *ssid;
731-+ NM80211ApFlags flags;
732- NM80211ApSecurityFlags wpa_flags, rsn_flags;
733- GtkWidget *dialog;
734- MoreInfo *more_info;
735-@@ -590,6 +591,7 @@ _do_new_auto_connection (NMApplet *apple
736- /* If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x
737- * setting and ask the user for more information.
738- */
739-+ flags = nm_access_point_get_flags (ap);
740- rsn_flags = nm_access_point_get_rsn_flags (ap);
741- wpa_flags = nm_access_point_get_wpa_flags (ap);
742- if ( (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
743-@@ -618,6 +620,29 @@ _do_new_auto_connection (NMApplet *apple
744- nm_connection_add_setting (connection, NM_SETTING (s_8021x));
745- }
746-
747-+ if (utils_default_to_private_connection (applet->nm_client)) {
748-+ if (!s_con) {
749-+ s_con = (NMSettingConnection *) nm_setting_connection_new ();
750-+ nm_connection_add_setting (connection, NM_SETTING (s_con));
751-+ }
752-+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
753-+
754-+ if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) ||
755-+ (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
756-+ if (!s_wsec) {
757-+ s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
758-+ nm_connection_add_setting (connection, NM_SETTING (s_wsec));
759-+ }
760-+ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
761-+ } else if (flags & NM_802_11_AP_FLAGS_PRIVACY) {
762-+ if (!s_wsec) {
763-+ s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
764-+ nm_connection_add_setting (connection, NM_SETTING (s_wsec));
765-+ }
766-+ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
767-+ }
768-+ }
769-+
770- /* If it's an 802.1x connection, we need more information, so pop up the
771- * Dialog Of Doom.
772- */
773-Index: network-manager-applet-1.0.4/src/connection-editor/ce-page.h
774-===================================================================
775---- network-manager-applet-1.0.4.orig/src/connection-editor/ce-page.h
776-+++ network-manager-applet-1.0.4/src/connection-editor/ce-page.h
777-@@ -48,6 +48,7 @@ typedef void (*PageNewConnectionFunc) (G
778- const char *detail,
779- NMRemoteSettings *settings,
780- PageNewConnectionResultFunc result_func,
781-+ NMClient *client,
782- gpointer user_data);
783-
784- #define CE_TYPE_PAGE (ce_page_get_type ())
785-Index: network-manager-applet-1.0.4/src/connection-editor/page-bond.c
786-===================================================================
787---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bond.c
788-+++ network-manager-applet-1.0.4/src/connection-editor/page-bond.c
789-@@ -611,6 +611,7 @@ bond_connection_new (GtkWindow *parent,
790- const char *detail,
791- NMRemoteSettings *settings,
792- PageNewConnectionResultFunc result_func,
793-+ NMClient *client,
794- gpointer user_data)
795- {
796- NMConnection *connection;
797-Index: network-manager-applet-1.0.4/src/connection-editor/page-bond.h
798-===================================================================
799---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bond.h
800-+++ network-manager-applet-1.0.4/src/connection-editor/page-bond.h
801-@@ -56,6 +56,7 @@ void bond_connection_new (GtkWindow *par
802- const char *detail,
803- NMRemoteSettings *settings,
804- PageNewConnectionResultFunc result_func,
805-+ NMClient *client,
806- gpointer user_data);
807-
808- #endif /* __PAGE_BOND_H__ */
809-Index: network-manager-applet-1.0.4/src/connection-editor/page-bridge.c
810-===================================================================
811---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bridge.c
812-+++ network-manager-applet-1.0.4/src/connection-editor/page-bridge.c
813-@@ -294,6 +294,7 @@ bridge_connection_new (GtkWindow *parent
814- const char *detail,
815- NMRemoteSettings *settings,
816- PageNewConnectionResultFunc result_func,
817-+ NMClient *client,
818- gpointer user_data)
819- {
820- NMConnection *connection;
821-Index: network-manager-applet-1.0.4/src/connection-editor/page-bridge.h
822-===================================================================
823---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bridge.h
824-+++ network-manager-applet-1.0.4/src/connection-editor/page-bridge.h
825-@@ -56,6 +56,7 @@ void bridge_connection_new (GtkWindow *p
826- const char *detail,
827- NMRemoteSettings *settings,
828- PageNewConnectionResultFunc result_func,
829-+ NMClient *client,
830- gpointer user_data);
831-
832- #endif /* __PAGE_BRIDGE_H__ */
833-Index: network-manager-applet-1.0.4/src/connection-editor/page-dsl.c
834-===================================================================
835---- network-manager-applet-1.0.4.orig/src/connection-editor/page-dsl.c
836-+++ network-manager-applet-1.0.4/src/connection-editor/page-dsl.c
837-@@ -221,6 +221,7 @@ dsl_connection_new (GtkWindow *parent,
838- const char *detail,
839- NMRemoteSettings *settings,
840- PageNewConnectionResultFunc result_func,
841-+ NMClient *client,
842- gpointer user_data)
843- {
844- NMConnection *connection;
845-Index: network-manager-applet-1.0.4/src/connection-editor/page-dsl.h
846-===================================================================
847---- network-manager-applet-1.0.4.orig/src/connection-editor/page-dsl.h
848-+++ network-manager-applet-1.0.4/src/connection-editor/page-dsl.h
849-@@ -58,6 +58,7 @@ void dsl_connection_new (GtkWindow *pare
850- const char *detail,
851- NMRemoteSettings *settings,
852- PageNewConnectionResultFunc callback,
853-+ NMClient *client,
854- gpointer user_data);
855-
856- #endif /* __PAGE_DSL_H__ */
857-Index: network-manager-applet-1.0.4/src/connection-editor/page-ethernet.c
858-===================================================================
859---- network-manager-applet-1.0.4.orig/src/connection-editor/page-ethernet.c
860-+++ network-manager-applet-1.0.4/src/connection-editor/page-ethernet.c
861-@@ -377,6 +377,7 @@ ethernet_connection_new (GtkWindow *pare
862- const char *detail,
863- NMRemoteSettings *settings,
864- PageNewConnectionResultFunc result_func,
865-+ NMClient *client,
866- gpointer user_data)
867- {
868- NMConnection *connection;
869-Index: network-manager-applet-1.0.4/src/connection-editor/page-ethernet.h
870-===================================================================
871---- network-manager-applet-1.0.4.orig/src/connection-editor/page-ethernet.h
872-+++ network-manager-applet-1.0.4/src/connection-editor/page-ethernet.h
873-@@ -58,6 +58,7 @@ void ethernet_connection_new (GtkWindow
874- const char *detail,
875- NMRemoteSettings *settings,
876- PageNewConnectionResultFunc result_func,
877-+ NMClient *client,
878- gpointer user_data);
879-
880- #endif /* __PAGE_ETHERNET_H__ */
881-Index: network-manager-applet-1.0.4/src/connection-editor/page-infiniband.c
882-===================================================================
883---- network-manager-applet-1.0.4.orig/src/connection-editor/page-infiniband.c
884-+++ network-manager-applet-1.0.4/src/connection-editor/page-infiniband.c
885-@@ -253,6 +253,7 @@ infiniband_connection_new (GtkWindow *pa
886- const char *detail,
887- NMRemoteSettings *settings,
888- PageNewConnectionResultFunc result_func,
889-+ NMClient *client,
890- gpointer user_data)
891- {
892- NMConnection *connection;
893-Index: network-manager-applet-1.0.4/src/connection-editor/page-infiniband.h
894-===================================================================
895---- network-manager-applet-1.0.4.orig/src/connection-editor/page-infiniband.h
896-+++ network-manager-applet-1.0.4/src/connection-editor/page-infiniband.h
897-@@ -56,6 +56,7 @@ void infiniband_connection_new (GtkWindo
898- const char *detail,
899- NMRemoteSettings *settings,
900- PageNewConnectionResultFunc result_func,
901-+ NMClient *client,
902- gpointer user_data);
903-
904- #endif /* __PAGE_INFINIBAND_H__ */
905-Index: network-manager-applet-1.0.4/src/connection-editor/page-mobile.c
906-===================================================================
907---- network-manager-applet-1.0.4.orig/src/connection-editor/page-mobile.c
908-+++ network-manager-applet-1.0.4/src/connection-editor/page-mobile.c
909-@@ -452,6 +452,7 @@ new_connection_mobile_wizard_done (NMAMo
910- NMConnection *connection = NULL;
911-
912- if (!canceled && method) {
913-+ NMSettingConnection *s_con;
914- NMSetting *type_setting;
915- const char *ctype = NULL;
916- char *detail = NULL;
917-@@ -465,6 +466,7 @@ new_connection_mobile_wizard_done (NMAMo
918- NM_SETTING_GSM_NUMBER, "*99#",
919- NM_SETTING_GSM_USERNAME, method->username,
920- NM_SETTING_GSM_PASSWORD, method->password,
921-+ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
922- NM_SETTING_GSM_APN, method->gsm_apn,
923- NULL);
924- break;
925-@@ -476,6 +478,7 @@ new_connection_mobile_wizard_done (NMAMo
926- NM_SETTING_CDMA_NUMBER, "#777",
927- NM_SETTING_GSM_USERNAME, method->username,
928- NM_SETTING_GSM_PASSWORD, method->password,
929-+ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
930- NULL);
931- break;
932- default:
933-@@ -490,6 +493,13 @@ new_connection_mobile_wizard_done (NMAMo
934- connection = ce_page_new_connection (detail, ctype, FALSE, info->settings, info->user_data);
935- g_free (detail);
936-
937-+ s_con = nm_connection_get_setting_connection (connection);
938-+ if (!s_con) {
939-+ s_con = (NMSettingConnection *) nm_setting_connection_new ();
940-+ nm_connection_add_setting (connection, NM_SETTING (s_con));
941-+ }
942-+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
943-+
944- nm_connection_add_setting (connection, type_setting);
945- nm_connection_add_setting (connection, nm_setting_ppp_new ());
946- }
947-@@ -514,6 +524,7 @@ mobile_connection_new (GtkWindow *parent
948- const char *detail,
949- NMRemoteSettings *settings,
950- PageNewConnectionResultFunc result_func,
951-+ NMClient *client,
952- gpointer user_data)
953- {
954- NMAMobileWizard *wizard;
955-Index: network-manager-applet-1.0.4/src/connection-editor/page-mobile.h
956-===================================================================
957---- network-manager-applet-1.0.4.orig/src/connection-editor/page-mobile.h
958-+++ network-manager-applet-1.0.4/src/connection-editor/page-mobile.h
959-@@ -58,6 +58,7 @@ void mobile_connection_new (GtkWindow *p
960- const char *detail,
961- NMRemoteSettings *settings,
962- PageNewConnectionResultFunc result_func,
963-+ NMClient *client,
964- gpointer user_data);
965-
966- #endif /* __PAGE_MOBILE_H__ */
967-Index: network-manager-applet-1.0.4/src/connection-editor/page-vlan.c
968-===================================================================
969---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vlan.c
970-+++ network-manager-applet-1.0.4/src/connection-editor/page-vlan.c
971-@@ -673,6 +673,7 @@ vlan_connection_new (GtkWindow *parent,
972- const char *detail,
973- NMRemoteSettings *settings,
974- PageNewConnectionResultFunc result_func,
975-+ NMClient *client,
976- gpointer user_data)
977- {
978- NMConnection *connection;
979-Index: network-manager-applet-1.0.4/src/connection-editor/page-vlan.h
980-===================================================================
981---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vlan.h
982-+++ network-manager-applet-1.0.4/src/connection-editor/page-vlan.h
983-@@ -56,6 +56,7 @@ void vlan_connection_new (GtkWindow *par
984- const char *detail,
985- NMRemoteSettings *settings,
986- PageNewConnectionResultFunc result_func,
987-+ NMClient *client,
988- gpointer user_data);
989-
990- #endif /* __PAGE_VLAN_H__ */
991-Index: network-manager-applet-1.0.4/src/connection-editor/page-vpn.c
992-===================================================================
993---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vpn.c
994-+++ network-manager-applet-1.0.4/src/connection-editor/page-vpn.c
995-@@ -253,6 +253,7 @@ vpn_connection_import (GtkWindow *parent
996- const char *detail,
997- NMRemoteSettings *settings,
998- PageNewConnectionResultFunc result_func,
999-+ NMClient *client,
1000- gpointer user_data)
1001- {
1002- NewVpnInfo *info;
1003-@@ -287,9 +288,11 @@ vpn_connection_new (GtkWindow *parent,
1004- const char *detail,
1005- NMRemoteSettings *settings,
1006- PageNewConnectionResultFunc result_func,
1007-+ NMClient *client,
1008- gpointer user_data)
1009- {
1010- NMConnection *connection;
1011-+ NMSettingConnection *s_con;
1012- NMSetting *s_vpn;
1013-
1014- if (!detail) {
1015-@@ -315,6 +318,14 @@ vpn_connection_new (GtkWindow *parent,
1016- FALSE,
1017- settings,
1018- user_data);
1019-+
1020-+ s_con = nm_connection_get_setting_connection (connection);
1021-+ if (!s_con) {
1022-+ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1023-+ nm_connection_add_setting (connection, NM_SETTING (s_con));
1024-+ }
1025-+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1026-+
1027- s_vpn = nm_setting_vpn_new ();
1028- g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, detail, NULL);
1029- nm_connection_add_setting (connection, s_vpn);
1030-Index: network-manager-applet-1.0.4/src/connection-editor/page-vpn.h
1031-===================================================================
1032---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vpn.h
1033-+++ network-manager-applet-1.0.4/src/connection-editor/page-vpn.h
1034-@@ -60,12 +60,14 @@ void vpn_connection_new (GtkWindow *pare
1035- const char *detail,
1036- NMRemoteSettings *settings,
1037- PageNewConnectionResultFunc result_func,
1038-+ NMClient *client,
1039- gpointer user_data);
1040-
1041- void vpn_connection_import (GtkWindow *parent,
1042- const char *detail,
1043- NMRemoteSettings *settings,
1044- PageNewConnectionResultFunc result_func,
1045-+ NMClient *client,
1046- gpointer user_data);
1047-
1048- #endif /* __PAGE_VPN_H__ */
1049-Index: network-manager-applet-1.0.4/src/connection-editor/page-wifi.c
1050-===================================================================
1051---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wifi.c
1052-+++ network-manager-applet-1.0.4/src/connection-editor/page-wifi.c
1053-@@ -33,6 +33,8 @@
1054- #include <nm-device-wifi.h>
1055- #include <nm-utils.h>
1056-
1057-+#include "utils.h"
1058-+
1059- #include "page-wifi.h"
1060-
1061- G_DEFINE_TYPE (CEPageWifi, ce_page_wifi, CE_TYPE_PAGE)
1062-@@ -622,6 +624,7 @@ wifi_connection_new (GtkWindow *parent,
1063- const char *detail,
1064- NMRemoteSettings *settings,
1065- PageNewConnectionResultFunc result_func,
1066-+ NMClient *client,
1067- gpointer user_data)
1068- {
1069- NMConnection *connection;
1070-@@ -632,6 +635,17 @@ wifi_connection_new (GtkWindow *parent,
1071- TRUE,
1072- settings,
1073- user_data);
1074-+
1075-+ if (utils_default_to_private_connection (client)) {
1076-+ NMSettingConnection *s_con;
1077-+ s_con = nm_connection_get_setting_connection (connection);
1078-+ if (!s_con) {
1079-+ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1080-+ nm_connection_add_setting (connection, NM_SETTING (s_con));
1081-+ }
1082-+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1083-+ }
1084-+
1085- s_wifi = nm_setting_wireless_new ();
1086- g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
1087- nm_connection_add_setting (connection, s_wifi);
1088-Index: network-manager-applet-1.0.4/src/connection-editor/page-wifi.h
1089-===================================================================
1090---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wifi.h
1091-+++ network-manager-applet-1.0.4/src/connection-editor/page-wifi.h
1092-@@ -62,6 +62,7 @@ void wifi_connection_new (GtkWindow *par
1093- const char *detail,
1094- NMRemoteSettings *settings,
1095- PageNewConnectionResultFunc result_func,
1096-+ NMClient *client,
1097- gpointer user_data);
1098-
1099- #endif /* __PAGE_WIFI_H__ */
1100-Index: network-manager-applet-1.0.4/src/connection-editor/page-wimax.c
1101-===================================================================
1102---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wimax.c
1103-+++ network-manager-applet-1.0.4/src/connection-editor/page-wimax.c
1104-@@ -216,6 +216,7 @@ wimax_connection_new (GtkWindow *parent,
1105- const char *detail,
1106- NMRemoteSettings *settings,
1107- PageNewConnectionResultFunc result_func,
1108-+ NMClient *client,
1109- gpointer user_data)
1110- {
1111- NMConnection *connection;
1112-Index: network-manager-applet-1.0.4/src/connection-editor/page-wimax.h
1113-===================================================================
1114---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wimax.h
1115-+++ network-manager-applet-1.0.4/src/connection-editor/page-wimax.h
1116-@@ -56,6 +56,7 @@ void wimax_connection_new (GtkWindow *pa
1117- const char *detail,
1118- NMRemoteSettings *settings,
1119- PageNewConnectionResultFunc result_func,
1120-+ NMClient *client,
1121- gpointer user_data);
1122-
1123- #endif /* __PAGE_WIMAX_H__ */
1124-Index: network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
1125-===================================================================
1126---- network-manager-applet-1.0.4.orig/src/gnome-bluetooth/nma-bt-device.c
1127-+++ network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
1128-@@ -342,6 +342,7 @@ dun_new_cdma (NMAMobileWizardAccessMetho
1129- NM_SETTING_CDMA_NUMBER, "#777",
1130- NM_SETTING_CDMA_USERNAME, method->username,
1131- NM_SETTING_CDMA_PASSWORD, method->password,
1132-+ NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1133- NULL);
1134- nm_connection_add_setting (connection, setting);
1135-
1136-@@ -368,6 +369,7 @@ dun_new_cdma (NMAMobileWizardAccessMetho
1137- NULL);
1138- g_free (uuid);
1139- g_free (id);
1140-+ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1141- nm_connection_add_setting (connection, setting);
1142-
1143- return connection;
1144-@@ -387,6 +389,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod
1145- NM_SETTING_GSM_NUMBER, "*99#",
1146- NM_SETTING_GSM_USERNAME, method->username,
1147- NM_SETTING_GSM_PASSWORD, method->password,
1148-+ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1149- NM_SETTING_GSM_APN, method->gsm_apn,
1150- NULL);
1151- nm_connection_add_setting (connection, setting);
1152-@@ -414,6 +417,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod
1153- NULL);
1154- g_free (uuid);
1155- g_free (id);
1156-+ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1157- nm_connection_add_setting (connection, setting);
1158-
1159- return connection;
1160-@@ -978,6 +982,7 @@ add_pan_connection (NmaBtDevice *self)
1161- NULL);
1162- g_free (id);
1163- g_free (uuid);
1164-+ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1165- nm_connection_add_setting (connection, setting);
1166-
1167- /* The Bluetooth settings */
1168-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
1169-===================================================================
1170---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wifi-dialog.c
1171-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
1172-@@ -38,6 +38,7 @@
1173- #include "nm-wifi-dialog.h"
1174- #include "wireless-security.h"
1175- #include "nm-ui-utils.h"
1176-+#include "utils.h"
1177- #include "eap-method.h"
1178-
1179- G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
1180-@@ -1202,6 +1203,9 @@ nma_wifi_dialog_get_connection (NMAWifiD
1181- NM_SETTING_CONNECTION_UUID, uuid,
1182- NULL);
1183- g_free (uuid);
1184-+ if (utils_default_to_private_connection (priv->client)) {
1185-+ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1186-+ }
1187- nm_connection_add_setting (connection, (NMSetting *) s_con);
1188-
1189- s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
1190-Index: network-manager-applet-1.0.4/src/mobile-helpers.c
1191-===================================================================
1192---- network-manager-applet-1.0.4.orig/src/mobile-helpers.c
1193-+++ network-manager-applet-1.0.4/src/mobile-helpers.c
1194-@@ -307,6 +307,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
1195- NM_SETTING_CDMA_NUMBER, "#777",
1196- NM_SETTING_CDMA_USERNAME, method->username,
1197- NM_SETTING_CDMA_PASSWORD, method->password,
1198-+ NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1199- NULL);
1200- nm_connection_add_setting (connection, setting);
1201- } else if (method->devtype == NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
1202-@@ -317,6 +318,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
1203- NM_SETTING_GSM_USERNAME, method->username,
1204- NM_SETTING_GSM_PASSWORD, method->password,
1205- NM_SETTING_GSM_APN, method->gsm_apn,
1206-+ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1207- NULL);
1208- nm_connection_add_setting (connection, setting);
1209- } else
1210-@@ -347,6 +349,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
1211- "user", g_get_user_name (), NULL);
1212- g_free (uuid);
1213- g_free (id);
1214-+ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1215- nm_connection_add_setting (connection, setting);
1216- }
1217-
1218-Index: network-manager-applet-1.0.4/src/utils/utils.c
1219-===================================================================
1220---- network-manager-applet-1.0.4.orig/src/utils/utils.c
1221-+++ network-manager-applet-1.0.4/src/utils/utils.c
1222-@@ -288,3 +288,10 @@ utils_filter_editable_on_insert_text (Gt
1223- return count > 0;
1224- }
1225-
1226-+gboolean
1227-+utils_default_to_private_connection (NMClient *client)
1228-+{
1229-+ NMClientPermissionResult perms;
1230-+ perms = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM);
1231-+ return (perms != NM_CLIENT_PERMISSION_RESULT_YES);
1232-+}
1233-Index: network-manager-applet-1.0.4/src/utils/utils.h
1234-===================================================================
1235---- network-manager-applet-1.0.4.orig/src/utils/utils.h
1236-+++ network-manager-applet-1.0.4/src/utils/utils.h
1237-@@ -27,6 +27,7 @@
1238- #include <gtk/gtk.h>
1239- #include <nm-connection.h>
1240- #include <nm-device.h>
1241-+#include <nm-client.h>
1242- #include <net/ethernet.h>
1243- #include <nm-access-point.h>
1244-
1245-@@ -85,6 +86,8 @@ void utils_show_error_dialog (const char
1246- gboolean modal,
1247- GtkWindow *parent);
1248-
1249-+gboolean utils_default_to_private_connection (NMClient *client);
1250-+
1251- #define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
1252-
1253- typedef enum {
1254-Index: network-manager-applet-1.0.4/src/wireless-security/ws-wep-key.c
1255-===================================================================
1256---- network-manager-applet-1.0.4.orig/src/wireless-security/ws-wep-key.c
1257-+++ network-manager-applet-1.0.4/src/wireless-security/ws-wep-key.c
1258-@@ -147,6 +147,7 @@ static void
1259- fill_connection (WirelessSecurity *parent, NMConnection *connection)
1260- {
1261- WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
1262-+ NMSettingConnection *s_con;
1263- NMSettingWirelessSecurity *s_wsec;
1264- NMSettingSecretFlags secret_flags;
1265- GtkWidget *widget, *passwd_entry;
1266-@@ -162,6 +163,8 @@ fill_connection (WirelessSecurity *paren
1267- key = gtk_entry_get_text (GTK_ENTRY (widget));
1268- strcpy (sec->keys[sec->cur_index], key);
1269-
1270-+ s_con = nm_connection_get_setting_connection (connection);
1271-+
1272- /* Blow away the old security setting by adding a clear one */
1273- s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
1274- nm_connection_add_setting (connection, (NMSetting *) s_wsec);
1275-@@ -173,6 +176,10 @@ fill_connection (WirelessSecurity *paren
1276- NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type,
1277- NULL);
1278-
1279-+ /* If the connection is user-owned, mark the secrets as agent-owned */
1280-+ if (s_con && nm_setting_connection_get_num_permissions (s_con))
1281-+ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
1282-+
1283- for (i = 0; i < 4; i++) {
1284- if (strlen (sec->keys[i]))
1285- nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]);
1286-Index: network-manager-applet-1.0.4/src/wireless-security/ws-wpa-psk.c
1287-===================================================================
1288---- network-manager-applet-1.0.4.orig/src/wireless-security/ws-wpa-psk.c
1289-+++ network-manager-applet-1.0.4/src/wireless-security/ws-wpa-psk.c
1290-@@ -97,12 +97,14 @@ fill_connection (WirelessSecurity *paren
1291- WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent;
1292- GtkWidget *widget, *passwd_entry;
1293- const char *key;
1294-+ NMSettingConnection *s_con;
1295- NMSettingWireless *s_wireless;
1296- NMSettingWirelessSecurity *s_wireless_sec;
1297- NMSettingSecretFlags secret_flags;
1298- const char *mode;
1299- gboolean is_adhoc = FALSE;
1300-
1301-+ s_con = nm_connection_get_setting_connection (connection);
1302- s_wireless = nm_connection_get_setting_wireless (connection);
1303- g_assert (s_wireless);
1304-
1305-@@ -118,6 +120,9 @@ fill_connection (WirelessSecurity *paren
1306- passwd_entry = widget;
1307- key = gtk_entry_get_text (GTK_ENTRY (widget));
1308- g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
1309-+ /* If the connection is user-owned, mark the secrets as agent-owned */
1310-+ if (s_con && nm_setting_connection_get_num_permissions (s_con))
1311-+ g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
1312-
1313- /* Save PSK_FLAGS to the connection */
1314- secret_flags = nma_utils_menu_to_secret_flags (passwd_entry);
1315-Index: network-manager-applet-1.0.4/src/connection-editor/page-team.c
1316-===================================================================
1317---- network-manager-applet-1.0.4.orig/src/connection-editor/page-team.c
1318-+++ network-manager-applet-1.0.4/src/connection-editor/page-team.c
1319-@@ -329,6 +329,7 @@ team_connection_new (GtkWindow *parent,
1320- const char *detail,
1321- NMRemoteSettings *settings,
1322- PageNewConnectionResultFunc result_func,
1323-+ NMClient *client,
1324- gpointer user_data)
1325- {
1326- NMConnection *connection;
1327-Index: network-manager-applet-1.0.4/src/connection-editor/page-team.h
1328-===================================================================
1329---- network-manager-applet-1.0.4.orig/src/connection-editor/page-team.h
1330-+++ network-manager-applet-1.0.4/src/connection-editor/page-team.h
1331-@@ -55,6 +55,7 @@ void team_connection_new (GtkWindow *par
1332- const char *detail,
1333- NMRemoteSettings *settings,
1334- PageNewConnectionResultFunc result_func,
1335-+ NMClient *client,
1336- gpointer user_data);
1337-
1338- #endif /* __PAGE_TEAM_H__ */
1339-Index: network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.c
1340-===================================================================
1341---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bluetooth.c
1342-+++ network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.c
1343-@@ -257,6 +257,7 @@ bluetooth_connection_new (GtkWindow *par
1344- const char *detail,
1345- NMRemoteSettings *settings,
1346- PageNewConnectionResultFunc result_func,
1347-+ NMClient *client,
1348- gpointer user_data)
1349- {
1350- gint response;
1351-Index: network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.h
1352-===================================================================
1353---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bluetooth.h
1354-+++ network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.h
1355-@@ -58,6 +58,7 @@ void bluetooth_connection_new (GtkWindow
1356- const char *detail,
1357- NMRemoteSettings *settings,
1358- PageNewConnectionResultFunc result_func,
1359-+ NMClient *client,
1360- gpointer user_data);
1361-
1362- #endif /* __PAGE_BLUETOOTH_H__ */
1363-Index: network-manager-applet-1.0.4/src/connection-editor/connection-helpers.c
1364-===================================================================
1365---- network-manager-applet-1.0.4.orig/src/connection-editor/connection-helpers.c
1366-+++ network-manager-applet-1.0.4/src/connection-editor/connection-helpers.c
1367-@@ -380,6 +380,7 @@ new_connection_of_type (GtkWindow *paren
1368- gpointer user_data)
1369- {
1370- NewConnectionData *ncd;
1371-+ NMConnectionList *list = user_data;
1372-
1373- ncd = g_slice_new (NewConnectionData);
1374- ncd->parent_window = parent_window;
1375-@@ -391,6 +392,7 @@ new_connection_of_type (GtkWindow *paren
1376- detail,
1377- settings,
1378- new_connection_result,
1379-+ list->nm_client,
1380- ncd);
1381- }
1382-
1383
1384=== added file 'debian/patches/Allow-to-create-connections-without-admin-privileges.patch'
1385--- debian/patches/Allow-to-create-connections-without-admin-privileges.patch 1970-01-01 00:00:00 +0000
1386+++ debian/patches/Allow-to-create-connections-without-admin-privileges.patch 2015-12-02 15:57:13 +0000
1387@@ -0,0 +1,683 @@
1388+From: Michael Biebl <biebl@debian.org>
1389+Date: Tue, 18 Mar 2014 10:49:13 +0100
1390+Subject: Allow to create connections without admin privileges
1391+MIME-Version: 1.0
1392+Content-Type: text/plain; charset="utf-8"
1393+Content-Transfer-Encoding: 8bit
1394+
1395+Set passwords as agent-owned when they need to, to allow users without
1396+root permissions to easily configure their connections.
1397+The logic is:
1398+- Bluetooth, CDMA and GSM connections: always user-owned
1399+- WEP/WPA connections: system-owned if user has the permissions
1400+ (with NM’s config, that is netdev or sudo membership), user-owned
1401+ otherwise. The password is stored in the keyring for WPA, not for
1402+ WEP.
1403+- WiMax / Wired connections: always system-owned (with 802.1x
1404+ passwords in the keyring).
1405+
1406+Closes: #696256
1407+---
1408+ src/applet-device-wifi.c | 25 +++++++++++++++++++++++++
1409+ src/connection-editor/ce-page.h | 1 +
1410+ src/connection-editor/connection-helpers.c | 2 ++
1411+ src/connection-editor/page-bond.c | 1 +
1412+ src/connection-editor/page-bond.h | 1 +
1413+ src/connection-editor/page-bridge.c | 1 +
1414+ src/connection-editor/page-bridge.h | 1 +
1415+ src/connection-editor/page-dsl.c | 1 +
1416+ src/connection-editor/page-dsl.h | 1 +
1417+ src/connection-editor/page-ethernet.c | 1 +
1418+ src/connection-editor/page-ethernet.h | 1 +
1419+ src/connection-editor/page-infiniband.c | 1 +
1420+ src/connection-editor/page-infiniband.h | 1 +
1421+ src/connection-editor/page-mobile.c | 11 +++++++++++
1422+ src/connection-editor/page-mobile.h | 1 +
1423+ src/connection-editor/page-team.c | 1 +
1424+ src/connection-editor/page-team.h | 1 +
1425+ src/connection-editor/page-vlan.c | 1 +
1426+ src/connection-editor/page-vlan.h | 1 +
1427+ src/connection-editor/page-vpn.c | 11 +++++++++++
1428+ src/connection-editor/page-vpn.h | 2 ++
1429+ src/connection-editor/page-wifi.c | 14 ++++++++++++++
1430+ src/connection-editor/page-wifi.h | 1 +
1431+ src/connection-editor/page-wimax.c | 1 +
1432+ src/connection-editor/page-wimax.h | 1 +
1433+ src/gnome-bluetooth/nma-bt-device.c | 5 +++++
1434+ src/libnm-gtk/nm-wifi-dialog.c | 4 ++++
1435+ src/mobile-helpers.c | 3 +++
1436+ src/utils/utils.c | 7 +++++++
1437+ src/utils/utils.h | 3 +++
1438+ src/wireless-security/ws-wep-key.c | 7 +++++++
1439+ src/wireless-security/ws-wpa-psk.c | 5 +++++
1440+ 32 files changed, 118 insertions(+)
1441+
1442+diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
1443+index 0ae44ad..dc7fbc8 100644
1444+--- a/src/applet-device-wifi.c
1445++++ b/src/applet-device-wifi.c
1446+@@ -386,6 +386,7 @@ _do_new_auto_connection (NMApplet *applet,
1447+ NMSettingWirelessSecurity *s_wsec = NULL;
1448+ NMSetting8021x *s_8021x = NULL;
1449+ const GByteArray *ssid;
1450++ NM80211ApFlags flags;
1451+ NM80211ApSecurityFlags wpa_flags, rsn_flags;
1452+ GtkWidget *dialog;
1453+ MoreInfo *more_info;
1454+@@ -417,6 +418,7 @@ _do_new_auto_connection (NMApplet *applet,
1455+ /* If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x
1456+ * setting and ask the user for more information.
1457+ */
1458++ flags = nm_access_point_get_flags (ap);
1459+ rsn_flags = nm_access_point_get_rsn_flags (ap);
1460+ wpa_flags = nm_access_point_get_wpa_flags (ap);
1461+ if ( (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
1462+@@ -445,6 +447,29 @@ _do_new_auto_connection (NMApplet *applet,
1463+ nm_connection_add_setting (connection, NM_SETTING (s_8021x));
1464+ }
1465+
1466++ if (utils_default_to_private_connection (applet->nm_client)) {
1467++ if (!s_con) {
1468++ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1469++ nm_connection_add_setting (connection, NM_SETTING (s_con));
1470++ }
1471++ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1472++
1473++ if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) ||
1474++ (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
1475++ if (!s_wsec) {
1476++ s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
1477++ nm_connection_add_setting (connection, NM_SETTING (s_wsec));
1478++ }
1479++ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
1480++ } else if (flags & NM_802_11_AP_FLAGS_PRIVACY) {
1481++ if (!s_wsec) {
1482++ s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
1483++ nm_connection_add_setting (connection, NM_SETTING (s_wsec));
1484++ }
1485++ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
1486++ }
1487++ }
1488++
1489+ /* If it's an 802.1x connection, we need more information, so pop up the
1490+ * Dialog Of Doom.
1491+ */
1492+diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
1493+index 41711d9..521dbc6 100644
1494+--- a/src/connection-editor/ce-page.h
1495++++ b/src/connection-editor/ce-page.h
1496+@@ -48,6 +48,7 @@ typedef void (*PageNewConnectionFunc) (GtkWindow *parent,
1497+ const char *detail,
1498+ NMRemoteSettings *settings,
1499+ PageNewConnectionResultFunc result_func,
1500++ NMClient *client,
1501+ gpointer user_data);
1502+
1503+ #define CE_TYPE_PAGE (ce_page_get_type ())
1504+diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
1505+index 69da25c..b638530 100644
1506+--- a/src/connection-editor/connection-helpers.c
1507++++ b/src/connection-editor/connection-helpers.c
1508+@@ -380,6 +380,7 @@ new_connection_of_type (GtkWindow *parent_window,
1509+ gpointer user_data)
1510+ {
1511+ NewConnectionData *ncd;
1512++ NMConnectionList *list = user_data;
1513+
1514+ ncd = g_slice_new (NewConnectionData);
1515+ ncd->parent_window = parent_window;
1516+@@ -391,6 +392,7 @@ new_connection_of_type (GtkWindow *parent_window,
1517+ detail,
1518+ settings,
1519+ new_connection_result,
1520++ list->nm_client,
1521+ ncd);
1522+ }
1523+
1524+diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
1525+index 799ea94..966625c 100644
1526+--- a/src/connection-editor/page-bond.c
1527++++ b/src/connection-editor/page-bond.c
1528+@@ -610,6 +610,7 @@ bond_connection_new (GtkWindow *parent,
1529+ const char *detail,
1530+ NMRemoteSettings *settings,
1531+ PageNewConnectionResultFunc result_func,
1532++ NMClient *client,
1533+ gpointer user_data)
1534+ {
1535+ NMConnection *connection;
1536+diff --git a/src/connection-editor/page-bond.h b/src/connection-editor/page-bond.h
1537+index dcc8e1f..3844869 100644
1538+--- a/src/connection-editor/page-bond.h
1539++++ b/src/connection-editor/page-bond.h
1540+@@ -56,6 +56,7 @@ void bond_connection_new (GtkWindow *parent,
1541+ const char *detail,
1542+ NMRemoteSettings *settings,
1543+ PageNewConnectionResultFunc result_func,
1544++ NMClient *client,
1545+ gpointer user_data);
1546+
1547+ #endif /* __PAGE_BOND_H__ */
1548+diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
1549+index 1ffcb1f..34ff9af 100644
1550+--- a/src/connection-editor/page-bridge.c
1551++++ b/src/connection-editor/page-bridge.c
1552+@@ -294,6 +294,7 @@ bridge_connection_new (GtkWindow *parent,
1553+ const char *detail,
1554+ NMRemoteSettings *settings,
1555+ PageNewConnectionResultFunc result_func,
1556++ NMClient *client,
1557+ gpointer user_data)
1558+ {
1559+ NMConnection *connection;
1560+diff --git a/src/connection-editor/page-bridge.h b/src/connection-editor/page-bridge.h
1561+index fa6d927..4bd0b95 100644
1562+--- a/src/connection-editor/page-bridge.h
1563++++ b/src/connection-editor/page-bridge.h
1564+@@ -56,6 +56,7 @@ void bridge_connection_new (GtkWindow *parent,
1565+ const char *detail,
1566+ NMRemoteSettings *settings,
1567+ PageNewConnectionResultFunc result_func,
1568++ NMClient *client,
1569+ gpointer user_data);
1570+
1571+ #endif /* __PAGE_BRIDGE_H__ */
1572+diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
1573+index c327979..a38f333 100644
1574+--- a/src/connection-editor/page-dsl.c
1575++++ b/src/connection-editor/page-dsl.c
1576+@@ -221,6 +221,7 @@ dsl_connection_new (GtkWindow *parent,
1577+ const char *detail,
1578+ NMRemoteSettings *settings,
1579+ PageNewConnectionResultFunc result_func,
1580++ NMClient *client,
1581+ gpointer user_data)
1582+ {
1583+ NMConnection *connection;
1584+diff --git a/src/connection-editor/page-dsl.h b/src/connection-editor/page-dsl.h
1585+index 514699a..656e3c6 100644
1586+--- a/src/connection-editor/page-dsl.h
1587++++ b/src/connection-editor/page-dsl.h
1588+@@ -58,6 +58,7 @@ void dsl_connection_new (GtkWindow *parent,
1589+ const char *detail,
1590+ NMRemoteSettings *settings,
1591+ PageNewConnectionResultFunc callback,
1592++ NMClient *client,
1593+ gpointer user_data);
1594+
1595+ #endif /* __PAGE_DSL_H__ */
1596+diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
1597+index 451ee22..9372c1e 100644
1598+--- a/src/connection-editor/page-ethernet.c
1599++++ b/src/connection-editor/page-ethernet.c
1600+@@ -377,6 +377,7 @@ ethernet_connection_new (GtkWindow *parent,
1601+ const char *detail,
1602+ NMRemoteSettings *settings,
1603+ PageNewConnectionResultFunc result_func,
1604++ NMClient *client,
1605+ gpointer user_data)
1606+ {
1607+ NMConnection *connection;
1608+diff --git a/src/connection-editor/page-ethernet.h b/src/connection-editor/page-ethernet.h
1609+index 4dd4a5c..55ade9b 100644
1610+--- a/src/connection-editor/page-ethernet.h
1611++++ b/src/connection-editor/page-ethernet.h
1612+@@ -58,6 +58,7 @@ void ethernet_connection_new (GtkWindow *parent,
1613+ const char *detail,
1614+ NMRemoteSettings *settings,
1615+ PageNewConnectionResultFunc result_func,
1616++ NMClient *client,
1617+ gpointer user_data);
1618+
1619+ #endif /* __PAGE_ETHERNET_H__ */
1620+diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
1621+index 19560a2..bb9335e 100644
1622+--- a/src/connection-editor/page-infiniband.c
1623++++ b/src/connection-editor/page-infiniband.c
1624+@@ -253,6 +253,7 @@ infiniband_connection_new (GtkWindow *parent,
1625+ const char *detail,
1626+ NMRemoteSettings *settings,
1627+ PageNewConnectionResultFunc result_func,
1628++ NMClient *client,
1629+ gpointer user_data)
1630+ {
1631+ NMConnection *connection;
1632+diff --git a/src/connection-editor/page-infiniband.h b/src/connection-editor/page-infiniband.h
1633+index e895a98..97bff3b 100644
1634+--- a/src/connection-editor/page-infiniband.h
1635++++ b/src/connection-editor/page-infiniband.h
1636+@@ -56,6 +56,7 @@ void infiniband_connection_new (GtkWindow *parent,
1637+ const char *detail,
1638+ NMRemoteSettings *settings,
1639+ PageNewConnectionResultFunc result_func,
1640++ NMClient *client,
1641+ gpointer user_data);
1642+
1643+ #endif /* __PAGE_INFINIBAND_H__ */
1644+diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
1645+index ef24184..df3d316 100644
1646+--- a/src/connection-editor/page-mobile.c
1647++++ b/src/connection-editor/page-mobile.c
1648+@@ -452,6 +452,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
1649+ NMConnection *connection = NULL;
1650+
1651+ if (!canceled && method) {
1652++ NMSettingConnection *s_con;
1653+ NMSetting *type_setting;
1654+ const char *ctype = NULL;
1655+ char *detail = NULL;
1656+@@ -465,6 +466,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
1657+ NM_SETTING_GSM_NUMBER, "*99#",
1658+ NM_SETTING_GSM_USERNAME, method->username,
1659+ NM_SETTING_GSM_PASSWORD, method->password,
1660++ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1661+ NM_SETTING_GSM_APN, method->gsm_apn,
1662+ NULL);
1663+ break;
1664+@@ -476,6 +478,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
1665+ NM_SETTING_CDMA_NUMBER, "#777",
1666+ NM_SETTING_GSM_USERNAME, method->username,
1667+ NM_SETTING_GSM_PASSWORD, method->password,
1668++ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1669+ NULL);
1670+ break;
1671+ default:
1672+@@ -490,6 +493,13 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
1673+ connection = ce_page_new_connection (detail, ctype, FALSE, info->settings, info->user_data);
1674+ g_free (detail);
1675+
1676++ s_con = nm_connection_get_setting_connection (connection);
1677++ if (!s_con) {
1678++ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1679++ nm_connection_add_setting (connection, NM_SETTING (s_con));
1680++ }
1681++ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1682++
1683+ nm_connection_add_setting (connection, type_setting);
1684+ nm_connection_add_setting (connection, nm_setting_ppp_new ());
1685+ }
1686+@@ -514,6 +524,7 @@ mobile_connection_new (GtkWindow *parent,
1687+ const char *detail,
1688+ NMRemoteSettings *settings,
1689+ PageNewConnectionResultFunc result_func,
1690++ NMClient *client,
1691+ gpointer user_data)
1692+ {
1693+ NMAMobileWizard *wizard;
1694+diff --git a/src/connection-editor/page-mobile.h b/src/connection-editor/page-mobile.h
1695+index ab2903c..bc5b479 100644
1696+--- a/src/connection-editor/page-mobile.h
1697++++ b/src/connection-editor/page-mobile.h
1698+@@ -58,6 +58,7 @@ void mobile_connection_new (GtkWindow *parent,
1699+ const char *detail,
1700+ NMRemoteSettings *settings,
1701+ PageNewConnectionResultFunc result_func,
1702++ NMClient *client,
1703+ gpointer user_data);
1704+
1705+ #endif /* __PAGE_MOBILE_H__ */
1706+diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
1707+index 9efa43d..786c0fa 100644
1708+--- a/src/connection-editor/page-team.c
1709++++ b/src/connection-editor/page-team.c
1710+@@ -367,6 +367,7 @@ team_connection_new (GtkWindow *parent,
1711+ const char *detail,
1712+ NMRemoteSettings *settings,
1713+ PageNewConnectionResultFunc result_func,
1714++ NMClient *client,
1715+ gpointer user_data)
1716+ {
1717+ NMConnection *connection;
1718+diff --git a/src/connection-editor/page-team.h b/src/connection-editor/page-team.h
1719+index d1936b3..91d9df3 100644
1720+--- a/src/connection-editor/page-team.h
1721++++ b/src/connection-editor/page-team.h
1722+@@ -55,6 +55,7 @@ void team_connection_new (GtkWindow *parent,
1723+ const char *detail,
1724+ NMRemoteSettings *settings,
1725+ PageNewConnectionResultFunc result_func,
1726++ NMClient *client,
1727+ gpointer user_data);
1728+
1729+ #endif /* __PAGE_TEAM_H__ */
1730+diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
1731+index 1a8c6b6..d41e38a 100644
1732+--- a/src/connection-editor/page-vlan.c
1733++++ b/src/connection-editor/page-vlan.c
1734+@@ -673,6 +673,7 @@ vlan_connection_new (GtkWindow *parent,
1735+ const char *detail,
1736+ NMRemoteSettings *settings,
1737+ PageNewConnectionResultFunc result_func,
1738++ NMClient *client,
1739+ gpointer user_data)
1740+ {
1741+ NMConnection *connection;
1742+diff --git a/src/connection-editor/page-vlan.h b/src/connection-editor/page-vlan.h
1743+index 0e66a06..c7969aa 100644
1744+--- a/src/connection-editor/page-vlan.h
1745++++ b/src/connection-editor/page-vlan.h
1746+@@ -56,6 +56,7 @@ void vlan_connection_new (GtkWindow *parent,
1747+ const char *detail,
1748+ NMRemoteSettings *settings,
1749+ PageNewConnectionResultFunc result_func,
1750++ NMClient *client,
1751+ gpointer user_data);
1752+
1753+ #endif /* __PAGE_VLAN_H__ */
1754+diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
1755+index 004a260..5c0c8b5 100644
1756+--- a/src/connection-editor/page-vpn.c
1757++++ b/src/connection-editor/page-vpn.c
1758+@@ -253,6 +253,7 @@ vpn_connection_import (GtkWindow *parent,
1759+ const char *detail,
1760+ NMRemoteSettings *settings,
1761+ PageNewConnectionResultFunc result_func,
1762++ NMClient *client,
1763+ gpointer user_data)
1764+ {
1765+ NewVpnInfo *info;
1766+@@ -287,9 +288,11 @@ vpn_connection_new (GtkWindow *parent,
1767+ const char *detail,
1768+ NMRemoteSettings *settings,
1769+ PageNewConnectionResultFunc result_func,
1770++ NMClient *client,
1771+ gpointer user_data)
1772+ {
1773+ NMConnection *connection;
1774++ NMSettingConnection *s_con;
1775+ NMSetting *s_vpn;
1776+
1777+ if (!detail) {
1778+@@ -315,6 +318,14 @@ vpn_connection_new (GtkWindow *parent,
1779+ FALSE,
1780+ settings,
1781+ user_data);
1782++
1783++ s_con = nm_connection_get_setting_connection (connection);
1784++ if (!s_con) {
1785++ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1786++ nm_connection_add_setting (connection, NM_SETTING (s_con));
1787++ }
1788++ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1789++
1790+ s_vpn = nm_setting_vpn_new ();
1791+ g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, detail, NULL);
1792+ nm_connection_add_setting (connection, s_vpn);
1793+diff --git a/src/connection-editor/page-vpn.h b/src/connection-editor/page-vpn.h
1794+index 2339732..2164930 100644
1795+--- a/src/connection-editor/page-vpn.h
1796++++ b/src/connection-editor/page-vpn.h
1797+@@ -60,12 +60,14 @@ void vpn_connection_new (GtkWindow *parent,
1798+ const char *detail,
1799+ NMRemoteSettings *settings,
1800+ PageNewConnectionResultFunc result_func,
1801++ NMClient *client,
1802+ gpointer user_data);
1803+
1804+ void vpn_connection_import (GtkWindow *parent,
1805+ const char *detail,
1806+ NMRemoteSettings *settings,
1807+ PageNewConnectionResultFunc result_func,
1808++ NMClient *client,
1809+ gpointer user_data);
1810+
1811+ #endif /* __PAGE_VPN_H__ */
1812+diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
1813+index 8a25c64..9c56e4b 100644
1814+--- a/src/connection-editor/page-wifi.c
1815++++ b/src/connection-editor/page-wifi.c
1816+@@ -33,6 +33,8 @@
1817+ #include <nm-device-wifi.h>
1818+ #include <nm-utils.h>
1819+
1820++#include "utils.h"
1821++
1822+ #include "page-wifi.h"
1823+
1824+ G_DEFINE_TYPE (CEPageWifi, ce_page_wifi, CE_TYPE_PAGE)
1825+@@ -622,6 +624,7 @@ wifi_connection_new (GtkWindow *parent,
1826+ const char *detail,
1827+ NMRemoteSettings *settings,
1828+ PageNewConnectionResultFunc result_func,
1829++ NMClient *client,
1830+ gpointer user_data)
1831+ {
1832+ NMConnection *connection;
1833+@@ -632,6 +635,17 @@ wifi_connection_new (GtkWindow *parent,
1834+ TRUE,
1835+ settings,
1836+ user_data);
1837++
1838++ if (utils_default_to_private_connection (client)) {
1839++ NMSettingConnection *s_con;
1840++ s_con = nm_connection_get_setting_connection (connection);
1841++ if (!s_con) {
1842++ s_con = (NMSettingConnection *) nm_setting_connection_new ();
1843++ nm_connection_add_setting (connection, NM_SETTING (s_con));
1844++ }
1845++ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1846++ }
1847++
1848+ s_wifi = nm_setting_wireless_new ();
1849+ g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
1850+ nm_connection_add_setting (connection, s_wifi);
1851+diff --git a/src/connection-editor/page-wifi.h b/src/connection-editor/page-wifi.h
1852+index c039b00..b89e589 100644
1853+--- a/src/connection-editor/page-wifi.h
1854++++ b/src/connection-editor/page-wifi.h
1855+@@ -62,6 +62,7 @@ void wifi_connection_new (GtkWindow *parent,
1856+ const char *detail,
1857+ NMRemoteSettings *settings,
1858+ PageNewConnectionResultFunc result_func,
1859++ NMClient *client,
1860+ gpointer user_data);
1861+
1862+ #endif /* __PAGE_WIFI_H__ */
1863+diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
1864+index 97c4d90..d8cf40c 100644
1865+--- a/src/connection-editor/page-wimax.c
1866++++ b/src/connection-editor/page-wimax.c
1867+@@ -216,6 +216,7 @@ wimax_connection_new (GtkWindow *parent,
1868+ const char *detail,
1869+ NMRemoteSettings *settings,
1870+ PageNewConnectionResultFunc result_func,
1871++ NMClient *client,
1872+ gpointer user_data)
1873+ {
1874+ NMConnection *connection;
1875+diff --git a/src/connection-editor/page-wimax.h b/src/connection-editor/page-wimax.h
1876+index 6938284..91d937c 100644
1877+--- a/src/connection-editor/page-wimax.h
1878++++ b/src/connection-editor/page-wimax.h
1879+@@ -56,6 +56,7 @@ void wimax_connection_new (GtkWindow *parent,
1880+ const char *detail,
1881+ NMRemoteSettings *settings,
1882+ PageNewConnectionResultFunc result_func,
1883++ NMClient *client,
1884+ gpointer user_data);
1885+
1886+ #endif /* __PAGE_WIMAX_H__ */
1887+diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
1888+index 870d2be..cd4103d 100644
1889+--- a/src/gnome-bluetooth/nma-bt-device.c
1890++++ b/src/gnome-bluetooth/nma-bt-device.c
1891+@@ -342,6 +342,7 @@ dun_new_cdma (NMAMobileWizardAccessMethod *method)
1892+ NM_SETTING_CDMA_NUMBER, "#777",
1893+ NM_SETTING_CDMA_USERNAME, method->username,
1894+ NM_SETTING_CDMA_PASSWORD, method->password,
1895++ NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1896+ NULL);
1897+ nm_connection_add_setting (connection, setting);
1898+
1899+@@ -368,6 +369,7 @@ dun_new_cdma (NMAMobileWizardAccessMethod *method)
1900+ NULL);
1901+ g_free (uuid);
1902+ g_free (id);
1903++ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1904+ nm_connection_add_setting (connection, setting);
1905+
1906+ return connection;
1907+@@ -387,6 +389,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod *method)
1908+ NM_SETTING_GSM_NUMBER, "*99#",
1909+ NM_SETTING_GSM_USERNAME, method->username,
1910+ NM_SETTING_GSM_PASSWORD, method->password,
1911++ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1912+ NM_SETTING_GSM_APN, method->gsm_apn,
1913+ NULL);
1914+ nm_connection_add_setting (connection, setting);
1915+@@ -414,6 +417,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod *method)
1916+ NULL);
1917+ g_free (uuid);
1918+ g_free (id);
1919++ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1920+ nm_connection_add_setting (connection, setting);
1921+
1922+ return connection;
1923+@@ -978,6 +982,7 @@ add_pan_connection (NmaBtDevice *self)
1924+ NULL);
1925+ g_free (id);
1926+ g_free (uuid);
1927++ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1928+ nm_connection_add_setting (connection, setting);
1929+
1930+ /* The Bluetooth settings */
1931+diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
1932+index ace323b..0916557 100644
1933+--- a/src/libnm-gtk/nm-wifi-dialog.c
1934++++ b/src/libnm-gtk/nm-wifi-dialog.c
1935+@@ -39,6 +39,7 @@
1936+ #include "wireless-security.h"
1937+ #include "nm-ui-utils.h"
1938+ #include "eap-method.h"
1939++#include "utils.h"
1940+
1941+ G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
1942+
1943+@@ -1203,6 +1204,9 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
1944+ NM_SETTING_CONNECTION_UUID, uuid,
1945+ NULL);
1946+ g_free (uuid);
1947++ if (utils_default_to_private_connection (priv->client)) {
1948++ nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
1949++ }
1950+ nm_connection_add_setting (connection, (NMSetting *) s_con);
1951+
1952+ s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
1953+diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
1954+index daa422e..903537f 100644
1955+--- a/src/mobile-helpers.c
1956++++ b/src/mobile-helpers.c
1957+@@ -179,6 +179,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
1958+ NM_SETTING_CDMA_NUMBER, "#777",
1959+ NM_SETTING_CDMA_USERNAME, method->username,
1960+ NM_SETTING_CDMA_PASSWORD, method->password,
1961++ NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1962+ NULL);
1963+ nm_connection_add_setting (connection, setting);
1964+ } else if (method->devtype == NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
1965+@@ -189,6 +190,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
1966+ NM_SETTING_GSM_USERNAME, method->username,
1967+ NM_SETTING_GSM_PASSWORD, method->password,
1968+ NM_SETTING_GSM_APN, method->gsm_apn,
1969++ NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
1970+ NULL);
1971+ nm_connection_add_setting (connection, setting);
1972+ } else
1973+@@ -219,6 +221,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
1974+ "user", g_get_user_name (), NULL);
1975+ g_free (uuid);
1976+ g_free (id);
1977++ nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
1978+ nm_connection_add_setting (connection, setting);
1979+ }
1980+
1981+diff --git a/src/utils/utils.c b/src/utils/utils.c
1982+index 61d6a9e..8d52ef1 100644
1983+--- a/src/utils/utils.c
1984++++ b/src/utils/utils.c
1985+@@ -286,3 +286,10 @@ utils_filter_editable_on_insert_text (GtkEditable *editable,
1986+ return count > 0;
1987+ }
1988+
1989++gboolean
1990++utils_default_to_private_connection (NMClient *client)
1991++{
1992++ NMClientPermissionResult perms;
1993++ perms = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM);
1994++ return (perms != NM_CLIENT_PERMISSION_RESULT_YES);
1995++}
1996+diff --git a/src/utils/utils.h b/src/utils/utils.h
1997+index 1abff65..714fe3d 100644
1998+--- a/src/utils/utils.h
1999++++ b/src/utils/utils.h
2000+@@ -27,6 +27,7 @@
2001+ #include <gtk/gtk.h>
2002+ #include <nm-connection.h>
2003+ #include <nm-device.h>
2004++#include <nm-client.h>
2005+ #include <net/ethernet.h>
2006+ #include <nm-access-point.h>
2007+
2008+@@ -85,6 +86,8 @@ void utils_show_error_dialog (const char *title,
2009+ gboolean modal,
2010+ GtkWindow *parent);
2011+
2012++gboolean utils_default_to_private_connection (NMClient *client);
2013++
2014+ #define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
2015+
2016+ typedef enum {
2017+diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
2018+index 2399ace..147f848 100644
2019+--- a/src/wireless-security/ws-wep-key.c
2020++++ b/src/wireless-security/ws-wep-key.c
2021+@@ -147,6 +147,7 @@ static void
2022+ fill_connection (WirelessSecurity *parent, NMConnection *connection)
2023+ {
2024+ WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
2025++ NMSettingConnection *s_con;
2026+ NMSettingWirelessSecurity *s_wsec;
2027+ NMSettingSecretFlags secret_flags;
2028+ GtkWidget *widget, *passwd_entry;
2029+@@ -173,6 +174,12 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
2030+ NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type,
2031+ NULL);
2032+
2033++ s_con = nm_connection_get_setting_connection (connection);
2034++
2035++ /* If the connection is user-owned, mark the secrets as agent-owned */
2036++ if (s_con && nm_setting_connection_get_num_permissions (s_con))
2037++ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
2038++
2039+ for (i = 0; i < 4; i++) {
2040+ if (strlen (sec->keys[i]))
2041+ nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]);
2042+diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
2043+index 5cd658a..f6eaa27 100644
2044+--- a/src/wireless-security/ws-wpa-psk.c
2045++++ b/src/wireless-security/ws-wpa-psk.c
2046+@@ -97,12 +97,14 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
2047+ WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent;
2048+ GtkWidget *widget, *passwd_entry;
2049+ const char *key;
2050++ NMSettingConnection *s_con;
2051+ NMSettingWireless *s_wireless;
2052+ NMSettingWirelessSecurity *s_wireless_sec;
2053+ NMSettingSecretFlags secret_flags;
2054+ const char *mode;
2055+ gboolean is_adhoc = FALSE;
2056+
2057++ s_con = nm_connection_get_setting_connection (connection);
2058+ s_wireless = nm_connection_get_setting_wireless (connection);
2059+ g_assert (s_wireless);
2060+
2061+@@ -118,6 +120,9 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
2062+ passwd_entry = widget;
2063+ key = gtk_entry_get_text (GTK_ENTRY (widget));
2064+ g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
2065++ /* If the connection is user-owned, mark the secrets as agent-owned */
2066++ if (s_con && nm_setting_connection_get_num_permissions (s_con))
2067++ g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
2068+
2069+ /* Save PSK_FLAGS to the connection */
2070+ secret_flags = nma_utils_menu_to_secret_flags (passwd_entry);
2071
2072=== added file 'debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch'
2073--- debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch 1970-01-01 00:00:00 +0000
2074+++ debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch 2015-12-02 15:57:13 +0000
2075@@ -0,0 +1,35 @@
2076+From: Michael Biebl <biebl@debian.org>
2077+Date: Tue, 1 Apr 2014 15:53:35 +0200
2078+Subject: Don't hard-code gnome-bluetooth plugin directory
2079+
2080+---
2081+ configure.ac | 2 ++
2082+ src/gnome-bluetooth/Makefile.am | 2 +-
2083+ 2 files changed, 3 insertions(+), 1 deletion(-)
2084+
2085+diff --git a/configure.ac b/configure.ac
2086+index 266bff6..9482a69 100644
2087+--- a/configure.ac
2088++++ b/configure.ac
2089+@@ -146,6 +146,8 @@ case "${with_bluetooth}" in
2090+ gnome-bluetooth-1.0 < 3.11.0
2091+ libnm-util libnm-glib,
2092+ have_gbt=yes, have_gbt=no)
2093++ GNOME_BLUETOOTH_PLUGIN_DIR="`$PKG_CONFIG --variable=libdir gnome-bluetooth-1.0`/gnome-bluetooth/plugins"
2094++ AC_SUBST(GNOME_BLUETOOTH_PLUGIN_DIR)
2095+ ;;
2096+ esac
2097+
2098+diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
2099+index 940aeba..2649d2e 100644
2100+--- a/src/gnome-bluetooth/Makefile.am
2101++++ b/src/gnome-bluetooth/Makefile.am
2102+@@ -16,7 +16,7 @@ BT_WIDGET_SOURCES = \
2103+ nma-bt-device.h
2104+
2105+ if HAVE_GBT
2106+-plugindir = $(libdir)/gnome-bluetooth/plugins
2107++plugindir = $(GNOME_BLUETOOTH_PLUGIN_DIR)
2108+
2109+ plugin_LTLIBRARIES = libnma.la
2110+
2111
2112=== added file 'debian/patches/Force-online-state-with-unmanaged-devices.patch'
2113--- debian/patches/Force-online-state-with-unmanaged-devices.patch 1970-01-01 00:00:00 +0000
2114+++ debian/patches/Force-online-state-with-unmanaged-devices.patch 2015-12-02 15:57:13 +0000
2115@@ -0,0 +1,28 @@
2116+From: Michael Biebl <biebl@debian.org>
2117+Date: Tue, 18 Mar 2014 10:49:13 +0100
2118+Subject: Force online state with unmanaged devices
2119+
2120+If NM has an active unmanaged device it will forcefully set the online
2121+state to CONNECTED_GLOBAL. In that case show a wired connection icon
2122+instead of an offline icon.
2123+
2124+Closes: #471191
2125+---
2126+ src/applet.c | 4 ++++
2127+ 1 file changed, 4 insertions(+)
2128+
2129+diff --git a/src/applet.c b/src/applet.c
2130+index 39ea8e4..0a1043b 100644
2131+--- a/src/applet.c
2132++++ b/src/applet.c
2133+@@ -2952,6 +2952,10 @@ applet_update_icon (gpointer user_data)
2134+ break;
2135+ default:
2136+ applet_get_device_icon_for_state (applet, &pixbuf, &icon_name, &dev_tip);
2137++ if (!pixbuf && state == NM_STATE_CONNECTED) {
2138++ icon_name = g_strdup ("nm-device-wired");
2139++ pixbuf = g_object_ref (nma_icon_check_and_load (icon_name, applet));
2140++ }
2141+ break;
2142+ }
2143+
2144
2145=== modified file 'debian/patches/nm-applet-use-indicator.patch'
2146--- debian/patches/nm-applet-use-indicator.patch 2015-10-07 09:06:59 +0000
2147+++ debian/patches/nm-applet-use-indicator.patch 2015-12-02 15:57:13 +0000
2148@@ -100,17 +100,17 @@
2149 info->modem_enabled,
2150 applet);
2151 +#else
2152-+ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
2153-+ info->provider_name,
2154-+ cdma_act_to_mb_act (info),
2155-+ cdma_state_to_mb_state (info));
2156-+ item = gtk_image_menu_item_new_with_label (text);
2157-+ g_free (text);
2158-+ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2159-+ info->quality : 0);
2160-+ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2161-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2162-+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2163++ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
2164++ info->provider_name,
2165++ cdma_act_to_mb_act (info),
2166++ cdma_state_to_mb_state (info));
2167++ item = gtk_image_menu_item_new_with_label (text);
2168++ g_free (text);
2169++ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2170++ info->quality : 0);
2171++ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2172++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2173++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2174 +#endif
2175 gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
2176 add_connection_item (device, active, item, menu, applet);
2177@@ -128,17 +128,17 @@
2178 info->modem_enabled,
2179 applet);
2180 +#else
2181-+ text = mobile_helper_get_connection_label (NULL,
2182-+ info->provider_name,
2183-+ cdma_act_to_mb_act (info),
2184-+ cdma_state_to_mb_state (info));
2185-+ item = gtk_image_menu_item_new_with_label (text);
2186-+ g_free (text);
2187-+ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2188-+ info->quality : 0);
2189-+ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2190-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2191-+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2192++ text = mobile_helper_get_connection_label (NULL,
2193++ info->provider_name,
2194++ cdma_act_to_mb_act (info),
2195++ cdma_state_to_mb_state (info));
2196++ item = gtk_image_menu_item_new_with_label (text);
2197++ g_free (text);
2198++ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2199++ info->quality : 0);
2200++ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2201++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2202++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2203 +#endif
2204 gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
2205 gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
2206@@ -201,17 +201,17 @@
2207 info->modem_enabled,
2208 applet);
2209 +#else
2210-+ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
2211-+ info->op_name,
2212-+ gsm_act_to_mb_act (info),
2213-+ gsm_state_to_mb_state (info));
2214-+ item = gtk_image_menu_item_new_with_label (text);
2215-+ g_free (text);
2216-+ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2217-+ info->quality : 0);
2218-+ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2219-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2220-+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2221++ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
2222++ info->op_name,
2223++ gsm_act_to_mb_act (info),
2224++ gsm_state_to_mb_state (info));
2225++ item = gtk_image_menu_item_new_with_label (text);
2226++ g_free (text);
2227++ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2228++ info->quality : 0);
2229++ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2230++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2231++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2232 +#endif
2233 gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
2234 add_connection_item (device, active, item, menu, applet);
2235@@ -229,18 +229,18 @@
2236 info->modem_enabled,
2237 applet);
2238 +#else
2239-+ text = mobile_helper_get_connection_label (NULL,
2240-+ info->op_name,
2241-+ gsm_act_to_mb_act (info),
2242-+ gsm_state_to_mb_state (info));
2243-+ item = gtk_image_menu_item_new_with_label (text);
2244-+ g_free (text);
2245-+ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2246-+ info->quality : 0);
2247-+ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2248-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2249-+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2250-+ gtk_widget_set_sensitive (item, FALSE);
2251++ text = mobile_helper_get_connection_label (NULL,
2252++ info->op_name,
2253++ gsm_act_to_mb_act (info),
2254++ gsm_state_to_mb_state (info));
2255++ item = gtk_image_menu_item_new_with_label (text);
2256++ g_free (text);
2257++ icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
2258++ info->quality : 0);
2259++ signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
2260++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
2261++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
2262++ gtk_widget_set_sensitive (item, FALSE);
2263 +#endif
2264 +
2265 gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
2266@@ -284,14 +284,14 @@
2267 +static gboolean
2268 +get_ap_is_encrypted (NMAccessPoint *ap)
2269 +{
2270-+ guint32 ap_flags, ap_wpa, ap_rsn;
2271-+
2272-+ ap_flags = nm_access_point_get_flags (ap);
2273-+ ap_wpa = nm_access_point_get_wpa_flags (ap);
2274-+ ap_rsn = nm_access_point_get_rsn_flags (ap);
2275-+
2276-+ if ((ap_flags & NM_802_11_AP_FLAGS_PRIVACY) || ap_wpa || ap_rsn)
2277-+ return TRUE;
2278++ guint32 ap_flags, ap_wpa, ap_rsn;
2279++
2280++ ap_flags = nm_access_point_get_flags (ap);
2281++ ap_wpa = nm_access_point_get_wpa_flags (ap);
2282++ ap_rsn = nm_access_point_get_rsn_flags (ap);
2283++
2284++ if ((ap_flags & NM_802_11_AP_FLAGS_PRIVACY) || ap_wpa || ap_rsn)
2285++ return TRUE;
2286 +
2287 + return FALSE;
2288 +}
2289@@ -300,11 +300,11 @@
2290 +ap_menu_item_set_sensitive (GtkWidget *item, NMAccessPoint *ap, guint32 dev_caps)
2291 +{
2292 + gboolean is_adhoc = FALSE;
2293-+ guint32 ap_flags, ap_wpa, ap_rsn;
2294++ guint32 ap_flags, ap_wpa, ap_rsn;
2295 +
2296-+ ap_flags = nm_access_point_get_flags (ap);
2297-+ ap_wpa = nm_access_point_get_wpa_flags (ap);
2298-+ ap_rsn = nm_access_point_get_rsn_flags (ap);
2299++ ap_flags = nm_access_point_get_flags (ap);
2300++ ap_wpa = nm_access_point_get_wpa_flags (ap);
2301++ ap_rsn = nm_access_point_get_rsn_flags (ap);
2302 +
2303 + if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC)
2304 + is_adhoc = TRUE;
2305@@ -336,18 +336,18 @@
2306 +
2307 + icon_name = g_string_new ("");
2308 + if (strength > 80)
2309-+ icon_name = g_string_assign (icon_name, "nm-signal-100");
2310-+ else if (strength > 55)
2311-+ icon_name = g_string_assign (icon_name, "nm-signal-75");
2312-+ else if (strength > 30)
2313-+ icon_name = g_string_assign (icon_name, "nm-signal-50");
2314-+ else if (strength > 5)
2315-+ icon_name = g_string_assign (icon_name, "nm-signal-25");
2316-+ else
2317-+ icon_name = g_string_assign (icon_name, "nm-signal-00");
2318++ icon_name = g_string_assign (icon_name, "nm-signal-100");
2319++ else if (strength > 55)
2320++ icon_name = g_string_assign (icon_name, "nm-signal-75");
2321++ else if (strength > 30)
2322++ icon_name = g_string_assign (icon_name, "nm-signal-50");
2323++ else if (strength > 5)
2324++ icon_name = g_string_assign (icon_name, "nm-signal-25");
2325++ else
2326++ icon_name = g_string_assign (icon_name, "nm-signal-00");
2327 +
2328-+ if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC) {
2329-+ icon_name = g_string_assign (icon_name, "nm-adhoc");
2330++ if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC) {
2331++ icon_name = g_string_assign (icon_name, "nm-adhoc");
2332 + goto out;
2333 + }
2334 +
2335@@ -363,8 +363,8 @@
2336 +
2337 +static void
2338 +set_menu_item_accessible_desc (NMAccessPoint *ap,
2339-+ GtkMenuItem *item,
2340-+ gboolean is_encrypted)
2341++ GtkMenuItem *item,
2342++ gboolean is_encrypted)
2343 +{
2344 + guint32 strength;
2345 + gchar *ssid = NULL;
2346@@ -542,8 +542,8 @@
2347 g_return_val_if_fail (dup_data.hash != NULL, NULL);
2348 +#else
2349 + /* heh, not much choice here, otherwise on startup we get tons of errors
2350-+ * because g_return_val_if_fail prints assertion errors.
2351-+ */
2352++ * because g_return_val_if_fail prints assertion errors.
2353++ */
2354 + if (dup_data.hash == NULL)
2355 + return NULL;
2356 +#endif
2357@@ -1083,7 +1083,6 @@
2358 +
2359 + return FALSE;
2360 +}
2361-+#endif
2362 +
2363 +void
2364 +applet_schedule_update_menu (NMApplet *applet)
2365@@ -1091,6 +1090,7 @@
2366 + if (!applet->update_menu_id)
2367 + applet->update_menu_id = g_idle_add (applet_update_indicator_menu, applet);
2368 +}
2369++#endif /* ENABLE_INDICATOR */
2370 +
2371 typedef struct {
2372 NMApplet *applet;
2373@@ -1139,7 +1139,7 @@
2374 +
2375 +#ifdef ENABLE_INDICATOR
2376 + if (icon_name == NULL && layer == ICON_LAYER_LINK) {
2377-+ icon_name = g_strdup ("nm-no-connection");
2378++ icon_name = "nm-no-connection";
2379 + }
2380 +
2381 + if (icon_name != NULL &&
2382@@ -1255,7 +1255,7 @@
2383 }
2384
2385 - foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name);
2386-+ foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name, dev_tip);
2387++ foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name, g_strdup (dev_tip));
2388 if (pixbuf)
2389 g_object_unref (pixbuf);
2390 if (icon_name)
2391@@ -1276,7 +1276,7 @@
2392 }
2393 }
2394 - foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name);
2395-+ foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name, dev_tip);
2396++ foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name, g_strdup (dev_tip));
2397 if (icon_name)
2398 g_free (icon_name);
2399
2400@@ -1377,7 +1377,7 @@
2401 if (!applet->status_icon)
2402 return FALSE;
2403 if (shell_debug)
2404-@@ -3602,11 +3873,34 @@ setup_widgets (NMApplet *applet)
2405+@@ -3602,13 +3873,36 @@ setup_widgets (NMApplet *applet)
2406 g_signal_connect (applet->status_icon, "popup-menu",
2407 G_CALLBACK (status_icon_popup_menu_cb), applet);
2408
2409@@ -1390,10 +1390,9 @@
2410 + if (!applet->context_menu)
2411 + return FALSE;
2412
2413-- return TRUE;
2414-+ return TRUE;
2415-+}
2416-+
2417+ return TRUE;
2418+ }
2419+
2420 +static gboolean
2421 +setup_widgets (NMApplet *applet)
2422 +{
2423@@ -1413,9 +1412,11 @@
2424 +#else
2425 + return success || indicator_success;
2426 +#endif
2427- }
2428-
2429++}
2430++
2431 static void
2432+ applet_embedded_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
2433+ {
2434 @@ -3697,6 +3991,8 @@ initable_init (GInitable *initable, GCan
2435 G_CALLBACK (applet_gsettings_show_changed), applet);
2436
2437
2438=== modified file 'debian/patches/series'
2439--- debian/patches/series 2015-10-07 03:56:07 +0000
2440+++ debian/patches/series 2015-12-02 15:57:13 +0000
2441@@ -1,3 +1,6 @@
2442+Allow-to-create-connections-without-admin-privileges.patch
2443+Force-online-state-with-unmanaged-devices.patch
2444+Don-t-hard-code-gnome-bluetooth-plugin-directory.patch
2445 lp341684_device_sensitive_disconnect_notify.patch
2446 lp460144_correctly_update_notification.patch
2447 applet-wifi-menu-before-vpn.patch
2448@@ -9,6 +12,5 @@
2449 lp1048516_dont_req_keyring_in_greeter.patch
2450 lp1048520_delay_pin_dialog_in_greeter.patch
2451 rebuild_menu_after_init.patch
2452-11-user-connections.patch
2453 ubuntu_dont_autostart_under_GNOME.patch
2454 hide_virtual_devices.patch
2455
2456=== modified file 'debian/rules'
2457--- debian/rules 2015-01-27 01:15:32 +0000
2458+++ debian/rules 2015-12-02 15:57:13 +0000
2459@@ -13,18 +13,16 @@
2460 --disable-more-warnings \
2461 --enable-migration \
2462 --enable-introspection \
2463- --with-modem-manager-1=yes \
2464- --enable-indicator \
2465+ --with-modem-manager-1 \
2466+ --enable-indicator
2467
2468 override_dh_auto_clean:
2469 dh_auto_clean
2470 rm -f icons/22/*-secure.png icons/22/nm-active-device.png
2471- rm -f debian/*.1
2472
2473 override_dh_auto_build:
2474 dh_auto_build
2475 cp -rf $(CURDIR)/debian/icons/22 icons/
2476- docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1
2477
2478 override_dh_install:
2479 dh_install -X.la -X.a --fail-missing

Subscribers

People subscribed via source and target branches