aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-06 22:11:28 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-07 16:03:00 +0800
commita13ef5ed10746ecb68171f965fe62806189c4f27 (patch)
treeedc984b15ac097f296670b937e702ae3801c0ee5
parente756c74ca8b2656a4975934fcc048cf5bf151a36 (diff)
downloadgsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar.gz
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar.bz2
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar.lz
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar.xz
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.tar.zst
gsoc2013-empathy-a13ef5ed10746ecb68171f965fe62806189c4f27.zip
/join: don't pass a call when calling empathy_dispatcher_join_muc()
We want to let the text channel handler to handle it.
-rw-r--r--libempathy-gtk/empathy-chat.c17
1 files changed, 1 insertions, 16 deletions
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++;
}