diff options
author | Thomas Thurman <thomas thurman org uk> | 2006-02-03 18:09:16 +0000 |
---|---|---|
committer | Elijah Newren <newren@src.gnome.org> | 2006-02-03 18:09:16 +0000 |
commit | b5c199c6e600b1d6eb55c54e31a5043f50d8a8c2 (patch) | |
tree | 968745ce1a148e645d7d438409f2f0bd606c5793 | |
parent | 63d978d22894a928a8d4afe5a87bb2624695b6fd (diff) | |
download | metacity-b5c199c6e600b1d6eb55c54e31a5043f50d8a8c2.tar.gz |
produce warning when invalid events with no timestamp are received, rather
2006-02-03 Thomas Thurman <thomas thurman org uk>
* src/display.c (event_callback): produce warning when invalid
events with no timestamp are received, rather than failing an
assertion
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/display.c | 18 |
2 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2006-02-03 Thomas Thurman <thomas thurman org uk> + + * src/display.c (event_callback): produce warning when invalid + events with no timestamp are received, rather than failing an + assertion + Thu Feb 2 17:58:22 2006 Søren Sandmann <sandmann@redhat.com> * compositor.c (process_map): update the pixmap. diff --git a/src/display.c b/src/display.c index 8289e1f9..ca0b6764 100644 --- a/src/display.c +++ b/src/display.c @@ -1607,9 +1607,21 @@ event_callback (XEvent *event, if (window && ((event->type == KeyPress) || (event->type == ButtonPress))) { - g_assert (CurrentTime != display->current_time); - meta_window_set_user_time (window, display->current_time); - sanity_check_timestamps (display, display->current_time); + if (CurrentTime == display->current_time) + { + /* We can't use missing (i.e. invalid) timestamps to set user time, + * nor do we want to use them to sanity check other timestamps. + * See bug 313490 for more details. + */ + meta_warning ("Event has no timestamp! You may be using a broken " + "program such as xse. Please ask the authors of that " + "program to fix it.\n"); + } + else + { + meta_window_set_user_time (window, display->current_time); + sanity_check_timestamps (display, display->current_time); + } } switch (event->type) |