From: Guillaume Desmottes Date: Thu, 6 Feb 2014 14:06:37 +0000 (+0100) Subject: prefix Telepathy bus names with TP_ X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=983d1b03fa252ea5743d58f290ab70be8fa8c291 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 --- diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 0689e78a..9542159a 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -134,7 +134,7 @@ call_new_with_streams (const gchar *contact, g_hash_table_unref (call_request); tp_account_channel_request_create_channel_async (call_req, - EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, NULL); + EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL); g_object_unref (call_req); } diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 2b5657e8..daec1952 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -864,7 +864,7 @@ chat_command_msg_internal (EmpathyChat *chat, data->message = g_strdup (message); tp_account_channel_request_ensure_and_observe_channel_async (req, - EMPATHY_CHAT_BUS_NAME, NULL, chat_command_msg_cb, data); + EMPATHY_CHAT_TP_BUS_NAME, NULL, chat_command_msg_cb, data); g_object_unref (req); g_hash_table_unref (request); diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index 4bb1c3c5..f15f9fb6 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 b053cbd9..280ff0f3 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 9c168d7a..a8cfbfaa 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 6d2d0a9c..caa3960b 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); diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 57254e65..3b57761d 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -163,7 +163,7 @@ empathy_call_factory_initialise (void) self = EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY, "account-manager", am, "factory", factory, - "name", EMPATHY_CALL_BUS_NAME_SUFFIX, + "name", EMPATHY_CALL_TP_BUS_NAME_SUFFIX, NULL)); g_object_unref (am); diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 7371abdf..a54346c6 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1511,7 +1511,7 @@ empathy_call_window_incoming_call_response_cb (GtkDialog *dialog, { case GTK_RESPONSE_ACCEPT: tp_channel_dispatch_operation_handle_with_time_async ( - self->priv->pending_cdo, EMPATHY_CALL_BUS_NAME, + self->priv->pending_cdo, EMPATHY_CALL_TP_BUS_NAME, empathy_get_current_action_time (), NULL, NULL); tp_clear_object (&self->priv->pending_cdo); diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 279d7d8f..b3b02c51 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -290,7 +290,7 @@ empathy_chat_manager_init (EmpathyChatManager *self) /* Text channels handler */ priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE, - EMPATHY_CHAT_BUS_NAME_SUFFIX, FALSE, handle_channels, self, NULL); + EMPATHY_CHAT_TP_BUS_NAME_SUFFIX, FALSE, handle_channels, self, NULL); g_object_unref (am); @@ -547,7 +547,7 @@ empathy_chat_manager_call_undo_closed_chat (void) proxy = g_object_new (TP_TYPE_PROXY, "dbus-daemon", dbus_daemon, "dbus-connection", tp_proxy_get_dbus_connection (TP_PROXY (dbus_daemon)), - "bus-name", EMPATHY_CHAT_BUS_NAME, + "bus-name", EMPATHY_CHAT_TP_BUS_NAME, "object-path", CHAT_MANAGER_PATH, NULL);