From 7b690d6bc1fc808c7d9aa88dc309b4256617eedc Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 9 Nov 2007 18:57:29 +0000 Subject: [PATCH] Fix swapped arguments when updating _NET_WM_USER_TIME 2007-11-09 Federico Mena Quintero * src/window.c (intervening_user_event_occurred): When the window doesn't have a user time nor an initial timestamp set, act as if there always was an intervening user event. This causes un-timestamped windows to *not* get the focus. Fixes http://bugzilla.gnome.org/show_bug.cgi?id=488468 Signed-off-by: Federico Mena Quintero svn path=/trunk/; revision=3378 --- ChangeLog | 16 ++++++++++++++++ src/window-props.c | 4 ++-- src/window.c | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e1bc6a1f..e3e7045d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-11-09 Federico Mena Quintero + + * src/window.c (intervening_user_event_occurred): When the window + doesn't have a user time nor an initial timestamp set, act as if + there always was an intervening user event. This causes + un-timestamped windows to *not* get the focus. Fixes + http://bugzilla.gnome.org/show_bug.cgi?id=488468 + +2007-11-07 Federico Mena Quintero + + * src/window-props.c (reload_net_wm_user_time_window): Fix typo; + the arguments to meta_window_reload_property_from_xwindow() were + reversed. This is why the wm_user_time wasn't getting initialized + properly from the _NET_WM_USER_TIME_WINDOW. Fixes part of + http://bugzilla.gnome.org/show_bug.cgi?id=488468 + 2007-11-06 Peter Bloomfield * src/window.c (meta_window_move_resize_internal): save diff --git a/src/window-props.c b/src/window-props.c index 3602395aa..48c5371d8 100644 --- a/src/window-props.c +++ b/src/window-props.c @@ -278,8 +278,8 @@ reload_net_wm_user_time_window (MetaWindow *window, */ meta_window_reload_property_from_xwindow ( window, - window->display->atom_net_wm_user_time, - window->user_time_window); + window->user_time_window, + window->display->atom_net_wm_user_time); } } } diff --git a/src/window.c b/src/window.c index eb7698293..09e560dd9 100644 --- a/src/window.c +++ b/src/window.c @@ -1789,7 +1789,7 @@ intervening_user_event_occurred (MetaWindow *window) meta_topic (META_DEBUG_STARTUP, "no information about window %s found\n", window->desc); - return FALSE; + return TRUE; } if (focus_window != NULL &&