summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2007-11-09 18:57:29 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2007-11-09 18:57:29 +0000
commit7b690d6bc1fc808c7d9aa88dc309b4256617eedc (patch)
treed4bcf98d0055c71165085082cf3eef4c045a5f2e
parent67ce5927e1183dc11f7db1d1181b07586daa52db (diff)
downloadmetacity-7b690d6bc1fc808c7d9aa88dc309b4256617eedc.tar.gz
Fix swapped arguments when updating _NET_WM_USER_TIME
2007-11-09 Federico Mena Quintero <federico@novell.com> * 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 <federico@gnu.org> svn path=/trunk/; revision=3378
-rw-r--r--ChangeLog16
-rw-r--r--src/window-props.c4
-rw-r--r--src/window.c2
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e1bc6a1..e3e7045d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-11-09 Federico Mena Quintero <federico@novell.com>
+
+ * 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 <federico@novell.com>
+
+ * 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 <pbloomfield@bellsouth.net>
* src/window.c (meta_window_move_resize_internal): save
diff --git a/src/window-props.c b/src/window-props.c
index 3602395a..48c5371d 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 eb769829..09e560dd 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 &&