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 0689e78a7e3760ccb851976119fefe02df85734b..9542159a99cc2c90fecaccaeff9e52e76b267af2 100644 (file)
--- 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,
   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);
 }
 
   g_object_unref (call_req);
 }

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 2b5657e8e49d1e219247e50458f216eb927edd92..daec195278c3ca5c9e61be62cb541f43a668df90 100644 (file)
--- 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,
        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);
 
        g_object_unref (req);
        g_hash_table_unref (request);

diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 4bb1c3c578741f68d78a22eef1373ce65da43636..f15f9fb6d7a5442a3d7d97a3dab3b6571e61090e 100644 (file)
--- 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,
   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,
 
   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 b053cbd91c427160a52bb8cb2aabac20d8dee2b7..280ff0f394591b50bd313f6a7a6d69710a320678 100644 (file)
--- 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);
 
   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);
 
   g_hash_table_unref (request);
   g_object_unref (req);

diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 9c168d7a37422106542530fd0b2db1d9816b0532..a8cfbfaab53a0fbed313a6cafcde2c25c6dab0b6 100644 (file)
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -29,14 +29,14 @@
 
 G_BEGIN_DECLS
 
 
 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,
 
 /* 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 6d2d0a9c9e6e5023029aab8b58cdf1cc89f05170..caa3960b8e28f47801bb8625729fc81974df424e 100644 (file)
--- 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,
       /* 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);
 
       g_object_unref (req);
       g_hash_table_unref (props);

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 57254e659e8f996e3c7e731504f5266aae04afb2..3b57761d94c04f7a4dcf34c502c7c8b162503048 100644 (file)
--- 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,
   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);
       NULL));
 
   g_object_unref (am);

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 7371abdf9b30fa048784b75cfc9f8653525ee5f6..a54346c6de9d87b451a7c26ef0354dfab267ad2b 100644 (file)
--- 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 (
     {
       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);
             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 279d7d8ff43bcdf31716067920e6a55f93aec8bd..b3b02c518560970d389b85a84d44c5d54eb99184 100644 (file)
--- 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,
 
   /* 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);
 
 
   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)),
   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);
 
       "object-path", CHAT_MANAGER_PATH,
       NULL);