diff -Nru network-manager-applet-1.28.0/debian/changelog network-manager-applet-1.28.0/debian/changelog --- network-manager-applet-1.28.0/debian/changelog 2022-06-07 18:21:36.000000000 -0300 +++ network-manager-applet-1.28.0/debian/changelog 2022-06-10 13:54:36.000000000 -0300 @@ -1,3 +1,26 @@ +network-manager-applet (1.28.0-1ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian. Remaining changes: + - d/control, d/rules: + + Run dh_translations. + - d/control: + + Drop , since the packages are now also available in s390x. + + Replace gnome-icon-theme by humanity-icon-theme in Recommends. + Both provide gnome-lockscreen's icon, but the latter is installed + by default in Ubuntu. + - d/patches: + + Force-online-state-with-unmanaged-devices.patch + + Have-the-appindicator-enabled-by-default.patch + + lp341684_device_sensitive_disconnect_notify.patch + + lp460144_correctly_update_notification.patch + + Make-policykit-restricted-actions-insensitive.patch + + Support-hiding-rather-than-desensitizing-disallowed-items.patch + * Drop patches applied upstream: + - git_owe_activation.patch + - gitlab_new_meson.patch + + -- Nathan Pratta Teodosio Fri, 10 Jun 2022 13:54:36 -0300 + network-manager-applet (1.28.0-1) unstable; urgency=medium * New upstream version 1.28.0 @@ -25,6 +48,27 @@ -- Michael Biebl Sun, 13 Feb 2022 12:58:56 +0100 +network-manager-applet (1.24.0-1ubuntu3) jammy; urgency=medium + + * debian/patches/gitlab_new_meson.patch: + - build compat changes for the new meson version + + -- Sebastien Bacher Mon, 07 Mar 2022 16:56:10 +0100 + +network-manager-applet (1.24.0-1ubuntu2) jammy; urgency=medium + + * debian/patches/git_owe_activation.patch + - Fix Enhanced Open (OWE) not being saved properly + (lp: #1963906) + + -- Sebastien Bacher Mon, 07 Mar 2022 16:23:08 +0100 + +network-manager-applet (1.24.0-1ubuntu1) impish; urgency=medium + + * New upstream version rebased on Debian + + -- Sebastien Bacher Wed, 25 Aug 2021 18:07:10 +0200 + network-manager-applet (1.24.0-1) unstable; urgency=medium * New upstream version 1.24.0 @@ -33,35 +77,37 @@ -- Michael Biebl Mon, 23 Aug 2021 11:38:34 +0200 -network-manager-applet (1.22.0-1) unstable; urgency=medium - - * New upstream version 1.22.0 - * Rebase patches - - -- Michael Biebl Mon, 16 Aug 2021 10:46:27 +0200 +network-manager-applet (1.22.0-0ubuntu1) impish; urgency=medium -network-manager-applet (1.20.0-3) unstable; urgency=medium + * New upstream version - * applet: support activating WireGuard connections as VPNs (Closes: #983641) - * editor: fix crash when evaluating secondaries + -- Sebastien Bacher Thu, 17 Jun 2021 11:28:20 +0200 - -- Michael Biebl Sat, 27 Feb 2021 20:11:20 +0100 +network-manager-applet (1.18.0-1ubuntu2) groovy; urgency=medium -network-manager-applet (1.20.0-2) unstable; urgency=medium + * d/p/Support-hiding-rather-than-desensitizing-disallowed-items.patch! + - restore initialization code for some of the 'allowed' variables which + was dropped by error in 16.10, fixes log warnings (lp: #1853331) - * Show wired icon only if we are in CONNECTED_GLOBAL state + -- Sebastien Bacher Wed, 29 Jul 2020 17:50:27 +0200 - -- Michael Biebl Thu, 11 Feb 2021 21:21:42 +0100 +network-manager-applet (1.18.0-1ubuntu1) groovy; urgency=low -network-manager-applet (1.20.0-1) unstable; urgency=medium + * Merge from Debian unstable. Remaining changes: + - Support for SAE authentication (WPA3 Personal) was added. + (lp: #1848339) + - Fixed external UI mode without interactive secrets. (lp: #1857253) + - use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + - Run dh_translations + - Add Ubuntu patches: + - lp341684_device_sensitive_disconnect_notify.patch + - lp460144_correctly_update_notification.patch + - Have-the-appindicator-enabled-by-default.patch + - Make-policykit-restricted-actions-insensitive.patch + - Support-hiding-rather-than-desensitizing-disallowed-items.patch - * New upstream version 1.20.0 - * Rebase patches - * Bump Standards-Version to 4.5.1 - * Set upstream metadata fields: Bug-Submit, Bug-Database, Repository, - Repository-Browse - - -- Michael Biebl Wed, 03 Feb 2021 15:59:07 +0100 + -- Gianfranco Costamagna Tue, 23 Jun 2020 10:04:08 +0200 network-manager-applet (1.18.0-1) unstable; urgency=medium @@ -71,6 +117,24 @@ -- Michael Biebl Mon, 22 Jun 2020 18:10:51 +0200 +network-manager-applet (1.16.0-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Support for SAE authentication (WPA3 Personal) was added. + (lp: #1848339) + - Fixed external UI mode without interactive secrets. (lp: #1857253) + - use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + - Run dh_translations + - Add Ubuntu patches: + - lp341684_device_sensitive_disconnect_notify.patch + - lp460144_correctly_update_notification.patch + - Have-the-appindicator-enabled-by-default.patch + - Make-policykit-restricted-actions-insensitive.patch + - Support-hiding-rather-than-desensitizing-disallowed-items.patch + + -- Gianfranco Costamagna Mon, 01 Jun 2020 09:37:52 +0200 + network-manager-applet (1.16.0-1) unstable; urgency=medium * New upstream version 1.16.0 @@ -90,6 +154,21 @@ -- Michael Biebl Wed, 22 Apr 2020 18:06:30 +0200 +network-manager-applet (1.8.24-1ubuntu2) focal; urgency=medium + + * No-change rebuild with fixed binutils on arm64. + + -- Matthias Klose Sat, 08 Feb 2020 11:12:34 +0000 + +network-manager-applet (1.8.24-1ubuntu1) focal; urgency=medium + + * Resynchronize on Debian + - Support for SAE authentication (WPA3 Personal) was added. + (lp: #1848339) + - Fixed external UI mode without interactive secrets. (lp: #1857253) + + -- Sebastien Bacher Mon, 13 Jan 2020 23:28:29 +0100 + network-manager-applet (1.8.24-1) unstable; urgency=medium * New upstream version 1.8.24 @@ -122,6 +201,45 @@ -- Boyuan Yang Fri, 19 Apr 2019 13:27:26 -0400 +network-manager-applet (1.8.20-1ubuntu2) eoan; urgency=medium + + * debian/control.in, debian/libnm-gtk*, debian/rules: + - Remove deprecated libnm-gtk0/libnm-gtk-dev, following Debian, + unity-control-centerwas ported to newer iibraries now. + * debian/compat, debian/control: + - Remove delta to stay on debhelper 11 + * debian/patches/Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + - remove, the n-m side was dropped in zesty + + -- Sebastien Bacher Wed, 22 May 2019 15:01:28 +0200 + +network-manager-applet (1.8.20-1ubuntu1) disco; urgency=medium + + * Resynchronize on Debian + * The new version includes + - connection-editor: re-enable launcher in GNOME and KDE, + it's needed for some sort of configurion which are not handled + by the desktop settings interfaces (lp: #1812697) + * debian/patches/git_wrong_free.patch: + - wifi-dialog: fix wrong free + * debian/patches/git_desktop_category.patch: + - connection-editor: add Utilities category to desktop file + * debian/patches/git_password_entry.patch: + - nma/pkcs11-cert-chooser: show the password entries when it makes sense + * debian/rules: + - build with --with-libnm-gtk, the default is now to disable it + upstream but we still have unity-control-center depending on it. + + -- Sebastien Bacher Mon, 04 Mar 2019 16:17:00 +0100 + +network-manager-applet (1.8.20-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix crash on creating custom Wi-Fi connection in wifi-dialog. + (Closes: #926328) + + -- Boyuan Yang Fri, 19 Apr 2019 13:27:26 -0400 + network-manager-applet (1.8.20-1) unstable; urgency=medium * New upstream version 1.8.20 @@ -135,6 +253,64 @@ -- Michael Biebl Tue, 26 Feb 2019 18:47:42 +0100 +network-manager-applet (1.8.18-2ubuntu5) disco; urgency=medium + + * Don't require gnome-shell on s390x since it's not built there. + Don't require the alternate dependencies either (notification-daemon + and policykit-1-gnome) since we're trying to demote them to universe. + + -- Jeremy Bicha Sat, 16 Feb 2019 11:04:05 -0500 + +network-manager-applet (1.8.18-2ubuntu4) disco; urgency=medium + + * Add gnome-shell as an alternate dependency to policykit-1-gnome + so that policykit-1-gnome can be demoted to universe + + -- Jeremy Bicha Sun, 10 Feb 2019 13:11:46 -0500 + +network-manager-applet (1.8.18-2ubuntu3) disco; urgency=medium + + * Add gnome-shell as an alternate dependency to notification-daemon + so that notification-daemon can be demoted to universe. + + -- Jeremy Bicha Sat, 09 Feb 2019 22:02:10 -0500 + +network-manager-applet (1.8.18-2ubuntu2) cosmic; urgency=medium + + * No change rebuild for launchpad translations import + + -- Sebastien Bacher Tue, 09 Oct 2018 11:11:19 +0200 + +network-manager-applet (1.8.18-2ubuntu1) cosmic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control, debian/rules: + + Drop gir1.2-nmgtk-1.0 as part of the libnm-gtk removal process + + use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + + Run dh_translations + - debian/control, debian/rules, debian/libnm-gtk*.symbols: + + Add legacy libnm-gtk packages, until unity-control-center + is ported (see LP 1744619) + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add Have-the-appindicator-enabled-by-default.patch: + + enable appindicator by default. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + + -- Iain Lane Mon, 01 Oct 2018 12:13:44 +0100 + network-manager-applet (1.8.18-2) unstable; urgency=medium * debian/patches/Revert*: Cherry-pick patches to fix "Apply" button @@ -144,6 +320,38 @@ -- Iain Lane Mon, 01 Oct 2018 11:53:20 +0100 +network-manager-applet (1.8.18-1ubuntu1) cosmic; urgency=medium + + * Merge from Debian unstable. Picking new bug-fix only release. + Remaining changes: (LP: #1791271) + - debian/control, debian/rules: + + Drop gir1.2-nmgtk-1.0 as part of the libnm-gtk removal process + + use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + + Run dh_translations + - debian/control, debian/rules, debian/libnm-gtk*.symbols: + + Add legacy libnm-gtk packages, until unity-control-center + is ported (see LP 1744619) + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add Have-the-appindicator-enabled-by-default.patch: + + enable appindicator by default. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + * Refresh patches + + -- Didier Roche Tue, 11 Sep 2018 09:45:44 +0200 + network-manager-applet (1.8.18-1) unstable; urgency=medium * New upstream version 1.8.18 @@ -154,6 +362,37 @@ -- Michael Biebl Sat, 08 Sep 2018 18:42:36 +0200 +network-manager-applet (1.8.16-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1791271) + - debian/control, debian/rules: + + Drop gir1.2-nmgtk-1.0 as part of the libnm-gtk removal process + + use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + + Run dh_translations + - debian/control, debian/rules, debian/libnm-gtk*.symbols: + + Add legacy libnm-gtk packages, until unity-control-center + is ported (see LP 1744619) + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add Have-the-appindicator-enabled-by-default.patch: + + enable appindicator by default. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + + + -- Didier Roche Thu, 06 Sep 2018 12:31:31 +0200 + network-manager-applet (1.8.16-1) unstable; urgency=medium * New upstream version 1.8.16 @@ -185,6 +424,56 @@ -- Michael Biebl Sun, 03 Jun 2018 23:59:13 +0200 +network-manager-applet (1.8.10-5ubuntu4) cosmic; urgency=medium + + * debian/control, debian/rules: + - use libappindicator for now, it is tested and in main and the + new ayatana variant from Debian hasn't been reviewed yet. + + -- Sebastien Bacher Tue, 03 Jul 2018 09:53:01 +0200 + +network-manager-applet (1.8.10-5ubuntu3) cosmic; urgency=medium + + * Drop gir1.2-nmgtk-1.0 as part of the libnm-gtk removal process + + -- Jeremy Bicha Fri, 11 May 2018 19:57:10 -0400 + +network-manager-applet (1.8.10-5ubuntu2) cosmic; urgency=medium + + * Add againn the legacy libnm-gtk packages, until unity-control-center + is ported (see LP 1744619) + + -- Gianfranco Costamagna Wed, 09 May 2018 14:45:19 +0200 + +network-manager-applet (1.8.10-5ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/icons/, debian/rules, debian/source/include-binaries: + + Add "secure" icons + - debian/control, debian/rules: + + Run dh_translations + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add Have-the-appindicator-enabled-by-default.patch: + + enable appindicator by default. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - On-Ubuntu-we-use-premade-icons-for-the-indicator-VPN.patch: + + use '-secure'-suffixed icons when connected to the VPN, since we + can't composit icons on the fly. + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + + -- Gianfranco Costamagna Wed, 09 May 2018 10:42:28 +0200 + network-manager-applet (1.8.10-5) unstable; urgency=medium * Enable Ayatana AppIndicator support (Closes: #880169) @@ -212,6 +501,36 @@ -- Michael Biebl Sun, 08 Apr 2018 18:58:14 +0200 +network-manager-applet (1.8.10-2ubuntu1) bionic; urgency=medium + + * Sync with Debian. Remaining changes: + - debian/icons/, debian/rules, debian/source/include-binaries: + + Add "secure" icons + - debian/control, debian/rules: + + Build appindicator support + + Run dh_translations + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Have-the-appindicator-enabled-by-default.patch: + + Enable the indicator by default + - On-Ubuntu-we-use-premade-icons-for-the-indicator-VPN.patch: + + use '-secure'-suffixed icons when connected to the VPN, since we + can't composit icons on the fly. + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + + -- Jeremy Bicha Mon, 22 Jan 2018 13:59:16 -0500 + network-manager-applet (1.8.10-2) unstable; urgency=medium * shared/compat: Fix memory handling of nm_setting_vpn_get_*_keys @@ -237,6 +556,40 @@ -- Michael Biebl Tue, 07 Nov 2017 20:57:13 +0100 +network-manager-applet (1.8.4-1ubuntu1) artful; urgency=medium + + * Sync with Debian. Remaining changes: + - debian/icons/, debian/rules, debian/source/include-binaries: + + Add "secure" icons + - debian/control, debian/rules: + + Build appindicator support + + Run dh_translations + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add 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. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Have-the-appindicator-enabled-by-default.patch: + + Enable the indicator by default + - On-Ubuntu-we-use-premade-icons-for-the-indicator-VPN.patch: + + use '-secure'-suffixed icons when connected to the VPN, since we + can't composit icons on the fly. + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + * Refresh patches + * Drop patches applied in new release: + - reorder-indicator-items.patch + - Always-center-dialogs-on-the-screen.patch + + -- Jeremy Bicha Fri, 22 Sep 2017 15:03:15 -0400 + network-manager-applet (1.8.4-1) unstable; urgency=medium * New upstream version 1.8.4 @@ -248,6 +601,41 @@ -- Michael Biebl Wed, 20 Sep 2017 22:22:26 +0200 +network-manager-applet (1.8.2-1ubuntu1) artful; urgency=medium + + * Sync with Debian. Remaining changes: + - debian/icons/, debian/rules, debian/source/include-binaries: + + Add "secure" icons + - debian/control, debian/rules: + + Build appindicator support + + Run dh_translations + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add 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. + - Always-center-dialogs-on-the-screen.patch: + + Position dialogs at the center of the screen + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - reorder-indicator-items.patch: + + Make sure devices show before networking toggles + - Have-the-appindicator-enabled-by-default.patch: + + Enable the indicator by default + - On-Ubuntu-we-use-premade-icons-for-the-indicator-VPN.patch: + + use '-secure'-suffixed icons when connected to the VPN, since we + can't composit icons on the fly. + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + * Refresh patches + + -- Jeremy Bicha Sun, 18 Jun 2017 19:06:46 -0400 + network-manager-applet (1.8.2-1) unstable; urgency=medium * New upstream version 1.8.2 @@ -1122,7 +1510,7 @@ - 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) + nm-connection-editor (Closes: #480039) [ Sjoerd Simons ] * debian/patches/02-nm-api-update.patch: @@ -1212,9 +1600,9 @@ - Better handling of VPN and WPA Enterprise security. (Closes: #444977) * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. - - Bump Standards-Version to 3.7.3. No further changes required. + - Bump Standards-Version to 3.7.3. No further changes required. - Fix Xfce spelling error in the package description. - - Bump Build-Depends on libnm-util-dev and network-manager-dev to + - Bump Build-Depends on libnm-util-dev and network-manager-dev to (>= 0.6.6). * Removed patches - debian/patches/10-po_fr.patch (merged upstream) @@ -1245,7 +1633,7 @@ network-manager-applet (0.6.5-2) unstable; urgency=low * debian/patches/30-connection_info_hide_on_delete_event.patch - - Patch from Ubuntu. Hide connection info dialog on delete-event. + - Patch from Ubuntu. Hide connection info dialog on delete-event. (Closes: #406073) -- Michael Biebl Wed, 19 Sep 2007 22:34:18 +0200 diff -Nru network-manager-applet-1.28.0/debian/control network-manager-applet-1.28.0/debian/control --- network-manager-applet-1.28.0/debian/control 2022-06-07 18:21:36.000000000 -0300 +++ network-manager-applet-1.28.0/debian/control 2022-06-10 13:42:18.000000000 -0300 @@ -1,9 +1,11 @@ Source: network-manager-applet Section: gnome Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl Build-Depends: debhelper-compat (= 13), + dh-translations, meson (>= 0.46.0), gettext (>= 0.18), libsecret-1-dev (>= 0.18), @@ -20,8 +22,8 @@ libselinux-dev, Standards-Version: 4.6.1 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/utopia-team/network-manager-applet.git -Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager-applet +Vcs-Git: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu-applet +Vcs-Browser: https://git.launchpad.net/~network-manager/network-manager/+git/ubuntu-applet Homepage: https://www.gnome.org/projects/NetworkManager/ Package: network-manager-gnome @@ -31,11 +33,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager, - policykit-1-gnome | polkit-1-auth-agent, + gnome-shell | policykit-1-gnome | polkit-1-auth-agent, default-dbus-session-bus | dbus-session-bus -Recommends: notification-daemon, +Recommends: gnome-shell | notification-daemon, gnome-keyring, - gnome-icon-theme, + humanity-icon-theme, mobile-broadband-provider-info, iso-codes Suggests: network-manager-openconnect-gnome, diff -Nru network-manager-applet-1.28.0/debian/patches/Force-online-state-with-unmanaged-devices.patch network-manager-applet-1.28.0/debian/patches/Force-online-state-with-unmanaged-devices.patch --- network-manager-applet-1.28.0/debian/patches/Force-online-state-with-unmanaged-devices.patch 2022-06-07 18:21:36.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/Force-online-state-with-unmanaged-devices.patch 2021-08-25 13:06:37.000000000 -0300 @@ -12,10 +12,10 @@ 1 file changed, 4 insertions(+) diff --git a/src/applet.c b/src/applet.c -index d9eb30e..825db0d 100644 +index 0d5e749..b2304c8 100644 --- a/src/applet.c +++ b/src/applet.c -@@ -2733,6 +2733,10 @@ applet_update_icon (gpointer user_data) +@@ -2742,6 +2742,10 @@ applet_update_icon (gpointer user_data) applet_get_device_icon_for_state (applet, &pixbuf, &icon_name_free, &dev_tip_free); icon_name = icon_name_free; dev_tip = dev_tip_free; diff -Nru network-manager-applet-1.28.0/debian/patches/Have-the-appindicator-enabled-by-default.patch network-manager-applet-1.28.0/debian/patches/Have-the-appindicator-enabled-by-default.patch --- network-manager-applet-1.28.0/debian/patches/Have-the-appindicator-enabled-by-default.patch 1969-12-31 21:00:00.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/Have-the-appindicator-enabled-by-default.patch 2021-06-17 06:27:55.000000000 -0300 @@ -0,0 +1,35 @@ +From: Mathieu Trudel-Lapierre +Date: Fri, 20 May 2016 14:32:07 +0800 +Subject: Have the appindicator enabled by default. + +--- + src/main.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +Index: network-manager-applet-1.22.0/src/main.c +=================================================================== +--- network-manager-applet-1.22.0.orig/src/main.c ++++ network-manager-applet-1.22.0/src/main.c +@@ -17,7 +17,7 @@ + + gboolean shell_debug = FALSE; + gboolean with_agent = TRUE; +-gboolean with_appindicator = FALSE; ++gboolean with_appindicator = TRUE; + + static void + usage (const char *progname) +@@ -47,11 +47,9 @@ int main (int argc, char *argv[]) + shell_debug = TRUE; + else if (!strcmp (argv[i], "--no-agent")) + with_agent = FALSE; +- else if (!strcmp (argv[i], "--indicator")) { ++ else if (!strcmp (argv[i], "--no-indicator")) { + #ifdef WITH_APPINDICATOR +- with_appindicator = TRUE; +-#else +- g_error ("Error: --indicator requested but indicator support not available"); ++ with_appindicator = FALSE; + #endif + } + } diff -Nru network-manager-applet-1.28.0/debian/patches/lp341684_device_sensitive_disconnect_notify.patch network-manager-applet-1.28.0/debian/patches/lp341684_device_sensitive_disconnect_notify.patch --- network-manager-applet-1.28.0/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 1969-12-31 21:00:00.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2021-08-25 13:07:10.000000000 -0300 @@ -0,0 +1,216 @@ +From: Ubuntu Developers +Date: Fri, 20 May 2016 14:27:57 +0800 +Subject: lp341684_device_sensitive_disconnect_notify + +--- + src/applet-device-wifi.c | 2 + + src/applet.c | 142 +++++++++++++++++++++++++++++++++++++++++++++-- + src/applet.h | 5 +- + 3 files changed, 143 insertions(+), 6 deletions(-) + +Index: network-manager-applet-1.24.0/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet-device-wifi.c ++++ network-manager-applet-1.24.0/src/applet-device-wifi.c +@@ -1286,6 +1286,8 @@ wifi_notify_connected (NMDevice *device, + + ap = _active_ap_get (applet, device); + ++ g_object_set_data_full (G_OBJECT(device), "canonical-last-essid", g_strdup (esc_ssid), (GDestroyNotify) g_free); ++ + esc_ssid = get_ssid_utf8 (ap); + + if (!ap) +Index: network-manager-applet-1.24.0/src/applet.c +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet.c ++++ network-manager-applet-1.24.0/src/applet.c +@@ -175,6 +175,19 @@ get_device_class_from_connection (NMConn + return NULL; + } + ++struct _OfflineNotificationContextInfo { ++ NMState state; ++ NMDeviceState device_state; ++ NMDeviceStateReason device_state_reason; ++ NMDeviceType device_type; ++ gchar* title; ++ gchar* text; ++ const gchar* icon; ++ NotifyUrgency urgency; ++}; ++ ++typedef struct _OfflineNotificationContextInfo OfflineNotificationContextInfo; ++ + static NMActiveConnection * + applet_get_best_activating_connection (NMApplet *applet, NMDevice **device) + { +@@ -2190,6 +2203,64 @@ applet_get_exported_connection_for_devic + return NULL; + } + ++static gboolean ++select_merged_notification_text (OfflineNotificationContextInfo *info) ++{ ++ info->urgency = NOTIFY_URGENCY_LOW; ++ /* only do something if this is about full offline state */ ++ if(info->state != NM_STATE_UNKNOWN || info->device_state != NM_DEVICE_STATE_UNKNOWN) { ++ info->urgency = NOTIFY_URGENCY_NORMAL; ++ if (!info->text) ++ info->text = g_strdup (_("Network")); ++ if (info->state == NM_STATE_DISCONNECTED || info->state == NM_STATE_ASLEEP) { ++ info->title = _("Disconnected - you are now offline"); ++ } else ++ info->title = _("Disconnected"); ++ ++ switch (info->device_type) { ++ case NM_DEVICE_TYPE_ETHERNET: ++ info->icon = "notification-network-ethernet-disconnected"; ++ break; ++ case NM_DEVICE_TYPE_WIFI: ++ info->icon = "notification-network-wireless-disconnected"; ++ break; ++ case NM_DEVICE_TYPE_MODEM: ++ info->icon = "notification-gsm-disconnected"; ++ break; ++ default: ++ info->icon = "nm-no-connection"; ++ break; ++ } ++ g_debug("going for offline with icon: %s", info->icon); ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++static gboolean ++foo_online_offline_deferred_notify (gpointer user_data) ++{ ++ NMApplet *applet = NM_APPLET (user_data); ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if(select_merged_notification_text (info)) ++ if (!g_settings_get_boolean (applet->gsettings, PREF_DISABLE_DISCONNECTED_NOTIFICATIONS)) ++ applet_do_notify (applet, info->urgency, info->title, ++ info->text, info->icon, ++ PREF_DISABLE_DISCONNECTED_NOTIFICATIONS, ++ _("Don't show this message again"), ++ notify_dont_show_cb, ++ applet); ++ else ++ g_debug("no notification because merged found that we have nothing to say (e.g. not offline)"); ++ if (info->text) ++ g_free (info->text); ++ info->text = NULL; ++ g_free (applet->notification_queue_data); ++ applet->notification_queue_data = NULL; ++ applet->deferred_id = 0; ++ return FALSE; ++} ++ + static void + applet_common_device_state_changed (NMDevice *device, + NMDeviceState new_state, +@@ -2204,6 +2275,54 @@ applet_common_device_state_changed (NMDe + + + switch (new_state) { ++ case NM_DEVICE_STATE_FAILED: ++ case NM_DEVICE_STATE_DISCONNECTED: ++ case NM_DEVICE_STATE_UNMANAGED: ++ case NM_DEVICE_STATE_UNAVAILABLE: ++ { ++ if (old_state != NM_DEVICE_STATE_FAILED && ++ old_state != NM_DEVICE_STATE_UNKNOWN && ++ old_state != NM_DEVICE_STATE_DISCONNECTED && ++ old_state != NM_DEVICE_STATE_UNMANAGED && ++ old_state != NM_DEVICE_STATE_UNAVAILABLE) { ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if (!info) { ++ info = g_new0(OfflineNotificationContextInfo, 1); ++ applet->notification_queue_data = info; ++ } ++ ++ info->device_state = new_state; ++ info->device_state_reason = reason; ++ if (info->text) { ++ g_free(info->text); ++ info->text = NULL; ++ } ++ if (NM_IS_DEVICE_WIFI (device)) { ++ info->device_type = NM_DEVICE_TYPE_WIFI; ++ info->text = g_strdup(g_object_get_data (G_OBJECT(device), "canonical-last-essid")); ++ if (!info->text) ++ info->text = g_strdup (_("Wireless network")); ++ } else if (NM_IS_DEVICE_ETHERNET (device)) { ++ info->device_type = NM_DEVICE_TYPE_ETHERNET; ++ info->text = g_strdup(_("Ethernet network")); ++ } else if (NM_IS_DEVICE_MODEM (device)) { ++ info->device_type = NM_DEVICE_TYPE_MODEM; ++ info->text = g_strdup (_("Modem network")); ++ } else { ++ info->device_type = NM_DEVICE_TYPE_UNKNOWN; ++ info->text = g_strdup (_("Network")); ++ } ++ ++ if (applet->deferred_id) ++ g_source_remove (applet->deferred_id); ++ applet->deferred_id = g_timeout_add (1000, foo_online_offline_deferred_notify, applet); ++ ++ clear_animation_timeout (applet); ++ } else { ++ g_debug ("old state indicates that this was not a disconnect %d", old_state); ++ } ++ break; ++ } + case NM_DEVICE_STATE_PREPARE: + case NM_DEVICE_STATE_CONFIG: + case NM_DEVICE_STATE_NEED_AUTH: +@@ -2290,13 +2409,26 @@ foo_client_state_changed_cb (NMClient *c + { + NMApplet *applet = NM_APPLET (user_data); + ++ g_debug("foo_client_state_changed_cb"); + switch (nm_client_get_state (client)) { + case NM_STATE_DISCONNECTED: +- applet_do_notify_with_pref (applet, _("Disconnected"), +- _("The network connection has been disconnected."), +- "nm-no-connection", +- PREF_DISABLE_DISCONNECTED_NOTIFICATIONS); +- break; ++ case NM_STATE_ASLEEP: ++ { ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if (!info) { ++ info = g_new0(OfflineNotificationContextInfo, 1); ++ applet->notification_queue_data = info; ++ } ++ ++ info->state = nm_client_get_state (client); ++ select_merged_notification_text (info); ++ ++ if (applet->deferred_id) ++ g_source_remove (applet->deferred_id); ++ applet->deferred_id = g_timeout_add (1000, foo_online_offline_deferred_notify, applet); ++ ++ /* Fall through */ ++ } + default: + break; + } +Index: network-manager-applet-1.24.0/src/applet.h +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet.h ++++ network-manager-applet-1.24.0/src/applet.h +@@ -142,8 +142,11 @@ typedef struct { + + /* Tracker objects for secrets requests */ + GSList * secrets_reqs; +- + guint wifi_scan_id; ++ ++ gpointer notification_queue_data; ++ guint deferred_id; ++ + } NMApplet; + + typedef void (*AppletNewAutoConnectionCallback) (NMConnection *connection, diff -Nru network-manager-applet-1.28.0/debian/patches/lp460144_correctly_update_notification.patch network-manager-applet-1.28.0/debian/patches/lp460144_correctly_update_notification.patch --- network-manager-applet-1.28.0/debian/patches/lp460144_correctly_update_notification.patch 1969-12-31 21:00:00.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/lp460144_correctly_update_notification.patch 2021-08-25 13:07:10.000000000 -0300 @@ -0,0 +1,83 @@ +From: Ubuntu Developers +Date: Fri, 20 May 2016 14:28:34 +0800 +Subject: lp460144_correctly_update_notification + +--- + src/applet.c | 38 +++++++++++++++++--------------------- + 1 file changed, 17 insertions(+), 21 deletions(-) + +Index: network-manager-applet-1.24.0/src/applet.c +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet.c ++++ network-manager-applet-1.24.0/src/applet.c +@@ -707,17 +707,6 @@ applet_menu_item_create_device_item_help + return item; + } + +-static void +-applet_clear_notify (NMApplet *applet) +-{ +- if (applet->notification == NULL) +- return; +- +- notify_notification_close (applet->notification, NULL); +- g_object_unref (applet->notification); +- applet->notification = NULL; +-} +- + static gboolean + applet_notify_server_has_actions (void) + { +@@ -774,19 +763,28 @@ applet_do_notify (NMApplet *applet, + if (!applet->agent) + return; + +- applet_clear_notify (applet); +- + escaped = utils_escape_notify_message (message); +- notify = notify_notification_new (summary, +- escaped, +- icon ? icon : "network-workgroup" ++ ++ if (applet->notification == NULL) { ++ notify = notify_notification_new (summary, ++ escaped, ++ icon ? icon : "network-workgroup" + #if HAVE_LIBNOTIFY_07 +- ); ++ ); + #else +- , NULL); ++ , NULL); + #endif ++ ++ applet->notification = notify; ++ } else { ++ notify = applet->notification; ++ notify_notification_update (notify, ++ summary, ++ escaped, ++ icon ? icon : "network-workgroup"); ++ } ++ + g_free (escaped); +- applet->notification = notify; + + #if HAVE_LIBNOTIFY_07 + notify_notification_set_hint (notify, "transient", g_variant_new_boolean (TRUE)); +@@ -3339,7 +3337,6 @@ status_icon_activate_cb (GtkStatusIcon * + /* Have clicking on the applet act also as acknowledgement + * of the notification. + */ +- applet_clear_notify (applet); + + applet_start_wifi_scan (applet, NULL); + +@@ -3371,7 +3368,6 @@ status_icon_popup_menu_cb (GtkStatusIcon + /* Have clicking on the applet act also as acknowledgement + * of the notification. + */ +- applet_clear_notify (applet); + + nma_context_menu_update (applet); + gtk_menu_popup (GTK_MENU (applet->context_menu), NULL, NULL, diff -Nru network-manager-applet-1.28.0/debian/patches/Make-policykit-restricted-actions-insensitive.patch network-manager-applet-1.28.0/debian/patches/Make-policykit-restricted-actions-insensitive.patch --- network-manager-applet-1.28.0/debian/patches/Make-policykit-restricted-actions-insensitive.patch 1969-12-31 21:00:00.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/Make-policykit-restricted-actions-insensitive.patch 2021-06-17 06:27:58.000000000 -0300 @@ -0,0 +1,127 @@ +From: =?utf-8?q?Antti_Kaijanm=C3=A4ki?= +Date: Tue, 24 May 2016 13:37:12 +0800 +Subject: Make policykit-restricted actions insensitive + +Make sure the behavior for policykit-restricted actions is +consistently to make the items insensitive +--- + src/applet-device-wifi.c | 29 +++++++++++++++++++++++++++++ + src/applet.c | 30 ++++++++++++++++++++++++++++-- + 2 files changed, 57 insertions(+), 2 deletions(-) + +Index: network-manager-applet-1.22.0/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-1.22.0.orig/src/applet-device-wifi.c ++++ network-manager-applet-1.22.0/src/applet-device-wifi.c +@@ -203,6 +203,8 @@ nma_menu_add_hidden_network_item (GtkWid + { + GtkWidget *menu_item; + GtkWidget *label; ++ gboolean allowed; ++ NMClientPermissionResult perm; + + menu_item = gtk_menu_item_new (); + label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wi-Fi Network…")); +@@ -213,6 +215,33 @@ nma_menu_add_hidden_network_item (GtkWid + g_signal_connect_swapped (menu_item, "activate", + G_CALLBACK (applet_wifi_connect_to_hidden_network), + applet); ++ ++ allowed = FALSE; ++ perm = nm_client_get_permission_result (applet->nm_client, ++ NM_CLIENT_PERMISSION_NETWORK_CONTROL); ++ if ( perm == NM_CLIENT_PERMISSION_RESULT_YES ++ || perm == NM_CLIENT_PERMISSION_RESULT_AUTH) { ++ /* First, the user has to be able to control networks ++ * to connect to a new hidden access point. ++ */ ++ perm = nm_client_get_permission_result (applet->nm_client, ++ NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN); ++ if ( perm == NM_CLIENT_PERMISSION_RESULT_YES ++ || perm == NM_CLIENT_PERMISSION_RESULT_AUTH) { ++ /* The user can modify (and add!) a new configuration for herself. */ ++ allowed = TRUE; ++ } else { ++ perm = nm_client_get_permission_result (applet->nm_client, ++ NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM); ++ if ( perm == NM_CLIENT_PERMISSION_RESULT_YES ++ || perm == NM_CLIENT_PERMISSION_RESULT_AUTH) { ++ /* The user can modify (and add!) a new system wide configuration. */ ++ allowed = TRUE; ++ } ++ } ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (menu_item), allowed); + } + + gboolean +Index: network-manager-applet-1.22.0/src/applet.c +=================================================================== +--- network-manager-applet-1.22.0.orig/src/applet.c ++++ network-manager-applet-1.22.0/src/applet.c +@@ -44,6 +44,8 @@ extern gboolean with_appindicator; + + G_DEFINE_TYPE (NMApplet, nma, G_TYPE_APPLICATION) + ++static gboolean is_permission_yes (NMApplet *applet, NMClientPermission perm); ++ + /********************************************************************/ + + static gboolean +@@ -1388,7 +1390,10 @@ nma_menu_device_get_menu_item (NMDevice + G_CALLBACK (applet_device_disconnect_db), + info, + applet_device_info_destroy, 0); +- gtk_widget_set_sensitive (item, TRUE); ++ if (is_permission_yes (applet, NM_CLIENT_PERMISSION_NETWORK_CONTROL)) ++ gtk_widget_set_sensitive (item, TRUE); ++ else ++ gtk_widget_set_sensitive (item, FALSE); + break; + } + default: +@@ -1542,7 +1547,8 @@ nma_menu_add_vpn_submenu (GtkWidget *men + state = nm_client_get_state (applet->nm_client); + if ( state != NM_STATE_CONNECTED_LOCAL + && state != NM_STATE_CONNECTED_SITE +- && state != NM_STATE_CONNECTED_GLOBAL) ++ && state != NM_STATE_CONNECTED_GLOBAL ++ && !is_permission_yes (applet, NM_CLIENT_PERMISSION_NETWORK_CONTROL)) + gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); + else + gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE); +@@ -1568,6 +1574,12 @@ nma_menu_add_vpn_submenu (GtkWidget *men + g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet); + } + gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item)); ++ if ( is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) ++ || is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE); ++ } else { ++ gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); ++ } + gtk_widget_show (GTK_WIDGET (item)); + + g_ptr_array_unref (list); +@@ -1826,6 +1838,20 @@ nma_context_menu_update (NMApplet *apple + gtk_widget_show_all (applet->wwan_enabled_item); + else + gtk_widget_hide (applet->wwan_enabled_item); ++ ++ if (is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) ++ || is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN) ++ || is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME)) { ++ ++ /* User has permissions to modify some of the settings. */ ++ gtk_widget_set_sensitive (applet->connections_menu_item, TRUE); ++ ++ } else { ++ /* the user is not allowed to edit any of the settings, ++ * so set the "Edit Connections..." menu item insensitive. ++ */ ++ gtk_widget_set_sensitive (applet->connections_menu_item, FALSE); ++ } + } + + static void diff -Nru network-manager-applet-1.28.0/debian/patches/series network-manager-applet-1.28.0/debian/patches/series --- network-manager-applet-1.28.0/debian/patches/series 2022-06-07 18:21:36.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/series 2022-06-10 09:18:05.000000000 -0300 @@ -1 +1,6 @@ Force-online-state-with-unmanaged-devices.patch +lp341684_device_sensitive_disconnect_notify.patch +lp460144_correctly_update_notification.patch +Have-the-appindicator-enabled-by-default.patch +Make-policykit-restricted-actions-insensitive.patch +Support-hiding-rather-than-desensitizing-disallowed-items.patch diff -Nru network-manager-applet-1.28.0/debian/patches/Support-hiding-rather-than-desensitizing-disallowed-items.patch network-manager-applet-1.28.0/debian/patches/Support-hiding-rather-than-desensitizing-disallowed-items.patch --- network-manager-applet-1.28.0/debian/patches/Support-hiding-rather-than-desensitizing-disallowed-items.patch 1969-12-31 21:00:00.000000000 -0300 +++ network-manager-applet-1.28.0/debian/patches/Support-hiding-rather-than-desensitizing-disallowed-items.patch 2021-08-25 13:07:10.000000000 -0300 @@ -0,0 +1,166 @@ +Subject: Support hiding rather than desensitizing disallowed items + +This is done using a new environment variable that can be set +when nm-applet is started: NM_APPLET_HIDE_POLICY_ITEMS. +--- + src/applet-device-wifi.c | 20 +++++++++++++++++--- + src/applet.c | 33 ++++++++++++++++++++++++++++----- + src/applet.h | 1 + + 3 files changed, 46 insertions(+), 8 deletions(-) + +Index: network-manager-applet-1.24.0/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet-device-wifi.c ++++ network-manager-applet-1.24.0/src/applet-device-wifi.c +@@ -211,7 +211,6 @@ nma_menu_add_hidden_network_item (GtkWid + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_container_add (GTK_CONTAINER (menu_item), label); + gtk_widget_show_all (menu_item); +- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_signal_connect_swapped (menu_item, "activate", + G_CALLBACK (applet_wifi_connect_to_hidden_network), + applet); +@@ -242,6 +241,13 @@ nma_menu_add_hidden_network_item (GtkWid + } + + gtk_widget_set_sensitive (GTK_WIDGET (menu_item), allowed); ++ if (!allowed && applet->hide_policy_items) { ++ /* don't add the item if it should be hidden */ ++ /* TODO: is this the final solution? */ ++ g_object_ref_sink (menu_item); ++ g_object_unref (menu_item); ++ } else ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } + + gboolean +@@ -289,13 +295,21 @@ nma_menu_add_create_network_item (GtkWid + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_container_add (GTK_CONTAINER (menu_item), label); + gtk_widget_show_all (menu_item); +- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_signal_connect_swapped (menu_item, "activate", + G_CALLBACK (applet_wifi_create_wifi_network), + applet); + +- if (!applet_wifi_can_create_wifi_network (applet)) ++ if (!applet_wifi_can_create_wifi_network (applet)) { + gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE); ++ if (applet->hide_policy_items) { ++ /* don't add the item if it should be hidden */ ++ /* TODO: is this the final solution? */ ++ g_object_ref_sink (menu_item); ++ g_object_unref (menu_item); ++ return; ++ } ++ } ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } + + typedef struct { +Index: network-manager-applet-1.24.0/src/applet.c +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet.c ++++ network-manager-applet-1.24.0/src/applet.c +@@ -1519,6 +1519,19 @@ nma_menu_add_vpn_submenu (GtkWidget *men + GtkMenuItem *item; + GPtrArray *list; + int i; ++ gboolean configure_allowed; ++ gboolean disconnect_allowed; ++ ++ if ( is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) ++ || is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) ++ configure_allowed = TRUE; ++ else ++ configure_allowed = FALSE; ++ ++ if (is_permission_yes (applet, NM_CLIENT_PERMISSION_NETWORK_CONTROL)) ++ disconnect_allowed = TRUE; ++ else ++ disconnect_allowed = FALSE; + + vpn_menu = GTK_MENU (gtk_menu_new ()); + +@@ -1548,9 +1561,16 @@ nma_menu_add_vpn_submenu (GtkWidget *men + if ( state != NM_STATE_CONNECTED_LOCAL + && state != NM_STATE_CONNECTED_SITE + && state != NM_STATE_CONNECTED_GLOBAL +- && !is_permission_yes (applet, NM_CLIENT_PERMISSION_NETWORK_CONTROL)) ++ && !disconnect_allowed){ + gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); +- else ++ if (!applet->hide_policy_items) ++ gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item)); ++ else { ++ /* TODO: is this the final solution? */ ++ g_object_ref_sink (item); ++ g_object_unref (item); ++ } ++ } else + gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE); + + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), !!active); +@@ -1566,7 +1586,10 @@ nma_menu_add_vpn_submenu (GtkWidget *men + + /* Draw a separator, but only if we have VPN connections above it */ + if (list->len) { +- nma_menu_add_separator_item (GTK_WIDGET (vpn_menu)); ++ if ( !applet->hide_policy_items ++ || configure_allowed ++ || disconnect_allowed) ++ nma_menu_add_separator_item (GTK_WIDGET (vpn_menu)); /* separator is added if there will be items under it */ + item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN…"))); + g_signal_connect (item, "activate", G_CALLBACK (nma_menu_configure_vpn_item_activate), applet); + } else { +@@ -1574,11 +1597,17 @@ nma_menu_add_vpn_submenu (GtkWidget *men + g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet); + } + gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item)); +- if ( is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) +- || is_permission_yes (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) { ++ if (configure_allowed) { + gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE); + } else { + gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); ++ if (!applet->hide_policy_items) { ++ gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item)); ++ } else { ++ /* TODO: is this the final solution? */ ++ g_object_ref_sink (item); ++ g_object_unref (item); ++ } + } + gtk_widget_show (GTK_WIDGET (item)); + +@@ -1851,6 +1880,7 @@ nma_context_menu_update (NMApplet *apple + * so set the "Edit Connections..." menu item insensitive. + */ + gtk_widget_set_sensitive (applet->connections_menu_item, FALSE); ++ gtk_widget_set_visible (applet->connections_menu_item, !applet->hide_policy_items); + } + } + +@@ -3636,6 +3666,10 @@ static void nma_init (NMApplet *applet) + + g_signal_connect (applet, "startup", G_CALLBACK (applet_startup), NULL); + g_signal_connect (applet, "activate", G_CALLBACK (applet_activate), NULL); ++ ++ applet->hide_policy_items = FALSE; ++ if (getenv ("NM_APPLET_HIDE_POLICY_ITEMS")) ++ applet->hide_policy_items = TRUE; + } + + static void nma_class_init (NMAppletClass *klass) +Index: network-manager-applet-1.24.0/src/applet.h +=================================================================== +--- network-manager-applet-1.24.0.orig/src/applet.h ++++ network-manager-applet-1.24.0/src/applet.h +@@ -82,6 +82,7 @@ typedef struct { + #endif + + gboolean visible; ++ gboolean hide_policy_items; + + /* Permissions */ + NMClientPermissionResult permissions[NM_CLIENT_PERMISSION_LAST + 1]; diff -Nru network-manager-applet-1.28.0/debian/rules network-manager-applet-1.28.0/debian/rules --- network-manager-applet-1.28.0/debian/rules 2022-06-07 18:21:36.000000000 -0300 +++ network-manager-applet-1.28.0/debian/rules 2022-06-10 09:17:28.000000000 -0300 @@ -4,7 +4,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs %: - dh $@ --without=autoreconf --buildsystem=meson + dh $@ --without=autoreconf --with translations --buildsystem=meson override_dh_auto_configure: dh_auto_configure -- \