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, 15 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 20225f7de..cfea24c0e 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -38,7 +38,6 @@ libempathy_headers =				\
 	empathy-contact-manager.h		\
 	empathy-contact.h			\
 	empathy-debug.h				\
-	empathy-dispatcher.h			\
 	empathy-ft-factory.h			\
 	empathy-ft-handler.h			\
 	empathy-gsettings.h			\
@@ -50,6 +49,7 @@ libempathy_headers =				\
 	empathy-keyring.h 			\
 	empathy-location.h			\
 	empathy-message.h			\
+	empathy-request-util.h			\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
 	empathy-status-presets.h		\
@@ -79,7 +79,6 @@ libempathy_la_SOURCES =					\
 	empathy-contact-manager.c			\
 	empathy-contact.c				\
 	empathy-debug.c					\
-	empathy-dispatcher.c				\
 	empathy-ft-factory.c				\
 	empathy-ft-handler.c				\
 	empathy-presence-manager.c					\
@@ -89,6 +88,7 @@ libempathy_la_SOURCES =					\
 	empathy-irc-server.c				\
 	empathy-keyring.c				\
 	empathy-message.c				\
+	empathy-request-util.c				\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
 	empathy-status-presets.c			\
diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index 5afb2b474..be3301503 100644
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -29,7 +29,6 @@
 #include <telepathy-glib/account.h>
 
 #include "empathy-chatroom.h"
-#include "empathy-dispatcher.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-request-util.c
index 1f7d7f277..c912cc1a2 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-request-util.c
@@ -1,4 +1,4 @@
-/* * Copyright (C) 2007-2009 Collabora Ltd.
+/* * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "empathy-dispatcher.h"
+#include "empathy-request-util.h"
 #include "empathy-utils.h"
 #include "empathy-utils.h"
 
@@ -35,10 +35,10 @@
 #include <libempathy/empathy-debug.h>
 
 void
-empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
+empathy_chat_with_contact (EmpathyContact *contact,
     gint64 timestamp)
 {
-  empathy_dispatcher_chat_with_contact_id (
+  empathy_chat_with_contact_id (
       empathy_contact_get_account (contact), empathy_contact_get_id (contact),
       timestamp);
 }
@@ -59,7 +59,7 @@ ensure_text_channel_cb (GObject *source,
 }
 
 void
-empathy_dispatcher_chat_with_contact_id (TpAccount *account,
+empathy_chat_with_contact_id (TpAccount *account,
     const gchar *contact_id,
     gint64 timestamp)
 {
@@ -83,7 +83,7 @@ empathy_dispatcher_chat_with_contact_id (TpAccount *account,
 }
 
 void
-empathy_dispatcher_join_muc (TpAccount *account,
+empathy_join_muc (TpAccount *account,
     const gchar *room_name,
     gint64 timestamp)
 {
diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-request-util.h
index 8c986ec1d..1073f0d5e 100644
--- a/libempathy/empathy-dispatcher.h
+++ b/libempathy/empathy-request-util.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,15 +31,15 @@
 G_BEGIN_DECLS
 
 /* Requesting 1 to 1 text channels */
-void empathy_dispatcher_chat_with_contact_id (TpAccount *account,
+void empathy_chat_with_contact_id (TpAccount *account,
   const gchar *contact_id,
   gint64 timestamp);
 
-void  empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
+void  empathy_chat_with_contact (EmpathyContact *contact,
   gint64 timestamp);
 
 /* Request a muc channel */
-void empathy_dispatcher_join_muc (TpAccount *account,
+void empathy_join_muc (TpAccount *account,
   const gchar *roomname,
   gint64 timestamp);
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 775a320c7..86c0f20af 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -48,7 +48,6 @@
 #include "empathy-utils.h"
 #include "empathy-contact-manager.h"
 #include "empathy-individual-manager.h"
-#include "empathy-dispatcher.h"
 #include "empathy-presence-manager.h"
 #include "empathy-tp-contact-factory.h"