summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-08-09 18:32:30 +0000
committerElijah Newren <newren@src.gnome.org>2006-08-09 18:32:30 +0000
commit9051b70d40caf6e6b96bae9c7ab4ab333cdf119d (patch)
treee72a8a4665f74de47493cd26ffc9f1d54fde578b /src
parent43b5985c20c5b0e9b03ea8f97a4d7db73c5f65ad (diff)
downloadmetacity-9051b70d40caf6e6b96bae9c7ab4ab333cdf119d.tar.gz
Vytautus Liuolia totally rocks; he tested and debugged and tracked down
2006-08-07 Elijah Newren <newren gmail com> * 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. :-)
Diffstat (limited to 'src')
-rw-r--r--src/window.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 408d84d2..ecce821b 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