Merge lp:~kamstrup/dee/filter-models-ng into lp:dee

[Mikkel Kamstrup Erlandsen]

Overhaul DeeFilter and DeeFilterModel to work with GI and be more like DeeModelReader and DeeIndex

This branch gives a slight API break in how DeeFilters are created and reverses the order of the arguments to dee_filter_model_new() to match the order in dee_{hash,tree}_index_new(). I tested manually that Python works with DeeFilterModel now.

(resubmitted because of quantum entanglement with the no-const branch)

[Michal Hruby (mhr3)]

Seems to be mixed up with the no-const branch, can you please merge trunk/resubmit, or whatever is necessary?

[Michal Hruby (mhr3)]

I'm getting: `Warning: multiple "IDs" for constraint linkend: DeeFilter.` when generating the documentation, not sure what's the root cause of that, but it wasn't there in trunk.

What's missing is regenerated vapi (we really need to hook that up into the build system properly) + no longer forcing Dee.Filter to be compact class.

One of the things I was never sure about is whether GI-langs are able to use functions that have in the C signature two function pointers and a single userdata + destroy (ie current dee_filter_new), but it doesn't seem likely.

review: Needs Information

[Mikkel Kamstrup Erlandsen (kamstrup)]

> I'm getting: `Warning: multiple "IDs" for constraint linkend: DeeFilter.` when
> generating the documentation, not sure what's the root cause of that, but it
> wasn't there in trunk.

I'll take a quick look; but it doesn't worry me too much right now as the docs themselves look fine. So I think we can land even if I don't find a fix right away.

> What's missing is regenerated vapi (we really need to hook that up into the
> build system properly) + no longer forcing Dee.Filter to be compact class.

Done

> One of the things I was never sure about is whether GI-langs are able to use
> functions that have in the C signature two function pointers and a single
> userdata + destroy (ie current dee_filter_new), but it doesn't seem likely.

This did cross my mind, and I thin you're right that it might now work. GDBus and other APIsdoes this as well though - but since we can easily expand the set of DeeFilters we distribute I am not too concerned about this.

[lp:~kamstrup/dee/filter-models-ng]

323. By Mikkel Kamstrup Erlandsen on 2011-12-15

Update VAPI for DeeFilter and DeeFilterModel

324. By Mikkel Kamstrup Erlandsen on 2011-12-15

Make DeeFilterMapNotify and dee_filter_notify() return a gboolean. TRUE if the iter was added to the filter model.

Also fix (scope notified) annotaitons in DeeFilter and DeeModelReader.

Update VAPI accordingly

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'dee/Makefile.am'
--- dee/Makefile.am	2011-11-24 15:47:41 +0000
+++ dee/Makefile.am	2011-12-15 11:35:14 +0000
@@ -31,7 +31,7 @@
   dee-model.h \
   dee-model-reader.h \
   dee-filter-model.h \
-  dee-filters.h \
+  dee-filter.h \
   dee-peer.h \
   dee-proxy-model.h \
   dee-sequence-model.h \
@@ -65,7 +65,7 @@
   dee-peer.c \
   dee-proxy-model.c \
   dee-filter-model.c \
-  dee-filters.c \
+  dee-filter.c \
   dee-sequence-model.c \
   dee-shared-model.c \
   dee-serializable-model.c \

=== modified file 'dee/dee-filter-model.c'
--- dee/dee-filter-model.c	2011-10-26 15:08:16 +0000
+++ dee/dee-filter-model.c	2011-12-15 11:35:14 +0000
@@ -51,8 +51,11 @@
 #include <config.h>
 #endif
 
+#include <string.h> // memcpy()
+
 #include "dee-peer.h"
 #include "dee-model.h"
+#include "dee-filter.h"
 #include "dee-proxy-model.h"
 #include "dee-filter-model.h"
 #include "dee-serializable-model.h"
@@ -161,20 +164,20 @@
 
   if (priv->filter)
     {
-      if (priv->filter->user_data && priv->filter->destroy)
-        {
-          priv->filter->destroy (priv->filter->user_data);
-        }
+      dee_filter_destroy (priv->filter);
       g_free (priv->filter);
+      priv->filter = NULL;
     }
   
   if (priv->iter_map)
     {
       g_hash_table_destroy (priv->iter_map);
+      priv->iter_map = NULL;
     }
   if (priv->iter_list)
     {
       g_sequence_free (priv->iter_list);
+      priv->iter_list = NULL;
     }
   
   if (priv->on_orig_row_added_id != 0)
@@ -184,9 +187,14 @@
   if (priv->on_orig_row_changed_id != 0)
     g_signal_handler_disconnect (priv->orig_model, priv->on_orig_row_changed_id);
 
+  priv->on_orig_row_added_id = 0;
+  priv->on_orig_row_removed_id = 0;
+  priv->on_orig_row_changed_id = 0;
+
   if (priv->orig_model)
     {
       g_object_unref (priv->orig_model);
+      priv->orig_model = NULL;
     }
 
   G_OBJECT_CLASS (dee_filter_model_parent_class)->finalize (object);
@@ -196,9 +204,8 @@
 dee_filter_model_constructed (GObject *object)
 {
   DeeFilterModelPrivate *priv = DEE_FILTER_MODEL (object)->priv;
-  DeeFilter             *filter = priv->filter;
   
-  if (filter == NULL)
+  if (priv->filter == NULL)
     {
       g_critical ("You must set the 'filter' property when "
                   "creating a DeeFilterModel");
@@ -214,9 +221,7 @@
                        g_sequence_get_end_iter (priv->iter_list));
   
   /* Apply filter to orig_model in order to fill this model */
-  filter->map_func (priv->orig_model,
-                    DEE_FILTER_MODEL (object),
-                    filter->user_data);
+  dee_filter_map (priv->filter, priv->orig_model, DEE_FILTER_MODEL (object));
   
   /* Listen for changes to orig_model */
   priv->on_orig_row_added_id =
@@ -243,11 +248,12 @@
 {
   DeeFilterModelPrivate *priv = DEE_FILTER_MODEL (object)->priv;
   
+
   switch (id)
     {
     case PROP_FILTER:
-      /* Assume ownership of filter */
-      priv->filter = g_value_get_pointer (value);
+      priv->filter = g_new0 (DeeFilter, 1);
+      memcpy (priv->filter, g_value_get_pointer (value), sizeof (DeeFilter));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, id, pspec);
@@ -350,20 +356,13 @@
  * Returns: (transfer full) (type DeeFilterModel): A newly allocated #DeeFilterModel. Free with g_object_unref().
  */
 DeeModel*
-dee_filter_model_new (const DeeFilter *filter,
-                      DeeModel  *orig_model)
+dee_filter_model_new (DeeModel  *orig_model,
+                      DeeFilter *filter)
 {
   DeeModel  *self;
-  DeeFilter *_filter;
-  
-  _filter = g_new0 (DeeFilter, 1);
-  _filter->map_func = filter->map_func;
-  _filter->map_notify = filter->map_notify;
-  _filter->destroy = filter->destroy;
-  _filter->user_data = filter->user_data;
   
   self = DEE_MODEL (g_object_new (DEE_TYPE_FILTER_MODEL,
-                                  "filter", _filter,
+                                  "filter", filter,
                                   "back-end", orig_model,
                                   "proxy-signals", FALSE,
                                   NULL));
@@ -618,15 +617,13 @@
                          DeeModelIter  *iter)
 {
   DeeFilterModelPrivate *priv;
-  DeeFilter             *filter;
   
   priv = self->priv;
-  filter = priv->filter;
   
   if (priv->ignore_orig_signals)
     return;
   
-  filter->map_notify (priv->orig_model, iter, self, filter->user_data);
+  dee_filter_notify (priv->filter, iter, priv->orig_model, self);
   
 }
 
@@ -978,7 +975,7 @@
   DeeFilterModelPrivate *priv;
   GSequenceIter         *seq_iter;
   
-  g_return_val_if_fail (DEE_IS_FILTER_MODEL (self), -1);
+  g_return_val_if_fail (DEE_IS_FILTER_MODEL (self), 0);
   
   priv = DEE_FILTER_MODEL (self)->priv;
   seq_iter = (GSequenceIter*) g_hash_table_lookup (priv->iter_map, iter);
@@ -986,7 +983,7 @@
   if (seq_iter == NULL)
     {
       g_critical ("Can not find next iter for unknown iter");
-      return -1;
+      return 0;
     }
   
   return (guint) ABS(g_sequence_iter_get_position (seq_iter));

=== modified file 'dee/dee-filter-model.h'
--- dee/dee-filter-model.h	2011-12-14 10:59:40 +0000
+++ dee/dee-filter-model.h	2011-12-15 11:35:14 +0000
@@ -52,68 +52,11 @@
 typedef struct _DeeFilterModel DeeFilterModel;
 typedef struct _DeeFilterModelClass DeeFilterModelClass;
 typedef struct _DeeFilterModelPrivate DeeFilterModelPrivate;
+
+/* We need this one here to avoid circular refs */
 typedef struct _DeeFilter DeeFilter;
 
 /**
- * DeeModelMapFunc:
- * @orig_model: The model containing the original data to filter
- * @filter_model: The model that will contain the filtered results. The
- *                filter func must iterate over @orig_model and add all relevant
- *                rows to @filter_model. This model is guaranteed to be empty
- *                when the filter func is invoked
- * @user_data: User data passed together with the filter func
- *
- * Function used to collect the rows from a model that should be included in
- * a #DeeFilterModel. To add rows to @filter_model use the methods
- * dee_filter_model_append_iter(), dee_filter_model_prepend_iter(),
- * dee_filter_model_insert_iter(), and dee_filter_model_insert_iter_before().
- *
- * The iteration over the original model is purposely left to the map func
- * in order to allow optimized iterations if the the caller has a priori
- * knowledge of the sorting and grouping of the data in the original model.
- */
-typedef void (*DeeModelMapFunc) (DeeModel       *orig_model,
-                                 DeeFilterModel *filter_model,
-                                 gpointer        user_data);
-
-/**
- * DeeModelMapNotify:
- * @orig_model: The model containing the added row
- * @orig_iter: A #DeeModelIter pointing to the new row in @orig_model
- * @filter_model: The model that was also passed to the #DeeModelMapFunc
- *                of the #DeeFilter this functions is a part of
- * @user_data: User data for the #DeeFilter
- *
- * Callback invoked when a row is added to @orig_model. To add rows to
- * @filter_model use the methods dee_filter_model_append_iter(),
- * dee_filter_model_prepend_iter(), dee_filter_model_insert_iter(),
- * and dee_filter_model_insert_iter_before().
- */
-typedef void (*DeeModelMapNotify) (DeeModel          *orig_model,
-                                   DeeModelIter      *orig_iter,
-                                   DeeFilterModel    *filter_model,
-                                   gpointer           user_data);
-
-/**
- * DeeFilter:
- * @map_func: The #DeeModelMapFunc used to construct the initial contents of
- *            a #DeeFilterModel
- * @map_notify: Callback invoked when the original model changes
- * @destroy: Callback for freeing the @user_data
- * @user_data: Free form user data associated with the filter. This pointer will
- *             be passed to @map_func and @map_notify
- *
- * Structure encapsulating the mapping logic used to construct a #DeeFilterModel
- */
-struct _DeeFilter
-{
-  DeeModelMapFunc   map_func;
-  DeeModelMapNotify map_notify;
-  GDestroyNotify    destroy;
-  gpointer          user_data;
-} ;
-
-/**
  * DeeFilterModel:
  *
  * All fields in the DeeFilterModel structure are private and should never be
@@ -148,8 +91,8 @@
  **/
 GType                 dee_filter_model_get_type        (void);
 
-DeeModel*             dee_filter_model_new             (const DeeFilter *filter,
-                                                        DeeModel  *orig_model);
+DeeModel*             dee_filter_model_new             (DeeModel  *orig_model,
+                                                        DeeFilter *filter);
 
 gboolean              dee_filter_model_contains        (DeeFilterModel *self,
                                                         DeeModelIter   *iter);

=== renamed file 'dee/dee-filters.c' => 'dee/dee-filter.c'
--- dee/dee-filters.c	2011-06-09 20:18:22 +0000
+++ dee/dee-filter.c	2011-12-15 11:35:14 +0000
@@ -19,7 +19,7 @@
  */
 
 /**
- * SECTION:dee-filters
+ * SECTION:dee-filter
  * @title: Filters
  * @short_description: A suite of simple #DeeFilter<!-- -->s for use with #DeeFilterModel<!-- -->s
  * @include: dee.h
@@ -52,7 +52,10 @@
 #include <config.h>
 #endif
 
+#include <string.h> // memset()
+
 #include "dee-filter-model.h"
+#include "dee-filter.h"
 #include "trace-log.h"
 
 /* The CollatorFilter stores collation keys for the columns in a DeeModelTag */
@@ -79,15 +82,15 @@
 /*
  * Private impl
  */
-static void _dee_filter_collator_map_notify (DeeModel *orig_model,
-                                             DeeModelIter *orig_iter,
-                                             DeeFilterModel *filter_model,
-                                             gpointer user_data);
+static gboolean _dee_filter_collator_map_notify (DeeModel *orig_model,
+                                                 DeeModelIter *orig_iter,
+                                                 DeeFilterModel *filter_model,
+                                                 gpointer user_data);
 
-static void _dee_filter_collator_desc_map_notify (DeeModel *orig_model,
-                                                  DeeModelIter *orig_iter,
-                                                  DeeFilterModel *filter_model,
-                                                  gpointer user_data);
+static gboolean _dee_filter_collator_desc_map_notify (DeeModel *orig_model,
+                                                      DeeModelIter *orig_iter,
+                                                      DeeFilterModel *filter_model,
+                                                      gpointer user_data);
 
 static void
 _dee_filter_collator_map_func (DeeModel *orig_model,
@@ -137,7 +140,7 @@
 
 }
 
-static void
+static gboolean
 _dee_filter_collator_map_notify (DeeModel *orig_model,
                                  DeeModelIter *orig_iter,
                                  DeeFilterModel *filter_model,
@@ -148,8 +151,8 @@
   const gchar    *column_value, *test_value;
   gchar          *collation_key;
 
-  g_return_if_fail (user_data != NULL);
-  g_return_if_fail (orig_iter != NULL);
+  g_return_val_if_fail (user_data != NULL, FALSE);
+  g_return_val_if_fail (orig_iter != NULL, FALSE);
 
   filter = (CollatorFilter *) user_data;
 
@@ -180,9 +183,11 @@
     {
       dee_filter_model_append_iter(filter_model, orig_iter);
     }
+    
+  return TRUE;
 }
 
-static void
+static gboolean
 _dee_filter_collator_desc_map_notify (DeeModel *orig_model,
                                  DeeModelIter *orig_iter,
                                  DeeFilterModel *filter_model,
@@ -193,8 +198,8 @@
   const gchar    *column_value, *test_value;
   gchar          *collation_key;
 
-  g_return_if_fail (user_data != NULL);
-  g_return_if_fail (orig_iter != NULL);
+  g_return_val_if_fail (user_data != NULL, FALSE);
+  g_return_val_if_fail (orig_iter != NULL, FALSE);
 
   filter = (CollatorFilter *) user_data;
 
@@ -225,6 +230,8 @@
     {
       dee_filter_model_append_iter(filter_model, orig_iter);
     }
+  
+  return TRUE;
 }
 
 static void
@@ -256,7 +263,7 @@
     }
 }
 
-static void
+static gboolean
 _dee_filter_key_map_notify (DeeModel *orig_model,
                             DeeModelIter *orig_iter,
                             DeeFilterModel *filter_model,
@@ -265,16 +272,17 @@
   KeyFilter      *filter;
   const gchar    *val;
 
-  g_return_if_fail (user_data != NULL);
+  g_return_val_if_fail (user_data != NULL, FALSE);
 
   filter = (KeyFilter *) user_data;
   val = dee_model_get_string (orig_model, orig_iter, filter->column);
 
   /* Ignore rows that don't match the key */
   if (g_strcmp0 (filter->key, val) != 0)
-    return;
+    return FALSE;
 
   dee_filter_model_insert_iter_with_original_order (filter_model, orig_iter);
+  return TRUE;
 }
 
 static void
@@ -303,7 +311,7 @@
     }
 }
 
-static void
+static gboolean
 _dee_filter_value_map_notify (DeeModel *orig_model,
                               DeeModelIter *orig_iter,
                               DeeFilterModel *filter_model,
@@ -312,16 +320,17 @@
   ValueFilter    *filter;
   GVariant       *val;
 
-  g_return_if_fail (user_data != NULL);
+  g_return_val_if_fail (user_data != NULL, FALSE);
 
   filter = (ValueFilter *) user_data;
   val = dee_model_get_value (orig_model, orig_iter, filter->column);
 
   /* Ignore rows that don't match the value */
   if (!g_variant_equal (filter->value, val))
-    return;
+    return FALSE;
 
   dee_filter_model_insert_iter_with_original_order (filter_model, orig_iter);
+  return TRUE;
 }
 
 static void
@@ -354,7 +363,7 @@
     }
 }
 
-static void
+static gboolean
 _dee_filter_regex_map_notify (DeeModel *orig_model,
                               DeeModelIter *orig_iter,
                               DeeFilterModel *filter_model,
@@ -363,16 +372,17 @@
   RegexFilter    *filter;
   const gchar    *val;
 
-  g_return_if_fail (user_data != NULL);
+  g_return_val_if_fail (user_data != NULL, FALSE);
 
   filter = (RegexFilter *) user_data;
   val = dee_model_get_string (orig_model, orig_iter, filter->column);
 
   /* Ignore rows that don't match the key */
   if (!g_regex_match (filter->regex, val, 0, NULL))
-    return;
+    return FALSE;
 
   dee_filter_model_insert_iter_with_original_order (filter_model, orig_iter);
+  return TRUE;
 }
 
 static void
@@ -401,95 +411,190 @@
  */
 
 /**
+ * dee_filter_notify:
+ * @filter: The filter to apply
+ * @orig_iter: The #DeeModelIter added to @orig_model
+ * @orig_model: The model that is being filtered
+ * @filter_model: The #DeeFilterModel that holds the
+ *                filtered subset of @orig_model
+ *
+ * Call the #DeeFilterMapNotify function of a #DeeFilter.
+ * When using a #DeeFilterModel you should not call this method yourself.
+ *
+ * Returns: The return value from the #DeeFilterMapNotify. That is; %TRUE
+ *          if @orig_iter was added to @filter_model
+ */
+gboolean
+dee_filter_notify (DeeFilter      *filter,
+                   DeeModelIter   *orig_iter,
+                   DeeModel       *orig_model,
+                   DeeFilterModel *filter_model)
+{
+  g_return_val_if_fail (filter != NULL, FALSE);
+
+  return filter->map_notify (orig_model, orig_iter,
+                             filter_model, filter->userdata);
+}
+
+/**
+ * dee_filter_map:
+ * @filter: The filter to apply
+ * @orig_model: The model that is being filtered
+ * @filter_model: The #DeeFilterModel that holds the
+ *                filtered subset of @orig_model
+ *
+ * Call the #DeeFilterMapFunc function of a #DeeFilter.
+ * When using a #DeeFilterModel you should not call this method yourself.
+ */
+void
+dee_filter_map (DeeFilter      *filter,
+                DeeModel       *orig_model,
+                DeeFilterModel *filter_model)
+{
+  g_return_if_fail (filter != NULL);
+
+  filter->map_func (orig_model, filter_model, filter->userdata);
+}
+
+/**
+ * dee_filter_destroy:
+ * @filter: The filter to destroy
+ *
+ * Call the #GDestroyNotify function on the userdata pointer of a #DeeFilter
+ * (if the destroy member is set, that is).
+ *
+ * When using a #DeeFilterModel you should not call this method yourself.
+ *
+ * This method will not free the memory allocated for @filter.
+ */
+void
+dee_filter_destroy (DeeFilter *filter)
+{
+  g_return_if_fail (filter != NULL);
+
+  if (filter->destroy)
+    filter->destroy (filter->userdata);
+}
+
+/**
+ * dee_filter_new:
+ * @map_func: (scope notified): The #DeeFilterMapFunc to use for the filter
+ * @map_notify: (scope notified): The #DeeFilterMapNotify to use for the filter
+ * @userdata: (closure) (allow-none): The user data to pass to
+                                      @map_func and @map_notify
+ * @destroy: (allow-none): The #GDestroyNotify to call on
+ *                                        @userdata when disposing of the filter
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
+ *
+ * Create a new #DeeFilter with the given parameters. This call will zero
+ * the @out_filter struct.
+ *
+ */
+void
+dee_filter_new (DeeFilterMapFunc   map_func,
+                DeeFilterMapNotify map_notify,
+                GDestroyNotify     destroy,
+                gpointer           userdata,
+                DeeFilter         *out_filter)
+{
+  g_return_if_fail (map_func != NULL);
+  g_return_if_fail (map_notify != NULL);
+  g_return_if_fail (out_filter != NULL);
+
+  memset (out_filter, 0, sizeof (DeeFilter));
+
+  out_filter->map_func = map_func;
+  out_filter->map_notify = map_notify;
+  out_filter->userdata = userdata;
+  out_filter->destroy = destroy;
+}
+
+/**
  * dee_filter_new_collator:
  * @column: The index of a column containing the strings to sort after
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
  *
  * Create a #DeeFilter that takes string values from a column in the model
  * and builds a #DeeFilterModel with the rows sorted according to the
  * collation rules of the current locale.
- *
- * Returns: (transfer full): A newly allocated #DeeFilter. Do not modify it.
- *          Free with g_free().
  */
-DeeFilter*
-dee_filter_new_collator    (guint column)
+void
+dee_filter_new_collator    (guint      column,
+                            DeeFilter *out_filter)
 {
-  DeeFilter      *filter;
   CollatorFilter *collator;
 
-  filter = g_new0 (DeeFilter, 1);
-  filter->map_func = _dee_filter_collator_map_func;
-  filter->map_notify = _dee_filter_collator_map_notify;
-
   collator = g_new0 (CollatorFilter, 1);
   collator->column = column;
 
-  filter->destroy = (GDestroyNotify) g_free;
-  filter->user_data =collator;
-
-  return filter;
+  dee_filter_new (_dee_filter_collator_map_func,
+                  _dee_filter_collator_map_notify,
+                  (GDestroyNotify) g_free,
+                  collator,
+                  out_filter);
 }
 
 /**
  * dee_filter_new_collator_desc:
  * @column: The index of a column containing the strings to sort after
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
  *
  * Create a #DeeFilter that takes string values from a column in the model
  * and builds a #DeeFilterModel with the rows sorted descending according to the
  * collation rules of the current locale.
- *
- * Returns: (transfer full): A newly allocated #DeeFilter. Do not modify it.
- *          Free with g_free().
  */
-DeeFilter*
-dee_filter_new_collator_desc    (guint column)
+void
+dee_filter_new_collator_desc    (guint      column,
+                                 DeeFilter *out_filter)
 {
-  DeeFilter      *filter;
   CollatorFilter *collator; 
- 
-  filter = g_new0 (DeeFilter, 1); 
-  filter->map_func = _dee_filter_collator_desc_map_func;
-  filter->map_notify = _dee_filter_collator_desc_map_notify;
- 
+
   collator = g_new0 (CollatorFilter, 1);
   collator->column = column;
 
-  filter->destroy = (GDestroyNotify) g_free;
-  filter->user_data =collator;
-
-  return filter;
+  dee_filter_new (_dee_filter_collator_desc_map_func,
+                  _dee_filter_collator_desc_map_notify,
+                  (GDestroyNotify) g_free,
+                  collator,
+                  out_filter);
 } 
 
 
 /**
  * dee_filter_new_for_key_column:
  * @column: The index of a column containing the string key to match
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
  *
  * Create a #DeeFilter that only includes rows from the original model
  * which has an exact match on some string column. A #DeeFilterModel created
  * with this filter will be ordered in accordance with its parent model.
- *
- * Returns: (transfer full): A newly allocated #DeeFilter. Do not modify it.
- *          Free with g_free().
  */
-DeeFilter*
-dee_filter_new_for_key_column    (guint column, const gchar *key)
+void
+dee_filter_new_for_key_column    (guint        column,
+                                  const gchar *key,
+                                  DeeFilter   *out_filter)
 {
-  DeeFilter      *filter;
   KeyFilter      *key_filter;
 
-  filter = g_new0 (DeeFilter, 1);
-  filter->map_func = _dee_filter_key_map_func;
-  filter->map_notify = _dee_filter_key_map_notify;
+  g_return_if_fail (key != NULL);
 
   key_filter = g_new0 (KeyFilter, 1);
   key_filter->column = column;
   key_filter->key = g_strdup (key);
 
-  filter->destroy = (GDestroyNotify) key_filter_free;
-  filter->user_data = key_filter;
-
-  return filter;
+  dee_filter_new (_dee_filter_key_map_func,
+                  _dee_filter_key_map_notify,
+                  (GDestroyNotify) key_filter_free,
+                  key_filter,
+                  out_filter);
 }
 
 /**
@@ -498,6 +603,9 @@
  * @value: (transfer none): A #GVariant value columns must match exactly.
  *         The matching semantics are those of g_variant_equal(). If @value
  *         is floating the ownership will be transfered to the filter
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
  *
  * Create a #DeeFilter that only includes rows from the original model
  * which match a variant value in a given column. A #DeeFilterModel
@@ -507,62 +615,56 @@
  * value comparison is done using g_variant_equal(). This means you can use
  * this filter as a convenient fallback when there is no predefined filter
  * for your column type if raw performance is not paramount.
- *
- * Returns: (transfer full): A newly allocated #DeeFilter. Do not modify it.
- *          Free with g_free().
  */
-DeeFilter*
-dee_filter_new_for_any_column (guint column, GVariant *value)
+void
+dee_filter_new_for_any_column (guint      column,
+                               GVariant  *value,
+                               DeeFilter *out_filter)
 {
-  DeeFilter      *filter;
   ValueFilter    *v_filter;
 
-  g_return_val_if_fail (value != NULL, NULL);
-
-  filter = g_new0 (DeeFilter, 1);
-  filter->map_func = _dee_filter_value_map_func;
-  filter->map_notify = _dee_filter_value_map_notify;
+  g_return_if_fail (value != NULL);
 
   v_filter = g_new0 (ValueFilter, 1);
   v_filter->column = column;
   v_filter->value = g_variant_ref_sink (value);
 
-  filter->destroy = (GDestroyNotify) value_filter_free;
-  filter->user_data = v_filter;
-
-  return filter;
+  dee_filter_new (_dee_filter_value_map_func,
+                  _dee_filter_value_map_notify,
+                  (GDestroyNotify) value_filter_free,
+                  v_filter,
+                  out_filter);
 }
 
 /**
  * dee_filter_new_regex:
  * @column: The index of a column containing the string to match
  * @regex: (transfer none):The regular expression @column must match
+ * @out_filter: (out): A pointer to an uninitialized #DeeFilter struct.
+ *                     This struct will zeroed and configured with the filter
+ *                     parameters
  *
  * Create a #DeeFilter that only includes rows from the original model
  * which match a regular expression on some string column. A #DeeFilterModel
  * created with this filter will be ordered in accordance with its parent model.
- *
- * Returns: (transfer full): A newly allocated #DeeFilter. Do not modify it.
- *          Free with g_free().
  */
-DeeFilter*
-dee_filter_new_regex (guint column, GRegex *regex)
+void
+dee_filter_new_regex (guint      column,
+                      GRegex    *regex,
+                      DeeFilter *out_filter)
 {
-  DeeFilter      *filter;
   RegexFilter    *r_filter;
 
-  g_return_val_if_fail (regex != NULL, NULL);
-
-  filter = g_new0 (DeeFilter, 1);
-  filter->map_func = _dee_filter_regex_map_func;
-  filter->map_notify = _dee_filter_regex_map_notify;
+  g_return_if_fail (regex != NULL);
 
   r_filter = g_new0 (RegexFilter, 1);
   r_filter->column = column;
   r_filter->regex = g_regex_ref (regex);
 
-  filter->destroy = (GDestroyNotify) regex_filter_free;
-  filter->user_data = r_filter;
-
-  return filter;
+  dee_filter_new (_dee_filter_regex_map_func,
+                  _dee_filter_regex_map_notify,
+                  (GDestroyNotify) regex_filter_free,
+                  r_filter,
+                  out_filter);
 }
+

=== renamed file 'dee/dee-filters.h' => 'dee/dee-filter.h'
--- dee/dee-filters.h	2011-06-09 20:18:22 +0000
+++ dee/dee-filter.h	2011-12-15 11:35:14 +0000
@@ -30,15 +30,109 @@
 
 G_BEGIN_DECLS
 
-DeeFilter* dee_filter_new_collator       (guint column);
-
-DeeFilter* dee_filter_new_collator_desc       (guint column);
-
-DeeFilter* dee_filter_new_for_key_column (guint column, const gchar *key);
-
-DeeFilter* dee_filter_new_for_any_column (guint column, GVariant *value);
-
-DeeFilter* dee_filter_new_regex          (guint column, GRegex *regex);
+typedef struct _DeeFilter DeeFilter;
+
+/**
+ * DeeFilterMapFunc:
+ * @orig_model: The model containing the original data to filter
+ * @filter_model: The model that will contain the filtered results. The
+ *                filter func must iterate over @orig_model and add all relevant
+ *                rows to @filter_model. This model is guaranteed to be empty
+ *                when the filter func is invoked
+ * @user_data: (closure): User data passed together with the filter func
+ *
+ * Function used to collect the rows from a model that should be included in
+ * a #DeeFilterModel. To add rows to @filter_model use the methods
+ * dee_filter_model_append_iter(), dee_filter_model_prepend_iter(),
+ * dee_filter_model_insert_iter(), and dee_filter_model_insert_iter_before().
+ *
+ * The iteration over the original model is purposely left to the map func
+ * in order to allow optimized iterations if the the caller has a priori
+ * knowledge of the sorting and grouping of the data in the original model.
+ */
+typedef void (*DeeFilterMapFunc) (DeeModel       *orig_model,
+                                  DeeFilterModel *filter_model,
+                                  gpointer        user_data);
+
+/**
+ * DeeFilterMapNotify:
+ * @orig_model: The model containing the added row
+ * @orig_iter: A #DeeModelIter pointing to the new row in @orig_model
+ * @filter_model: The model that was also passed to the #DeeModelMapFunc
+ *                of the #DeeFilter this functions is a part of
+ * @user_data: (closure): User data for the #DeeFilter
+ *
+ * Callback invoked when a row is added to @orig_model. To add rows to
+ * @filter_model use the methods dee_filter_model_append_iter(),
+ * dee_filter_model_prepend_iter(), dee_filter_model_insert_iter(),
+ * and dee_filter_model_insert_iter_before().
+ *
+ * Returns: %TRUE if @orig_iter was added to @filter_model
+ */
+typedef gboolean (*DeeFilterMapNotify) (DeeModel          *orig_model,
+                                        DeeModelIter      *orig_iter,
+                                        DeeFilterModel    *filter_model,
+                                        gpointer           user_data);
+
+/**
+ * DeeFilter:
+ * @map_func: (scope notified): The #DeeModelMapFunc used to construct
+ *                              the initial contents of a #DeeFilterModel
+ * @map_notify: (scope notified): Callback invoked when the original model changes
+ * @destroy: Callback for freeing the @user_data
+ * @userdata (closure): Free form user data associated with the filter.
+ *                       This pointer will be passed to @map_func and @map_notify
+ *
+ * Structure encapsulating the mapping logic used to construct a #DeeFilterModel
+ */
+struct _DeeFilter
+{
+  DeeFilterMapFunc   map_func;
+  DeeFilterMapNotify map_notify;
+  GDestroyNotify     destroy;
+  gpointer           userdata;
+
+  /*< private >*/
+  gpointer          _padding_1;
+  gpointer          _padding_2;
+  gpointer          _padding_3;
+  gpointer          _padding_4;
+};
+
+gboolean dee_filter_notify         (DeeFilter      *filter,
+                                    DeeModelIter   *orig_iter,
+                                    DeeModel       *orig_model,
+                                    DeeFilterModel *filter_model);
+
+void dee_filter_map                (DeeFilter      *filter,
+                                    DeeModel       *orig_model,
+                                    DeeFilterModel *filter_model);
+
+void dee_filter_destroy            (DeeFilter      *filter);
+
+void dee_filter_new                (DeeFilterMapFunc   map_func,
+                                    DeeFilterMapNotify map_notify,
+                                    GDestroyNotify    destroy,
+                                    gpointer          userdata,
+                                    DeeFilter        *out_filter);
+
+void dee_filter_new_collator       (guint       column,
+                                    DeeFilter  *out_filter);
+
+void dee_filter_new_collator_desc  (guint       column,
+                                    DeeFilter  *out_filter);
+
+void dee_filter_new_for_key_column (guint        column,
+                                    const gchar *key,
+                                    DeeFilter   *out_filter);
+
+void dee_filter_new_for_any_column (guint        column,
+                                    GVariant    *value,
+                                    DeeFilter   *out_filter);
+
+void dee_filter_new_regex          (guint        column,
+                                    GRegex      *regex,
+                                    DeeFilter   *out_filter);
 
 G_END_DECLS
 

=== modified file 'dee/dee-model-reader.c'
--- dee/dee-model-reader.c	2011-11-28 13:35:14 +0000
+++ dee/dee-model-reader.c	2011-12-15 11:35:14 +0000
@@ -85,9 +85,9 @@
 
 /**
  * dee_model_reader_new:
- * @reader_func: The #DeeModelReaderFunc to use for the reader
+ * @reader_func: (scope notified): The #DeeModelReaderFunc to use for the reader
  * @userdata: (closure) (allow-none): The user data to pass to @reader_func
- * @destroy: (scope notify) (allow-none): The #GDestroyNotify to call on
+ * @destroy: (allow-none): The #GDestroyNotify to call on
  *                                        @userdata when disposing of the reader
  * @out_reader: (out): A pointer to an uninitialized #DeeModelReader struct
  *

=== modified file 'dee/dee-model-reader.h'
--- dee/dee-model-reader.h	2011-11-25 08:18:32 +0000
+++ dee/dee-model-reader.h	2011-12-15 11:35:14 +0000
@@ -30,6 +30,8 @@
 
 G_BEGIN_DECLS
 
+typedef struct _DeeFilter DeeFilter;
+
 /**
  * DeeModelReaderFunc:
  * @model: The model being indexed
@@ -47,9 +49,10 @@
 
 /**
  * DeeModelReader:
- * @reader_func: The #DeeModelReaderFunc used to extract string from a model
+ * @reader_func: (scope notified): The #DeeModelReaderFunc used to extract
+ *                                 string from a model
  * @userdata: (closure): user data to pass to @reader_func
- * @destroy: (scope notified): Called when the reader is destroyed
+ * @destroy: Called when the reader is destroyed
  *
  * Structure encapsulating the information needed to read strings from a
  * model. Used for example by #DeeIndex.

=== modified file 'dee/dee.h'
--- dee/dee.h	2011-11-24 15:47:41 +0000
+++ dee/dee.h	2011-12-15 11:35:14 +0000
@@ -37,7 +37,7 @@
 #include <dee-sequence-model.h>
 #include <dee-shared-model.h>
 #include <dee-filter-model.h>
-#include <dee-filters.h>
+#include <dee-filter.h>
 #include <dee-index.h>
 #include <dee-hash-index.h>
 #include <dee-tree-index.h>

=== modified file 'doc/reference/dee-1.0/dee-1.0-docs.sgml'
--- doc/reference/dee-1.0/dee-1.0-docs.sgml	2011-11-24 15:47:41 +0000
+++ doc/reference/dee-1.0/dee-1.0-docs.sgml	2011-12-15 11:35:14 +0000
@@ -22,7 +22,7 @@
       <xi:include href="xml/dee-proxy-model.xml"/>
       <xi:include href="xml/dee-serializable-model.xml"/>
       <xi:include href="xml/dee-filter-model.xml"/>
-      <xi:include href="xml/dee-filters.xml"/>
+      <xi:include href="xml/dee-filter.xml"/>
   </chapter>
   
   <chapter>

=== modified file 'tests/test-filter-model.c'
--- tests/test-filter-model.c	2011-06-09 20:18:22 +0000
+++ tests/test-filter-model.c	2011-12-15 11:35:14 +0000
@@ -150,15 +150,18 @@
 static void
 test_empty_orig (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter *filter = g_new0 (DeeFilter, 1);
-  filter->map_func = append_all_model_map;
-  filter->map_notify = append_all_model_notify;
-  filter->user_data = fix;
+  DeeFilter filter;
+
+  dee_filter_new (append_all_model_map,
+                  append_all_model_notify,
+                  NULL,
+                  fix,
+                  &filter);
   
   dee_model_clear (fix->model);
   g_assert_cmpint (0, ==, dee_model_get_n_rows (fix->model));
   
-  DeeModel *m = dee_filter_model_new (filter, fix->model);
+  DeeModel *m = dee_filter_model_new (fix->model, &filter);
   g_assert_cmpint (0, ==, dee_model_get_n_rows (fix->model));
   
   DeeModelIter *iter = dee_model_get_first_iter (m);
@@ -170,12 +173,15 @@
 static void
 test_append_all (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter filter = { 0 };
-  filter.map_func = append_all_model_map;
-  filter.map_notify = append_all_model_notify;
-  filter.user_data = fix;
+  DeeFilter filter;
+
+  dee_filter_new (append_all_model_map,
+                  append_all_model_notify,
+                  NULL,
+                  fix,
+                  &filter);
   
-  DeeModel *m = dee_filter_model_new (&filter, fix->model);
+  DeeModel *m = dee_filter_model_new (fix->model, &filter);
   g_assert_cmpint (3, ==, dee_model_get_n_rows (fix->model));
   
   DeeModelIter *iter = dee_model_get_first_iter (m);
@@ -207,12 +213,15 @@
 static void
 test_discard_all (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter filter = { 0 };
-  filter.map_func = discard_all_model_map;
-  filter.map_notify = discard_all_model_notify;
-  filter.user_data = fix;
+  DeeFilter filter;
+
+  dee_filter_new (discard_all_model_map,
+                  discard_all_model_notify,
+                  NULL,
+                  fix,
+                  &filter);
   
-  DeeModel *m = dee_filter_model_new (&filter, fix->model);
+  DeeModel *m = dee_filter_model_new (fix->model, &filter);
   
   /* Check expected sizes */
   g_return_if_fail (DEE_IS_FILTER_MODEL (m));
@@ -261,12 +270,15 @@
 static void
 test_discard_all_append_notify (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter filter = { 0 };
-  filter.map_func = discard_all_model_map;
-  filter.map_notify = append_all_model_notify;
-  filter.user_data = fix;
+  DeeFilter filter;
   
-  DeeModel *m = dee_filter_model_new (&filter, fix->model);
+  dee_filter_new (discard_all_model_map,
+                  append_all_model_notify,
+                  NULL,
+                  fix,
+                  &filter);
+
+  DeeModel *m = dee_filter_model_new (fix->model, &filter);
   
   guint filter_add_count = 0;
   guint orig_add_count = 0;
@@ -310,10 +322,11 @@
 test_collator_asc (FilterFixture *fix, gconstpointer data)
 {
   DeeModelIter *r0, *r1, *r2, *r3, *r4, *r5;
-  DeeFilter    *collator = dee_filter_new_collator (1);
-  DeeModel     *m = dee_filter_model_new (collator, fix->model);
+  DeeFilter    collator;
+  DeeModel     *m;
 
-  g_free (collator);
+  dee_filter_new_collator (1, &collator);
+  m  = dee_filter_model_new (fix->model, &collator);
 
   /* Test alphabetic sorting after initial construction */
   r0 = dee_model_get_iter_at_row (m, 0);
@@ -353,10 +366,11 @@
 test_collator_desc (FilterFixture *fix, gconstpointer data)
 {
   DeeModelIter *r0, *r1, *r2, *r3, *r4, *r5;
-  DeeFilter    *collator = dee_filter_new_collator_desc (1);
-  DeeModel     *m = dee_filter_model_new (collator, fix->model);
+  DeeFilter    collator;
+  DeeModel     *m;
 
-  g_free (collator);
+  dee_filter_new_collator_desc (1, &collator);
+  m  = dee_filter_model_new (fix->model, &collator);
 
   /* Test alphabetic sorting after initial construction */
   r0 = dee_model_get_iter_at_row (m, 0);
@@ -396,7 +410,7 @@
                      DeeFilter     *filter)
 {
   DeeModelIter *r0, *r1, *r2, *r3, *r4;//, *r5;
-  DeeModel     *m = dee_filter_model_new (filter, fix->model);
+  DeeModel     *m = dee_filter_model_new (fix->model, filter);
 
   /* Assert that the initial filtering is good:
    * { [  0, "Zero" ] }        { [  0, "Zero" ],
@@ -492,34 +506,33 @@
 static void
 test_key (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter    *filter = dee_filter_new_for_key_column (1, "Zero");
+  DeeFilter    filter;
 
-  _test_orig_ordering (fix, filter);
-  g_free (filter);
+  dee_filter_new_for_key_column (1, "Zero", &filter);
+  _test_orig_ordering (fix, &filter);
 }
 
 /* Test dee_filter_new_for_any_column() */
 static void
 test_any (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter    *filter =
-            dee_filter_new_for_any_column (1, g_variant_new_string ("Zero"));
-
-  _test_orig_ordering (fix, filter);
-  g_free (filter);
+  DeeFilter    filter;
+
+  dee_filter_new_for_any_column (1, g_variant_new_string ("Zero"), &filter);
+
+  _test_orig_ordering (fix, &filter);
 }
 
 /* Test dee_filter_new_regex() */
 static void
 test_regex (FilterFixture *fix, gconstpointer data)
 {
-  DeeFilter    *filter;
+  DeeFilter    filter;
   GRegex       *regex;
 
   regex = g_regex_new (".ero", 0, 0, NULL);
-  filter = dee_filter_new_regex (1, regex);
+  dee_filter_new_regex (1, regex, &filter);
 
-  _test_orig_ordering (fix, filter);
+  _test_orig_ordering (fix, &filter);
   g_regex_unref (regex);
-  g_free (filter);
 }

=== modified file 'vapi/Dee-1.0-custom.vala'
--- vapi/Dee-1.0-custom.vala	2011-12-05 09:53:29 +0000
+++ vapi/Dee-1.0-custom.vala	2011-12-15 11:35:14 +0000
@@ -1,18 +1,10 @@
 namespace Dee {
-	[CCode (free_function = "g_free")]
-	[Compact]
-	public class Filter {
-		[CCode (has_construct_function = false)]
-		public Filter.collator (uint column);
-		[CCode (has_construct_function = false)]
-		public Filter.collator_desc (uint column);
-		[CCode (has_construct_function = false)]
-		public Filter.for_any_column (uint column, GLib.Variant value);
-		[CCode (has_construct_function = false)]
-		public Filter.for_key_column (uint column, string key);
-		[CCode (has_construct_function = false)]
-		public Filter.regex (uint column, GLib.Regex regex);
-	}
+  
+  public struct Filter {
+    [CCode (cname = "destroy")]
+    public GLib.DestroyNotify destroy_notify;
+  }
+  
 	[CCode (ref_function = "", unref_function = "")]
 	[Compact]
 	public class ModelIter {

=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2011-12-05 09:53:29 +0000
+++ vapi/dee-1.0.vapi	2011-12-15 11:35:14 +0000
@@ -21,28 +21,10 @@
 		public unowned string get_primary_path ();
 		public string primary_path { get; construct; }
 	}
-	[CCode (cheader_filename = "dee.h", free_function = "g_free")]
-	[Compact]
-	public class Filter {
-		public weak GLib.DestroyNotify destroy;
-		public weak Dee.ModelMapFunc map_func;
-		public weak Dee.ModelMapNotify map_notify;
-		public void* user_data;
-		[CCode (has_construct_function = false)]
-		public Filter.collator (uint column);
-		[CCode (has_construct_function = false)]
-		public Filter.collator_desc (uint column);
-		[CCode (has_construct_function = false)]
-		public Filter.for_any_column (uint column, GLib.Variant value);
-		[CCode (has_construct_function = false)]
-		public Filter.for_key_column (uint column, string key);
-		[CCode (has_construct_function = false)]
-		public Filter.regex (uint column, GLib.Regex regex);
-	}
 	[CCode (cheader_filename = "dee.h", type_id = "dee_filter_model_get_type ()")]
 	public class FilterModel : Dee.ProxyModel, Dee.Model, Dee.Serializable {
 		[CCode (has_construct_function = false, type = "DeeModel*")]
-		public FilterModel (Dee.Filter filter, Dee.Model orig_model);
+		public FilterModel (Dee.Model orig_model, Dee.Filter filter);
 		public unowned Dee.ModelIter append_iter (Dee.ModelIter iter);
 		public bool contains (Dee.ModelIter iter);
 		public unowned Dee.ModelIter insert_iter (Dee.ModelIter iter, uint pos);
@@ -50,7 +32,7 @@
 		public unowned Dee.ModelIter insert_iter_with_original_order (Dee.ModelIter iter);
 		public unowned Dee.ModelIter prepend_iter (Dee.ModelIter iter);
 		[NoAccessorMethod]
-		public Dee.Filter filter { owned get; construct; }
+		public Dee.Filter filter { get; construct; }
 	}
 	[CCode (cheader_filename = "dee.h", type_id = "dee_hash_index_get_type ()")]
 	public class HashIndex : Dee.Index {
@@ -234,6 +216,23 @@
 		public abstract GLib.Variant serialize ();
 	}
 	[CCode (cheader_filename = "dee.h")]
+	public struct Filter {
+		[CCode (cname = "destroy")]
+		public GLib.DestroyNotify destroy_notify;
+		public weak Dee.FilterMapFunc map_func;
+		public weak Dee.FilterMapNotify map_notify;
+		public void* userdata;
+		public void destroy ();
+		public void map (Dee.Model orig_model, Dee.FilterModel filter_model);
+		public static Dee.Filter @new (Dee.FilterMapFunc map_func, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Dee.FilterMapNotify map_notify);
+		public static Dee.Filter new_collator (uint column);
+		public static Dee.Filter new_collator_desc (uint column);
+		public static Dee.Filter new_for_any_column (uint column, GLib.Variant value);
+		public static Dee.Filter new_for_key_column (uint column, string key);
+		public static Dee.Filter new_regex (uint column, GLib.Regex regex);
+		public bool notify (Dee.ModelIter orig_iter, Dee.Model orig_model, Dee.FilterModel filter_model);
+	}
+	[CCode (cheader_filename = "dee.h")]
 	public struct ModelReader {
 		public weak Dee.ModelReaderFunc reader_func;
 		public void* userdata;
@@ -258,12 +257,12 @@
 	[CCode (cheader_filename = "dee.h", instance_pos = 1.9)]
 	public delegate string CollatorFunc (string input);
 	[CCode (cheader_filename = "dee.h", instance_pos = 2.9)]
+	public delegate void FilterMapFunc (Dee.Model orig_model, Dee.FilterModel filter_model);
+	[CCode (cheader_filename = "dee.h", instance_pos = 3.9)]
+	public delegate bool FilterMapNotify (Dee.Model orig_model, Dee.ModelIter orig_iter, Dee.FilterModel filter_model);
+	[CCode (cheader_filename = "dee.h", instance_pos = 2.9)]
 	public delegate bool IndexIterFunc (string key, Dee.ResultSet rows);
 	[CCode (cheader_filename = "dee.h", instance_pos = 2.9)]
-	public delegate void ModelMapFunc (Dee.Model orig_model, Dee.FilterModel filter_model);
-	[CCode (cheader_filename = "dee.h", instance_pos = 3.9)]
-	public delegate void ModelMapNotify (Dee.Model orig_model, Dee.ModelIter orig_iter, Dee.FilterModel filter_model);
-	[CCode (cheader_filename = "dee.h", instance_pos = 2.9)]
 	public delegate string ModelReaderFunc (Dee.Model model, Dee.ModelIter iter);
 	[CCode (cheader_filename = "dee.h", has_target = false)]
 	public delegate GLib.Object SerializableParseFunc (GLib.Variant data);