rename empathy-dispatcher to empathy-request-util

We don't have EmpathyDispatcher any more so this file just contains some
utility functions now.

5 files changed, 12 insertions, 11 deletions

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index c84b5f447..c3488dc45 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -20,7 +20,7 @@
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-chat-window.h"
@@ -433,10 +433,10 @@ empathy_chat_manager_undo_closed_chat (EmpathyChatManager *self)
       data->room ? "room" : "contact", data->id);
 
   if (data->room)
-    empathy_dispatcher_join_muc (data->account, data->id,
+    empathy_join_muc (data->account, data->id,
         TP_USER_ACTION_TIME_NOT_USER_ACTION);
   else
-    empathy_dispatcher_chat_with_contact_id (data->account, data->id,
+    empathy_chat_with_contact_id (data->account, data->id,
         TP_USER_ACTION_TIME_NOT_USER_ACTION);
 
   g_signal_emit (self, signals[CLOSED_CHATS_CHANGED], 0,
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 755e9d1a8..6c6e617eb 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -45,6 +45,7 @@
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-contact-list.h>
+#include <libempathy/empathy-request-util.h>
 
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
@@ -1768,7 +1769,7 @@ chat_window_drag_data_received (GtkWidget        *widget,
 		}
 
 		if (!chat) {
-			empathy_dispatcher_chat_with_contact_id (
+			empathy_chat_with_contact_id (
 				account, contact_id, gtk_get_current_event_time ());
 
 			g_strfreev (strv);
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 12b99ba5f..b4c1254df 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -35,7 +35,7 @@
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-contact-list.h>
@@ -1157,7 +1157,7 @@ join_chatroom (EmpathyChatroom *chatroom,
 	room = empathy_chatroom_get_room (chatroom);
 
 	DEBUG ("Requesting channel for '%s'", room);
-	empathy_dispatcher_join_muc (account, room, timestamp);
+	empathy_join_muc (account, room, timestamp);
 }
 
 typedef struct
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index edaeb0ea5..f27e8de03 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -36,7 +36,7 @@
 #include <libempathy/empathy-tp-roomlist.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-request-util.h>
 
 #include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -690,7 +690,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
 	g_strstrip (room_name);
 
 	DEBUG ("Requesting channel for '%s'", room_name);
-	empathy_dispatcher_join_muc (account, room_name,
+	empathy_join_muc (account, room_name,
 		gtk_get_current_event_time ());
 
 	g_free (room_name);
diff --git a/src/empathy.c b/src/empathy.c
index e03e43aa6..e18288c35 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -52,7 +52,7 @@
 #include <libempathy/empathy-account-settings.h>
 #include <libempathy/empathy-connectivity.h>
 #include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-ft-factory.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-tp-chat.h>
@@ -539,7 +539,7 @@ account_status_changed_cb (TpAccount *account,
   if (new_status != TP_CONNECTION_STATUS_CONNECTED)
     return;
 
-  empathy_dispatcher_join_muc (account,
+  empathy_join_muc (account,
       empathy_chatroom_get_room (room), TP_USER_ACTION_TIME_NOT_USER_ACTION);
 }
 
@@ -587,7 +587,7 @@ account_manager_chatroom_ready_cb (GObject *source_object,
             }
           else
             {
-              empathy_dispatcher_join_muc (account,
+              empathy_join_muc (account,
                   empathy_chatroom_get_room (room),
                   TP_USER_ACTION_TIME_NOT_USER_ACTION);
             }