diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-07 21:54:01 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-17 16:53:49 +0800 |
| commit | 04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094 (patch) | |
| tree | de34834afdea50fada419c2c622c4435084d9ae3 /src | |
| parent | 23d90f884b28cabd3b9b986998c118314a9238f9 (diff) | |
| download | gsoc2013-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 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 4 | ||||
| -rw-r--r-- | src/empathy-streamed-media-factory.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index c3488dc45..ff715fe37 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -286,8 +286,8 @@ empathy_chat_manager_init (EmpathyChatManager *self) priv->chatroom_mgr = empathy_chatroom_manager_dup_singleton (NULL); /* Text channels handler */ - priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy.Chat", - FALSE, handle_channels, self, NULL); + priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, + EMPATHY_CHAT_BUS_NAME_SUFFIX, FALSE, handle_channels, self, NULL); /* EmpathyTpChat relies on these features being prepared */ tp_base_client_add_connection_features_varargs (priv->handler, diff --git a/src/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c index 70b237941..e044a1b52 100644 --- a/src/empathy-streamed-media-factory.c +++ b/src/empathy-streamed-media-factory.c @@ -27,6 +27,7 @@ #include <telepathy-glib/interfaces.h> #include <telepathy-glib/util.h> +#include <libempathy/empathy-request-util.h> #include <libempathy/empathy-utils.h> #include "empathy-streamed-media-factory.h" @@ -85,7 +86,7 @@ empathy_streamed_media_factory_init (EmpathyStreamedMediaFactory *obj) } priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, - "Empathy.AudioVideo", FALSE, handle_channels_cb, obj, NULL); + EMPATHY_AV_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, obj, NULL); tp_base_client_take_handler_filter (priv->handler, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, |