diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-28 16:26:44 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-29 14:28:06 +0100 |
| commit | b4f51ab2f4c9dc6490d309188ee2717a934e54ee (patch) | |
| tree | d9e66f98ce502af1dd4ff817b5351d53875c7878 /plugins | |
| parent | c252ced5cf209e869fb75dabae61f18e0db0850d (diff) | |
new TpChannelManager API
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/console/channel-manager.c | 18 | ||||
| -rw-r--r-- | plugins/test.c | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/plugins/console/channel-manager.c b/plugins/console/channel-manager.c index 2f4955225..bf2a9be05 100644 --- a/plugins/console/channel-manager.c +++ b/plugins/console/channel-manager.c @@ -200,7 +200,7 @@ console_channel_closed_cb ( { GabbleConsoleChannelManager *self = GABBLE_CONSOLE_CHANNEL_MANAGER (user_data); - tp_channel_manager_emit_channel_closed_for_object (self, + tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self), TP_EXPORTABLE_CHANNEL (channel)); if (g_queue_remove (&self->console_channels, channel)) @@ -213,14 +213,14 @@ console_channel_closed_cb ( static gboolean gabble_console_channel_manager_create_channel ( TpChannelManager *manager, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties) { GabbleConsoleChannelManager *self = GABBLE_CONSOLE_CHANNEL_MANAGER (manager); GabblePluginConnection *connection; TpBaseChannel *channel = NULL; GError *error = NULL; - GSList *request_tokens; + GSList *requests; if (tp_strdiff (tp_asv_get_string (request_properties, TP_IFACE_CHANNEL ".ChannelType"), @@ -252,17 +252,17 @@ gabble_console_channel_manager_create_channel ( self); g_queue_push_tail (&self->console_channels, channel); - request_tokens = g_slist_prepend (NULL, request_token); - tp_channel_manager_emit_new_channel (self, - TP_EXPORTABLE_CHANNEL (channel), request_tokens); - g_slist_free (request_tokens); + requests = g_slist_prepend (NULL, request); + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self), + TP_EXPORTABLE_CHANNEL (channel), requests); + g_slist_free (requests); g_object_unref (connection); return TRUE; error: - tp_channel_manager_emit_request_failed (self, request_token, - error->domain, error->code, error->message); + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (self), + request, error->domain, error->code, error->message); g_error_free (error); return TRUE; } diff --git a/plugins/test.c b/plugins/test.c index cfcc223fb..3b68e1b27 100644 --- a/plugins/test.c +++ b/plugins/test.c @@ -691,7 +691,6 @@ channel_manager_iface_init (gpointer g_iface, /* not requestable. */ iface->ensure_channel = NULL; iface->create_channel = NULL; - iface->request_channel = NULL; iface->foreach_channel_class = NULL; } |