diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-10-16 13:08:22 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-10-20 21:34:13 +0100 |
commit | 7a354440274d2cc6632222beef03805116483dcf (patch) | |
tree | 5ee062bc35f3faab34719b204f6707b6a018cdfb /src | |
parent | f72721935bee551919a2a595d33042df060a8779 (diff) | |
download | telepathy-mission-control-7a354440274d2cc6632222beef03805116483dcf.tar.gz |
_mcd_client_proxy_handle_channels: trivial wrapper for tp_cli call
Common code from the two places that call HandleChannels can gradually
move into this function.
Diffstat (limited to 'src')
-rw-r--r-- | src/mcd-client-priv.h | 7 | ||||
-rw-r--r-- | src/mcd-client.c | 22 | ||||
-rw-r--r-- | src/mcd-dispatch-operation.c | 2 | ||||
-rw-r--r-- | src/mcd-dispatcher.c | 2 |
4 files changed, 31 insertions, 2 deletions
diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h index 5af1c047..71e57f96 100644 --- a/src/mcd-client-priv.h +++ b/src/mcd-client-priv.h @@ -113,6 +113,13 @@ G_GNUC_INTERNAL guint _mcd_client_match_filters ( GHashTable *channel_properties, const GList *filters, gboolean assume_requested); +G_GNUC_INTERNAL void _mcd_client_proxy_handle_channels (McdClientProxy *self, + gint timeout_ms, const gchar *account_path, const gchar *connection_path, + const GPtrArray *channel_details, const GPtrArray *requests_satisfied, + guint64 user_action_time, GHashTable *handler_info, + tp_cli_client_handler_callback_for_handle_channels callback, + gpointer user_data, GDestroyNotify destroy, GObject *weak_object); + G_END_DECLS #endif diff --git a/src/mcd-client.c b/src/mcd-client.c index a0cc1b96..31fc25a4 100644 --- a/src/mcd-client.c +++ b/src/mcd-client.c @@ -1536,3 +1536,25 @@ _mcd_client_match_filters (GHashTable *channel_properties, return best_quality; } + +void +_mcd_client_proxy_handle_channels (McdClientProxy *self, + gint timeout_ms, + const gchar *account_path, + const gchar *connection_path, + const GPtrArray *channel_details, + const GPtrArray *requests_satisfied, + guint64 user_action_time, + GHashTable *handler_info, + tp_cli_client_handler_callback_for_handle_channels callback, + gpointer user_data, + GDestroyNotify destroy, + GObject *weak_object) +{ + g_return_if_fail (MCD_IS_CLIENT_PROXY (self)); + + tp_cli_client_handler_call_handle_channels ((TpClient *) self, + timeout_ms, account_path, connection_path, channel_details, + requests_satisfied, user_action_time, handler_info, + callback, user_data, destroy, weak_object); +} diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c index 4e2d05ce..4cba9fe3 100644 --- a/src/mcd-dispatch-operation.c +++ b/src/mcd-dispatch-operation.c @@ -1726,7 +1726,7 @@ mcd_dispatch_operation_handle_channels (McdDispatchOperation *self, DEBUG ("calling HandleChannels on %s for op %p", tp_proxy_get_bus_name (handler), self); - tp_cli_client_handler_call_handle_channels ((TpClient *) handler, + _mcd_client_proxy_handle_channels (handler, -1, account_path, connection_path, channels_array, satisfied_requests, user_action_time, handler_info, _mcd_dispatch_operation_handle_channels_cb, diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index 191b3bbf..76d0d8d3 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -1854,7 +1854,7 @@ _mcd_dispatcher_reinvoke_handler (McdDispatcher *dispatcher, _mcd_channel_set_status (request, MCD_CHANNEL_STATUS_HANDLER_INVOKED); - tp_cli_client_handler_call_handle_channels ((TpClient *) handler, + _mcd_client_proxy_handle_channels (handler, -1, account_path, connection_path, details, satisfied_requests, user_action_time, handler_info, reinvoke_handle_channels_cb, NULL, NULL, (GObject *) request); |