]> git.0d.be Git - empathy.git/commitdiff
/join: don't pass a call when calling empathy_dispatcher_join_muc()
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 6 Jul 2010 14:11:28 +0000 (16:11 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 7 Jul 2010 08:03:00 +0000 (10:03 +0200)
We want to let the text channel handler to handle it.

libempathy-gtk/empathy-chat.c

index 487d0c11827cfeda8ee42388ed1336f957b295d4..f14cfe4bac37b454d5fd56f5d467d5d73484cb8d 100644 (file)
@@ -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++;
        }