fix from Gaute Lindkvist #82977 for unsticking windows

2002-06-17  Havoc Pennington  <hp@pobox.com>

	* src/window.c (meta_window_change_workspace): fix from Gaute
	Lindkvist #82977 for unsticking windows
This commit is contained in:
Havoc Pennington 2002-06-18 01:41:08 +00:00 committed by Havoc Pennington
parent c7a72aeed3
commit 6cda7d0b11
3 changed files with 11 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2002-06-17 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_change_workspace): fix from Gaute
Lindkvist #82977 for unsticking windows
2002-06-17 Frederic Crozat <fcrozat@mandrakesoft.com> 2002-06-17 Frederic Crozat <fcrozat@mandrakesoft.com>
* src/metacity.schemas.in: associate close_window keybinding to * src/metacity.schemas.in: associate close_window keybinding to

2
rationales.txt Normal file
View File

@ -0,0 +1,2 @@
Focus windows on map: see http://bugzilla.gnome.org/show_bug.cgi?id=82921

View File

@ -2737,21 +2737,14 @@ meta_window_change_workspace (MetaWindow *window,
meta_verbose ("Changing window %s to workspace %d\n", meta_verbose ("Changing window %s to workspace %d\n",
window->desc, meta_workspace_index (workspace)); window->desc, meta_workspace_index (workspace));
/* See if we're already on this space */ /* See if we're already on this space. If not, make sure we are */
if (g_list_find (window->workspaces, workspace) != NULL) if (g_list_find (window->workspaces, workspace) == NULL)
{ {
meta_verbose ("%s already on this workspace\n", window->desc); meta_workspace_add_window (workspace, window);
return;
} }
/* Add first, to maintain invariant that we're always
* on some workspace.
*/
meta_workspace_add_window (workspace, window);
/* unstick if stuck */ /* unstick if stuck */
if (window->on_all_workspaces) if (window->on_all_workspaces)
window->on_all_workspaces = FALSE; meta_window_unstick (window);
/* Lamely rely on prepend */ /* Lamely rely on prepend */
g_assert (window->workspaces->data == workspace); g_assert (window->workspaces->data == workspace);