r54069 - in /desktop/experimental/mutter/debian: changelog control patches/series patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Fri Sep 22 18:13:12 2017
New Revision: 54069

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54069
Log:
debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch:
Cherry-pick from upstream. Fix positioning of desktop icons at startup.
(LP: #1696621)

Added:
    desktop/experimental/mutter/debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/control
    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=54069&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Fri Sep 22 18:13:12 2017
@@ -1,3 +1,11 @@
+mutter (3.26.0-2) UNRELEASED; urgency=medium
+
+  * debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch:
+    Cherry-pick from upstream. Fix positioning of desktop icons at startup.
+    (LP: #1696621)
+
+ -- Iain Lane <laney at debian.org>  Fri, 22 Sep 2017 18:39:41 +0100
+
 mutter (3.26.0-1) experimental; urgency=medium
 
   * Team upload

Modified: desktop/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control?rev=54069&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control	[utf-8] (original)
+++ desktop/experimental/mutter/debian/control	[utf-8] Fri Sep 22 18:13:12 2017
@@ -6,7 +6,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Iain Lane <laney at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 10),
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.15),

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=54069&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Fri Sep 22 18:13:12 2017
@@ -1,3 +1,4 @@
+src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch
 bgo768531_workaround-startup-notifications.patch
 skip-failing-tests.patch
 skip-failing-tests-325.patch

Added: desktop/experimental/mutter/debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch?rev=54069&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch	(added)
+++ desktop/experimental/mutter/debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch	[utf-8] Fri Sep 22 18:13:12 2017
@@ -0,0 +1,39 @@
+From 8532b102909e09e1e0fdbd7f2701a7c40de1af5f Mon Sep 17 00:00:00 2001
+From: Andrea Azzarone <andrea.azzarone at canonical.com>
+Date: Wed, 6 Sep 2017 14:34:35 +0200
+Subject: [PATCH] src/core/screen.c: Set _NET_NUMBER_OF_DESKTOPS in
+ meta_screen_new
+
+Make sure to call set_number_of_spaces_hint in meta_screen_new.
+_NET_NUMBER_OF_DESKTOPS is required by nautilus-desktop to correctly
+get the desktop workarea.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760651
+---
+ src/core/screen.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/screen.c b/src/core/screen.c
+index 98c5538e3..99ab5d7c7 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -72,6 +72,8 @@ static void prefs_changed_callback (MetaPreference pref,
+ 
+ static void set_desktop_geometry_hint (MetaScreen *screen);
+ static void set_desktop_viewport_hint (MetaScreen *screen);
++static void set_number_of_spaces_hint (MetaScreen *screen,
++                                       int         n_spaces);
+ 
+ static void on_monitors_changed (MetaMonitorManager *manager,
+                                  MetaScreen         *screen);
+@@ -771,6 +773,7 @@ meta_screen_new (MetaDisplay *display,
+    * so create that required workspace.
+    */
+   meta_workspace_new (screen);
++  set_number_of_spaces_hint (screen, g_list_length (screen->workspaces));
+ 
+   screen->keys_grabbed = FALSE;
+   meta_screen_grab_keys (screen);
+-- 
+2.14.1
+