diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-12 17:09:37 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-12 18:05:13 +0800 |
| commit | a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c (patch) | |
| tree | 010333d040b7a2c5352878c7ec53e645de96adc7 /src/empathy-event-manager.c | |
| parent | f312b6f85b4128dffd08a5afc7797b7c204c7887 (diff) | |
| download | gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.gz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.bz2 gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.lz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.xz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.zst gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.zip | |
Properly convert timestamps received from X11 (#650015)
X11 timestamps are guint32 while Telepathy uses gint64 timestamps. We should
always use tp_user_action_time_from_x11() to do the conversion.
Diffstat (limited to 'src/empathy-event-manager.c')
| -rw-r--r-- | src/empathy-event-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 2786e0738..00d2c8ab8 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -43,6 +43,7 @@ #include <libempathy-gtk/empathy-images.h> #include <libempathy-gtk/empathy-contact-dialogs.h> #include <libempathy-gtk/empathy-sound-manager.h> +#include <libempathy-gtk/empathy-ui-utils.h> #include "empathy-event-manager.h" #include "empathy-main-window.h" @@ -316,7 +317,7 @@ event_manager_approval_approve (EventManagerApproval *approval) } else { - timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ()); + timestamp = empathy_get_current_action_time (); } g_assert (approval->operation != NULL); |