diff options
| author | Elijah Newren <newren@gmail.com> | 2005-02-09 03:15:11 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2005-02-09 03:15:11 +0000 |
| commit | 454e595ef845caf60aa02d5bcfd51711e9d3a5f4 (patch) | |
| tree | 03f1b413ef91c42b715eb6d8e9c2e75d6b153e0a | |
| parent | 50596a6f97860e0c42801a0487051f1f4dc34496 (diff) | |
| download | metacity-454e595ef845caf60aa02d5bcfd51711e9d3a5f4.tar.gz | |
If we're not passed a timestamp, make sure to manually get one. Fixes
2005-02-08 Elijah Newren <newren@gmail.com>
* src/window.c: (meta_window_activate): If we're not passed a
timestamp, make sure to manually get one. Fixes #166728.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-02-08 Elijah Newren <newren@gmail.com> + + * 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 <newren@gmail.com> * configure.in: post-release version bump to 2.9.21 diff --git a/src/window.c b/src/window.c index 529327d2..947acff3 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); |