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-main-window.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-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 0cef0e10f..0ac08c856 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1584,7 +1584,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) join_fav_account_sig_ctx *ctx; ctx = join_fav_account_sig_ctx_new (account, chatroom, - gtk_get_current_event_time ()); + empathy_get_current_action_time ()); ctx->sig_id = g_signal_connect_data (account, "status-changed", G_CALLBACK (account_status_changed_cb), ctx, @@ -1595,7 +1595,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) return; } - join_chatroom (chatroom, gtk_get_current_event_time ()); + join_chatroom (chatroom, empathy_get_current_action_time ()); } static void |