isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

[MetaScreen] Keep num_workspaces key in sync with the actual workspace number

Browse Source 
Changing the number of workspaces via an external pager relies on the gconf
key; if a plugin adds or removes workspaces on the fly, we can get into a
situation when the stale number stored by the preferences matches the new
number requested by the pager, in which case the pager request becomes a nop.

This commit ensures that when the meta_screen_append_new_workspace() or
meta_screen_remove_workspace() functions are called, the stored value is
updated accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=613127
This commit is contained in:
Tomas Frydrych 2010-02-11 10:06:38 +00:00
parent 28767c4d34
commit fc9488211f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/screen.c
View File

@ -1266,7 +1266,8 @@ meta_screen_remove_workspace (MetaScreen *screen, MetaWorkspace *workspace,
GList *l; GList *l;
MetaWorkspace *neighbour = NULL; MetaWorkspace *neighbour = NULL;
GList *next = NULL; GList *next = NULL;
int index; int index;
int new_num;
l = screen->workspaces; l = screen->workspaces;
while (l) while (l)
@ -1308,7 +1309,10 @@ meta_screen_remove_workspace (MetaScreen *screen, MetaWorkspace *workspace,
/* This also removes the workspace from the screens list */ /* This also removes the workspace from the screens list */
meta_workspace_remove (workspace); meta_workspace_remove (workspace);
set_number_of_spaces_hint (screen, g_list_length (screen->workspaces)); new_num = g_list_length (screen->workspaces);
set_number_of_spaces_hint (screen, new_num);
meta_prefs_set_num_workspaces (new_num);
l = next; l = next;
while (l) while (l)
@ -1344,6 +1348,7 @@ meta_screen_append_new_workspace (MetaScreen *screen, gboolean activate,
guint32 timestamp) guint32 timestamp)
{ {
MetaWorkspace *w; MetaWorkspace *w;
int new_num;
/* This also adds the workspace to the screen list */ /* This also adds the workspace to the screen list */
w = meta_workspace_new (screen); w = meta_workspace_new (screen);
@ -1354,7 +1359,10 @@ meta_screen_append_new_workspace (MetaScreen *screen, gboolean activate,
if (activate) if (activate)
meta_workspace_activate (w, timestamp); meta_workspace_activate (w, timestamp);
set_number_of_spaces_hint (screen, g_list_length (screen->workspaces)); new_num = g_list_length (screen->workspaces);
set_number_of_spaces_hint (screen, new_num);
meta_prefs_set_num_workspaces (new_num);
meta_screen_queue_workarea_recalc (screen); meta_screen_queue_workarea_recalc (screen);
@ -1381,6 +1389,9 @@ update_num_workspaces (MetaScreen *screen,
g_assert (new_num > 0); g_assert (new_num > 0);
if (g_list_length (screen->workspaces) == (guint) new_num)
return;
last_remaining = NULL; last_remaining = NULL;
extras = NULL; extras = NULL;
i = 0; i = 0;