prefix Telepathy bus names with TP_
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 6 Feb 2014 14:06:37 +0000 (15:06 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 6 Feb 2014 14:32:57 +0000 (15:32 +0100)
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

libempathy-gtk/empathy-call-utils.c
libempathy-gtk/empathy-chat.c
libempathy/empathy-ft-factory.c
libempathy/empathy-request-util.c
libempathy/empathy-request-util.h
libempathy/empathy-tp-chat.c
src/empathy-call-factory.c
src/empathy-call-window.c
src/empathy-chat-manager.c

index 0689e78..9542159 100644 (file)
@@ -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);
 }
index 2b5657e..daec195 100644 (file)
@@ -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);
index 4bb1c3c..f15f9fb 100644 (file)
@@ -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,
index b053cbd..280ff0f 100644 (file)
@@ -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);
index 9c168d7..a8cfbfa 100644 (file)
 
 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,
index 6d2d0a9..caa3960 100644 (file)
@@ -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);
index 57254e6..3b57761 100644 (file)
@@ -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);
index 7371abd..a54346c 100644 (file)
@@ -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);
index 279d7d8..b3b02c5 100644 (file)
@@ -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);