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 /libempathy-gtk/empathy-chat.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 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index b580812ac..8ce698f02 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -753,7 +753,7 @@ empathy_chat_join_muc (EmpathyChat *chat, EmpathyChatPriv *priv = GET_PRIV (chat); empathy_join_muc (priv->account, room, - gtk_get_current_event_time ()); + empathy_get_current_action_time ()); } static void @@ -824,7 +824,7 @@ chat_command_msg_internal (EmpathyChat *chat, NULL); req = tp_account_channel_request_new (priv->account, request, - tp_user_action_time_from_x11 (gtk_get_current_event_time ())); + empathy_get_current_action_time ()); /* FIXME: We should probably search in members alias. But this * is enough for IRC */ |