aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-07 22:22:29 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-17 16:53:49 +0800
commit52eb24e6e7b012856525f6f09d3c1a941375d383 (patch)
tree08167041abd448ceb4ef7fc5e841e64305e22101 /libempathy
parent04edfb3dbbdf9a2a4ac6cf2ecafcbd88044ee094 (diff)
downloadgsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar.gz
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar.bz2
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar.lz
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar.xz
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.tar.zst
gsoc2013-empathy-52eb24e6e7b012856525f6f09d3c1a941375d383.zip
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).
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-request-util.c8
-rw-r--r--libempathy/empathy-tp-chat.c5
-rw-r--r--libempathy/empathy-utils.c6
3 files changed, 10 insertions, 9 deletions
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index c912cc1a2..ea885dacc 100644
--- 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 a9077994c..86aca446b 100644
--- 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 86c0f20af..663c5009f 100644
--- 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);