summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c6
-rw-r--r--libempathy/empathy-dispatcher.c6
-rw-r--r--libempathy/empathy-dispatcher.h4
-rw-r--r--src/empathy-chat-manager.c2
-rw-r--r--src/empathy-main-window.c2
-rw-r--r--src/empathy-new-chatroom-dialog.c2
-rw-r--r--src/empathy.c5
7 files changed, 10 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ece8e1679..9c5fcc525 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -250,8 +250,7 @@ reconnected_connection_ready_cb (TpConnection *connection,
break;
case TP_HANDLE_TYPE_ROOM:
empathy_dispatcher_join_muc (connection,
- priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION,
- NULL, NULL);
+ priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION);
break;
default:
g_assert_not_reached ();
@@ -710,8 +709,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 (),
- NULL, NULL);
+ gtk_get_current_event_time ());
}
i++;
}
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 778d3be62..82ae343c1 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1360,9 +1360,7 @@ dispatcher_request_handles_cb (TpConnection *connection,
void
empathy_dispatcher_join_muc (TpConnection *connection,
const gchar *roomname,
- gint64 timestamp,
- EmpathyDispatcherRequestCb *callback,
- gpointer user_data)
+ gint64 timestamp)
{
EmpathyDispatcher *self;
EmpathyDispatcherPriv *priv;
@@ -1383,7 +1381,7 @@ empathy_dispatcher_join_muc (TpConnection *connection,
/* Don't know the room handle yet */
request_data = new_dispatcher_request_data (self, connection,
TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM, 0, NULL, timestamp,
- NULL, callback, user_data);
+ NULL, NULL, NULL);
request_data->should_ensure = TRUE;
connection_data->outstanding_requests = g_list_prepend
diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h
index d1dec072c..93adb0691 100644
--- a/libempathy/empathy-dispatcher.h
+++ b/libempathy/empathy-dispatcher.h
@@ -94,9 +94,7 @@ void empathy_dispatcher_send_file_to_contact (EmpathyContact *contact,
/* Request a muc channel */
void empathy_dispatcher_join_muc (TpConnection *connection,
const gchar *roomname,
- gint64 timestamp,
- EmpathyDispatcherRequestCb *callback,
- gpointer user_data);
+ gint64 timestamp);
void empathy_dispatcher_find_requestable_channel_classes_async
(EmpathyDispatcher *dispatcher, TpConnection *connection,
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);
}
}