diff --git a/0001-network-properly-remove-connections-from-list.patch b/0001-network-properly-remove-connections-from-list.patch new file mode 100644 index 0000000..81ad0ff --- /dev/null +++ b/0001-network-properly-remove-connections-from-list.patch @@ -0,0 +1,35 @@ +From 86618ce1f963be53410ac5e68d99a8b7bb82e0c6 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Sun, 16 Nov 2014 15:50:14 -0800 +Subject: [PATCH] network: properly remove connections from list + +Due to a typo we were always removing the first (index 0) connection +from the global list of connections instead of the correct one. + +This resulted in some connections remaining in the shell's connection +list long after they were removed. In particular, this resulted in +multiple copies of a bluetooth connection appearing after suspend/resume +(when the device was readded and the cached connection list was +rescanned). + +https://bugzilla.gnome.org/show_bug.cgi?id=740227 +--- + 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 049406d..4f02d78 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -1866,7 +1866,7 @@ const NMApplet = new Lang.Class({ + _connectionRemoved: function(connection) { + let pos = this._connections.indexOf(connection); + if (pos != -1) +- this._connections.splice(connection, 1); ++ this._connections.splice(pos, 1); + + let section = connection._section; + +-- +2.1.0 + diff --git a/gnome-shell.spec b/gnome-shell.spec index 96e5cb0..f4e2648 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.14.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -13,6 +13,9 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.14/%{name}-%{ver # Replace Epiphany with Firefox in the default favourite apps list Patch1: gnome-shell-favourite-apps-firefox.patch +# Backported upstream patch +Patch2: 0001-network-properly-remove-connections-from-list.patch + %define clutter_version 1.15.90 %define gnome_bluetooth_version 1:3.9.0 %define gobject_introspection_version 1.41.0 @@ -118,6 +121,7 @@ easy to use experience. %prep %setup -q %patch1 -p1 -b .firefox +%patch2 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -179,6 +183,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %exclude %{_datadir}/gtk-doc %changelog +* Wed Nov 26 2014 Kalev Lember - 3.14.2-3 +- Backport a patch for repopulating network connections list after suspend + * Wed Nov 12 2014 Richard Hughes - 3.14.2-2 - Fix non-Fedora build