aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-09-01 00:33:08 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-09-01 00:43:39 +0800
commit97332942b44691aaa9105e63188145699af674b1 (patch)
tree3e800ffc57adb551857dc53262c038ce0e31c16b /libempathy
parent75544880821487471da44423eca14e2d16a112fb (diff)
downloadgsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar.gz
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar.bz2
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar.lz
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar.xz
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.tar.zst
gsoc2013-empathy-97332942b44691aaa9105e63188145699af674b1.zip
Always try to use the Requests interface before calling RequestChannel
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-dispatcher.c53
1 files changed, 43 insertions, 10 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 67b75278d..7aec41438 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -179,6 +179,10 @@ typedef struct
gpointer user_data;
} FindChannelRequest;
+static void
+empathy_dispatcher_call_create_channel (EmpathyDispatcher *dispatcher,
+ DispatcherRequestData *request_data);
+
static DispatchData *
new_dispatch_data (TpChannel *channel,
GObject *channel_wrapper)
@@ -1253,12 +1257,34 @@ dispatcher_request_channel_cb (TpConnection *connection,
static void
dispatcher_request_channel (DispatcherRequestData *request_data)
{
- tp_cli_connection_call_request_channel (request_data->connection, -1,
- request_data->channel_type,
- request_data->handle_type,
- request_data->handle,
- TRUE, dispatcher_request_channel_cb,
- request_data, NULL, G_OBJECT (request_data->dispatcher));
+ if (tp_proxy_has_interface_by_id (TP_PROXY (request_data->connection),
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS))
+ {
+ /* Extend the request_data to be a valid request */
+ g_assert (request_data->request == NULL);
+ request_data->request = tp_asv_new (
+ TP_IFACE_CHANNEL ".ChannelType",
+ G_TYPE_STRING, request_data->channel_type,
+ TP_IFACE_CHANNEL ".TargetHandleType",
+ G_TYPE_UINT, request_data->handle_type,
+ NULL);
+
+ if (request_data->handle_type != TP_HANDLE_TYPE_NONE)
+ tp_asv_set_uint32 (request_data->request,
+ TP_IFACE_CHANNEL ".TargetHandle", request_data->handle);
+
+ empathy_dispatcher_call_create_channel (request_data->dispatcher,
+ request_data);
+ }
+ else
+ {
+ tp_cli_connection_call_request_channel (request_data->connection, -1,
+ request_data->channel_type,
+ request_data->handle_type,
+ request_data->handle,
+ TRUE, dispatcher_request_channel_cb,
+ request_data, NULL, G_OBJECT (request_data->dispatcher));
+ }
}
void
@@ -1432,6 +1458,16 @@ dispatcher_create_channel_cb (TpConnection *connect,
request_data, object_path, properties, error);
}
+static void
+empathy_dispatcher_call_create_channel (EmpathyDispatcher *dispatcher,
+ DispatcherRequestData *request_data)
+{
+ tp_cli_connection_interface_requests_call_create_channel (
+ request_data->connection, -1,
+ request_data->request, dispatcher_create_channel_cb, request_data, NULL,
+ G_OBJECT (request_data->dispatcher));
+}
+
void
empathy_dispatcher_create_channel (EmpathyDispatcher *dispatcher,
TpConnection *connection,
@@ -1470,10 +1506,7 @@ empathy_dispatcher_create_channel (EmpathyDispatcher *dispatcher,
connection_data->outstanding_requests = g_list_prepend
(connection_data->outstanding_requests, request_data);
- tp_cli_connection_interface_requests_call_create_channel (
- request_data->connection, -1,
- request_data->request, dispatcher_create_channel_cb, request_data, NULL,
- G_OBJECT (request_data->dispatcher));
+ empathy_dispatcher_call_create_channel (dispatcher, request_data);
}
static gboolean