diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-06 22:18:39 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-07 16:03:00 +0800 |
commit | 26110eb9baef0ef58e8daebff9c3373485da3e50 (patch) | |
tree | 19b1bde418cb00b3d73c02a5f792fe06224861d8 /libempathy-gtk/empathy-chat.c | |
parent | 817f3db6bb903c509b55a194425a1ccb350192fa (diff) | |
download | gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.gz gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.bz2 gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.lz gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.xz gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.tar.zst gsoc2013-empathy-26110eb9baef0ef58e8daebff9c3373485da3e50.zip |
empathy_dispatcher_join_muc: remove callback arg
We always want to let the text handler handle the channel.
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
-rw-r--r-- | libempathy-gtk/empathy-chat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index ece8e1679..9c5fcc525 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -250,8 +250,7 @@ reconnected_connection_ready_cb (TpConnection *connection, break; case TP_HANDLE_TYPE_ROOM: empathy_dispatcher_join_muc (connection, - priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION, - NULL, NULL); + priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); break; default: g_assert_not_reached (); @@ -710,8 +709,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 (), - NULL, NULL); + gtk_get_current_event_time ()); } i++; } |