Commit 118a1fb7 authored by Elijah Newren's avatar Elijah Newren Committed by Elijah Newren

activating the current workspace should be a no-op. This prevents a race

2004-08-07  Elijah Newren  <newren@math.utah.edu>

	* src/display.c (event_callback): activating the current workspace
	should be a no-op.  This prevents a race condition in focus window
	choice when activating a window via the taskbar.  Fix for #149589.
parent bd73853f
2004-08-07 Elijah Newren <newren@math.utah.edu>
* window.c, window.h: Revert Rob's 2004-07-31 patch that ignored
net_wm_user_time when unminimizing a window
* src/display.c (event_callback): activating the current workspace
should be a no-op. This prevents a race condition in focus window
choice when activating a window via the taskbar. Fix for #149589.
* window.c (meta_window_activate): If a nonzero timestamp is
2004-08-07 Elijah Newren <newren@math.utah.edu>
* src/window.c, src/window.h: Revert Rob's 2004-07-31 patch that
ignored net_wm_user_time when unminimizing a window
* src/window.c (meta_window_activate): If a nonzero timestamp is
passed, update the window's net_wm_user_time accordingly. (see
comments 102-108 of bug 118372)
......
......@@ -2057,8 +2057,13 @@ event_callback (XEvent *event,
if (workspace)
{
meta_workspace_activate (workspace);
meta_workspace_focus_default_window (workspace, NULL);
if (workspace != screen->active_workspace)
{
meta_workspace_activate (workspace);
meta_workspace_focus_default_window (workspace, NULL);
}
else
meta_verbose ("Workspace %d already active.\n", space);
}
else
meta_verbose ("Don't know about workspace %d\n", space);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment