[gnome-shell] shell-global: Remove hacks around clutter_event_get_current_time()
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] shell-global: Remove hacks around clutter_event_get_current_time()
- Date: Mon, 24 Dec 2012 02:18:10 +0000 (UTC)
commit 5566aa45889956b51149a822ff5b9adbcb66ec29
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Dec 23 04:15:51 2012 -0500
shell-global: Remove hacks around clutter_event_get_current_time()
clutter_event_get_current_time() has been fixed upstream as part
of reentrant bug fixes, so there's no need for these shenanigans.
https://bugzilla.gnome.org/show_bug.cgi?id=690665
src/shell-global.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/src/shell-global.c b/src/shell-global.c
index c95f078..2a6b14e 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1415,7 +1415,7 @@ shell_global_get_current_time (ShellGlobal *global)
from some Clutter event callbacks.
clutter_get_current_event_time() will return the correct time
- from a Clutter event callback, but may return an out-of-date
+ from a Clutter event callback, but may return CLUTTER_CURRENT_TIME
timestamp if called at other times.
So we try meta_display_get_current_time() first, since we
@@ -1425,17 +1425,9 @@ shell_global_get_current_time (ShellGlobal *global)
time = meta_display_get_current_time (global->meta_display);
if (time != CLUTTER_CURRENT_TIME)
- return time;
- /*
- * We don't use clutter_get_current_event_time as it can give us a
- * too old timestamp if there is no current event.
- */
- clutter_event = clutter_get_current_event ();
+ return time;
- if (clutter_event != NULL)
- return clutter_event_get_time (clutter_event);
- else
- return CLUTTER_CURRENT_TIME;
+ return clutter_get_current_event_time ();
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]