diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-06 16:18:39 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-07 10:03:00 +0200 |
| commit | 26110eb9baef0ef58e8daebff9c3373485da3e50 (patch) | |
| tree | 19b1bde418cb00b3d73c02a5f792fe06224861d8 /src | |
| parent | 817f3db6bb903c509b55a194425a1ccb350192fa (diff) | |
empathy_dispatcher_join_muc: remove callback arg
We always want to let the text handler handle the channel.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 2 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 2 | ||||
| -rw-r--r-- | src/empathy.c | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 1b103031b..0e8a335c2 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -379,7 +379,7 @@ connection_ready_cb (TpConnection *connection, { if (data->room) empathy_dispatcher_join_muc (connection, data->id, - EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); + EMPATHY_DISPATCHER_NON_USER_ACTION); else empathy_dispatcher_chat_with_contact_id (connection, data->id, EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 565612478..eba94a54f 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -899,7 +899,7 @@ join_chatroom (EmpathyChatroom *chatroom, room = empathy_chatroom_get_room (chatroom); DEBUG ("Requesting channel for '%s'", room); - empathy_dispatcher_join_muc (connection, room, timestamp, NULL, NULL); + empathy_dispatcher_join_muc (connection, room, timestamp); } typedef struct diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 8d954aa85..88003e948 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -735,7 +735,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) DEBUG ("Requesting channel for '%s'", room_name); empathy_dispatcher_join_muc (connection, room_name, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time ()); g_free (room_name); } diff --git a/src/empathy.c b/src/empathy.c index 81ff77c17..091099201 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -361,8 +361,7 @@ account_status_changed_cb (TpAccount *account, return; empathy_dispatcher_join_muc (conn, - empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION, - NULL, NULL); + empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION); } static void @@ -411,7 +410,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, { empathy_dispatcher_join_muc (conn, empathy_chatroom_get_room (room), - EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL); + EMPATHY_DISPATCHER_NON_USER_ACTION); } } |