Update to 3.11.91

.gitignore

@@ -71,3 +71,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-3.11.4.tar.xz
 /gnome-shell-3.11.5.tar.xz
 /gnome-shell-3.11.90.tar.xz
+/gnome-shell-3.11.91.tar.xz

0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch

@@ -1,31 +0,0 @@
-From 89a2dc71fc1ed56702b0eac83b6d597cb946596f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Fri, 21 Feb 2014 10:38:29 +0100
-Subject: [PATCH 1/8] workspaceThumbnails: Fix creating new workspace via DND
-
-Commit 61a58ff3c981d4 replaced the (removed in commit 254afc50223a7)
-MetaWindowActor.get_workspace() method by MetaWindow.get_workspace(),
-but did not take into account that the return values differ - the
-former returns the workspace index, the latter the workspace object.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724686
----
- js/ui/workspaceThumbnail.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 7b7bc90..913ed23 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -822,7 +822,7 @@ const ThumbnailsBox = new Lang.Class({
-             // ... move them down one.
-             windows.forEach(function(winActor) {
-                 let window = winActor.meta_window;
--                window.change_workspace_by_index(window.get_workspace() + 1, true);
-+                window.change_workspace_by_index(window.get_workspace().index() + 1, true);
-             });
- 
-             if (isWindow)
--- 
-1.9.0
-

0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch

@@ -1,33 +0,0 @@
-From f4607626e40b97500f18bbe719952d4c58fef83a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Sun, 23 Feb 2014 00:10:50 +0100
-Subject: [PATCH 8/8] workspaceThumbnails: Really fix DND creating new
- workspaces
-
-The same problem spotted in commit 89a2dc71fc1ed is present in
-some more places, fix those as well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724686
----
- js/ui/workspaceThumbnail.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 913ed23..25469e3 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -812,9 +812,9 @@ const ThumbnailsBox = new Lang.Class({
-                     return false;
- 
-                 if (isWindow)
--                    return window.get_workspace() >= newWorkspaceIndex && winActor != source;
-+                    return window.get_workspace().index() >= newWorkspaceIndex && winActor != source;
-                 else
--                    return window.get_workspace() >= newWorkspaceIndex;
-+                    return window.get_workspace().index() >= newWorkspaceIndex;
-             });
- 
-             this._spliceIndex = newWorkspaceIndex;
--- 
-1.9.0
-

gnome-shell-3.11.90-wifi_secrets.patch

@@ -1,137 +0,0 @@
-From 725f5c83303a192ccf008b963e21592cf8f9fc90 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Thu, 20 Feb 2014 15:10:36 -0600
-Subject: [PATCH] NetworkAgent: fix initial secrets requests after 17726abb
-
-While the named commit was correct for VPN connections, it didn't
-work correctly for the initial secrets requests like when connecting
-to a new access point.  In that case, secrets *should* be requested
-when none are found, but only if interaction is enabled.  The
-bits of 17726abb which removed checking secrets against the hints
-*were* correct, but 17726abb removed too much.
-
-Also, to ensure passwords don't get inadvertently cleared when
-simply reading them from the keyring, don't save passwords
-unless something might have changed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724779
----
- src/shell-network-agent.c | 26 ++++++++++++++++++--------
- 1 file changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
-index 8d2b9b2..c6f4b79 100644
---- a/src/shell-network-agent.c
-+++ b/src/shell-network-agent.c
-@@ -252,14 +252,15 @@ get_secrets_keyring_cb (GObject            *source,
-   ShellNetworkAgent *self;
-   ShellNetworkAgentPrivate *priv;
-   GError *secret_error = NULL;
-   GError *error = NULL;
-   GList *items;
-   GList *l;
-   GHashTable *outer;
-+  gboolean secrets_found = FALSE;
- 
-   items = secret_service_search_finish (NULL, result, &secret_error);
- 
-   if (g_error_matches (secret_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-     {
-       g_error_free (secret_error);
-       return;
-@@ -308,30 +309,36 @@ get_secrets_keyring_cb (GObject            *source,
-                   g_value_set_string (secret_value, secret_value_get (secret, NULL));
- 
-                   g_hash_table_insert (closure->entries, secret_name, secret_value);
-                 }
-               else
-                 g_hash_table_insert (closure->vpn_entries, secret_name, g_strdup (secret_value_get (secret, NULL)));
- 
-+              secrets_found = TRUE;
-+
-               g_hash_table_unref (attributes);
-               secret_value_unref (secret);
-               break;
-             }
-         }
- 
-       g_hash_table_unref (attributes);
-       secret_value_unref (secret);
-     }
- 
-   g_list_free_full (items, g_object_unref);
- 
-   /* All VPN requests get sent to the VPN's auth dialog, since it knows better
--   * than the agent do about what secrets are required.
-+   * than the agent about what secrets are required.  Otherwise, if no secrets
-+   * were found and interaction is allowed the ask for some secrets, because
-+   * NetworkManager will fail the connection if not secrets are returned
-+   * instead of asking again with REQUEST_NEW.
-    */
--  if (closure->is_vpn)
-+  if (closure->is_vpn ||
-+      (!secrets_found && (closure->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION)))
-     {
-       nm_connection_update_secrets (closure->connection, closure->setting_name, closure->entries, NULL);
- 
-       request_secrets_from_ui (closure);
-       return;
-     }
- 
-@@ -459,15 +466,14 @@ shell_network_agent_set_password (ShellNetworkAgent *self,
- void
- shell_network_agent_respond (ShellNetworkAgent         *self,
-                              gchar                     *request_id,
-                              ShellNetworkAgentResponse  response)
- {
-   ShellNetworkAgentPrivate *priv;
-   ShellAgentRequest *request;
--  NMConnection *dup;
-   GHashTable *outer;
- 
-   g_return_if_fail (SHELL_IS_NETWORK_AGENT (self));
- 
-   priv = self->priv;
-   request = g_hash_table_lookup (priv->requests, request_id);
-   g_return_if_fail (request != NULL);
-@@ -494,27 +500,31 @@ shell_network_agent_respond (ShellNetworkAgent         *self,
-       g_error_free (error);
-       g_hash_table_remove (priv->requests, request_id);
-       return;
-     }
- 
-   /* response == SHELL_NETWORK_AGENT_CONFIRMED */
- 
--  /* Save updated secrets */
--  dup = nm_connection_duplicate (request->connection);
-+  /* Save any updated secrets */
-+  if ((request->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION) ||
-+      (request->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW))
-+    {
-+      NMConnection *dup = nm_connection_duplicate (request->connection);
- 
--  nm_connection_update_secrets (dup, request->setting_name, request->entries, NULL);
--  nm_secret_agent_save_secrets (NM_SECRET_AGENT (self), dup, NULL, NULL);
-+      nm_connection_update_secrets (dup, request->setting_name, request->entries, NULL);
-+      nm_secret_agent_save_secrets (NM_SECRET_AGENT (self), dup, NULL, NULL);
-+      g_object_unref (dup);
-+    }
- 
-   outer = g_hash_table_new (g_str_hash, g_str_equal);
-   g_hash_table_insert (outer, request->setting_name, request->entries);
- 
-   request->callback (NM_SECRET_AGENT (self), request->connection, outer, NULL, request->callback_data);
- 
-   g_hash_table_destroy (outer);
--  g_object_unref (dup);
-   g_hash_table_remove (priv->requests, request_id);
- }
- 
- static void
- shell_network_agent_cancel_get_secrets (NMSecretAgent *agent,
-                                         const gchar   *connection_path,
-                                         const gchar   *setting_name)
--- 
-1.8.5.3
-
-

gnome-shell.spec

@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        3.11.90
-Release:        5%{?dist}
+Version:        3.11.91
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -16,13 +16,6 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=722149
 Patch2: gnome-shell-3.11.90-background.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=724779
-Patch3: gnome-shell-3.11.90-wifi_secrets.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=724686
-Patch4: 0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch
-Patch5: 0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch
-
 %define clutter_version 1.13.4
 %define gnome_bluetooth_version 1:3.9.0
 %define gobject_introspection_version 0.10.1
@@ -127,9 +120,6 @@ easy to use experience.
 %setup -q
 %patch1 -p1 -b .firefox
 %patch2 -p1 -b .background
-%patch3 -p1 -b .wifi_secrets
-%patch4 -p1 -b .workspace_dnd1
-%patch5 -p1 -b .workspace_dnd2
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -189,6 +179,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Thu Mar 06 2014 Florian Müllner <fmuellner@redhat.com> - 3.11.91-1
+- Update to 3.11.91
+
 * Mon Mar 03 2014 Adam Williamson <awilliam@redhat.com> - 3.11.90-5
 - backport fixes to fix drag-and-drop workspace creation (BGO #724686)
 

sources

@@ -1 +1 @@
-f27545ec983b48088f56501e3db3db58  gnome-shell-3.11.90.tar.xz
+2df509f67ffcc31fab43e3064d2869e9  gnome-shell-3.11.91.tar.xz