diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-25 00:19:50 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-25 02:44:09 +0800 |
| commit | a6748d5d5fd1f37cef6bf26a6256cd299a60a09c (patch) | |
| tree | 2c175c69ee287aa947800d27caefe7b7ace84d19 /libempathy-gtk/empathy-chat.c | |
| parent | 54ae82bdf32156387e3d720656bd361a859b8db6 (diff) | |
| download | gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.gz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.bz2 gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.lz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.xz gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.tar.zst gsoc2013-empathy-a6748d5d5fd1f37cef6bf26a6256cd299a60a09c.zip | |
add timestamp arg to empathy_dispatcher_join_muc
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 06ee4bbe7..57cf62632 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -268,7 +268,7 @@ reconnected_connection_ready_cb (TpConnection *connection, break; case TP_HANDLE_TYPE_ROOM: empathy_dispatcher_join_muc (connection, - priv->id, + priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION, chat_connect_channel_reconnected, chat); break; @@ -743,6 +743,7 @@ chat_command_join (EmpathyChat *chat, connection = empathy_tp_chat_get_connection (priv->tp_chat); empathy_dispatcher_join_muc (connection, rooms[i], + gtk_get_current_event_time (), chat_command_join_cb, chat); } |