From a13ef5ed10746ecb68171f965fe62806189c4f27 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 6 Jul 2010 16:11:28 +0200 Subject: /join: don't pass a call when calling empathy_dispatcher_join_muc() We want to let the text channel handler to handle it. --- libempathy-gtk/empathy-chat.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'libempathy-gtk/empathy-chat.c') diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 487d0c118..f14cfe4ba 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -649,20 +649,6 @@ chat_input_history_update (EmpathyChat *chat, g_free (text); } -static void -chat_command_join_cb (EmpathyDispatchOperation *dispatch, - const GError *error, - gpointer user_data) -{ - EmpathyChat *chat = user_data; - - if (error != NULL) { - DEBUG ("Error: %s", error->message); - empathy_chat_view_append_event (chat->view, - _("Failed to join chat room")); - } -} - typedef struct { EmpathyChat *chat; gchar *message; @@ -749,8 +735,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); + NULL, NULL); } i++; } -- cgit v1.2.3