[empathy] /join: don't pass a call when calling empathy_dispatcher_join_muc()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] /join: don't pass a call when calling empathy_dispatcher_join_muc()
- Date: Wed, 7 Jul 2010 08:03:10 +0000 (UTC)
commit a13ef5ed10746ecb68171f965fe62806189c4f27
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Jul 6 16:11:28 2010 +0200
/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 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 487d0c1..f14cfe4 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++;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]