prefix Telepathy bus names with TP_

[empathy.git] / libempathy / empathy-request-util.h

diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 6781b72d40b4ac2351f5a4fa08ce0da0cdefe005..a8cfbfaab53a0fbed313a6cafcde2c25c6dab0b6 100644 (file)
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -23,24 +23,20 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
-#define EMPATHY_CHAT_BUS_NAME_SUFFIX "Empathy.Chat"
-#define EMPATHY_CHAT_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_CHAT_BUS_NAME_SUFFIX
-
-#define EMPATHY_AV_BUS_NAME_SUFFIX "Empathy.AudioVideo"
-#define EMPATHY_AV_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_AV_BUS_NAME_SUFFIX
+#define EMPATHY_CHAT_TP_BUS_NAME_SUFFIX "Empathy.Chat"
+#define EMPATHY_CHAT_TP_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_CHAT_TP_BUS_NAME_SUFFIX
 
-#define EMPATHY_CALL_BUS_NAME_SUFFIX "Empathy.Call"
-#define EMPATHY_CALL_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_CALL_BUS_NAME_SUFFIX
+#define EMPATHY_CALL_TP_BUS_NAME_SUFFIX "Empathy.Call"
+#define EMPATHY_CALL_TP_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_CALL_TP_BUS_NAME_SUFFIX
 
-#define EMPATHY_FT_BUS_NAME_SUFFIX "Empathy.FileTransfer"
-#define EMPATHY_FT_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_FT_BUS_NAME_SUFFIX
+#define EMPATHY_FT_TP_BUS_NAME_SUFFIX "Empathy.FileTransfer"
+#define EMPATHY_FT_TP_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_FT_TP_BUS_NAME_SUFFIX
 
 /* Requesting 1 to 1 text channels */
 void empathy_chat_with_contact_id (TpAccount *account,