pass a preferred handler when requesting channels

We want to use Empathy components when possible instead of, say, KDE ones if
both are installed (#643863).

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index d1442d816da1603ec01ef10f1775b258d603f9ba..6bcaa84bc8fa740bd458e4889e6d3796333462ef 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -819,8 +819,8 @@ chat_command_msg_internal (EmpathyChat *chat,
        data->chat = chat;
        data->message = g_strdup (message);
 
-       tp_account_channel_request_ensure_and_observe_channel_async (req, NULL, NULL,
-               chat_command_msg_cb, data);
+       tp_account_channel_request_ensure_and_observe_channel_async (req,
+               EMPATHY_CHAT_BUS_NAME, NULL, chat_command_msg_cb, data);
 
        g_object_unref (req);
        g_hash_table_unref (request);

diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 2d35fadecfc486bcb74814c565d154c9815c5575..fbff2770eda31039a3fb491f062fc95fdc52a0b5 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -31,6 +31,7 @@
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-request-util.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -108,8 +109,8 @@ call_contact (TpAccount *account,
 
   req = tp_account_channel_request_new (account, request, timestamp);
 
-  tp_account_channel_request_create_channel_async (req, NULL, NULL,
-      create_media_channel_cb, NULL);
+  tp_account_channel_request_create_channel_async (req, EMPATHY_AV_BUS_NAME,
+      NULL, create_media_channel_cb, NULL);
 
   g_object_unref (req);
 }

diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index c912cc1a23cf201a383cc1d5c5d8cf2b92768ed5..ea885dacc273f9d1a9c61fe3b506b17fcbdc8e25 100644 (file)
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -75,8 +75,8 @@ empathy_chat_with_contact_id (TpAccount *account,
 
   req = tp_account_channel_request_new (account, request, timestamp);
 
-  tp_account_channel_request_ensure_channel_async (req, NULL, NULL,
-      ensure_text_channel_cb, NULL);
+  tp_account_channel_request_ensure_channel_async (req, EMPATHY_CHAT_BUS_NAME,
+      NULL, ensure_text_channel_cb, NULL);
 
   g_hash_table_unref (request);
   g_object_unref (req);
@@ -99,8 +99,8 @@ empathy_join_muc (TpAccount *account,
 
   req = tp_account_channel_request_new (account, request, timestamp);
 
-  tp_account_channel_request_ensure_channel_async (req, NULL, NULL,
-      ensure_text_channel_cb, NULL);
+  tp_account_channel_request_ensure_channel_async (req, EMPATHY_CHAT_BUS_NAME,
+      NULL, ensure_text_channel_cb, NULL);
 
   g_hash_table_unref (request);
   g_object_unref (req);

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index a9077994cb7fd7647692d3760c04e3a24fd95283..86aca446b6ab7a8241dad96aebd4307cfa5b5087 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -31,6 +31,7 @@
 #include "empathy-tp-contact-factory.h"
 #include "empathy-contact-list.h"
 #include "empathy-marshal.h"
+#include "empathy-request-util.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
@@ -170,8 +171,8 @@ tp_chat_add (EmpathyContactList *list,
 
                /* Although this is a MUC, it's anonymous, so CreateChannel is
                 * valid. */
-               tp_account_channel_request_create_channel_async (req, NULL, NULL,
-                       create_conference_cb, NULL);
+               tp_account_channel_request_create_channel_async (req, EMPATHY_CHAT_BUS_NAME,
+                       NULL, create_conference_cb, NULL);
 
                g_object_unref (req);
                g_hash_table_unref (props);

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 86c0f20af175e746f775e119e22a0e4698a44875..663c5009fdcc61e67ba249a6391e5baa226c8875 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -49,6 +49,7 @@
 #include "empathy-contact-manager.h"
 #include "empathy-individual-manager.h"
 #include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
 #include "empathy-tp-contact-factory.h"
 
 #include <extensions/extensions.h>
@@ -288,9 +289,8 @@ empathy_call_new_with_streams (EmpathyContact *contact,
 
        req = tp_account_channel_request_new (account, request, timestamp);
 
-       tp_account_channel_request_create_channel_async (req, NULL, NULL,
-                                                        create_media_channel_cb,
-                                                        NULL);
+       tp_account_channel_request_create_channel_async (req, EMPATHY_AV_BUS_NAME,
+                                                        NULL, create_media_channel_cb, NULL);
 
        g_hash_table_unref (request);
        g_object_unref (req);