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-new-chatroom-dialog.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-new-chatroom-dialog.c')
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 388a1e506..a09a5f710 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -683,8 +683,8 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) g_strstrip (room_name); DEBUG ("Requesting channel for '%s'", room_name); - empathy_join_muc (account, room_name, - gtk_get_current_event_time ()); + + empathy_join_muc (account, room_name, empathy_get_current_action_time ()); g_free (room_name); } |