empathy_dispatcher_join_muc: remove callback arg

We always want to let the text handler handle the channel.

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ece8e1679f6915f97d581a10aafb4fe411a01065..9c5fcc525f9d8f88633982656d2db58dbc8cb572 100644 (file)
--- 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 778d3be62c460ff662de31568b51e93808a212fd..82ae343c1ae0e01bfcc4c2a0f3ce3caaec3131f3 100644 (file)
--- 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 d1dec072c186f09ee688755f2a8fe624d7bf06f5..93adb0691074a29029aaea2ef9a58de5daa29497 100644 (file)
--- 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 1b103031b04295b578a849e21837bfeef98527a2..0e8a335c2e5970c60b46a88e698f05e9817d2751 100644 (file)
--- 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 565612478f2110b9235c2f4022fa7d26405e7fa5..eba94a54fe4e1907e8daf86957cb1cc7946e6350 100644 (file)
--- 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 8d954aa85c542b3fa87358a81e43d64e798dede7..88003e948e4745fa86ee9ac4e6f5c8ac98475bd0 100644 (file)
--- 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 81ff77c17de0aa678d8b775c184025deb5fb3ddd..091099201e3d8c813edaa0b8f9416168b95030fb 100644 (file)
--- 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);
             }
         }