From fd763ad857dc5630ae2788d69c6b9dea8e171097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 30 Sep 2017 00:14:19 +0200 Subject: [PATCH] Revert "src/core/screen.c: Set _NET_NUMBER_OF_DESKTOPS in meta_screen_new" When dynamic workspaces are used, we pick up an existing NUMBER_OF_DESKTOP hint in meta_screen_init_workspaces() to properly restore workspaces on restart. Unconditionally setting that hint to 1 *before* reading it breaks that, and we end up shifting all windows to the first workspace. This reverts commit 8532b102909e09e1e0fdbd7f2701a7c40de1af5f. https://bugzilla.gnome.org/show_bug.cgi?id=760651 --- src/core/screen.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/core/screen.c b/src/core/screen.c index 82ad386b2..c96aefd7f 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -72,8 +72,6 @@ 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); @@ -773,7 +771,6 @@ 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);