telepathy-mission-control: McdDispatcher: remove the ability to add old-style filters

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: a22bf24e9189c98a87baef9b7288a37795424d66
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=a22bf24e9189c98a87baef9b7288a37795424d66

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May  8 14:01:39 2012 +0100

McdDispatcher: remove the ability to add old-style filters

---

 src/mcd-dispatcher-context.h |    7 ----
 src/mcd-dispatcher.c         |   83 +-----------------------------------------
 2 files changed, 1 insertions(+), 89 deletions(-)

diff --git a/src/mcd-dispatcher-context.h b/src/mcd-dispatcher-context.h
index a07fb6b..11f99a6 100644
--- a/src/mcd-dispatcher-context.h
+++ b/src/mcd-dispatcher-context.h
@@ -57,13 +57,6 @@ typedef struct filter_t {
     gpointer user_data;
 } McdFilter;
 
-void mcd_dispatcher_add_filter (McdDispatcher *dispatcher,
-                                McdFilterFunc filter,
-                                guint priority,
-                                gpointer user_data);
-void mcd_dispatcher_add_filters (McdDispatcher *dispatcher,
-                                 const McdFilter *filters);
-
 G_END_DECLS
 
 #endif
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 9f95198..c944f53 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -197,25 +197,6 @@ mcd_dispatcher_context_ref (McdDispatcherContext *context,
     context->ref_count++;
 }
 
-static GList *
-chain_add_filter (GList *chain,
-		  McdFilterFunc filter,
-		  guint priority,
-                  gpointer user_data)
-{
-    GList *elem;
-    McdFilter *filter_data;
-
-    filter_data = g_slice_new (McdFilter);
-    filter_data->func = filter;
-    filter_data->priority = priority;
-    filter_data->user_data = user_data;
-    for (elem = chain; elem; elem = elem->next)
-	if (((McdFilter *)elem->data)->priority >= priority) break;
-
-    return g_list_insert_before (chain, elem, filter_data);
-}
-
 static void
 on_master_abort (McdMaster *master, McdDispatcherPrivate *priv)
 {
@@ -359,7 +340,7 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
     DEBUG ("CTXREF11 on %p", context);
     context->ref_count = 1;
     context->dispatcher = dispatcher;
-    context->chain = priv->filters;
+    context->chain = NULL;
 
     DEBUG ("new dispatcher context %p for %s channel %p (%s): %s",
            context, requested ? "requested" : "unrequested",
@@ -507,22 +488,6 @@ _mcd_dispatcher_get_property (GObject * obj, guint prop_id,
 }
 
 static void
-_mcd_dispatcher_finalize (GObject * object)
-{
-    McdDispatcherPrivate *priv = MCD_DISPATCHER_PRIV (object);
-
-    if (priv->filters)
-    {
-        GList *list;
-        for (list = priv->filters; list != NULL; list = list->next)
-            g_slice_free (McdFilter, list->data);
-        g_list_free (priv->filters);
-    }
-
-    G_OBJECT_CLASS (mcd_dispatcher_parent_class)->finalize (object);
-}
-
-static void
 mcd_dispatcher_client_handling_channel_cb (McdClientProxy *client,
                                            const gchar *object_path,
                                            McdDispatcher *self)
@@ -945,7 +910,6 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
     object_class->constructed = mcd_dispatcher_constructed;
     object_class->set_property = _mcd_dispatcher_set_property;
     object_class->get_property = _mcd_dispatcher_get_property;
-    object_class->finalize = _mcd_dispatcher_finalize;
     object_class->dispose = _mcd_dispatcher_dispose;
 
     /* Properties */
@@ -1186,51 +1150,6 @@ _mcd_dispatcher_take_channels (McdDispatcher *dispatcher, GList *channels,
     g_strfreev (possible_handlers);
 }
 
-/**
- * mcd_dispatcher_add_filter:
- * @dispatcher: The #McdDispatcher.
- * @filter: the filter function to be registered.
- * @priority: The priority of the filter.
- * @user_data: user data to be passed to @filter on invocation.
- *
- * Register a filter into the dispatcher chain: @filter will be invoked
- * whenever channels need to be dispatched.
- */
-void
-mcd_dispatcher_add_filter (McdDispatcher *dispatcher,
-                           McdFilterFunc filter,
-                           guint priority,
-                           gpointer user_data)
-{
-    McdDispatcherPrivate *priv;
-
-    g_return_if_fail (MCD_IS_DISPATCHER (dispatcher));
-    priv = dispatcher->priv;
-    priv->filters =
-        chain_add_filter (priv->filters, filter, priority, user_data);
-}
-
-/**
- * mcd_dispatcher_add_filters:
- * @dispatcher: The #McdDispatcher.
- * @filters: a zero-terminated array of #McdFilter elements.
- *
- * Convenience function to add a batch of filters at once.
- */
-void
-mcd_dispatcher_add_filters (McdDispatcher *dispatcher,
-                            const McdFilter *filters)
-{
-    const McdFilter *filter;
-
-    g_return_if_fail (filters != NULL);
-
-    for (filter = filters; filter->func != NULL; filter++)
-        mcd_dispatcher_add_filter (dispatcher, filter->func,
-                                   filter->priority,
-                                   filter->user_data);
-}
-
 static void
 mcd_dispatcher_finish_reinvocation (McdChannel *request)
 {