r54531 - in /desktop/unstable/gnome-shell/debian: changelog patches/git_popupmenu-icon-via-string.patch patches/git_spawn-wifi-panel-wpa-enterprise.patch patches/series

Sun Oct 22 00:07:31 UTC 2017

Author: jbicha
Date: Sun Oct 22 00:07:30 2017
New Revision: 54531

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54531
Log:
Cherry-pick 2 git commits, fix some extensions & a Wi-Fi Settings link

* Cherry-pick git_popupmenu-icon-via-string.patch:
  - Fix setting icon name via string, used by some extensions
* Cherry-pick git_spawn-wifi-panel-wpa-enterprise.patch:
  - Launch Wi-Fi Settings not Network panel for WPA Enterprise

Added:
    desktop/unstable/gnome-shell/debian/patches/git_popupmenu-icon-via-string.patch
    desktop/unstable/gnome-shell/debian/patches/git_spawn-wifi-panel-wpa-enterprise.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=54531&op=diff
==============================================================================

--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Sun Oct 22 00:07:30 2017
@@ -1,3 +1,12 @@
+gnome-shell (3.26.1-3) UNRELEASED; urgency=medium
+
+  * Cherry-pick git_popupmenu-icon-via-string.patch:
+    - Fix setting icon name via string, used by some extensions
+  * Cherry-pick git_spawn-wifi-panel-wpa-enterprise.patch:
+    - Launch Wi-Fi Settings not Network panel for WPA Enterprise
+
+ -- Jeremy Bicha <jbicha at debian.org>  Sat, 21 Oct 2017 19:59:31 -0400
+
 gnome-shell (3.26.1-2) unstable; urgency=medium
 
   [ Jeremy Bicha ]

Added: desktop/unstable/gnome-shell/debian/patches/git_popupmenu-icon-via-string.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/git_popupmenu-icon-via-string.patch?rev=54531&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/git_popupmenu-icon-via-string.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/git_popupmenu-icon-via-string.patch	[utf-8] Sun Oct 22 00:07:30 2017
@@ -0,0 +1,29 @@
+From f4237a4ae78fa93df19655a4fa276690083a7b76 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 16 Oct 2017 00:09:52 +0200
+Subject: popupMenu: Fix setting ImageMenuItem's icons via strings
+
+Commit 28ca96064bcb added support for setting PopupImageMenuItem's icons
+via GIcons as well as via strings. However as the check whether an object
+implements the GIcon interface only works on GObjects, specifying an icon
+name was broken. Fix that to actually allow both strings and GIcons.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789018
+---
+ js/ui/popupMenu.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index d00132f..cb975f5 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -405,7 +405,7 @@ var PopupImageMenuItem = new Lang.Class({
+ 
+     setIcon: function(icon) {
+         // The 'icon' parameter can be either a Gio.Icon or a string.
+-        if (GObject.type_is_a(icon, Gio.Icon))
++        if (icon instanceof GObject.Object && GObject.type_is_a(icon, Gio.Icon))
+             this._icon.gicon = icon;
+         else
+             this._icon.icon_name = icon;
+

Added: desktop/unstable/gnome-shell/debian/patches/git_spawn-wifi-panel-wpa-enterprise.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/git_spawn-wifi-panel-wpa-enterprise.patch?rev=54531&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/git_spawn-wifi-panel-wpa-enterprise.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/git_spawn-wifi-panel-wpa-enterprise.patch	[utf-8] Sun Oct 22 00:07:30 2017
@@ -0,0 +1,27 @@
+From 78d58deb5afbe4fc06319553d4ed975053589d00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 20 Oct 2017 15:29:07 +0200
+Subject: network: Spawn wifi panel for further WPA enterprise configuration
+
+Settings recently split Wi-Fi configuration from the Network panel,
+so launch that instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789231
+---
+ js/ui/status/network.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 02a43c1..9575af7 100644
+--- a/js/ui/status/network.js
++++ b/js/ui/status/network.js
+@@ -951,7 +951,7 @@ var NMWirelessDialog = new Lang.Class({
+                 || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
+                 // 802.1x-enabled APs require further configuration, so they're
+                 // handled in gnome-control-center
+-                Util.spawn(['gnome-control-center', 'network', 'connect-8021x-wifi',
++                Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
+                             this._device.get_path(), accessPoints[0].dbus_path]);
+             } else {
+                 let connection = new NetworkManager.Connection();
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=54531&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Sun Oct 22 00:07:30 2017
@@ -2,3 +2,5 @@
 workaround_crasher_fractional_scaling.patch
 fix_reset_initial_focus.patch
 git_layout-unset-when-headless.patch
+git_popupmenu-icon-via-string.patch
+git_spawn-wifi-panel-wpa-enterprise.patch


