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

[Łukasz Zemczak]

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

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.

[lp:~sil2100/network-manager-applet/merge_1.0.6_debian]

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)]

Looks good!

review: Approve

[lp:~sil2100/network-manager-applet/merge_1.0.6_debian]

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

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

[Łukasz Zemczak (sil2100)]

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!

[lp:~sil2100/network-manager-applet/merge_1.0.6_debian]

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

One more file not needed.

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

Re-release.

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-07 09:23:09 +0000
+++ debian/changelog	2015-12-02 15:57:13 +0000
@@ -1,6 +1,67 @@
-network-manager-applet (1.0.4-0ubuntu1) wily; urgency=medium
-
-  * New upstream release
+network-manager-applet (1.0.6-2ubuntu2) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - lp341684_device_sensitive_disconnect_notify.patch: show correct
+      notification messages for disconnect events, to be in line with the other
+      *connect*text patches.
+    - lp460144_correctly_update_notification.patch: cleaner notification
+      messages, and allow for messages to be updated instead of cleared.
+    - applet-wifi-menu-before-vpn.patch: show Create New and Connect to Hidden
+      wifi menu items with the other Wifi items, rather than separated by
+      the VPN menus.
+    - nm-applet-use-indicator.patch: patch to support showing nm-applet as an
+      appindicator in Unity.
+    - position_dialogs_to_center_of_the_screen.patch: position dialogs to the
+      center of the screen.
+    - make_menu_items_insensitive_based_on_permissions.patch,
+      hide_policy_items_env_var.patch: provide a method to desensitize or hide
+      menu items which are useless given the current policykit policy level of
+      the user.
+    - applet_adhoc_use_wpa_rsn_part1.patch: enable Ad-Hoc using WPA RSN.
+    - lp1048516_dont_req_keyring_in_greeter.patch: don't try to load the
+      keyring if the user has no permissions to edit their own connections.
+    - lp1048520_delay_pin_dialog_in_greeter.patch: only ask for PIN entry when
+      a connection is being established rather than when a modem is detected.
+    - rebuild_menu_after_init.patch: force a rebuild of the menu to avoid it
+      staying empty on login.
+    - ubuntu_dont_autostart_under_GNOME.patch
+    - hide_virtual_devices.patch: updated to no longer show
+    - debian/rules: ship extra icons, use --enable-indicators, export
+      translations for Launchpad and fail if any files are missing from
+      .install files, or not being installed.
+    - debian/control: Build-Depend on dh-translations, libappindicator3-dev,
+      update package descriptions, add Breaks against gnome-bluetooth (<< 3.0).
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 25 Nov 2015 17:05:02 +0100
+
+network-manager-applet (1.0.6-2) unstable; urgency=medium
+
+  * Fix crash in nm-connection-editor when importing existing VPN config.
+    (Closes: #726935)
+
+ -- Michael Biebl <[e-mail]>  Mon, 07 Sep 2015 06:26:02 +0200
+
+network-manager-applet (1.0.6-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Refresh patches.
+  * Update symbols file, the symbols introduced in 1.0.4 now use symbol
+    versioning.
+
+ -- Michael Biebl <[e-mail]>  Fri, 28 Aug 2015 17:21:30 +0200
+
+network-manager-applet (1.0.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Make no-patch-numbers the default for gbp pq to avoid unnecessary noise.
+  * Refresh patches.
+  * Update symbols file for libnm-gtk0.
+
+ -- Michael Biebl <[e-mail]>  Wed, 29 Jul 2015 01:08:38 +0200
+
+network-manager-applet (1.0.4-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release (LP: #1467267)
   * debian/control:
     - Bump build-depends on libnm-util-dev, libnm-glib-dev, libnm-glib-vpn-dev,
       network-manager-dev 
@@ -14,7 +75,39 @@
   * debian/patches/nm-applet-fix-shell-version.patch:
     - No longer applicable
 
- -- Robert Ancell <[e-mail]>  Wed, 07 Oct 2015 15:08:47 +1300
+ -- Robert Ancell <[e-mail]>  Wed, 28 Oct 2015 09:02:20 +1300
+
+network-manager-applet (1.0.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Rebase patches.
+
+ -- Michael Biebl <[e-mail]>  Tue, 05 May 2015 23:16:53 +0200
+
+network-manager-applet (1.0.0-3) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Mon, 27 Apr 2015 16:43:02 +0200
+
+network-manager-applet (1.0.0-2) experimental; urgency=medium
+
+  * Install typelib files into multiarch paths now that gobject-introspection
+    supports that.
+  * Mark dev and gir packages as Multi-Arch: same.
+
+ -- Michael Biebl <[e-mail]>  Mon, 09 Feb 2015 00:49:43 +0100
+
+network-manager-applet (1.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Rebase patches.
+  * Bump dependency on network-manager and related dev packages to (>= 1.0.0).
+  * Bump Standards-Version to 3.9.6. No further changes.
+  * Update Vcs-Browser URL to use cgit and https.
+  * Update Homepage URL to use https.
+
+ -- Michael Biebl <[e-mail]>  Mon, 02 Feb 2015 13:40:08 +0100
 
 network-manager-applet (0.9.10.1-0ubuntu7) wily; urgency=medium
 
@@ -95,6 +188,80 @@
 
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 26 Jan 2015 23:08:58 -0500
 
+network-manager-applet (0.9.10.0-2) unstable; urgency=medium
+
+  * Disable bluetooth support. The gnome-bluetooth plugin no longer builds
+    with gnome-bluetooth 3.12. But this plugin is really only useful for DUN
+    which with bluez 5 isn't supported (yet).
+    PAN support should still be functional.
+
+ -- Michael Biebl <[e-mail]>  Wed, 16 Jul 2014 01:31:23 +0200
+
+network-manager-applet (0.9.10.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update Build-Depends as per configure.ac.
+  * Drop obsolete --with-gtkver configure switch.
+  * Refresh patches.
+  * Update symbols file. A few deprecated symbols were dropped which were used
+    in older versions of network-manager-gnome, so add a versioned Breaks.
+  * Exclude libtool .la files and static libraries from list-missing.
+
+ -- Michael Biebl <[e-mail]>  Thu, 10 Jul 2014 07:32:44 +0200
+
+network-manager-applet (0.9.8.10-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update patches.
+  * Tighten Build-Depends on libgnome-bluetooth-dev to (<< 3.11.0).
+    The bluetooth widget no longer builds with newer gnome-bluetooth since the
+    plugin API was removed.
+
+ -- Michael Biebl <[e-mail]>  Thu, 01 May 2014 14:22:42 +0200
+
+network-manager-applet (0.9.8.8-5) unstable; urgency=medium
+
+  * Use valid paths when loading the org.gnome.nm-applet.eap schema.
+    We were missing a trailing '/'. Newer glib versions validate the path more
+    strictly, leading to an assert.
+
+ -- Michael Biebl <[e-mail]>  Fri, 04 Apr 2014 17:51:38 +0200
+
+network-manager-applet (0.9.8.8-4) unstable; urgency=medium
+
+  * Drop dbus reload from postinst. The dbus package uses a file trigger
+    nowadays to automatically reload its configuration.
+  * Use the paths specified in the VPN .name files.
+    Since LIBDIR of nm-applet and the VPN plugins aren't necessarily the
+    same, use the paths as specified by the VPN plugins and only
+    reconstruct the path if it is not absolute or we fail to load the plugin.
+
+ -- Michael Biebl <[e-mail]>  Tue, 01 Apr 2014 21:41:36 +0200
+
+network-manager-applet (0.9.8.8-3) unstable; urgency=medium
+
+  * Bump debhelper compatibility level to 9.
+  * Determine gnome-bluetooth plugin directory using libdir from
+    gnome-bluetooth-1.0.pc.
+  * Convert to multi-arch. Mark libnm-gtk0 as M-A: same, libnm-gtk-common as
+    M-A: foreign.
+  * Rely on dh v9 to set flags from dpkg-buildflags.
+
+ -- Michael Biebl <[e-mail]>  Tue, 01 Apr 2014 16:23:05 +0200
+
+network-manager-applet (0.9.8.8-2) unstable; urgency=medium
+
+  * Enable ModemManager1 interface support. (Closes: #711968)
+
+ -- Michael Biebl <[e-mail]>  Thu, 27 Mar 2014 16:50:18 +0100
+
+network-manager-applet (0.9.8.8-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5.
+
+ -- Michael Biebl <[e-mail]>  Tue, 18 Mar 2014 11:17:48 +0100
+
 network-manager-applet (0.9.8.8-0ubuntu9) vivid; urgency=medium
 
   * Switch gnome-icon-theme to adwaita-icon-theme, which is its
@@ -513,6 +680,16 @@
 
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 19 Nov 2012 14:46:29 -0500
 
+network-manager-applet (0.9.6.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump Build-Depends on libnm-*-dev and network-manager-dev to (>= 0.9.6).
+  * Bump Depends on network-manager to (>= 0.9.6).
+  * debian/patches/01-fix-crash-in-migration-wizard.patch: Removed, merged
+    upstream.
+
+ -- Michael Biebl <[e-mail]>  Tue, 11 Sep 2012 23:06:31 +0200
+
 network-manager-applet (0.9.6.2-0ubuntu6) quantal; urgency=low
 
   * debian/patches/git_indicate_hspa+_lte_tech_dbe3b12.patch: add indications
@@ -2140,6 +2317,75 @@
 
  -- Alexander Sack <[e-mail]>  Tue, 17 Feb 2009 16:06:09 +0100
 
+network-manager-applet (0.7.0-2) experimental; urgency=low
+
+  * debian/patches/01-dbus_access_nm_applet.patch
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. (Closes: #510728)
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+  * debian/control
+    - Wrap build dependencies.
+    - Bump build dependency on debhelper to (>= 7).
+  * debian/compat
+    - Bump to debhelper v7 compat mode.
+
+ -- Michael Biebl <[e-mail]>  Sat, 14 Feb 2009 16:16:35 +0100
+
+network-manager-applet (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+    - Notification popups can be disabled. (Closes: #446963)
+    - Notification applet correctly handles panel restarts. (Closes:# 458332)
+    - The nm-editor tool has been replaced by nm-connection-editor.
+      (Closes: #494148, #482107, #485651)
+    - Show the correct configuration for WPA Enterprise setups in
+      nm-connection-editor (Closes: #480039)  
+
+  [ Sjoerd Simons ]
+  * debian/patches/02-nm-api-update.patch:
+    - Removed. Fixed upstream
+  * debian/control: Tighten build-depends on nm related libraries
+
+  [ Michael Biebl ]
+  * debian/copyright
+    - More updates to the copyright file. The polkit-helper bits are licensed
+      under the LGPL.
+  * debian/control
+    - Add network-manager-pptp-gnome to Suggests.
+
+ -- Michael Biebl <[e-mail]>  Tue, 16 Dec 2008 06:50:06 +0100
+
+network-manager-applet (0.7.0~svn953-1) experimental; urgency=low
+
+  [ Michael Biebl ]
+  * Switch to quilt patch management system.
+  * debian/rules
+    - Set libexecdir to /usr/lib/NetworkManager, so nm-applet and
+      nm-connection-editor automatically find the VPN GUI plugins.
+  * debian/control:
+    - Bump Standards-Version to 3.8.0. No further changes.
+    - Demote Recommends on VPN plugins to Suggests.
+    - Bump Depends on network-manager to (>= 0.7).
+    - Add Build-Depends on libpolkit-gnome-dev.
+    - Add Recommends on policykit-gnome. This package is required if you want
+      to manage system connections.
+  * debian/patches/01-dbus_access_nm_applet.patch: Updated
+  * Removed obsolete patches:
+    - debian/patches/02-hal_deprecated_keys.patch
+    - debian/patches/03-nm_editor_category.patch
+  * debian/copyright: Revised for the latest changes.
+
+  [ Simon McVittie ]
+  * Newer svn snapshot
+
+  [ Sjoerd Simons ]
+  * debian/patches/02-nm-api-udate.patch
+    - Added. cope with a small NM 0.7 api change
+  * debian/control: Build-Depend on nm-glib dev packages with new api
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 18 Oct 2008 21:40:05 +0100
+
 network-manager-applet (0.7-0ubuntu2) jaunty; urgency=low
 
   * fix LP: #295788 - Network Configuration menu item should also be
@@ -2520,6 +2766,7 @@
   * Add debian/watch to track new upstream releases.
 
  -- Michael Biebl <[e-mail]>  Mon, 27 Aug 2007 08:03:06 +0200
+
 network-manager-applet (0.6.5-0ubuntu11) hardy; urgency=low
 
   * apply patch to drop gnome-runtime dependencies (LP: #136945) - patch by Jani
@@ -2638,3 +2885,4 @@
    to network-manager package due to bad source splitting
 
  -- Anthony Mercatante <[e-mail]>  Fri, 15 Jun 2007 12:46:22 +0200
+
 
=== modified file 'debian/control'
--- debian/control	2015-10-07 03:56:07 +0000
+++ debian/control	2015-12-02 15:57:13 +0000
@@ -4,59 +4,53 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Utopia Maintenance Team <[e-mail]>
 Uploaders: Michael Biebl <[e-mail]>
-Build-Depends:
- debhelper (>= 9),
- autotools-dev,
- dh-autoreconf,
- gnome-common,
- intltool,
- docbook-to-man,
- libdbus-glib-1-dev (>= 0.74),
- libgnome-keyring-dev,
- libsecret-1-dev,
- libgtk-3-dev (>= 3.4),
- libglib2.0-dev (>= 2.32),
- libgconf2-dev,
- libnotify-dev (>= 0.7),
- libnm-util-dev (>= 1.0.0),
- libnm-glib-dev (>= 1.0.0),
- libnm-glib-vpn-dev (>= 1.0.0),
- network-manager-dev (>= 1.0.0),
- libmm-glib-dev,
- libgudev-1.0-dev (>= 147),
- iso-codes,
- libgirepository1.0-dev,
- dh-translations,
- libappindicator3-dev,
- gobject-introspection
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               dh-autoreconf,
+               gnome-common,
+               intltool,
+               libdbus-glib-1-dev (>= 0.74),
+               libgnome-keyring-dev,
+               libsecret-1-dev,
+               libgtk-3-dev (>= 3.4),
+               libglib2.0-dev (>= 2.32),
+               libgconf2-dev,
+               libnotify-dev (>= 0.7),
+               libnm-util-dev (>= 1.0.0),
+               libnm-glib-dev (>= 1.0.0),
+               libnm-glib-vpn-dev (>= 1.0.0),
+               network-manager-dev (>= 1.0.0),
+               libmm-glib-dev,
+               libgudev-1.0-dev (>= 147),
+               iso-codes,
+               libgirepository1.0-dev,
+               dh-translations,
+               libappindicator3-dev,
+               gobject-introspection
+Standards-Version: 3.9.6
 Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager-applet/ubuntu
-Homepage: http://www.gnome.org/projects/NetworkManager/
+Homepage: https://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager-gnome
 Architecture: linux-any
 Section: gnome
 Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libnm-gtk0 (= ${binary:Version}),
- network-manager (>= 0.9.10),
- policykit-1-gnome,
- adwaita-icon-theme,
- dbus-x11
-Recommends:
- notification-daemon,
- gnome-keyring,
- mobile-broadband-provider-info,
- iso-codes
-Suggests:
- network-manager-openconnect-gnome,
- network-manager-openvpn-gnome,
- network-manager-vpnc-gnome,
- network-manager-pptp-gnome
-Breaks:
- gnome-bluetooth (<< 3.0)
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libnm-gtk0 (= ${binary:Version}),
+         network-manager (>= 1.0.0),
+         policykit-1-gnome,
+         gnome-icon-theme,
+         dbus-x11
+Recommends: notification-daemon,
+            gnome-keyring,
+            mobile-broadband-provider-info,
+            iso-codes
+Suggests: network-manager-openconnect-gnome,
+          network-manager-openvpn-gnome,
+          network-manager-vpnc-gnome,
+          network-manager-pptp-gnome
+Breaks: gnome-bluetooth (<< 3.0) 
 Description: network management framework (GNOME frontend)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
@@ -75,10 +69,10 @@
 Architecture: linux-any
 Multi-Arch: same
 Section: libs
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libnm-gtk-common (= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libnm-gtk-common (= ${source:Version})
 Breaks: network-manager-gnome (<< 0.9.10.0)
 Description: network management framework (GNOME dialogs for wifi and mobile)
  NetworkManager is a system network service that manages your network devices
@@ -93,8 +87,7 @@
 Architecture: all
 Multi-Arch: foreign
 Section: libs
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: network management framework (common files for wifi and mobile)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
@@ -106,17 +99,17 @@
 
 Package: libnm-gtk-dev
 Architecture: linux-any
+Multi-Arch: same
 Section: libdevel
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libnm-gtk0 (= ${binary:Version}),
- gir1.2-nmgtk-1.0 (= ${binary:Version}),
- network-manager-dev (>= 0.9),
- libnm-util-dev (>= 0.9),
- libnm-glib-dev (>= 0.9),
- libgtk-3-dev,
- libdbus-glib-1-dev
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libnm-gtk0 (= ${binary:Version}),
+         gir1.2-nmgtk-1.0 (= ${binary:Version}),
+         network-manager-dev (>= 1.0.0),
+         libnm-util-dev (>= 1.0.0),
+         libnm-glib-dev (>= 1.0.0),
+         libgtk-3-dev,
+         libdbus-glib-1-dev
 Description: network management framework (dialogs development libraries)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
@@ -130,10 +123,10 @@
 Package: gir1.2-nmgtk-1.0
 Section: introspection
 Architecture: linux-any
-Depends:
- ${gir:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
+Multi-Arch: same
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: GObject introspection data for libnm-gtk
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
 
=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2014-01-07 03:29:35 +0000
+++ debian/gbp.conf	2015-12-02 15:57:13 +0000
@@ -1,3 +1,4 @@
 [DEFAULT]
 pristine-tar = True
+patch-numbers = False
 debian-branch = master
 
=== modified file 'debian/gir1.2-nmgtk-1.0.install'
--- debian/gir1.2-nmgtk-1.0.install	2015-01-27 01:15:32 +0000
+++ debian/gir1.2-nmgtk-1.0.install	2015-12-02 15:57:13 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0/ usr/lib/
+usr/lib/*/girepository-1.0/
 
=== modified file 'debian/libnm-gtk0.symbols'
--- debian/libnm-gtk0.symbols	2015-10-07 09:23:09 +0000
+++ debian/libnm-gtk0.symbols	2015-12-02 15:57:13 +0000
@@ -1,4 +1,5 @@
 libnm-gtk.so.0 libnm-gtk0 #MINVER#
+ libnm_gtk_1_0_6@libnm_gtk_1_0_6 1.0.6
  nma_country_info_get_country_code@Base 0.9.7.995
  nma_country_info_get_country_name@Base 0.9.7.995
  nma_country_info_get_providers@Base 0.9.7.995
@@ -42,15 +43,15 @@
  nma_utils_get_device_product@Base 0.9.7.995
  nma_utils_get_device_type_name@Base 0.9.7.995
  nma_utils_get_device_vendor@Base 0.9.7.995
- nma_utils_menu_to_secret_flags@Base 1.0.4
- nma_utils_setup_password_storage@Base 1.0.4
- nma_utils_update_password_storage@Base 1.0.4
+ nma_utils_menu_to_secret_flags@libnm_gtk_1_0_6 1.0.6
+ nma_utils_setup_password_storage@libnm_gtk_1_0_6 1.0.6
+ nma_utils_update_password_storage@libnm_gtk_1_0_6 1.0.6
  nma_vpn_password_dialog_focus_password@Base 0.9.10.0
  nma_vpn_password_dialog_focus_password_secondary@Base 0.9.10.0
- nma_vpn_password_dialog_focus_password_ternary@Base 1.0.4
+ nma_vpn_password_dialog_focus_password_ternary@libnm_gtk_1_0_6 1.0.6
  nma_vpn_password_dialog_get_password@Base 0.9.10.0
  nma_vpn_password_dialog_get_password_secondary@Base 0.9.10.0
- nma_vpn_password_dialog_get_password_ternary@Base 1.0.4
+ nma_vpn_password_dialog_get_password_ternary@libnm_gtk_1_0_6 1.0.6
  nma_vpn_password_dialog_get_type@Base 0.9.10.0
  nma_vpn_password_dialog_new@Base 0.9.10.0
  nma_vpn_password_dialog_run_and_block@Base 0.9.10.0
@@ -58,11 +59,11 @@
  nma_vpn_password_dialog_set_password_label@Base 0.9.10.0
  nma_vpn_password_dialog_set_password_secondary@Base 0.9.10.0
  nma_vpn_password_dialog_set_password_secondary_label@Base 0.9.10.0
- nma_vpn_password_dialog_set_password_ternary@Base 1.0.4
- nma_vpn_password_dialog_set_password_ternary_label@Base 1.0.4
+ nma_vpn_password_dialog_set_password_ternary@libnm_gtk_1_0_6 1.0.6
+ nma_vpn_password_dialog_set_password_ternary_label@libnm_gtk_1_0_6 1.0.6
  nma_vpn_password_dialog_set_show_password@Base 0.9.10.0
  nma_vpn_password_dialog_set_show_password_secondary@Base 0.9.10.0
- nma_vpn_password_dialog_set_show_password_ternary@Base 1.0.4
+ nma_vpn_password_dialog_set_show_password_ternary@libnm_gtk_1_0_6 1.0.6
  nma_wifi_dialog_get_connection@Base 0.9.6.4
  nma_wifi_dialog_get_nag_ignored@Base 0.9.6.4
  nma_wifi_dialog_get_type@Base 0.9.6.4
 
=== modified file 'debian/network-manager-gnome.README.Debian'
--- debian/network-manager-gnome.README.Debian	2011-05-05 20:36:27 +0000
+++ debian/network-manager-gnome.README.Debian	2015-12-02 15:57:13 +0000
@@ -1,6 +1,11 @@
 network-manager-gnome provides a Notification Area applet called nm-applet for
 conveniently choosing wired and wireless networks in GNOME, KDE and XFCE.
 
+network-manager-gnome (by virtue of the fact it uses network-manager)
+requires users to be in the group 'netdev' for it to work. If users aren't
+in the group 'netdev' then it won't automatically appear, and work, in the
+Notification Area.
+
 network-manager-gnome uses network-manager. Please see the
 network-mananger documentation in 
 /usr/share/doc/network-manager/README.Debian for further information.
 
=== removed file 'debian/network-manager-gnome.manpages'
--- debian/network-manager-gnome.manpages	2011-05-05 20:40:26 +0000
+++ debian/network-manager-gnome.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/nm-applet.1
 
=== added file 'debian/network-manager-gnome.postinst'
--- debian/network-manager-gnome.postinst	1970-01-01 00:00:00 +0000
+++ debian/network-manager-gnome.postinst	2015-12-02 15:57:13 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 0.9.0-2 ; then
+    [ -x /usr/share/update-notifier/notify-reboot-required ] && \
+        /usr/share/update-notifier/notify-reboot-required || true
+fi
+
+#DEBHELPER#
 
=== removed file 'debian/nm-applet.sgml'
--- debian/nm-applet.sgml	2011-05-05 20:40:26 +0000
+++ debian/nm-applet.sgml	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY date        "<date>8 February, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY package     "nm-applet">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      <email>[e-mail]</email>;
-    </address>
-    <author>
-      <firstname>Riccardo</firstname>
-      <surname>Setti</surname>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Riccardo Setti</holder>
-    </copyright>
-    &date;
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>nm-applet</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>&package;</refname>
-
-    <refpurpose>Network management framework</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&package;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&package;</command> is the GNOME front-end for NetworkManager</para>
-         <para>It is a systray applet which will display an icon in GNOME's notification area but it 
-	 also works for other desktop environments which provide a systray like KDE or XFCE.</para>
-	 <para><command>&package;</command> shows a list of available networks and allows you to easily switch between them. For encrypted networks it 
-	 will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to 
-	 type them again.</para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>NetworkManager(8), nm-tool(1)</para>
-
-    <para>More Information about NetworkManager can be found at
-      http://www.gnome.org/projects/NetworkManager/ .</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by Riccardo Setti <email>[e-mail]</email> for
-      the <productname>Debian</productname> system.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
 
=== removed file 'debian/patches/11-user-connections.patch'
--- debian/patches/11-user-connections.patch	2015-10-07 09:18:50 +0000
+++ debian/patches/11-user-connections.patch	1970-01-01 00:00:00 +0000
@@ -1,698 +0,0 @@
-From: Josselin Mouette <[e-mail]>
-Subject: Set passwords as agent-owned when they need to, to allow users
-    without modify.system permissions to easily configure their connections.
-Last-Update: 2014-03-18
-
----
- src/applet-device-wifi.c                |   25 +++++++++++++++++++++++++
- src/connection-editor/ce-page.h         |    1 +
- src/connection-editor/new-connection.c  |    2 ++
- src/connection-editor/page-bond.c       |    1 +
- src/connection-editor/page-bond.h       |    1 +
- src/connection-editor/page-bridge.c     |    1 +
- src/connection-editor/page-bridge.h     |    1 +
- src/connection-editor/page-dsl.c        |    1 +
- src/connection-editor/page-dsl.h        |    1 +
- src/connection-editor/page-ethernet.c   |    1 +
- src/connection-editor/page-ethernet.h   |    1 +
- src/connection-editor/page-infiniband.c |    1 +
- src/connection-editor/page-infiniband.h |    1 +
- src/connection-editor/page-mobile.c     |   11 +++++++++++
- src/connection-editor/page-mobile.h     |    1 +
- src/connection-editor/page-vlan.c       |    1 +
- src/connection-editor/page-vlan.h       |    1 +
- src/connection-editor/page-vpn.c        |   11 +++++++++++
- src/connection-editor/page-vpn.h        |    2 ++
- src/connection-editor/page-wifi.c       |   14 ++++++++++++++
- src/connection-editor/page-wifi.h       |    1 +
- src/connection-editor/page-wimax.c      |    1 +
- src/connection-editor/page-wimax.h      |    1 +
- src/gnome-bluetooth/nma-bt-device.c     |    5 +++++
- src/libnm-gtk/nm-wifi-dialog.c          |    4 ++++
- src/mobile-helpers.c                    |    3 +++
- src/utils/utils.c                       |    7 +++++++
- src/utils/utils.h                       |    3 +++
- src/wireless-security/ws-wep-key.c      |    7 +++++++
- src/wireless-security/ws-wpa-psk.c      |    5 +++++
- 30 files changed, 116 insertions(+)
-
-Index: network-manager-applet-1.0.4/src/applet-device-wifi.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/applet-device-wifi.c
-+++ network-manager-applet-1.0.4/src/applet-device-wifi.c
-@@ -559,6 +559,7 @@ _do_new_auto_connection (NMApplet *apple
- 	NMSettingWirelessSecurity *s_wsec = NULL;
- 	NMSetting8021x *s_8021x = NULL;
- 	const GByteArray *ssid;
-+	NM80211ApFlags flags;
- 	NM80211ApSecurityFlags wpa_flags, rsn_flags;
- 	GtkWidget *dialog;
- 	MoreInfo *more_info;
-@@ -590,6 +591,7 @@ _do_new_auto_connection (NMApplet *apple
- 	/* If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x
- 	 * setting and ask the user for more information.
- 	 */
-+	flags = nm_access_point_get_flags (ap);
- 	rsn_flags = nm_access_point_get_rsn_flags (ap);
- 	wpa_flags = nm_access_point_get_wpa_flags (ap);
- 	if (   (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
-@@ -618,6 +620,29 @@ _do_new_auto_connection (NMApplet *apple
- 		nm_connection_add_setting (connection, NM_SETTING (s_8021x));
- 	}
- 
-+	if (utils_default_to_private_connection (applet->nm_client)) {
-+		if (!s_con) {
-+			s_con = (NMSettingConnection *) nm_setting_connection_new ();
-+			nm_connection_add_setting (connection, NM_SETTING (s_con));
-+		}
-+		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
-+
-+		if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) ||
-+		    (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
-+			if (!s_wsec) {
-+				s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-+				nm_connection_add_setting (connection, NM_SETTING (s_wsec));
-+			}
-+			g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
-+		} else if (flags & NM_802_11_AP_FLAGS_PRIVACY) {
-+			if (!s_wsec) {
-+				s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-+				nm_connection_add_setting (connection, NM_SETTING (s_wsec));
-+			}
-+			g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
-+		}
-+	}
-+
- 	/* If it's an 802.1x connection, we need more information, so pop up the
- 	 * Dialog Of Doom.
- 	 */
-Index: network-manager-applet-1.0.4/src/connection-editor/ce-page.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/ce-page.h
-+++ network-manager-applet-1.0.4/src/connection-editor/ce-page.h
-@@ -48,6 +48,7 @@ typedef void (*PageNewConnectionFunc) (G
-                                        const char *detail,
-                                        NMRemoteSettings *settings,
-                                        PageNewConnectionResultFunc result_func,
-+                                       NMClient *client,
-                                        gpointer user_data);
- 
- #define CE_TYPE_PAGE            (ce_page_get_type ())
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bond.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bond.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bond.c
-@@ -611,6 +611,7 @@ bond_connection_new (GtkWindow *parent,
-                      const char *detail,
-                      NMRemoteSettings *settings,
-                      PageNewConnectionResultFunc result_func,
-+                     NMClient *client,
-                      gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bond.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bond.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bond.h
-@@ -56,6 +56,7 @@ void bond_connection_new (GtkWindow *par
-                           const char *detail,
-                           NMRemoteSettings *settings,
-                           PageNewConnectionResultFunc result_func,
-+                          NMClient *client,
-                           gpointer user_data);
- 
- #endif  /* __PAGE_BOND_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bridge.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bridge.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bridge.c
-@@ -294,6 +294,7 @@ bridge_connection_new (GtkWindow *parent
-                      const char *detail,
-                      NMRemoteSettings *settings,
-                      PageNewConnectionResultFunc result_func,
-+                     NMClient *client,
-                      gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bridge.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bridge.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bridge.h
-@@ -56,6 +56,7 @@ void bridge_connection_new (GtkWindow *p
-                             const char *detail,
-                             NMRemoteSettings *settings,
-                             PageNewConnectionResultFunc result_func,
-+                            NMClient *client,
-                             gpointer user_data);
- 
- #endif  /* __PAGE_BRIDGE_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-dsl.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-dsl.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-dsl.c
-@@ -221,6 +221,7 @@ dsl_connection_new (GtkWindow *parent,
-                     const char *detail,
-                     NMRemoteSettings *settings,
-                     PageNewConnectionResultFunc result_func,
-+                    NMClient *client,
-                     gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-dsl.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-dsl.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-dsl.h
-@@ -58,6 +58,7 @@ void dsl_connection_new (GtkWindow *pare
-                          const char *detail,
-                          NMRemoteSettings *settings,
-                          PageNewConnectionResultFunc callback,
-+                         NMClient *client,
-                          gpointer user_data);
- 
- #endif  /* __PAGE_DSL_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-ethernet.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-ethernet.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-ethernet.c
-@@ -377,6 +377,7 @@ ethernet_connection_new (GtkWindow *pare
-                          const char *detail,
-                          NMRemoteSettings *settings,
-                          PageNewConnectionResultFunc result_func,
-+                         NMClient *client,
-                          gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-ethernet.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-ethernet.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-ethernet.h
-@@ -58,6 +58,7 @@ void ethernet_connection_new (GtkWindow
-                               const char *detail,
-                               NMRemoteSettings *settings,
-                               PageNewConnectionResultFunc result_func,
-+                              NMClient *client,
-                               gpointer user_data);
- 
- #endif  /* __PAGE_ETHERNET_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-infiniband.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-infiniband.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-infiniband.c
-@@ -253,6 +253,7 @@ infiniband_connection_new (GtkWindow *pa
-                            const char *detail,
-                            NMRemoteSettings *settings,
-                            PageNewConnectionResultFunc result_func,
-+                           NMClient *client,
-                            gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-infiniband.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-infiniband.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-infiniband.h
-@@ -56,6 +56,7 @@ void infiniband_connection_new (GtkWindo
-                                 const char *detail,
-                                 NMRemoteSettings *settings,
-                                 PageNewConnectionResultFunc result_func,
-+                                NMClient *client,
-                                 gpointer user_data);
- 
- #endif  /* __PAGE_INFINIBAND_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-mobile.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-mobile.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-mobile.c
-@@ -452,6 +452,7 @@ new_connection_mobile_wizard_done (NMAMo
- 	NMConnection *connection = NULL;
- 
- 	if (!canceled && method) {
-+		NMSettingConnection *s_con;
- 		NMSetting *type_setting;
- 		const char *ctype = NULL;
- 		char *detail = NULL;
-@@ -465,6 +466,7 @@ new_connection_mobile_wizard_done (NMAMo
- 			              NM_SETTING_GSM_NUMBER, "*99#",
- 			              NM_SETTING_GSM_USERNAME, method->username,
- 			              NM_SETTING_GSM_PASSWORD, method->password,
-+			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 			              NM_SETTING_GSM_APN, method->gsm_apn,
- 			              NULL);
- 			break;
-@@ -476,6 +478,7 @@ new_connection_mobile_wizard_done (NMAMo
- 			              NM_SETTING_CDMA_NUMBER, "#777",
- 			              NM_SETTING_GSM_USERNAME, method->username,
- 			              NM_SETTING_GSM_PASSWORD, method->password,
-+			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 			              NULL);
- 			break;
- 		default:
-@@ -490,6 +493,13 @@ new_connection_mobile_wizard_done (NMAMo
- 		connection = ce_page_new_connection (detail, ctype, FALSE, info->settings, info->user_data);
- 		g_free (detail);
- 
-+		s_con = nm_connection_get_setting_connection (connection);
-+		if (!s_con) {
-+			s_con = (NMSettingConnection *) nm_setting_connection_new ();
-+			nm_connection_add_setting (connection, NM_SETTING (s_con));
-+		}
-+		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
-+
- 		nm_connection_add_setting (connection, type_setting);
- 		nm_connection_add_setting (connection, nm_setting_ppp_new ());
- 	}
-@@ -514,6 +524,7 @@ mobile_connection_new (GtkWindow *parent
-                        const char *detail,
-                        NMRemoteSettings *settings,
-                        PageNewConnectionResultFunc result_func,
-+                       NMClient *client,
-                        gpointer user_data)
- {
- 	NMAMobileWizard *wizard;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-mobile.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-mobile.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-mobile.h
-@@ -58,6 +58,7 @@ void mobile_connection_new (GtkWindow *p
-                             const char *detail,
-                             NMRemoteSettings *settings,
-                             PageNewConnectionResultFunc result_func,
-+                            NMClient *client,
-                             gpointer user_data);
- 
- #endif  /* __PAGE_MOBILE_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-vlan.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vlan.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-vlan.c
-@@ -673,6 +673,7 @@ vlan_connection_new (GtkWindow *parent,
-                      const char *detail,
-                      NMRemoteSettings *settings,
-                      PageNewConnectionResultFunc result_func,
-+                     NMClient *client,
-                      gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-vlan.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vlan.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-vlan.h
-@@ -56,6 +56,7 @@ void vlan_connection_new (GtkWindow *par
-                           const char *detail,
-                           NMRemoteSettings *settings,
-                           PageNewConnectionResultFunc result_func,
-+                          NMClient *client,
-                           gpointer user_data);
- 
- #endif  /* __PAGE_VLAN_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-vpn.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vpn.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-vpn.c
-@@ -253,6 +253,7 @@ vpn_connection_import (GtkWindow *parent
-                        const char *detail,
-                        NMRemoteSettings *settings,
-                        PageNewConnectionResultFunc result_func,
-+                       NMClient *client,
-                        gpointer user_data)
- {
- 	NewVpnInfo *info;
-@@ -287,9 +288,11 @@ vpn_connection_new (GtkWindow *parent,
-                     const char *detail,
-                     NMRemoteSettings *settings,
-                     PageNewConnectionResultFunc result_func,
-+                    NMClient *client,
-                     gpointer user_data)
- {
- 	NMConnection *connection;
-+	NMSettingConnection *s_con;
- 	NMSetting *s_vpn;
- 
- 	if (!detail) {
-@@ -315,6 +318,14 @@ vpn_connection_new (GtkWindow *parent,
- 	                                     FALSE,
- 	                                     settings,
- 	                                     user_data);
-+
-+	s_con = nm_connection_get_setting_connection (connection);
-+	if (!s_con) {
-+		s_con = (NMSettingConnection *) nm_setting_connection_new ();
-+		nm_connection_add_setting (connection, NM_SETTING (s_con));
-+	}
-+	nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
-+
- 	s_vpn = nm_setting_vpn_new ();
- 	g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, detail, NULL);
- 	nm_connection_add_setting (connection, s_vpn);
-Index: network-manager-applet-1.0.4/src/connection-editor/page-vpn.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-vpn.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-vpn.h
-@@ -60,12 +60,14 @@ void vpn_connection_new (GtkWindow *pare
-                          const char *detail,
-                          NMRemoteSettings *settings,
-                          PageNewConnectionResultFunc result_func,
-+                         NMClient *client,
-                          gpointer user_data);
- 
- void vpn_connection_import (GtkWindow *parent,
-                             const char *detail,
-                             NMRemoteSettings *settings,
-                             PageNewConnectionResultFunc result_func,
-+                            NMClient *client,
-                             gpointer user_data);
- 
- #endif  /* __PAGE_VPN_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-wifi.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wifi.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-wifi.c
-@@ -33,6 +33,8 @@
- #include <nm-device-wifi.h>
- #include <nm-utils.h>
- 
-+#include "utils.h"
-+
- #include "page-wifi.h"
- 
- G_DEFINE_TYPE (CEPageWifi, ce_page_wifi, CE_TYPE_PAGE)
-@@ -622,6 +624,7 @@ wifi_connection_new (GtkWindow *parent,
-                      const char *detail,
-                      NMRemoteSettings *settings,
-                      PageNewConnectionResultFunc result_func,
-+                     NMClient *client,
-                      gpointer user_data)
- {
- 	NMConnection *connection;
-@@ -632,6 +635,17 @@ wifi_connection_new (GtkWindow *parent,
- 	                                     TRUE,
- 	                                     settings,
- 	                                     user_data);
-+
-+	if (utils_default_to_private_connection (client)) {
-+		NMSettingConnection *s_con;
-+		s_con = nm_connection_get_setting_connection (connection);
-+		if (!s_con) {
-+			s_con = (NMSettingConnection *) nm_setting_connection_new ();
-+			nm_connection_add_setting (connection, NM_SETTING (s_con));
-+		}
-+		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
-+	}
-+
- 	s_wifi = nm_setting_wireless_new ();
- 	g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
- 	nm_connection_add_setting (connection, s_wifi);
-Index: network-manager-applet-1.0.4/src/connection-editor/page-wifi.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wifi.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-wifi.h
-@@ -62,6 +62,7 @@ void wifi_connection_new (GtkWindow *par
-                           const char *detail,
-                           NMRemoteSettings *settings,
-                           PageNewConnectionResultFunc result_func,
-+                          NMClient *client,
-                           gpointer user_data);
- 
- #endif  /* __PAGE_WIFI_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-wimax.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wimax.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-wimax.c
-@@ -216,6 +216,7 @@ wimax_connection_new (GtkWindow *parent,
-                       const char *detail,
-                       NMRemoteSettings *settings,
-                       PageNewConnectionResultFunc result_func,
-+                      NMClient *client,
-                       gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-wimax.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-wimax.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-wimax.h
-@@ -56,6 +56,7 @@ void wimax_connection_new (GtkWindow *pa
-                            const char *detail,
-                            NMRemoteSettings *settings,
-                            PageNewConnectionResultFunc result_func,
-+                           NMClient *client,
-                            gpointer user_data);
- 
- #endif  /* __PAGE_WIMAX_H__ */
-Index: network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/gnome-bluetooth/nma-bt-device.c
-+++ network-manager-applet-1.0.4/src/gnome-bluetooth/nma-bt-device.c
-@@ -342,6 +342,7 @@ dun_new_cdma (NMAMobileWizardAccessMetho
- 	              NM_SETTING_CDMA_NUMBER, "#777",
- 	              NM_SETTING_CDMA_USERNAME, method->username,
- 	              NM_SETTING_CDMA_PASSWORD, method->password,
-+	              NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 	              NULL);
- 	nm_connection_add_setting (connection, setting);
- 
-@@ -368,6 +369,7 @@ dun_new_cdma (NMAMobileWizardAccessMetho
- 	              NULL);
- 	g_free (uuid);
- 	g_free (id);
-+	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
- 	nm_connection_add_setting (connection, setting);
- 
- 	return connection;
-@@ -387,6 +389,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod
- 	              NM_SETTING_GSM_NUMBER, "*99#",
- 	              NM_SETTING_GSM_USERNAME, method->username,
- 	              NM_SETTING_GSM_PASSWORD, method->password,
-+	              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 	              NM_SETTING_GSM_APN, method->gsm_apn,
- 	              NULL);
- 	nm_connection_add_setting (connection, setting);
-@@ -414,6 +417,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod
- 	              NULL);
- 	g_free (uuid);
- 	g_free (id);
-+	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
- 	nm_connection_add_setting (connection, setting);
- 
- 	return connection;
-@@ -978,6 +982,7 @@ add_pan_connection (NmaBtDevice *self)
- 	              NULL);
- 	g_free (id);
- 	g_free (uuid);
-+	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
- 	nm_connection_add_setting (connection, setting);
- 
- 	/* The Bluetooth settings */
-Index: network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/libnm-gtk/nm-wifi-dialog.c
-+++ network-manager-applet-1.0.4/src/libnm-gtk/nm-wifi-dialog.c
-@@ -38,6 +38,7 @@
- #include "nm-wifi-dialog.h"
- #include "wireless-security.h"
- #include "nm-ui-utils.h"
-+#include "utils.h"
- #include "eap-method.h"
- 
- G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
-@@ -1202,6 +1203,9 @@ nma_wifi_dialog_get_connection (NMAWifiD
- 			      NM_SETTING_CONNECTION_UUID, uuid,
- 			      NULL);
- 		g_free (uuid);
-+		if (utils_default_to_private_connection (priv->client)) {
-+			nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
-+		}
- 		nm_connection_add_setting (connection, (NMSetting *) s_con);
- 
- 		s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
-Index: network-manager-applet-1.0.4/src/mobile-helpers.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/mobile-helpers.c
-+++ network-manager-applet-1.0.4/src/mobile-helpers.c
-@@ -307,6 +307,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
- 			              NM_SETTING_CDMA_NUMBER, "#777",
- 			              NM_SETTING_CDMA_USERNAME, method->username,
- 			              NM_SETTING_CDMA_PASSWORD, method->password,
-+			              NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 			              NULL);
- 			nm_connection_add_setting (connection, setting);
- 		} else if (method->devtype == NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
-@@ -317,6 +318,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
- 			              NM_SETTING_GSM_USERNAME, method->username,
- 			              NM_SETTING_GSM_PASSWORD, method->password,
- 			              NM_SETTING_GSM_APN, method->gsm_apn,
-+			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
- 			              NULL);
- 			nm_connection_add_setting (connection, setting);
- 		} else
-@@ -347,6 +349,7 @@ mobile_wizard_done (NMAMobileWizard *wiz
- 		                                      "user", g_get_user_name (), NULL);
- 		g_free (uuid);
- 		g_free (id);
-+		nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
- 		nm_connection_add_setting (connection, setting);
- 	}
- 
-Index: network-manager-applet-1.0.4/src/utils/utils.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/utils/utils.c
-+++ network-manager-applet-1.0.4/src/utils/utils.c
-@@ -288,3 +288,10 @@ utils_filter_editable_on_insert_text (Gt
- 	return count > 0;
- }
- 
-+gboolean
-+utils_default_to_private_connection (NMClient *client)
-+{
-+	NMClientPermissionResult perms;
-+	perms = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM);
-+	return (perms != NM_CLIENT_PERMISSION_RESULT_YES);
-+}
-Index: network-manager-applet-1.0.4/src/utils/utils.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/utils/utils.h
-+++ network-manager-applet-1.0.4/src/utils/utils.h
-@@ -27,6 +27,7 @@
- #include <gtk/gtk.h>
- #include <nm-connection.h>
- #include <nm-device.h>
-+#include <nm-client.h>
- #include <net/ethernet.h>
- #include <nm-access-point.h>
- 
-@@ -85,6 +86,8 @@ void utils_show_error_dialog (const char
-                               gboolean modal,
-                               GtkWindow *parent);
- 
-+gboolean utils_default_to_private_connection (NMClient *client);
-+
- #define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
- 
- typedef enum  {
-Index: network-manager-applet-1.0.4/src/wireless-security/ws-wep-key.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/ws-wep-key.c
-+++ network-manager-applet-1.0.4/src/wireless-security/ws-wep-key.c
-@@ -147,6 +147,7 @@ static void
- fill_connection (WirelessSecurity *parent, NMConnection *connection)
- {
- 	WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
-+	NMSettingConnection *s_con;
- 	NMSettingWirelessSecurity *s_wsec;
- 	NMSettingSecretFlags secret_flags;
- 	GtkWidget *widget, *passwd_entry;
-@@ -162,6 +163,8 @@ fill_connection (WirelessSecurity *paren
- 	key = gtk_entry_get_text (GTK_ENTRY (widget));
- 	strcpy (sec->keys[sec->cur_index], key);
- 
-+	s_con = nm_connection_get_setting_connection (connection);
-+
- 	/* Blow away the old security setting by adding a clear one */
- 	s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
- 	nm_connection_add_setting (connection, (NMSetting *) s_wsec);
-@@ -173,6 +176,10 @@ fill_connection (WirelessSecurity *paren
- 	              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type,
- 	              NULL);
- 
-+	/* If the connection is user-owned, mark the secrets as agent-owned */
-+	if (s_con && nm_setting_connection_get_num_permissions (s_con))
-+		g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
-+
- 	for (i = 0; i < 4; i++) {
- 		if (strlen (sec->keys[i]))
- 			nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]);
-Index: network-manager-applet-1.0.4/src/wireless-security/ws-wpa-psk.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/wireless-security/ws-wpa-psk.c
-+++ network-manager-applet-1.0.4/src/wireless-security/ws-wpa-psk.c
-@@ -97,12 +97,14 @@ fill_connection (WirelessSecurity *paren
- 	WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent;
- 	GtkWidget *widget, *passwd_entry;
- 	const char *key;
-+	NMSettingConnection *s_con;
- 	NMSettingWireless *s_wireless;
- 	NMSettingWirelessSecurity *s_wireless_sec;
- 	NMSettingSecretFlags secret_flags;
- 	const char *mode;
- 	gboolean is_adhoc = FALSE;
- 
-+	s_con = nm_connection_get_setting_connection (connection);
- 	s_wireless = nm_connection_get_setting_wireless (connection);
- 	g_assert (s_wireless);
- 
-@@ -118,6 +120,9 @@ fill_connection (WirelessSecurity *paren
- 	passwd_entry = widget;
- 	key = gtk_entry_get_text (GTK_ENTRY (widget));
- 	g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
-+	/* If the connection is user-owned, mark the secrets as agent-owned */
-+	if (s_con && nm_setting_connection_get_num_permissions (s_con))
-+		g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
- 
- 	/* Save PSK_FLAGS to the connection */
- 	secret_flags = nma_utils_menu_to_secret_flags (passwd_entry);
-Index: network-manager-applet-1.0.4/src/connection-editor/page-team.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-team.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-team.c
-@@ -329,6 +329,7 @@ team_connection_new (GtkWindow *parent,
-                      const char *detail,
-                      NMRemoteSettings *settings,
-                      PageNewConnectionResultFunc result_func,
-+                     NMClient *client,
-                      gpointer user_data)
- {
- 	NMConnection *connection;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-team.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-team.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-team.h
-@@ -55,6 +55,7 @@ void team_connection_new (GtkWindow *par
-                           const char *detail,
-                           NMRemoteSettings *settings,
-                           PageNewConnectionResultFunc result_func,
-+                          NMClient *client,
-                           gpointer user_data);
- 
- #endif  /* __PAGE_TEAM_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bluetooth.c
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.c
-@@ -257,6 +257,7 @@ bluetooth_connection_new (GtkWindow *par
-                           const char *detail,
-                           NMRemoteSettings *settings,
-                           PageNewConnectionResultFunc result_func,
-+                          NMClient *client,
-                           gpointer user_data)
- {
- 	gint response;
-Index: network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.h
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/page-bluetooth.h
-+++ network-manager-applet-1.0.4/src/connection-editor/page-bluetooth.h
-@@ -58,6 +58,7 @@ void bluetooth_connection_new (GtkWindow
-                                const char *detail,
-                                NMRemoteSettings *settings,
-                                PageNewConnectionResultFunc result_func,
-+                               NMClient *client,
-                                gpointer user_data);
- 
- #endif  /* __PAGE_BLUETOOTH_H__ */
-Index: network-manager-applet-1.0.4/src/connection-editor/connection-helpers.c
-===================================================================
---- network-manager-applet-1.0.4.orig/src/connection-editor/connection-helpers.c
-+++ network-manager-applet-1.0.4/src/connection-editor/connection-helpers.c
-@@ -380,6 +380,7 @@ new_connection_of_type (GtkWindow *paren
-                         gpointer user_data)
- {
- 	NewConnectionData *ncd;
-+	NMConnectionList *list = user_data;
- 
- 	ncd = g_slice_new (NewConnectionData);
- 	ncd->parent_window = parent_window;
-@@ -391,6 +392,7 @@ new_connection_of_type (GtkWindow *paren
- 	          detail,
- 	          settings,
- 	          new_connection_result,
-+	          list->nm_client,
- 	          ncd);
- }
- 
 
=== added file 'debian/patches/Allow-to-create-connections-without-admin-privileges.patch'
--- debian/patches/Allow-to-create-connections-without-admin-privileges.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Allow-to-create-connections-without-admin-privileges.patch	2015-12-02 15:57:13 +0000
@@ -0,0 +1,683 @@
+From: Michael Biebl <[e-mail]>
+Date: Tue, 18 Mar 2014 10:49:13 +0100
+Subject: Allow to create connections without admin privileges
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Set passwords as agent-owned when they need to, to allow users without
+root permissions to easily configure their connections.
+The logic is:
+- Bluetooth, CDMA and GSM connections: always user-owned
+- WEP/WPA connections: system-owned if user has the permissions
+  (with NM’s config, that is netdev or sudo membership), user-owned
+  otherwise. The password is stored in the keyring for WPA, not for
+  WEP.
+- WiMax / Wired connections: always system-owned (with 802.1x
+  passwords in the keyring).
+
+Closes: #696256
+---
+ src/applet-device-wifi.c                   | 25 +++++++++++++++++++++++++
+ src/connection-editor/ce-page.h            |  1 +
+ src/connection-editor/connection-helpers.c |  2 ++
+ src/connection-editor/page-bond.c          |  1 +
+ src/connection-editor/page-bond.h          |  1 +
+ src/connection-editor/page-bridge.c        |  1 +
+ src/connection-editor/page-bridge.h        |  1 +
+ src/connection-editor/page-dsl.c           |  1 +
+ src/connection-editor/page-dsl.h           |  1 +
+ src/connection-editor/page-ethernet.c      |  1 +
+ src/connection-editor/page-ethernet.h      |  1 +
+ src/connection-editor/page-infiniband.c    |  1 +
+ src/connection-editor/page-infiniband.h    |  1 +
+ src/connection-editor/page-mobile.c        | 11 +++++++++++
+ src/connection-editor/page-mobile.h        |  1 +
+ src/connection-editor/page-team.c          |  1 +
+ src/connection-editor/page-team.h          |  1 +
+ src/connection-editor/page-vlan.c          |  1 +
+ src/connection-editor/page-vlan.h          |  1 +
+ src/connection-editor/page-vpn.c           | 11 +++++++++++
+ src/connection-editor/page-vpn.h           |  2 ++
+ src/connection-editor/page-wifi.c          | 14 ++++++++++++++
+ src/connection-editor/page-wifi.h          |  1 +
+ src/connection-editor/page-wimax.c         |  1 +
+ src/connection-editor/page-wimax.h         |  1 +
+ src/gnome-bluetooth/nma-bt-device.c        |  5 +++++
+ src/libnm-gtk/nm-wifi-dialog.c             |  4 ++++
+ src/mobile-helpers.c                       |  3 +++
+ src/utils/utils.c                          |  7 +++++++
+ src/utils/utils.h                          |  3 +++
+ src/wireless-security/ws-wep-key.c         |  7 +++++++
+ src/wireless-security/ws-wpa-psk.c         |  5 +++++
+ 32 files changed, 118 insertions(+)
+
+diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
+index 0ae44ad..dc7fbc8 100644
+--- a/src/applet-device-wifi.c
++++ b/src/applet-device-wifi.c
+@@ -386,6 +386,7 @@ _do_new_auto_connection (NMApplet *applet,
+ 	NMSettingWirelessSecurity *s_wsec = NULL;
+ 	NMSetting8021x *s_8021x = NULL;
+ 	const GByteArray *ssid;
++	NM80211ApFlags flags;
+ 	NM80211ApSecurityFlags wpa_flags, rsn_flags;
+ 	GtkWidget *dialog;
+ 	MoreInfo *more_info;
+@@ -417,6 +418,7 @@ _do_new_auto_connection (NMApplet *applet,
+ 	/* If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x
+ 	 * setting and ask the user for more information.
+ 	 */
++	flags = nm_access_point_get_flags (ap);
+ 	rsn_flags = nm_access_point_get_rsn_flags (ap);
+ 	wpa_flags = nm_access_point_get_wpa_flags (ap);
+ 	if (   (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
+@@ -445,6 +447,29 @@ _do_new_auto_connection (NMApplet *applet,
+ 		nm_connection_add_setting (connection, NM_SETTING (s_8021x));
+ 	}
+ 
++	if (utils_default_to_private_connection (applet->nm_client)) {
++		if (!s_con) {
++			s_con = (NMSettingConnection *) nm_setting_connection_new ();
++			nm_connection_add_setting (connection, NM_SETTING (s_con));
++		}
++		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
++
++		if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) ||
++		    (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
++			if (!s_wsec) {
++				s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
++				nm_connection_add_setting (connection, NM_SETTING (s_wsec));
++			}
++			g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
++		} else if (flags & NM_802_11_AP_FLAGS_PRIVACY) {
++			if (!s_wsec) {
++				s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
++				nm_connection_add_setting (connection, NM_SETTING (s_wsec));
++			}
++			g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
++		}
++	}
++
+ 	/* If it's an 802.1x connection, we need more information, so pop up the
+ 	 * Dialog Of Doom.
+ 	 */
+diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
+index 41711d9..521dbc6 100644
+--- a/src/connection-editor/ce-page.h
++++ b/src/connection-editor/ce-page.h
+@@ -48,6 +48,7 @@ typedef void (*PageNewConnectionFunc) (GtkWindow *parent,
+                                        const char *detail,
+                                        NMRemoteSettings *settings,
+                                        PageNewConnectionResultFunc result_func,
++                                       NMClient *client,
+                                        gpointer user_data);
+ 
+ #define CE_TYPE_PAGE            (ce_page_get_type ())
+diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
+index 69da25c..b638530 100644
+--- a/src/connection-editor/connection-helpers.c
++++ b/src/connection-editor/connection-helpers.c
+@@ -380,6 +380,7 @@ new_connection_of_type (GtkWindow *parent_window,
+                         gpointer user_data)
+ {
+ 	NewConnectionData *ncd;
++	NMConnectionList *list = user_data;
+ 
+ 	ncd = g_slice_new (NewConnectionData);
+ 	ncd->parent_window = parent_window;
+@@ -391,6 +392,7 @@ new_connection_of_type (GtkWindow *parent_window,
+ 	          detail,
+ 	          settings,
+ 	          new_connection_result,
++	          list->nm_client,
+ 	          ncd);
+ }
+ 
+diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
+index 799ea94..966625c 100644
+--- a/src/connection-editor/page-bond.c
++++ b/src/connection-editor/page-bond.c
+@@ -610,6 +610,7 @@ bond_connection_new (GtkWindow *parent,
+                      const char *detail,
+                      NMRemoteSettings *settings,
+                      PageNewConnectionResultFunc result_func,
++                     NMClient *client,
+                      gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-bond.h b/src/connection-editor/page-bond.h
+index dcc8e1f..3844869 100644
+--- a/src/connection-editor/page-bond.h
++++ b/src/connection-editor/page-bond.h
+@@ -56,6 +56,7 @@ void bond_connection_new (GtkWindow *parent,
+                           const char *detail,
+                           NMRemoteSettings *settings,
+                           PageNewConnectionResultFunc result_func,
++                          NMClient *client,
+                           gpointer user_data);
+ 
+ #endif  /* __PAGE_BOND_H__ */
+diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
+index 1ffcb1f..34ff9af 100644
+--- a/src/connection-editor/page-bridge.c
++++ b/src/connection-editor/page-bridge.c
+@@ -294,6 +294,7 @@ bridge_connection_new (GtkWindow *parent,
+                      const char *detail,
+                      NMRemoteSettings *settings,
+                      PageNewConnectionResultFunc result_func,
++                     NMClient *client,
+                      gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-bridge.h b/src/connection-editor/page-bridge.h
+index fa6d927..4bd0b95 100644
+--- a/src/connection-editor/page-bridge.h
++++ b/src/connection-editor/page-bridge.h
+@@ -56,6 +56,7 @@ void bridge_connection_new (GtkWindow *parent,
+                             const char *detail,
+                             NMRemoteSettings *settings,
+                             PageNewConnectionResultFunc result_func,
++                            NMClient *client,
+                             gpointer user_data);
+ 
+ #endif  /* __PAGE_BRIDGE_H__ */
+diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
+index c327979..a38f333 100644
+--- a/src/connection-editor/page-dsl.c
++++ b/src/connection-editor/page-dsl.c
+@@ -221,6 +221,7 @@ dsl_connection_new (GtkWindow *parent,
+                     const char *detail,
+                     NMRemoteSettings *settings,
+                     PageNewConnectionResultFunc result_func,
++                    NMClient *client,
+                     gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-dsl.h b/src/connection-editor/page-dsl.h
+index 514699a..656e3c6 100644
+--- a/src/connection-editor/page-dsl.h
++++ b/src/connection-editor/page-dsl.h
+@@ -58,6 +58,7 @@ void dsl_connection_new (GtkWindow *parent,
+                          const char *detail,
+                          NMRemoteSettings *settings,
+                          PageNewConnectionResultFunc callback,
++                         NMClient *client,
+                          gpointer user_data);
+ 
+ #endif  /* __PAGE_DSL_H__ */
+diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
+index 451ee22..9372c1e 100644
+--- a/src/connection-editor/page-ethernet.c
++++ b/src/connection-editor/page-ethernet.c
+@@ -377,6 +377,7 @@ ethernet_connection_new (GtkWindow *parent,
+                          const char *detail,
+                          NMRemoteSettings *settings,
+                          PageNewConnectionResultFunc result_func,
++                         NMClient *client,
+                          gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-ethernet.h b/src/connection-editor/page-ethernet.h
+index 4dd4a5c..55ade9b 100644
+--- a/src/connection-editor/page-ethernet.h
++++ b/src/connection-editor/page-ethernet.h
+@@ -58,6 +58,7 @@ void ethernet_connection_new (GtkWindow *parent,
+                               const char *detail,
+                               NMRemoteSettings *settings,
+                               PageNewConnectionResultFunc result_func,
++                              NMClient *client,
+                               gpointer user_data);
+ 
+ #endif  /* __PAGE_ETHERNET_H__ */
+diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
+index 19560a2..bb9335e 100644
+--- a/src/connection-editor/page-infiniband.c
++++ b/src/connection-editor/page-infiniband.c
+@@ -253,6 +253,7 @@ infiniband_connection_new (GtkWindow *parent,
+                            const char *detail,
+                            NMRemoteSettings *settings,
+                            PageNewConnectionResultFunc result_func,
++                           NMClient *client,
+                            gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-infiniband.h b/src/connection-editor/page-infiniband.h
+index e895a98..97bff3b 100644
+--- a/src/connection-editor/page-infiniband.h
++++ b/src/connection-editor/page-infiniband.h
+@@ -56,6 +56,7 @@ void infiniband_connection_new (GtkWindow *parent,
+                                 const char *detail,
+                                 NMRemoteSettings *settings,
+                                 PageNewConnectionResultFunc result_func,
++                                NMClient *client,
+                                 gpointer user_data);
+ 
+ #endif  /* __PAGE_INFINIBAND_H__ */
+diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
+index ef24184..df3d316 100644
+--- a/src/connection-editor/page-mobile.c
++++ b/src/connection-editor/page-mobile.c
+@@ -452,6 +452,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
+ 	NMConnection *connection = NULL;
+ 
+ 	if (!canceled && method) {
++		NMSettingConnection *s_con;
+ 		NMSetting *type_setting;
+ 		const char *ctype = NULL;
+ 		char *detail = NULL;
+@@ -465,6 +466,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
+ 			              NM_SETTING_GSM_NUMBER, "*99#",
+ 			              NM_SETTING_GSM_USERNAME, method->username,
+ 			              NM_SETTING_GSM_PASSWORD, method->password,
++			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 			              NM_SETTING_GSM_APN, method->gsm_apn,
+ 			              NULL);
+ 			break;
+@@ -476,6 +478,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
+ 			              NM_SETTING_CDMA_NUMBER, "#777",
+ 			              NM_SETTING_GSM_USERNAME, method->username,
+ 			              NM_SETTING_GSM_PASSWORD, method->password,
++			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 			              NULL);
+ 			break;
+ 		default:
+@@ -490,6 +493,13 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
+ 		connection = ce_page_new_connection (detail, ctype, FALSE, info->settings, info->user_data);
+ 		g_free (detail);
+ 
++		s_con = nm_connection_get_setting_connection (connection);
++		if (!s_con) {
++			s_con = (NMSettingConnection *) nm_setting_connection_new ();
++			nm_connection_add_setting (connection, NM_SETTING (s_con));
++		}
++		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
++
+ 		nm_connection_add_setting (connection, type_setting);
+ 		nm_connection_add_setting (connection, nm_setting_ppp_new ());
+ 	}
+@@ -514,6 +524,7 @@ mobile_connection_new (GtkWindow *parent,
+                        const char *detail,
+                        NMRemoteSettings *settings,
+                        PageNewConnectionResultFunc result_func,
++                       NMClient *client,
+                        gpointer user_data)
+ {
+ 	NMAMobileWizard *wizard;
+diff --git a/src/connection-editor/page-mobile.h b/src/connection-editor/page-mobile.h
+index ab2903c..bc5b479 100644
+--- a/src/connection-editor/page-mobile.h
++++ b/src/connection-editor/page-mobile.h
+@@ -58,6 +58,7 @@ void mobile_connection_new (GtkWindow *parent,
+                             const char *detail,
+                             NMRemoteSettings *settings,
+                             PageNewConnectionResultFunc result_func,
++                            NMClient *client,
+                             gpointer user_data);
+ 
+ #endif  /* __PAGE_MOBILE_H__ */
+diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
+index 9efa43d..786c0fa 100644
+--- a/src/connection-editor/page-team.c
++++ b/src/connection-editor/page-team.c
+@@ -367,6 +367,7 @@ team_connection_new (GtkWindow *parent,
+                      const char *detail,
+                      NMRemoteSettings *settings,
+                      PageNewConnectionResultFunc result_func,
++                     NMClient *client,
+                      gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-team.h b/src/connection-editor/page-team.h
+index d1936b3..91d9df3 100644
+--- a/src/connection-editor/page-team.h
++++ b/src/connection-editor/page-team.h
+@@ -55,6 +55,7 @@ void team_connection_new (GtkWindow *parent,
+                           const char *detail,
+                           NMRemoteSettings *settings,
+                           PageNewConnectionResultFunc result_func,
++                          NMClient *client,
+                           gpointer user_data);
+ 
+ #endif  /* __PAGE_TEAM_H__ */
+diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
+index 1a8c6b6..d41e38a 100644
+--- a/src/connection-editor/page-vlan.c
++++ b/src/connection-editor/page-vlan.c
+@@ -673,6 +673,7 @@ vlan_connection_new (GtkWindow *parent,
+                      const char *detail,
+                      NMRemoteSettings *settings,
+                      PageNewConnectionResultFunc result_func,
++                     NMClient *client,
+                      gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-vlan.h b/src/connection-editor/page-vlan.h
+index 0e66a06..c7969aa 100644
+--- a/src/connection-editor/page-vlan.h
++++ b/src/connection-editor/page-vlan.h
+@@ -56,6 +56,7 @@ void vlan_connection_new (GtkWindow *parent,
+                           const char *detail,
+                           NMRemoteSettings *settings,
+                           PageNewConnectionResultFunc result_func,
++                          NMClient *client,
+                           gpointer user_data);
+ 
+ #endif  /* __PAGE_VLAN_H__ */
+diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
+index 004a260..5c0c8b5 100644
+--- a/src/connection-editor/page-vpn.c
++++ b/src/connection-editor/page-vpn.c
+@@ -253,6 +253,7 @@ vpn_connection_import (GtkWindow *parent,
+                        const char *detail,
+                        NMRemoteSettings *settings,
+                        PageNewConnectionResultFunc result_func,
++                       NMClient *client,
+                        gpointer user_data)
+ {
+ 	NewVpnInfo *info;
+@@ -287,9 +288,11 @@ vpn_connection_new (GtkWindow *parent,
+                     const char *detail,
+                     NMRemoteSettings *settings,
+                     PageNewConnectionResultFunc result_func,
++                    NMClient *client,
+                     gpointer user_data)
+ {
+ 	NMConnection *connection;
++	NMSettingConnection *s_con;
+ 	NMSetting *s_vpn;
+ 
+ 	if (!detail) {
+@@ -315,6 +318,14 @@ vpn_connection_new (GtkWindow *parent,
+ 	                                     FALSE,
+ 	                                     settings,
+ 	                                     user_data);
++
++	s_con = nm_connection_get_setting_connection (connection);
++	if (!s_con) {
++		s_con = (NMSettingConnection *) nm_setting_connection_new ();
++		nm_connection_add_setting (connection, NM_SETTING (s_con));
++	}
++	nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
++
+ 	s_vpn = nm_setting_vpn_new ();
+ 	g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, detail, NULL);
+ 	nm_connection_add_setting (connection, s_vpn);
+diff --git a/src/connection-editor/page-vpn.h b/src/connection-editor/page-vpn.h
+index 2339732..2164930 100644
+--- a/src/connection-editor/page-vpn.h
++++ b/src/connection-editor/page-vpn.h
+@@ -60,12 +60,14 @@ void vpn_connection_new (GtkWindow *parent,
+                          const char *detail,
+                          NMRemoteSettings *settings,
+                          PageNewConnectionResultFunc result_func,
++                         NMClient *client,
+                          gpointer user_data);
+ 
+ void vpn_connection_import (GtkWindow *parent,
+                             const char *detail,
+                             NMRemoteSettings *settings,
+                             PageNewConnectionResultFunc result_func,
++                            NMClient *client,
+                             gpointer user_data);
+ 
+ #endif  /* __PAGE_VPN_H__ */
+diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
+index 8a25c64..9c56e4b 100644
+--- a/src/connection-editor/page-wifi.c
++++ b/src/connection-editor/page-wifi.c
+@@ -33,6 +33,8 @@
+ #include <nm-device-wifi.h>
+ #include <nm-utils.h>
+ 
++#include "utils.h"
++
+ #include "page-wifi.h"
+ 
+ G_DEFINE_TYPE (CEPageWifi, ce_page_wifi, CE_TYPE_PAGE)
+@@ -622,6 +624,7 @@ wifi_connection_new (GtkWindow *parent,
+                      const char *detail,
+                      NMRemoteSettings *settings,
+                      PageNewConnectionResultFunc result_func,
++                     NMClient *client,
+                      gpointer user_data)
+ {
+ 	NMConnection *connection;
+@@ -632,6 +635,17 @@ wifi_connection_new (GtkWindow *parent,
+ 	                                     TRUE,
+ 	                                     settings,
+ 	                                     user_data);
++
++	if (utils_default_to_private_connection (client)) {
++		NMSettingConnection *s_con;
++		s_con = nm_connection_get_setting_connection (connection);
++		if (!s_con) {
++			s_con = (NMSettingConnection *) nm_setting_connection_new ();
++			nm_connection_add_setting (connection, NM_SETTING (s_con));
++		}
++		nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
++	}
++
+ 	s_wifi = nm_setting_wireless_new ();
+ 	g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
+ 	nm_connection_add_setting (connection, s_wifi);
+diff --git a/src/connection-editor/page-wifi.h b/src/connection-editor/page-wifi.h
+index c039b00..b89e589 100644
+--- a/src/connection-editor/page-wifi.h
++++ b/src/connection-editor/page-wifi.h
+@@ -62,6 +62,7 @@ void wifi_connection_new (GtkWindow *parent,
+                           const char *detail,
+                           NMRemoteSettings *settings,
+                           PageNewConnectionResultFunc result_func,
++                          NMClient *client,
+                           gpointer user_data);
+ 
+ #endif  /* __PAGE_WIFI_H__ */
+diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
+index 97c4d90..d8cf40c 100644
+--- a/src/connection-editor/page-wimax.c
++++ b/src/connection-editor/page-wimax.c
+@@ -216,6 +216,7 @@ wimax_connection_new (GtkWindow *parent,
+                       const char *detail,
+                       NMRemoteSettings *settings,
+                       PageNewConnectionResultFunc result_func,
++                      NMClient *client,
+                       gpointer user_data)
+ {
+ 	NMConnection *connection;
+diff --git a/src/connection-editor/page-wimax.h b/src/connection-editor/page-wimax.h
+index 6938284..91d937c 100644
+--- a/src/connection-editor/page-wimax.h
++++ b/src/connection-editor/page-wimax.h
+@@ -56,6 +56,7 @@ void wimax_connection_new (GtkWindow *parent,
+                            const char *detail,
+                            NMRemoteSettings *settings,
+                            PageNewConnectionResultFunc result_func,
++                           NMClient *client,
+                            gpointer user_data);
+ 
+ #endif  /* __PAGE_WIMAX_H__ */
+diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
+index 870d2be..cd4103d 100644
+--- a/src/gnome-bluetooth/nma-bt-device.c
++++ b/src/gnome-bluetooth/nma-bt-device.c
+@@ -342,6 +342,7 @@ dun_new_cdma (NMAMobileWizardAccessMethod *method)
+ 	              NM_SETTING_CDMA_NUMBER, "#777",
+ 	              NM_SETTING_CDMA_USERNAME, method->username,
+ 	              NM_SETTING_CDMA_PASSWORD, method->password,
++	              NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 	              NULL);
+ 	nm_connection_add_setting (connection, setting);
+ 
+@@ -368,6 +369,7 @@ dun_new_cdma (NMAMobileWizardAccessMethod *method)
+ 	              NULL);
+ 	g_free (uuid);
+ 	g_free (id);
++	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
+ 	nm_connection_add_setting (connection, setting);
+ 
+ 	return connection;
+@@ -387,6 +389,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod *method)
+ 	              NM_SETTING_GSM_NUMBER, "*99#",
+ 	              NM_SETTING_GSM_USERNAME, method->username,
+ 	              NM_SETTING_GSM_PASSWORD, method->password,
++	              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 	              NM_SETTING_GSM_APN, method->gsm_apn,
+ 	              NULL);
+ 	nm_connection_add_setting (connection, setting);
+@@ -414,6 +417,7 @@ dun_new_gsm (NMAMobileWizardAccessMethod *method)
+ 	              NULL);
+ 	g_free (uuid);
+ 	g_free (id);
++	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
+ 	nm_connection_add_setting (connection, setting);
+ 
+ 	return connection;
+@@ -978,6 +982,7 @@ add_pan_connection (NmaBtDevice *self)
+ 	              NULL);
+ 	g_free (id);
+ 	g_free (uuid);
++	nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
+ 	nm_connection_add_setting (connection, setting);
+ 
+ 	/* The Bluetooth settings */
+diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
+index ace323b..0916557 100644
+--- a/src/libnm-gtk/nm-wifi-dialog.c
++++ b/src/libnm-gtk/nm-wifi-dialog.c
+@@ -39,6 +39,7 @@
+ #include "wireless-security.h"
+ #include "nm-ui-utils.h"
+ #include "eap-method.h"
++#include "utils.h"
+ 
+ G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
+ 
+@@ -1203,6 +1204,9 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
+ 			      NM_SETTING_CONNECTION_UUID, uuid,
+ 			      NULL);
+ 		g_free (uuid);
++		if (utils_default_to_private_connection (priv->client)) {
++			nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
++		}
+ 		nm_connection_add_setting (connection, (NMSetting *) s_con);
+ 
+ 		s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
+diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
+index daa422e..903537f 100644
+--- a/src/mobile-helpers.c
++++ b/src/mobile-helpers.c
+@@ -179,6 +179,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
+ 			              NM_SETTING_CDMA_NUMBER, "#777",
+ 			              NM_SETTING_CDMA_USERNAME, method->username,
+ 			              NM_SETTING_CDMA_PASSWORD, method->password,
++			              NM_SETTING_CDMA_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 			              NULL);
+ 			nm_connection_add_setting (connection, setting);
+ 		} else if (method->devtype == NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
+@@ -189,6 +190,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
+ 			              NM_SETTING_GSM_USERNAME, method->username,
+ 			              NM_SETTING_GSM_PASSWORD, method->password,
+ 			              NM_SETTING_GSM_APN, method->gsm_apn,
++			              NM_SETTING_GSM_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+ 			              NULL);
+ 			nm_connection_add_setting (connection, setting);
+ 		} else
+@@ -219,6 +221,7 @@ mobile_wizard_done (NMAMobileWizard *wizard,
+ 		                                      "user", g_get_user_name (), NULL);
+ 		g_free (uuid);
+ 		g_free (id);
++		nm_setting_connection_add_permission ((NMSettingConnection *) setting, "user", g_get_user_name (), NULL);
+ 		nm_connection_add_setting (connection, setting);
+ 	}
+ 
+diff --git a/src/utils/utils.c b/src/utils/utils.c
+index 61d6a9e..8d52ef1 100644
+--- a/src/utils/utils.c
++++ b/src/utils/utils.c
+@@ -286,3 +286,10 @@ utils_filter_editable_on_insert_text (GtkEditable *editable,
+ 	return count > 0;
+ }
+ 
++gboolean
++utils_default_to_private_connection (NMClient *client)
++{
++	NMClientPermissionResult perms;
++	perms = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM);
++	return (perms != NM_CLIENT_PERMISSION_RESULT_YES);
++}
+diff --git a/src/utils/utils.h b/src/utils/utils.h
+index 1abff65..714fe3d 100644
+--- a/src/utils/utils.h
++++ b/src/utils/utils.h
+@@ -27,6 +27,7 @@
+ #include <gtk/gtk.h>
+ #include <nm-connection.h>
+ #include <nm-device.h>
++#include <nm-client.h>
+ #include <net/ethernet.h>
+ #include <nm-access-point.h>
+ 
+@@ -85,6 +86,8 @@ void utils_show_error_dialog (const char *title,
+                               gboolean modal,
+                               GtkWindow *parent);
+ 
++gboolean utils_default_to_private_connection (NMClient *client);
++
+ #define NMA_ERROR (g_quark_from_static_string ("nma-error-quark"))
+ 
+ typedef enum  {
+diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
+index 2399ace..147f848 100644
+--- a/src/wireless-security/ws-wep-key.c
++++ b/src/wireless-security/ws-wep-key.c
+@@ -147,6 +147,7 @@ static void
+ fill_connection (WirelessSecurity *parent, NMConnection *connection)
+ {
+ 	WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
++	NMSettingConnection *s_con;
+ 	NMSettingWirelessSecurity *s_wsec;
+ 	NMSettingSecretFlags secret_flags;
+ 	GtkWidget *widget, *passwd_entry;
+@@ -173,6 +174,12 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
+ 	              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type,
+ 	              NULL);
+ 
++	s_con = nm_connection_get_setting_connection (connection);
++
++	/* If the connection is user-owned, mark the secrets as agent-owned */
++	if (s_con && nm_setting_connection_get_num_permissions (s_con))
++		g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
++
+ 	for (i = 0; i < 4; i++) {
+ 		if (strlen (sec->keys[i]))
+ 			nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]);
+diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
+index 5cd658a..f6eaa27 100644
+--- a/src/wireless-security/ws-wpa-psk.c
++++ b/src/wireless-security/ws-wpa-psk.c
+@@ -97,12 +97,14 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
+ 	WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent;
+ 	GtkWidget *widget, *passwd_entry;
+ 	const char *key;
++	NMSettingConnection *s_con;
+ 	NMSettingWireless *s_wireless;
+ 	NMSettingWirelessSecurity *s_wireless_sec;
+ 	NMSettingSecretFlags secret_flags;
+ 	const char *mode;
+ 	gboolean is_adhoc = FALSE;
+ 
++	s_con = nm_connection_get_setting_connection (connection);
+ 	s_wireless = nm_connection_get_setting_wireless (connection);
+ 	g_assert (s_wireless);
+ 
+@@ -118,6 +120,9 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
+ 	passwd_entry = widget;
+ 	key = gtk_entry_get_text (GTK_ENTRY (widget));
+ 	g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
++	/* If the connection is user-owned, mark the secrets as agent-owned */
++	if (s_con && nm_setting_connection_get_num_permissions (s_con))
++		g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
+ 
+ 	/* Save PSK_FLAGS to the connection */
+ 	secret_flags = nma_utils_menu_to_secret_flags (passwd_entry);
 
=== added file 'debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch'
--- debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch	2015-12-02 15:57:13 +0000
@@ -0,0 +1,35 @@
+From: Michael Biebl <[e-mail]>
+Date: Tue, 1 Apr 2014 15:53:35 +0200
+Subject: Don't hard-code gnome-bluetooth plugin directory
+
+---
+ configure.ac                    | 2 ++
+ src/gnome-bluetooth/Makefile.am | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 266bff6..9482a69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,6 +146,8 @@ case "${with_bluetooth}" in
+ 				  gnome-bluetooth-1.0 < 3.11.0
+ 				  libnm-util libnm-glib,
+ 				  have_gbt=yes, have_gbt=no)
++		GNOME_BLUETOOTH_PLUGIN_DIR="`$PKG_CONFIG --variable=libdir gnome-bluetooth-1.0`/gnome-bluetooth/plugins"
++		AC_SUBST(GNOME_BLUETOOTH_PLUGIN_DIR)
+ 		;;
+ esac
+ 
+diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
+index 940aeba..2649d2e 100644
+--- a/src/gnome-bluetooth/Makefile.am
++++ b/src/gnome-bluetooth/Makefile.am
+@@ -16,7 +16,7 @@ BT_WIDGET_SOURCES = \
+ 	nma-bt-device.h
+ 
+ if HAVE_GBT
+-plugindir = $(libdir)/gnome-bluetooth/plugins
++plugindir = $(GNOME_BLUETOOTH_PLUGIN_DIR)
+ 
+ plugin_LTLIBRARIES = libnma.la
+ 
 
=== added file 'debian/patches/Force-online-state-with-unmanaged-devices.patch'
--- debian/patches/Force-online-state-with-unmanaged-devices.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Force-online-state-with-unmanaged-devices.patch	2015-12-02 15:57:13 +0000
@@ -0,0 +1,28 @@
+From: Michael Biebl <[e-mail]>
+Date: Tue, 18 Mar 2014 10:49:13 +0100
+Subject: Force online state with unmanaged devices
+
+If NM has an active unmanaged device it will forcefully set the online
+state to CONNECTED_GLOBAL. In that case show a wired connection icon
+instead of an offline icon.
+
+Closes: #471191
+---
+ src/applet.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/applet.c b/src/applet.c
+index 39ea8e4..0a1043b 100644
+--- a/src/applet.c
++++ b/src/applet.c
+@@ -2952,6 +2952,10 @@ applet_update_icon (gpointer user_data)
+ 		break;
+ 	default:
+ 		applet_get_device_icon_for_state (applet, &pixbuf, &icon_name, &dev_tip);
++		if (!pixbuf && state == NM_STATE_CONNECTED) {
++			icon_name = g_strdup ("nm-device-wired");
++			pixbuf = g_object_ref (nma_icon_check_and_load (icon_name, applet));
++		}
+ 		break;
+ 	}
+ 
 
=== modified file 'debian/patches/nm-applet-use-indicator.patch'
--- debian/patches/nm-applet-use-indicator.patch	2015-10-07 09:06:59 +0000
+++ debian/patches/nm-applet-use-indicator.patch	2015-12-02 15:57:13 +0000
@@ -100,17 +100,17 @@
  		                            info->modem_enabled,
  		                            applet);
 +#else
-+                text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
-+                                                           info->provider_name,
-+                                                           cdma_act_to_mb_act (info),
-+                                                           cdma_state_to_mb_state (info));
-+                item = gtk_image_menu_item_new_with_label (text);
-+                g_free (text);
-+                icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
-+                                                                 info->quality : 0);
-+                signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
-+                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
++		text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
++		                                           info->provider_name,
++		                                           cdma_act_to_mb_act (info),
++		                                           cdma_state_to_mb_state (info));
++		item = gtk_image_menu_item_new_with_label (text);
++		g_free (text);
++		icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
++		                                                 info->quality : 0);
++		signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
++		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
++		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 +#endif
  		gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
  		add_connection_item (device, active, item, menu, applet);
@@ -128,17 +128,17 @@
  		                            info->modem_enabled,
  		                            applet);
 +#else
-+                text = mobile_helper_get_connection_label (NULL,
-+                                                            info->provider_name,
-+                                                            cdma_act_to_mb_act (info),
-+                                                            cdma_state_to_mb_state (info));
-+                item = gtk_image_menu_item_new_with_label (text);
-+                g_free (text);
-+                icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
-+                                                                 info->quality : 0);
-+                signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
-+                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
++		text = mobile_helper_get_connection_label (NULL,
++		                                           info->provider_name,
++		                                           cdma_act_to_mb_act (info),
++		                                           cdma_state_to_mb_state (info));
++		item = gtk_image_menu_item_new_with_label (text);
++		g_free (text);
++		icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
++		                                                 info->quality : 0);
++		signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
++		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
++		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 +#endif
  		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -201,17 +201,17 @@
  		                            info->modem_enabled,
  		                            applet);
 +#else
-+                text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
-+                                                           info->op_name,
-+                                                           gsm_act_to_mb_act (info),
-+                                                           gsm_state_to_mb_state (info));
-+                item = gtk_image_menu_item_new_with_label (text);
-+                g_free (text);
-+                icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
-+                                                                 info->quality : 0);
-+                signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
-+                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
++		text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con),
++		                                           info->op_name,
++		                                           gsm_act_to_mb_act (info),
++		                                           gsm_state_to_mb_state (info));
++		item = gtk_image_menu_item_new_with_label (text);
++		g_free (text);
++		icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
++		                                                 info->quality : 0);
++		signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
++		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
++		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 +#endif
  		gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
  		add_connection_item (device, active, item, menu, applet);
@@ -229,18 +229,18 @@
  		                            info->modem_enabled,
  		                            applet);
 +#else
-+                text = mobile_helper_get_connection_label (NULL,
-+                                                           info->op_name,
-+                                                           gsm_act_to_mb_act (info),
-+                                                           gsm_state_to_mb_state (info));
-+                item = gtk_image_menu_item_new_with_label (text);
-+                g_free (text);
-+                icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
-+                                                                 info->quality : 0);
-+                signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
-+                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-+                gtk_widget_set_sensitive (item, FALSE);
++		text = mobile_helper_get_connection_label (NULL,
++		                                           info->op_name,
++		                                           gsm_act_to_mb_act (info),
++		                                           gsm_state_to_mb_state (info));
++		item = gtk_image_menu_item_new_with_label (text);
++		g_free (text);
++		icon_name = mobile_helper_get_quality_icon_name (info->quality_valid ?
++		                                                 info->quality : 0);
++		signal_icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
++		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon);
++		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
++		gtk_widget_set_sensitive (item, FALSE);
 +#endif
 +
  		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
@@ -284,14 +284,14 @@
 +static gboolean
 +get_ap_is_encrypted (NMAccessPoint *ap)
 +{
-+        guint32 ap_flags, ap_wpa, ap_rsn;
-+
-+        ap_flags = nm_access_point_get_flags (ap);
-+        ap_wpa = nm_access_point_get_wpa_flags (ap);
-+        ap_rsn = nm_access_point_get_rsn_flags (ap);
-+
-+        if ((ap_flags & NM_802_11_AP_FLAGS_PRIVACY) || ap_wpa || ap_rsn)
-+                return TRUE;
++	guint32 ap_flags, ap_wpa, ap_rsn;
++
++	ap_flags = nm_access_point_get_flags (ap);
++	ap_wpa = nm_access_point_get_wpa_flags (ap);
++	ap_rsn = nm_access_point_get_rsn_flags (ap);
++
++	if ((ap_flags & NM_802_11_AP_FLAGS_PRIVACY) || ap_wpa || ap_rsn)
++		return TRUE;
 +
 +	return FALSE;
 +}
@@ -300,11 +300,11 @@
 +ap_menu_item_set_sensitive (GtkWidget *item, NMAccessPoint *ap, guint32 dev_caps)
 +{
 +	gboolean is_adhoc = FALSE;
-+        guint32 ap_flags, ap_wpa, ap_rsn;
++	guint32 ap_flags, ap_wpa, ap_rsn;
 +
-+        ap_flags = nm_access_point_get_flags (ap);
-+        ap_wpa = nm_access_point_get_wpa_flags (ap);
-+        ap_rsn = nm_access_point_get_rsn_flags (ap);
++	ap_flags = nm_access_point_get_flags (ap);
++	ap_wpa = nm_access_point_get_wpa_flags (ap);
++	ap_rsn = nm_access_point_get_rsn_flags (ap);
 +
 +	if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC)
 +		is_adhoc = TRUE;
@@ -336,18 +336,18 @@
 +
 +	icon_name = g_string_new ("");
 +	if (strength > 80)
-+                icon_name = g_string_assign (icon_name, "nm-signal-100");
-+        else if (strength > 55)
-+                icon_name = g_string_assign (icon_name, "nm-signal-75");
-+        else if (strength > 30)
-+                icon_name = g_string_assign (icon_name, "nm-signal-50");
-+        else if (strength > 5)
-+                icon_name = g_string_assign (icon_name, "nm-signal-25");
-+        else
-+                icon_name = g_string_assign (icon_name, "nm-signal-00");
++		icon_name = g_string_assign (icon_name, "nm-signal-100");
++	else if (strength > 55)
++		icon_name = g_string_assign (icon_name, "nm-signal-75");
++	else if (strength > 30)
++		icon_name = g_string_assign (icon_name, "nm-signal-50");
++	else if (strength > 5)
++		icon_name = g_string_assign (icon_name, "nm-signal-25");
++	else
++		icon_name = g_string_assign (icon_name, "nm-signal-00");
 +
-+        if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC) {
-+                icon_name = g_string_assign (icon_name, "nm-adhoc");
++	if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC) {
++		icon_name = g_string_assign (icon_name, "nm-adhoc");
 +		goto out;
 +	}
 +
@@ -363,8 +363,8 @@
 +
 +static void
 +set_menu_item_accessible_desc (NMAccessPoint *ap,
-+			       GtkMenuItem *item,
-+			       gboolean is_encrypted)
++                               GtkMenuItem *item,
++                               gboolean is_encrypted)
 +{
 +	guint32 strength;
 +	gchar *ssid = NULL;
@@ -542,8 +542,8 @@
  	g_return_val_if_fail (dup_data.hash != NULL, NULL);
 +#else
 +	/* heh, not much choice here, otherwise on startup we get tons of errors
-+         * because g_return_val_if_fail prints assertion errors.
-+         */
++	 * because g_return_val_if_fail prints assertion errors.
++	 */
 +	if (dup_data.hash == NULL)
 +		return NULL;
 +#endif
@@ -1083,7 +1083,6 @@
 +
 +	return FALSE;
 +}
-+#endif
 +
 +void
 +applet_schedule_update_menu (NMApplet *applet)
@@ -1091,6 +1090,7 @@
 +	if (!applet->update_menu_id)
 +		applet->update_menu_id = g_idle_add (applet_update_indicator_menu, applet);
 +}
++#endif /* ENABLE_INDICATOR */
 +
  typedef struct {
  	NMApplet *applet;
@@ -1139,7 +1139,7 @@
 +
 +#ifdef ENABLE_INDICATOR
 +	if (icon_name == NULL && layer == ICON_LAYER_LINK) {
-+		icon_name = g_strdup ("nm-no-connection");
++		icon_name = "nm-no-connection";
 +	}
 +
 +	if (icon_name != NULL &&
@@ -1255,7 +1255,7 @@
  	}
  
 -	foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name);
-+	foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name, dev_tip);
++	foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name, g_strdup (dev_tip));
  	if (pixbuf)
  		g_object_unref (pixbuf);
  	if (icon_name)
@@ -1276,7 +1276,7 @@
  		}
  	}
 -	foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name);
-+	foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name, dev_tip);
++	foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name, g_strdup (dev_tip));
  	if (icon_name)
  		g_free (icon_name);
  
@@ -1377,7 +1377,7 @@
  	if (!applet->status_icon)
  		return FALSE;
  	if (shell_debug)
-@@ -3602,11 +3873,34 @@ setup_widgets (NMApplet *applet)
+@@ -3602,13 +3873,36 @@ setup_widgets (NMApplet *applet)
  	g_signal_connect (applet->status_icon, "popup-menu",
  			  G_CALLBACK (status_icon_popup_menu_cb), applet);
  
@@ -1390,10 +1390,9 @@
 + 	if (!applet->context_menu)
 + 		return FALSE;
  
--	return TRUE;
-+ 	return TRUE;
-+}
-+
+ 	return TRUE;
+ }
+ 
 +static gboolean
 +setup_widgets (NMApplet *applet)
 +{
@@ -1413,9 +1412,11 @@
 +#else
 +	return success || indicator_success;
 +#endif
- }
- 
++}
++
  static void
+ applet_embedded_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
+ {
 @@ -3697,6 +3991,8 @@ initable_init (GInitable *initable, GCan
  	                  G_CALLBACK (applet_gsettings_show_changed), applet);
  
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-10-07 03:56:07 +0000
+++ debian/patches/series	2015-12-02 15:57:13 +0000
@@ -1,3 +1,6 @@
+Allow-to-create-connections-without-admin-privileges.patch
+Force-online-state-with-unmanaged-devices.patch
+Don-t-hard-code-gnome-bluetooth-plugin-directory.patch
 lp341684_device_sensitive_disconnect_notify.patch
 lp460144_correctly_update_notification.patch
 applet-wifi-menu-before-vpn.patch
@@ -9,6 +12,5 @@
 lp1048516_dont_req_keyring_in_greeter.patch
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
-11-user-connections.patch
 ubuntu_dont_autostart_under_GNOME.patch
 hide_virtual_devices.patch
 
=== modified file 'debian/rules'
--- debian/rules	2015-01-27 01:15:32 +0000
+++ debian/rules	2015-12-02 15:57:13 +0000
@@ -13,18 +13,16 @@
 		--disable-more-warnings \
 		--enable-migration \
 		--enable-introspection \
-		--with-modem-manager-1=yes \
-		--enable-indicator \
+		--with-modem-manager-1 \
+		--enable-indicator
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f icons/22/*-secure.png icons/22/nm-active-device.png
-	rm -f debian/*.1
 
 override_dh_auto_build:
 	dh_auto_build
 	cp -rf $(CURDIR)/debian/icons/22 icons/
-	docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1
 
 override_dh_install:
 	dh_install -X.la -X.a --fail-missing