r42392 - in /desktop/experimental/mutter/debian: changelog patches/series patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Aug 31 12:46:23 2014
New Revision: 42392

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42392
Log:
* d/p/workspace-Smarten-assert-in-light-of-O-R-windows.patch
  + Added. Fix assertion failure when removing a workspace with a window on
    at that is on all workspaces (from upstream git)

Added:
    desktop/experimental/mutter/debian/patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/patches/series

Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=42392&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Sun Aug 31 12:46:23 2014
@@ -26,7 +26,12 @@
   * Update library name to libmutter0e since the API/ABI is not compatible
     with 3.12.x releases
 
- -- Andreas Henriksson <andreas at fatal.se>  Sun, 24 Aug 2014 15:42:23 -0700
+  [ Sjoerd Simons ]
+  * d/p/workspace-Smarten-assert-in-light-of-O-R-windows.patch
+    + Added. Fix assertion failure when removing a workspace with a window on
+      at that is on all workspaces (from upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 31 Aug 2014 14:44:58 +0200
 
 mutter (3.13.1-1) experimental; urgency=medium
 

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=42392&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Sun Aug 31 12:46:23 2014
@@ -1 +1,2 @@
 01_Wcast-align.patch
+workspace-Smarten-assert-in-light-of-O-R-windows.patch

Added: desktop/experimental/mutter/debian/patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch?rev=42392&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch	(added)
+++ desktop/experimental/mutter/debian/patches/workspace-Smarten-assert-in-light-of-O-R-windows.patch	[utf-8] Sun Aug 31 12:46:23 2014
@@ -0,0 +1,60 @@
+From 8f757c7b8062edc45e7d2c78508ed50969aa0be7 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Mon, 25 Aug 2014 08:57:13 -0400
+Subject: [PATCH] workspace: Smarten assert in light of O-R windows
+
+O-R windows appear in workspace->windows, which aren't relocatable,
+so we can't simply check if the workspace is empty after relocating
+all normal windows, since those windows remain.
+
+Make sure that the only windows we have are those that are
+on_all_workspaces.
+---
+ src/core/workspace.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/workspace.c b/src/core/workspace.c
+index af84eed..d55593c 100644
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -241,6 +241,19 @@ workspace_free_builtin_struts (MetaWorkspace *workspace)
+   workspace->builtin_struts = NULL;
+ }
+ 
++/* Ensure that the workspace is empty by making sure that
++ * all of our windows are on-all-workspaces. */
++static void
++assert_workspace_empty (MetaWorkspace *workspace)
++{
++  GList *l;
++  for (l = workspace->windows; l != NULL; l = l->next)
++    {
++      MetaWindow *window = l->data;
++      g_assert (window->on_all_workspaces);
++    }
++}
++
+ void
+ meta_workspace_remove (MetaWorkspace *workspace)
+ {
+@@ -249,7 +262,7 @@ meta_workspace_remove (MetaWorkspace *workspace)
+ 
+   g_return_if_fail (workspace != workspace->screen->active_workspace);
+ 
+-  g_assert (workspace->windows == NULL);
++  assert_workspace_empty (workspace);
+ 
+   screen = workspace->screen;
+ 
+@@ -349,7 +362,7 @@ meta_workspace_relocate_windows (MetaWorkspace *workspace,
+ 
+   g_list_free (copy);
+ 
+-  g_assert (workspace->windows == NULL);
++  assert_workspace_empty (workspace);
+ }
+ 
+ void
+-- 
+2.1.0
+