From 9051b70d40caf6e6b96bae9c7ab4ab333cdf119d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 9 Aug 2006 18:32:30 +0000 Subject: [PATCH] Vytautus Liuolia totally rocks; he tested and debugged and tracked down 2006-08-07 Elijah Newren * src/window.c (intervening_user_event_occurred): Vytautus Liuolia totally rocks; he tested and debugged and tracked down where we were using the focus window's net_wm_user_time even when it was uninitialized. This may fix bug 311868 and others I've heard about (with Valknut, IIRC). It definitely fixes the issues Vytas was seeing with his single instance library. :-) --- ChangeLog | 9 +++++++++ src/window.c | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c577ef7c8..0cfbaca2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-08-07 Elijah Newren + + * src/window.c (intervening_user_event_occurred): Vytautus Liuolia + totally rocks; he tested and debugged and tracked down where we + were using the focus window's net_wm_user_time even when it was + uninitialized. This may fix bug 311868 and others I've heard + about (with Valknut, IIRC). It definitely fixes the issues Vytas + was seeing with his single instance library. :-) + 2006-08-07 Elijah Newren * src/constraints.c (setup_constraint_info): patch from Stéphane diff --git a/src/window.c b/src/window.c index 408d84d2f..ecce821b6 100644 --- a/src/window.c +++ b/src/window.c @@ -1646,9 +1646,11 @@ intervening_user_event_occurred (MetaWindow *window) { meta_topic (META_DEBUG_STARTUP, "COMPARISON (continued):\n" - " focus_window : %s\n" - " fw->net_wm_user_time : %lu\n", + " focus_window : %s\n" + " fw->net_wm_user_time_set : %d\n" + " fw->net_wm_user_time : %lu\n", focus_window->desc, + focus_window->net_wm_user_time_set, focus_window->net_wm_user_time); } @@ -1677,6 +1679,15 @@ intervening_user_event_occurred (MetaWindow *window) return FALSE; } + if (focus_window != NULL && + !focus_window->net_wm_user_time_set) + { + meta_topic (META_DEBUG_STARTUP, + "focus window, %s, doesn't have a user time set yet!\n", + window->desc); + return FALSE; + } + /* To determine the "launch" time of an application, * startup-notification can set the TIMESTAMP and the * application (usually via its toolkit such as gtk or qt) can