diff options
Diffstat (limited to 'src/mcd-dispatch-operation.c')
| -rw-r--r-- | src/mcd-dispatch-operation.c | 64 |
1 files changed, 2 insertions, 62 deletions
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c index 4948b6be..4abaf078 100644 --- a/src/mcd-dispatch-operation.c +++ b/src/mcd-dispatch-operation.c @@ -388,8 +388,6 @@ static void mcd_dispatch_operation_set_channel_handled_by ( const gchar *well_known_name); static gboolean _mcd_dispatch_operation_handlers_can_bypass_approval ( McdDispatchOperation *self); -static gboolean _mcd_dispatch_operation_handlers_can_bypass_observers ( - McdDispatchOperation *self); static void _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self) @@ -1828,34 +1826,6 @@ _mcd_dispatch_operation_handlers_can_bypass_approval ( return FALSE; } -/* this is analogous to *_can_bypass_handlers() method above */ -static gboolean -_mcd_dispatch_operation_handlers_can_bypass_observers ( - McdDispatchOperation *self) -{ - gchar **iter; - - for (iter = self->priv->possible_handlers; - iter != NULL && *iter != NULL; - iter++) - { - McdClientProxy *handler = _mcd_client_registry_lookup ( - self->priv->client_registry, *iter); - - if (handler != NULL) - { - gboolean bypass = _mcd_client_proxy_get_bypass_observers ( - handler); - - DEBUG ("%s has BypassObservers=%c", *iter, bypass ? 'T' : 'F'); - return bypass; - } - } - - return FALSE; -} - - gboolean _mcd_dispatch_operation_has_channel (McdDispatchOperation *self, McdChannel *channel) @@ -2240,15 +2210,8 @@ _mcd_dispatch_operation_run_clients (McdDispatchOperation *self) { const GList *mini_plugins; - if (_mcd_dispatch_operation_handlers_can_bypass_observers (self)) - { - DEBUG ("Bypassing observers"); - } - else - { - DEBUG ("Running observers"); - _mcd_dispatch_operation_run_observers (self); - } + DEBUG ("Running observers"); + _mcd_dispatch_operation_run_observers (self); for (mini_plugins = mcp_list_objects (); mini_plugins != NULL; @@ -2544,29 +2507,6 @@ _mcd_dispatch_operation_forget_channels (McdDispatchOperation *self) } void -_mcd_dispatch_operation_leave_channels (McdDispatchOperation *self, - TpChannelGroupChangeReason reason, - const gchar *message) -{ - if (message == NULL) - { - message = ""; - } - - if (self->priv->channel != NULL) - { - /* Take a temporary copy, because self->priv->channels could - * be modified as a result */ - McdChannel *channel = g_object_ref (self->priv->channel); - - _mcd_channel_depart (channel, reason, message); - g_object_unref (channel); - } - - _mcd_dispatch_operation_forget_channels (self); -} - -void _mcd_dispatch_operation_close_channels (McdDispatchOperation *self) { if (self->priv->channel != NULL) |