From 04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 7 Mar 2011 14:54:01 +0100 Subject: define constants for handler bus name It's more convenient and safe than hardcoding them everywhere. --- src/empathy-chat-manager.c | 4 ++-- src/empathy-streamed-media-factory.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') 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 #include +#include #include #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, -- cgit v1.2.3