diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-10-13 04:33:45 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-02-25 00:29:17 +0800 |
| commit | c98d650deadd48624a6dba026aa466ddc5b58626 (patch) | |
| tree | 36e30eb3353a597de1045d2a4fa9856aa8880277 /libempathy | |
| parent | 0e9bd3f5a6c19512f088993bfac8cec6aaabff7b (diff) | |
| download | gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar.gz gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar.bz2 gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar.lz gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar.xz gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.tar.zst gsoc2013-empathy-c98d650deadd48624a6dba026aa466ddc5b58626.zip | |
Set ourselves as the preferred handler if there is a callback
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index d7d3b9f9a..d6c790029 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1712,16 +1712,20 @@ empathy_dispatcher_call_create_or_ensure_channel ( { EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher); TpAccount *account; + const gchar *handler = ""; account = empathy_get_account_for_connection (request_data->connection); + if (request_data->cb) + handler = empathy_handler_get_busname (priv->handler); + if (request_data->should_ensure) { request_data->pending_call = tp_cli_channel_dispatcher_call_ensure_channel ( priv->channel_dispatcher, -1, tp_proxy_get_object_path (TP_PROXY (account)), - request_data->request, 0, "", + request_data->request, 0, handler, dispatcher_create_channel_cb, request_data, NULL, NULL); } else @@ -1730,7 +1734,7 @@ empathy_dispatcher_call_create_or_ensure_channel ( tp_cli_channel_dispatcher_call_create_channel ( priv->channel_dispatcher, -1, tp_proxy_get_object_path (TP_PROXY (account)), - request_data->request, 0, "", + request_data->request, 0, handler, dispatcher_create_channel_cb, request_data, NULL, G_OBJECT (dispatcher)); } |