aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-07 21:54:01 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-17 16:53:49 +0800
commit04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094 (patch)
treede34834afdea50fada419c2c622c4435084d9ae3 /libempathy
parent23d90f884b28cabd3b9b986998c118314a9238f9 (diff)
downloadgsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar.gz
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar.bz2
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar.lz
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar.xz
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.tar.zst
gsoc2013-empathy-04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094.zip
define constants for handler bus name
It's more convenient and safe than hardcoding them everywhere.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-ft-factory.c3
-rw-r--r--libempathy/empathy-request-util.h9
2 files changed, 11 insertions, 1 deletions
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 398474719..5fb238a2b 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -28,6 +28,7 @@
#include "empathy-ft-factory.h"
#include "empathy-ft-handler.h"
#include "empathy-marshal.h"
+#include "empathy-request-util.h"
#include "empathy-utils.h"
/**
@@ -219,7 +220,7 @@ empathy_ft_factory_init (EmpathyFTFactory *self)
}
priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE,
- "Empathy.FileTransfer", FALSE, handle_channels_cb, self, NULL);
+ EMPATHY_FT_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL);
tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 1073f0d5e..afb8013cb 100644
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -30,6 +30,15 @@
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_FT_BUS_NAME_SUFFIX "Empathy.FileTransfer"
+#define EMPATHY_FT_BUS_NAME TP_CLIENT_BUS_NAME_BASE EMPATHY_FT_BUS_NAME_SUFFIX
+
/* Requesting 1 to 1 text channels */
void empathy_chat_with_contact_id (TpAccount *account,
const gchar *contact_id,