From 454e595ef845caf60aa02d5bcfd51711e9d3a5f4 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 9 Feb 2005 03:15:11 +0000 Subject: [PATCH] If we're not passed a timestamp, make sure to manually get one. Fixes 2005-02-08 Elijah Newren * src/window.c: (meta_window_activate): If we're not passed a timestamp, make sure to manually get one. Fixes #166728. --- ChangeLog | 5 +++++ src/window.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1770d0689..93771833a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-08 Elijah Newren + + * src/window.c: (meta_window_activate): If we're not passed a + timestamp, make sure to manually get one. Fixes #166728. + 2005-02-07 Elijah Newren * configure.in: post-release version bump to 2.9.21 diff --git a/src/window.c b/src/window.c index 529327d23..947acff3d 100644 --- a/src/window.c +++ b/src/window.c @@ -2169,8 +2169,10 @@ meta_window_activate (MetaWindow *window, return; } - if (timestamp != 0) - window->net_wm_user_time = timestamp; + if (timestamp == 0) + timestamp = meta_display_get_current_time_roundtrip (window->display); + + window->net_wm_user_time = timestamp; /* disable show desktop mode unless we're a desktop component */ maybe_leave_show_desktop_mode (window);