diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-06 15:06:37 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-06 15:32:57 +0100 |
| commit | 983d1b03fa252ea5743d58f290ab70be8fa8c291 (patch) | |
| tree | fec9a37b9800abbd38cf07fe0cfafe6e63a03d00 /libempathy | |
| parent | 21674ad377f646ef1e242f7e4260ee2398a220be (diff) | |
prefix Telepathy bus names with TP_
So it's clearer that we are referring the Telepathy bus name and not the
GtkApplication one.
https://bugzilla.gnome.org/show_bug.cgi?id=723766
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-ft-factory.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-request-util.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-request-util.h | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index 4bb1c3c57..f15f9fb6d 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -205,7 +205,7 @@ empathy_ft_factory_init (EmpathyFTFactory *self) am = tp_account_manager_dup (); priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE, - EMPATHY_FT_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL); + EMPATHY_FT_TP_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.c b/libempathy/empathy-request-util.c index b053cbd91..280ff0f39 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -77,8 +77,9 @@ create_text_channel (TpAccount *account, req = tp_account_channel_request_new (account, request, timestamp); tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE); - tp_account_channel_request_ensure_channel_async (req, EMPATHY_CHAT_BUS_NAME, - NULL, callback ? callback : ensure_text_channel_cb, user_data); + tp_account_channel_request_ensure_channel_async (req, + EMPATHY_CHAT_TP_BUS_NAME, NULL, + callback ? callback : ensure_text_channel_cb, user_data); g_hash_table_unref (request); g_object_unref (req); diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 9c168d7a3..a8cfbfaab 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -29,14 +29,14 @@ 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_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, diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 6d2d0a9c9..caa3960b8 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -225,7 +225,7 @@ empathy_tp_chat_add (EmpathyTpChat *self, /* Although this is a MUC, it's anonymous, so CreateChannel is * valid. */ tp_account_channel_request_create_and_observe_channel_async (req, - EMPATHY_CHAT_BUS_NAME, NULL, create_conference_cb, NULL); + EMPATHY_CHAT_TP_BUS_NAME, NULL, create_conference_cb, NULL); g_object_unref (req); g_hash_table_unref (props); |