diff options
-rw-r--r-- | src/idle-im-manager.c | 45 | ||||
-rw-r--r-- | src/idle-muc-manager.c | 47 | ||||
-rw-r--r-- | src/idle-roomlist-manager.c | 57 | ||||
-rw-r--r-- | src/server-tls-manager.c | 5 |
4 files changed, 56 insertions, 98 deletions
diff --git a/src/idle-im-manager.c b/src/idle-im-manager.c index 914306b..cd100fc 100644 --- a/src/idle-im-manager.c +++ b/src/idle-im-manager.c @@ -78,10 +78,9 @@ static void _im_manager_type_foreach_class (GType type, TpChannelManagerTypeChan //static TpChannelManagerRequestStatus _iface_request(TpChannelFactoryIface *iface, const gchar *chan_type, TpHandleType handle_type, guint handle, gpointer request, TpChannelIface **new_chan, GError **error); -static gboolean _im_manager_create_channel(TpChannelManager *manager, gpointer request_token, GHashTable *request_properties); -static gboolean _im_manager_request_channel(TpChannelManager *manager, gpointer request_token, GHashTable *request_properties); -static gboolean _im_manager_ensure_channel(TpChannelManager *manager, gpointer request_token, GHashTable *request_properties); -static gboolean _im_manager_requestotron (IdleIMManager *self, gpointer request_token, GHashTable *request_properties, gboolean require_new); +static gboolean _im_manager_create_channel(TpChannelManager *manager, TpChannelManagerRequest *request, GHashTable *request_properties); +static gboolean _im_manager_ensure_channel(TpChannelManager *manager, TpChannelManagerRequest *request, GHashTable *request_properties); +static gboolean _im_manager_requestotron (IdleIMManager *self, TpChannelManagerRequest *request, GHashTable *request_properties, gboolean require_new); static IdleIMChannel *_im_manager_new_channel (IdleIMManager *mgr, TpHandle handle, TpHandle initiator, gpointer request); static void _im_channel_closed_cb (IdleIMChannel *chan, gpointer user_data); @@ -276,43 +275,30 @@ static void _im_manager_type_foreach_class (GType type, static gboolean _im_manager_create_channel(TpChannelManager *manager, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties) { IdleIMManager *self = IDLE_IM_MANAGER (manager); - return _im_manager_requestotron (self, request_token, request_properties, + return _im_manager_requestotron (self, request, request_properties, TRUE); } - -static gboolean -_im_manager_request_channel(TpChannelManager *manager, - gpointer request_token, - GHashTable *request_properties) -{ - IdleIMManager *self = IDLE_IM_MANAGER (manager); - - return _im_manager_requestotron (self, request_token, request_properties, - FALSE); -} - - static gboolean _im_manager_ensure_channel(TpChannelManager *manager, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties) { IdleIMManager *self = IDLE_IM_MANAGER (manager); - return _im_manager_requestotron (self, request_token, request_properties, + return _im_manager_requestotron (self, request, request_properties, FALSE); } static gboolean _im_manager_requestotron (IdleIMManager *self, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties, gboolean require_new) { @@ -359,7 +345,7 @@ _im_manager_requestotron (IdleIMManager *self, if (channel == NULL) { - _im_manager_new_channel (self, handle, tp_base_connection_get_self_handle (base_conn), request_token); + _im_manager_new_channel (self, handle, tp_base_connection_get_self_handle (base_conn), request); return TRUE; } @@ -370,12 +356,12 @@ _im_manager_requestotron (IdleIMManager *self, goto error; } - tp_channel_manager_emit_request_already_satisfied (self, request_token, + tp_channel_manager_emit_request_already_satisfied (TP_CHANNEL_MANAGER (self), request, channel); return TRUE; error: - tp_channel_manager_emit_request_failed (self, request_token, + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (self), request, error->domain, error->code, error->message); g_error_free (error); return TRUE; @@ -390,7 +376,7 @@ _im_channel_closed_cb (IdleIMChannel *chan, IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE (self); TpBaseChannel *base = TP_BASE_CHANNEL (chan); - tp_channel_manager_emit_channel_closed_for_object (self, + tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self), TP_EXPORTABLE_CHANNEL (chan)); if (priv->channels) @@ -404,7 +390,7 @@ _im_channel_closed_cb (IdleIMChannel *chan, } else { IDLE_DEBUG ("reopening channel with handle %u due to pending messages", handle); - tp_channel_manager_emit_new_channel (self, + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self), (TpExportableChannel *) chan, NULL); } } @@ -443,8 +429,8 @@ _im_manager_new_channel (IdleIMManager *mgr, if (request != NULL) requests = g_slist_prepend (requests, request); - tp_channel_manager_emit_new_channel (mgr, TP_EXPORTABLE_CHANNEL (chan), - requests); + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr), + TP_EXPORTABLE_CHANNEL (chan), requests); g_slist_free (requests); @@ -458,7 +444,6 @@ static void _im_manager_iface_init(gpointer g_iface, gpointer iface_data) { iface->foreach_channel = _im_manager_foreach; iface->type_foreach_channel_class = _im_manager_type_foreach_class; - iface->request_channel = _im_manager_request_channel; iface->create_channel = _im_manager_create_channel; iface->ensure_channel = _im_manager_ensure_channel; } diff --git a/src/idle-muc-manager.c b/src/idle-muc-manager.c index eefcf33..98aec2a 100644 --- a/src/idle-muc-manager.c +++ b/src/idle-muc-manager.c @@ -285,7 +285,7 @@ static IdleParserHandlerResult _invite_handler(IdleParser *parser, IdleParserMes if (!chan) { chan = _muc_manager_new_channel(manager, room_handle, inviter_handle, FALSE); - tp_channel_manager_emit_new_channel(TP_CHANNEL_MANAGER(user_data), (TpExportableChannel *) chan, NULL); + tp_channel_manager_emit_new_channel(TP_CHANNEL_MANAGER (user_data), (TpExportableChannel *) chan, NULL); idle_muc_channel_invited(chan, inviter_handle); } @@ -415,7 +415,7 @@ static IdleParserHandlerResult _nick_handler(IdleParser *parser, IdleParserMessa if (old_handle == new_handle) return IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED; - tp_channel_manager_foreach_channel(mgr, _channel_rename_foreach, &data); + tp_channel_manager_foreach_channel (TP_CHANNEL_MANAGER (mgr), _channel_rename_foreach, &data); return IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED; } @@ -498,7 +498,7 @@ static IdleParserHandlerResult _quit_handler(IdleParser *parser, IdleParserMessa const gchar *message = (args->n_values == 2) ? g_value_get_string(g_value_array_get_nth(args, 1)) : NULL; ChannelQuitForeachData data = {leaver_handle, message}; - tp_channel_manager_foreach_channel(manager, _channel_quit_foreach, &data); + tp_channel_manager_foreach_channel (TP_CHANNEL_MANAGER (manager), _channel_quit_foreach, &data); return IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED; } @@ -682,14 +682,14 @@ static void _channel_closed_cb(IdleMUCChannel *chan, gpointer user_data) { * didn't finish before we killed the channel. */ for (GSList *l = reqs; l != NULL; l = l->next) { - tp_channel_manager_emit_request_failed(manager, l->data, TP_ERROR, + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (manager), l->data, TP_ERROR, TP_ERROR_DISCONNECTED, "Unable to complete this channel request, we're disconnecting!"); } g_slist_free(reqs); - tp_channel_manager_emit_channel_closed_for_object (manager, + tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (manager), TP_EXPORTABLE_CHANNEL (chan)); if (priv->channels) { @@ -698,7 +698,7 @@ static void _channel_closed_cb(IdleMUCChannel *chan, gpointer user_data) { if (tp_base_channel_is_destroyed (base)) g_hash_table_remove(priv->channels, GUINT_TO_POINTER(handle)); else - tp_channel_manager_emit_new_channel (manager, TP_EXPORTABLE_CHANNEL (chan), + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), TP_EXPORTABLE_CHANNEL (chan), NULL); } } @@ -713,7 +713,7 @@ static void _channel_join_ready_cb(IdleMUCChannel *chan, guint err, gpointer use GSList *l; if (err == MUC_CHANNEL_JOIN_ERROR_NONE) { - tp_channel_manager_emit_new_channel(manager, (TpExportableChannel *) chan, reqs); + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), (TpExportableChannel *) chan, reqs); goto out; } @@ -741,7 +741,7 @@ static void _channel_join_ready_cb(IdleMUCChannel *chan, guint err, gpointer use } for (l = reqs; l != NULL; l = l->next) { - tp_channel_manager_emit_request_failed(manager, l->data, TP_ERROR, err_code, err_msg); + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (manager), l->data, TP_ERROR, err_code, err_msg); } if (priv->channels) @@ -754,7 +754,7 @@ out: static gboolean _muc_manager_request ( IdleMUCManager *self, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties, gboolean require_new) { @@ -824,8 +824,9 @@ _muc_manager_request ( } else if (idle_muc_channel_is_ready (channel)) { - tp_channel_manager_emit_request_already_satisfied (self, - request_token, TP_EXPORTABLE_CHANNEL (channel)); + tp_channel_manager_emit_request_already_satisfied ( + TP_CHANNEL_MANAGER (self), + request, TP_EXPORTABLE_CHANNEL (channel)); return TRUE; } } @@ -836,12 +837,12 @@ _muc_manager_request ( idle_muc_channel_join_attempt (channel); } - associate_request (self, channel, request_token); + associate_request (self, channel, request); return TRUE; error: - tp_channel_manager_emit_request_failed (self, request_token, + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (self), request, error->domain, error->code, error->message); g_error_free (error); return TRUE; @@ -850,34 +851,23 @@ error: static gboolean _muc_manager_create_channel ( TpChannelManager *manager, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties) { IdleMUCManager *self = IDLE_MUC_MANAGER (manager); - return _muc_manager_request (self, request_token, request_properties, TRUE); -} - -static gboolean -_muc_manager_request_channel ( - TpChannelManager *manager, - gpointer request_token, - GHashTable *request_properties) -{ - IdleMUCManager *self = IDLE_MUC_MANAGER (manager); - - return _muc_manager_request (self, request_token, request_properties, FALSE); + return _muc_manager_request (self, request, request_properties, TRUE); } static gboolean _muc_manager_ensure_channel ( TpChannelManager *manager, - gpointer request_token, + TpChannelManagerRequest *request, GHashTable *request_properties) { IdleMUCManager *self = IDLE_MUC_MANAGER (manager); - return _muc_manager_request (self, request_token, request_properties, FALSE); + return _muc_manager_request (self, request, request_properties, FALSE); } static void @@ -889,7 +879,6 @@ _muc_manager_iface_init ( iface->foreach_channel = _muc_manager_foreach_channel; iface->type_foreach_channel_class = _muc_manager_type_foreach_channel_class; - iface->request_channel = _muc_manager_request_channel; iface->create_channel = _muc_manager_create_channel; iface->ensure_channel = _muc_manager_ensure_channel; } diff --git a/src/idle-roomlist-manager.c b/src/idle-roomlist-manager.c index 4cfeccd..29f9f2e 100644 --- a/src/idle-roomlist-manager.c +++ b/src/idle-roomlist-manager.c @@ -69,11 +69,10 @@ static void connection_status_changed_cb (IdleConnection* conn, guint status, gu static void _roomlist_manager_foreach (TpChannelManager *self, TpExportableChannelFunc func, gpointer user_data); static void _roomlist_manager_foreach_class (TpChannelManager *self, TpChannelManagerChannelClassFunc func, gpointer user_data); -static gboolean _roomlist_manager_create_channel (TpChannelManager *self, gpointer request_token, GHashTable *request_properties); -static gboolean _roomlist_manager_request_channel (TpChannelManager *self, gpointer request_token, GHashTable *request_properties); -static gboolean _roomlist_manager_ensure_channel (TpChannelManager *self, gpointer request_token, GHashTable *request_properties); -static gboolean _roomlist_manager_requestotron (IdleRoomlistManager *self, gpointer request_token, GHashTable *request_properties, gboolean require_new); -static IdleRoomlistChannel *_roomlist_manager_new_channel (IdleRoomlistManager *self, gpointer request); +static gboolean _roomlist_manager_create_channel (TpChannelManager *self, TpChannelManagerRequest *request, GHashTable *request_properties); +static gboolean _roomlist_manager_ensure_channel (TpChannelManager *self, TpChannelManagerRequest *request, GHashTable *request_properties); +static gboolean _roomlist_manager_requestotron (IdleRoomlistManager *self, TpChannelManagerRequest *request, GHashTable *request_properties, gboolean require_new); +static IdleRoomlistChannel *_roomlist_manager_new_channel (IdleRoomlistManager *self, TpChannelManagerRequest *request); static void _roomlist_channel_closed_cb (IdleRoomlistChannel *chan, gpointer user_data); @@ -254,45 +253,32 @@ _roomlist_manager_foreach_class (TpChannelManager *self, static gboolean _roomlist_manager_create_channel (TpChannelManager *self, - gpointer request_token, - GHashTable *request_properties) + TpChannelManagerRequest *request, + GHashTable *request_properties) { IdleRoomlistManager *mgr = IDLE_ROOMLIST_MANAGER (self); - return _roomlist_manager_requestotron (mgr, request_token, request_properties, + return _roomlist_manager_requestotron (mgr, request, request_properties, TRUE); } - -static gboolean -_roomlist_manager_request_channel (TpChannelManager *self, - gpointer request_token, - GHashTable *request_properties) -{ - IdleRoomlistManager *mgr = IDLE_ROOMLIST_MANAGER (self); - - return _roomlist_manager_requestotron (mgr, request_token, - request_properties, FALSE); -} - - static gboolean _roomlist_manager_ensure_channel (TpChannelManager *self, - gpointer request_token, - GHashTable *request_properties) + TpChannelManagerRequest *request, + GHashTable *request_properties) { IdleRoomlistManager *mgr = IDLE_ROOMLIST_MANAGER (self); - return _roomlist_manager_requestotron (mgr, request_token, + return _roomlist_manager_requestotron (mgr, request, request_properties, FALSE); } static gboolean _roomlist_manager_requestotron (IdleRoomlistManager *self, - gpointer request_token, - GHashTable *request_properties, - gboolean require_new) + TpChannelManagerRequest *request, + GHashTable *request_properties, + gboolean require_new) { IdleRoomlistManagerPrivate *priv = self->priv; GError *error = NULL; @@ -318,7 +304,7 @@ _roomlist_manager_requestotron (IdleRoomlistManager *self, if (priv->channel == NULL) { - _roomlist_manager_new_channel (self, request_token); + _roomlist_manager_new_channel (self, request); return TRUE; } @@ -329,12 +315,12 @@ _roomlist_manager_requestotron (IdleRoomlistManager *self, goto error; } - tp_channel_manager_emit_request_already_satisfied (self, request_token, - TP_EXPORTABLE_CHANNEL (priv->channel)); + tp_channel_manager_emit_request_already_satisfied (TP_CHANNEL_MANAGER (self), + request, TP_EXPORTABLE_CHANNEL (priv->channel)); return TRUE; error: - tp_channel_manager_emit_request_failed (self, request_token, + tp_channel_manager_emit_request_failed (TP_CHANNEL_MANAGER (self), request, error->domain, error->code, error->message); g_error_free (error); return TRUE; @@ -348,7 +334,7 @@ _roomlist_channel_closed_cb (IdleRoomlistChannel *chan, IdleRoomlistManager *self = IDLE_ROOMLIST_MANAGER (user_data); IdleRoomlistManagerPrivate *priv = self->priv; - tp_channel_manager_emit_channel_closed_for_object (self, + tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self), TP_EXPORTABLE_CHANNEL (chan)); if (priv->channel) @@ -362,7 +348,7 @@ _roomlist_channel_closed_cb (IdleRoomlistChannel *chan, static IdleRoomlistChannel * _roomlist_manager_new_channel (IdleRoomlistManager *self, - gpointer request) + TpChannelManagerRequest *request) { IdleRoomlistManagerPrivate *priv = self->priv; IdleRoomlistChannel *chan; @@ -379,8 +365,8 @@ _roomlist_manager_new_channel (IdleRoomlistManager *self, if (request != NULL) requests = g_slist_prepend (requests, request); - tp_channel_manager_emit_new_channel (self, TP_EXPORTABLE_CHANNEL (chan), - requests); + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self), + TP_EXPORTABLE_CHANNEL (chan), requests); g_slist_free (requests); @@ -399,7 +385,6 @@ _roomlist_manager_iface_init (gpointer g_iface, iface->foreach_channel = _roomlist_manager_foreach; iface->foreach_channel_class = _roomlist_manager_foreach_class; - iface->request_channel = _roomlist_manager_request_channel; iface->create_channel = _roomlist_manager_create_channel; iface->ensure_channel = _roomlist_manager_ensure_channel; } diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c index b14cecd..bce2c6f 100644 --- a/src/server-tls-manager.c +++ b/src/server-tls-manager.c @@ -183,7 +183,7 @@ server_tls_channel_closed_cb (IdleServerTLSChannel *channel, self->priv->completed_channels, l); } - 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)); g_object_unref (channel); } @@ -274,7 +274,7 @@ idle_server_tls_manager_verify_async (IdleServerTLSManager *self, G_CALLBACK (tls_certificate_rejected_cb), self); /* emit NewChannel on the ChannelManager iface */ - tp_channel_manager_emit_new_channel (self, + tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self), (TpExportableChannel *) self->priv->channel, NULL); } @@ -393,7 +393,6 @@ channel_manager_iface_init (gpointer g_iface, /* these channels are not requestable. */ iface->ensure_channel = NULL; iface->create_channel = NULL; - iface->request_channel = NULL; iface->foreach_channel_class = NULL; } |