Merge lp:~mhr3/dee/gir-fixes into lp:dee

[Michal Hruby]

[Mikkel Kamstrup Erlandsen (kamstrup)]

I like the general idea of generating the vapi from the gir, but have
you tested if existing modules like lenses and gwibber still work aft
er this transition? I don't think it would be a good idea to introduce
regressions here...

(and in any case I don't think this is material for the 0.5 series -
so 0.6 material)

[Michal Hruby (mhr3)]

The transition to generating vapi from gir can surely go into 0.6, I don't really see any problem with that, as it's basically just leak fixes. (although quick grep for 'unowned' in the various lenses didn't reveal anything that would be affected by this change)

What I would like to see is the annotation fixes, right now many methods are marked as static, which means that using dee from python would be quite broken atm.

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

=== modified file 'dee/Makefile.am'
--- dee/Makefile.am	2011-09-16 09:45:58 +0000
+++ dee/Makefile.am	2011-10-21 10:55:26 +0000
@@ -146,6 +146,8 @@
 	--add-include-path=$(srcdir) \
 	--add-include-path=$(top_builddir) \
 	--add-include-path=$(top_builddir)/dee \
+	--c-include="dee.h" \
+	--pkg-export=dee-1.0 \
 	--warn-all \
 	-I$(srcdir) \
 	-I$(top_srcdir) \

=== modified file 'dee/dee-file-resource-manager.c'
--- dee/dee-file-resource-manager.c	2011-03-11 11:19:42 +0000
+++ dee/dee-file-resource-manager.c	2011-10-21 10:55:26 +0000
@@ -188,7 +188,7 @@
  * You normally don't need to create you own resource managers. Instead
  * you should call dee_resource_manager_get_default().
  *
- * Return value: (transfer full): A newly allocated #DeeFileResourceManager.
+ * Return value: (transfer full) (type DeeFileResourceManager): A newly allocated #DeeFileResourceManager.
  *               Free with g_object_unref().
  */
 DeeResourceManager*
@@ -205,7 +205,8 @@
 
 /**
  * dee_file_resource_manager_add_search_path:
- * @self: The resource manager to add a search path to
+ * @self: (type DeeFileResourceManager): The resource manager to add a search
+ * path to
  * @path: The path to add to the set of searched paths
  *
  * Add a path to the set of paths searched for resources. The manager will
@@ -228,7 +229,7 @@
 
 /**
  * dee_file_resource_manager_get_primary_path:
- * @self: The resource manager to inspect
+ * @self: (type DeeFileResourceManager): The resource manager to inspect
  *
  * Helper method to access the :primary-path property.
  *

=== modified file 'dee/dee-filter-model.c'
--- dee/dee-filter-model.c	2011-07-14 08:50:02 +0000
+++ dee/dee-filter-model.c	2011-10-21 10:55:26 +0000
@@ -280,6 +280,7 @@
   /**
    * DeeFilterModel:filter:
    *
+   * Type: DeeFilter
    * Property holding the #DeeFilter used to filter the model
    * defined in the #DeeFilterModel:back-end property.
    */
@@ -340,7 +341,7 @@
  * @orig_model: The back end model. This will be set as the
  *              #DeeProxyModel:back-end property
  *
- * Returns: (transfer full): A newly allocated #DeeFilterModel. Free with g_object_unref().
+ * Returns: (transfer full) (type DeeFilterModel): A newly allocated #DeeFilterModel. Free with g_object_unref().
  */
 DeeModel*
 dee_filter_model_new (const DeeFilter *filter,
@@ -539,8 +540,9 @@
 
 /**
  * dee_filter_model_insert_iter_with_original_order:
- * @self:
- * @iter:
+ * 
+ * @self: A #DeeFilterModel instance
+ * @iter: Iterator
  *
  * Inserts @iter in @self in a way that is consistent with the ordering of the
  * rows in the original #DeeModel behind @self. THis method assumes that @self
@@ -551,7 +553,7 @@
  * of #DeeFilter implementations that creates filter models sorted in
  * accordance with the original models.
  *
- * Return value:(transfer none): Always returns @iter
+ * Return value: (transfer none): Always returns @iter
  */
 DeeModelIter*
 dee_filter_model_insert_iter_with_original_order (DeeFilterModel *self,

=== modified file 'dee/dee-index.c'
--- dee/dee-index.c	2011-03-15 09:12:48 +0000
+++ dee/dee-index.c	2011-10-21 10:55:26 +0000
@@ -160,6 +160,7 @@
   /**
    * DeeIndex:analyzer:
    *
+   * Type: DeeAnalyzer
    * The #DeeAnalyzer used to extract terms from rows in the model
    */
   pspec = g_param_spec_pointer("analyzer", "Analyzer",

=== modified file 'dee/dee-index.h'
--- dee/dee-index.h	2011-03-15 09:09:08 +0000
+++ dee/dee-index.h	2011-10-21 10:55:26 +0000
@@ -58,7 +58,7 @@
  * DeeIndexIterFunc:
  * @key: A key in the index being traversed
  * @rows: A #DeeResultSet. Do not free or modify.
- * @userdata: The pointer passed to dee_index_foreach()
+ * @userdata: (closure): The pointer passed to dee_index_foreach()
  *
  * The signature of the function passed to dee_index_foreach().
  *
@@ -80,7 +80,7 @@
  * @model: The model being indexed
  * @iter: The row to extract terms for
  * @out_terms: A #DeeTermList to store the extracted terms in
- * @userdata: The @userdata member of the #DeeAnalyzer instance
+ * @userdata: (closure): The @userdata member of the #DeeAnalyzer instance
  *
  * The signature of the function used to build a #DeeTermList for a given
  * row in a #DeeModel.

=== modified file 'dee/dee-model.c'
--- dee/dee-model.c	2011-03-11 11:03:19 +0000
+++ dee/dee-model.c	2011-10-21 10:55:26 +0000
@@ -284,8 +284,8 @@
  * Get a %NULL-terminated array of #GVariant type strings that defines the
  * required formats for the columns of @self.
  *
- * Returns: (array) (element-type utf8) (transfer none): A %NULL-terminated
- *          array of #GVariant type strings. The length of
+ * Returns: (array length=num_columns) (element-type utf8) (transfer none):
+ *          A %NULL-terminated array of #GVariant type strings. The length of
  *          the returned array is written to @num_columns. The returned array
  *          should not be freed or modified. It is owned by the model.
  */
@@ -1174,16 +1174,16 @@
  * dee_model_get_row:
  * @self: A #DeeModel to get a row from
  * @iter: A #DeeModelIter pointing to the row to get
- * @out_row_members: (array) (out): An array 
- *                   of variants with a length bigger than or equal to
+ * @out_row_members: (array) (out) (allow-none) (default NULL):
+ *                   An array of variants with a length bigger than or equal to
  *                   the number of columns in @self, or %NULL. If you pass
  *                   %NULL here a new array will be allocated for you. The
  *                   returned variants will have a non-floating reference
  *
- * Returns: @out_row_members if it was not %NULL or a newly allocated array
- *          otherwise which you must free with g_free(). The variants in the
- *          array will have a strong reference and needs to be freed with
- *          g_variant_unref().
+ * Returns: (array zero-terminated=1): @out_row_members if it was not %NULL
+ *          or a newly allocated array otherwise which you must free
+ *          with g_free(). The variants in the array will have a strong
+ *          reference and needs to be freed with g_variant_unref().
  **/
 GVariant**
 dee_model_get_row (DeeModel      *self,

=== modified file 'dee/dee-sequence-model.c'
--- dee/dee-sequence-model.c	2011-09-16 11:36:01 +0000
+++ dee/dee-sequence-model.c	2011-10-21 10:55:26 +0000
@@ -856,8 +856,8 @@
  * Create a new #DeeSequenceModel. Before using it you must normally set a
  * schema on it by calling dee_model_set_schema().
  *
- * Return value: (transfer full): A newly created #DeeSequenceModel. Free with
- *               g_object_unref().
+ * Return value: (transfer full) (type DeeSequenceModel): A newly created 
+ *               #DeeSequenceModel. Free with g_object_unref().
  *
  */
 DeeModel*

=== modified file 'dee/dee-serializable-model.c'
--- dee/dee-serializable-model.c	2011-09-23 14:14:45 +0000
+++ dee/dee-serializable-model.c	2011-10-21 10:55:26 +0000
@@ -269,7 +269,15 @@
   
   return DEE_SERIALIZABLE_MODEL (self)->priv->seqnum;
 }
-                                                          
+
+
+/**
+ * dee_serializable_model_get_seqnum:
+ *
+ * @self: (type DeeSerializableModel): A #DeeSerializableModel instance
+ *
+ * Return value: Sequence number of this #DeeSerializableModel.
+ */
 guint64
 dee_serializable_model_get_seqnum (DeeModel *self)
 {
@@ -286,7 +294,15 @@
     
   DEE_SERIALIZABLE_MODEL (self)->priv->seqnum = seqnum;
 }
-                                                          
+
+/**
+ * dee_serializable_model_set_seqnum:
+ *
+ * @self: (type DeeSerializableModel): A #DeeSerializableModel instance
+ * @seqnum: Sequence number
+ *
+ * Sets sequence number of this #DeeSerializableModel.
+ */
 void
 dee_serializable_model_set_seqnum (DeeModel *self,
                                      guint64   seqnum)
@@ -304,6 +320,13 @@
   return ++DEE_SERIALIZABLE_MODEL (self)->priv->seqnum;
 }
 
+/**
+ * dee_serializable_model_inc_seqnum:
+ *
+ * @self: (type DeeSerializableModel): A #DeeSerializableModel instance
+ *
+ * Increments sequence number of this #DeeSerializableModel.
+ */
 guint64
 dee_serializable_model_inc_seqnum (DeeModel *self)
 {

=== modified file 'dee/dee-serializable.h'
--- dee/dee-serializable.h	2011-03-01 13:57:30 +0000
+++ dee/dee-serializable.h	2011-10-21 10:55:26 +0000
@@ -50,11 +50,11 @@
  *        dee_serializable_register_parser() when the parser was registered.
  *        The variant is not referenced.
  *
- * Return value: A newly constructed #GObject of the #GType used when
- *               registering the parser. Note that since the environment
- *               guarantees that the input data is valid according to the
- *               registration information this function can not fail.
- *               Thus %NULL is not a valid return value.
+ * Return value: (transfer full): A newly constructed #GObject of the #GType
+ *               used when registering the parser. Note that since
+ *               the environment guarantees that the input data is valid
+ *               according to the registration information this function
+ *               can not fail. Thus %NULL is not a valid return value.
  */
 typedef GObject* (*DeeSerializableParseFunc) (GVariant *data);
 

=== modified file 'dee/dee-shared-model.c'
--- dee/dee-shared-model.c	2011-07-14 08:50:02 +0000
+++ dee/dee-shared-model.c	2011-10-21 10:55:26 +0000
@@ -1262,7 +1262,7 @@
  * A shared model created with this constructor will store row data in a
  * suitably picked memory backed model.
  *
- * Return value: (transfer full): a new #DeeSharedModel
+ * Return value: (transfer full) (type DeeSharedModel): a new #DeeSharedModel
  */
 DeeModel*
 dee_shared_model_new (const gchar *name)
@@ -1290,7 +1290,7 @@
  * In order to start synchronizing the new model with peer models you must call
  * dee_shared_model_connect() on it.
  *
- * Return value: (transfer full): a new #DeeSharedModel
+ * Return value: (transfer full) (type DeeSharedModel): a new #DeeSharedModel
  */
 DeeModel*
 dee_shared_model_new_with_back_end (const gchar *name, DeeModel *back_end)

=== added file 'vapi/Dee-0.5-custom.vala'
--- vapi/Dee-0.5-custom.vala	1970-01-01 00:00:00 +0000
+++ vapi/Dee-0.5-custom.vala	2011-10-21 10:55:26 +0000
@@ -0,0 +1,34 @@
+namespace Dee {
+	[CCode (free_function = "g_free")]
+  [Compact]
+	public class Analyzer {
+		[CCode (has_construct_function = false)]
+		public Analyzer.for_full_text_column (uint column);
+		[CCode (has_construct_function = false)]
+		public Analyzer.for_int32_column (uint column);
+		[CCode (has_construct_function = false)]
+		public Analyzer.for_key_column (uint column);
+		[CCode (has_construct_function = false)]
+		public Analyzer.for_uint32_column (uint column);
+	}
+	[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 interface ResultSet {
+		[CCode (cname = "_vala_dee_result_set_iterator")]
+		public Dee.ResultSet iterator ();
+		[CCode (cname = "_vala_dee_result_set_next_value")]
+		public unowned Dee.ModelIter? next_value ();
+	}
+}

=== added file 'vapi/Dee-0.5.metadata'
--- vapi/Dee-0.5.metadata	1970-01-01 00:00:00 +0000
+++ vapi/Dee-0.5.metadata	2011-10-21 10:55:26 +0000
@@ -0,0 +1,35 @@
+GListResultSet skip
+GListResultSetClass skip
+
+FilterModel
+	.filter unowned
+Model
+	.append skip=false
+	.get skip=false
+	.get_row.out_row_members default=null
+	.insert skip=false
+	.insert_before skip=false
+	.prepend skip=false
+	.set skip=false
+	.set_schema skip=false
+
+SerializableParseFunc skip=false
+Serializable
+	.register_parser skip=false
+
+SerializableModel
+	.get_seqnum virtual
+	.set_seqnum virtual
+	.inc_seqnum virtual
+
+SharedModelError errordomain
+	.shared_model_error_leader_invalidated name="LEADER_INVALIDATED"
+
+Analyzer struct=false
+Filter struct=false
+	.new_regex skip=false
+
+// why does gir add these twice?
+resource_manager_get_default skip
+serializable_parse skip
+serializable_parse_external skip

=== modified file 'vapi/Makefile.am'
--- vapi/Makefile.am	2011-09-23 14:32:53 +0000
+++ vapi/Makefile.am	2011-10-21 10:55:26 +0000
@@ -8,13 +8,8 @@
         $(NULL)
 
 dist_noinst_DATA = \
-        dee-1.0.defines \
-        dee-1.0.excludes \
-        dee-1.0.files \
-        dee-1.0.gi \
-        dee-1.0.metadata \
-        dee-1.0.namespace \
-        dee-1.0-custom.vala \
+        Dee-0.5.metadata \
+        Dee-0.5-custom.vala \
         $(NULL)
 
 EXTRA_DIST = \

=== removed file 'vapi/dee-1.0-custom.vala'
--- vapi/dee-1.0-custom.vala	2011-06-29 13:20:03 +0000
+++ vapi/dee-1.0-custom.vala	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-
-namespace Dee
-{
-  [CCode (cheader_filename = "dee.h")]
-  public interface Model : GLib.Object
-    {
-      public virtual signal void row_added (ModelIter iter);
-      public virtual signal void row_removed (ModelIter iter);
-      public virtual signal void row_changed (ModelIter iter);
-    }
-  
-  [CCode (cheader_filename = "dee.h")]
-  public class FilterModel
-    {
-      [NoAccessorMethod]
-      public unowned Filter filter { get; construct; }
-    }
-  [Compact]
-  [CCode (free_function = "g_free", cheader_filename = "dee.h")]
-  public class Filter {
-  }
-
-  
-  [CCode (cheader_filename = "dee.h")]
-  public interface ResultSet: GLib.Object
-    {
-      [CCode (cname = "_vala_dee_result_set_next_value")]
-      public unowned Dee.ModelIter? next_value ();
-      [CCode (cname = "_vala_dee_result_set_iterator")]
-      public ResultSet iterator ();
-    }
-  
-  [CCode (cheader_filename = "dee.h")]
-  public class HashIndex : Dee.Index
-    {
-      [CCode (type = "DeeHashIndex*", has_construct_function = false)]
-      public HashIndex (Dee.Model model, Dee.Analyzer analyzer);
-    }
-  
-}

=== removed file 'vapi/dee-1.0.defines'
--- vapi/dee-1.0.defines	2010-05-27 12:10:03 +0000
+++ vapi/dee-1.0.defines	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--D_DEE_H_INSIDE

=== removed file 'vapi/dee-1.0.excludes'
--- vapi/dee-1.0.excludes	2010-05-27 12:10:03 +0000
+++ vapi/dee-1.0.excludes	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-include/dee-1.0/dee.h

=== removed file 'vapi/dee-1.0.files'
--- vapi/dee-1.0.files	2010-05-27 12:10:03 +0000
+++ vapi/dee-1.0.files	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-include/dee-1.0
-lib/libdee-1.0.so

=== removed file 'vapi/dee-1.0.gi'
--- vapi/dee-1.0.gi	2011-06-09 20:18:22 +0000
+++ vapi/dee-1.0.gi	1970-01-01 00:00:00 +0000
@@ -1,1358 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Dee">
-		<callback name="DeeAnalyzerFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="model" type="DeeModel*"/>
-				<parameter name="iter" type="DeeModelIter*"/>
-				<parameter name="out_terms" type="DeeTermList*"/>
-				<parameter name="userdata" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="DeeIndexIterFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="key" type="gchar*"/>
-				<parameter name="rows" type="DeeResultSet*"/>
-				<parameter name="userdata" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="DeeModelMapFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="orig_model" type="DeeModel*"/>
-				<parameter name="filter_model" type="DeeFilterModel*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="DeeModelMapNotify">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="orig_model" type="DeeModel*"/>
-				<parameter name="orig_iter" type="DeeModelIter*"/>
-				<parameter name="filter_model" type="DeeFilterModel*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="DeeSerializableParseFunc">
-			<return-type type="GObject*"/>
-			<parameters>
-				<parameter name="data" type="GVariant*"/>
-			</parameters>
-		</callback>
-		<struct name="DeeAnalyzer">
-			<method name="new_for_full_text_column" symbol="dee_analyzer_new_for_full_text_column">
-				<return-type type="DeeAnalyzer*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="new_for_int32_column" symbol="dee_analyzer_new_for_int32_column">
-				<return-type type="DeeAnalyzer*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="new_for_key_column" symbol="dee_analyzer_new_for_key_column">
-				<return-type type="DeeAnalyzer*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="new_for_uint32_column" symbol="dee_analyzer_new_for_uint32_column">
-				<return-type type="DeeAnalyzer*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<field name="analyze" type="DeeAnalyzerFunc"/>
-			<field name="userdata" type="gpointer"/>
-			<field name="destroy" type="GDestroyNotify"/>
-			<field name="reserved1" type="gpointer"/>
-			<field name="reserved2" type="gpointer"/>
-			<field name="reserved3" type="gpointer"/>
-			<field name="reserved4" type="gpointer"/>
-			<field name="reserved5" type="gpointer"/>
-		</struct>
-		<struct name="DeeFilter">
-			<method name="new_collator" symbol="dee_filter_new_collator">
-				<return-type type="DeeFilter*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="new_collator_desc" symbol="dee_filter_new_collator_desc">
-				<return-type type="DeeFilter*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="new_for_any_column" symbol="dee_filter_new_for_any_column">
-				<return-type type="DeeFilter*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-					<parameter name="value" type="GVariant*"/>
-				</parameters>
-			</method>
-			<method name="new_for_key_column" symbol="dee_filter_new_for_key_column">
-				<return-type type="DeeFilter*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-					<parameter name="key" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new_regex" symbol="dee_filter_new_regex">
-				<return-type type="DeeFilter*"/>
-				<parameters>
-					<parameter name="column" type="guint"/>
-					<parameter name="regex" type="GRegex*"/>
-				</parameters>
-			</method>
-			<field name="map_func" type="DeeModelMapFunc"/>
-			<field name="map_notify" type="DeeModelMapNotify"/>
-			<field name="destroy" type="GDestroyNotify"/>
-			<field name="user_data" type="gpointer"/>
-		</struct>
-		<struct name="DeeModelIter">
-		</struct>
-		<struct name="DeeModelTag">
-		</struct>
-		<enum name="DeeSharedModelError">
-			<member name="DEE_SHARED_MODEL_ERROR_LEADER_INVALIDATED" value="0"/>
-		</enum>
-		<enum name="DeeTermMatchFlag">
-			<member name="DEE_TERM_MATCH_EXACT" value="0"/>
-			<member name="DEE_TERM_MATCH_PREFIX" value="2"/>
-		</enum>
-		<object name="DeeFileResourceManager" parent="GObject" type-name="DeeFileResourceManager" get-type="dee_file_resource_manager_get_type">
-			<implements>
-				<interface name="DeeResourceManager"/>
-			</implements>
-			<method name="add_search_path" symbol="dee_file_resource_manager_add_search_path">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-					<parameter name="path" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_primary_path" symbol="dee_file_resource_manager_get_primary_path">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="dee_file_resource_manager_new">
-				<return-type type="DeeResourceManager*"/>
-				<parameters>
-					<parameter name="primary_path" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<property name="primary-path" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="DeeFilterModel" parent="DeeProxyModel" type-name="DeeFilterModel" get-type="dee_filter_model_get_type">
-			<implements>
-				<interface name="DeeModel"/>
-				<interface name="DeeSerializable"/>
-			</implements>
-			<method name="append_iter" symbol="dee_filter_model_append_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="contains" symbol="dee_filter_model_contains">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="insert_iter" symbol="dee_filter_model_insert_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="pos" type="guint"/>
-				</parameters>
-			</method>
-			<method name="insert_iter_before" symbol="dee_filter_model_insert_iter_before">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="pos" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="insert_iter_with_original_order" symbol="dee_filter_model_insert_iter_with_original_order">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="dee_filter_model_new">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="filter" type="DeeFilter*"/>
-					<parameter name="orig_model" type="DeeModel*"/>
-				</parameters>
-			</constructor>
-			<method name="prepend_iter" symbol="dee_filter_model_prepend_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeFilterModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<property name="filter" type="gpointer" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="DeeIndex" parent="GObject" type-name="DeeIndex" get-type="dee_index_get_type">
-			<method name="foreach" symbol="dee_index_foreach">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="start_term" type="gchar*"/>
-					<parameter name="func" type="DeeIndexIterFunc"/>
-					<parameter name="userdata" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="get_analyzer" symbol="dee_index_get_analyzer">
-				<return-type type="DeeAnalyzer*"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</method>
-			<method name="get_model" symbol="dee_index_get_model">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</method>
-			<method name="get_n_rows" symbol="dee_index_get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</method>
-			<method name="get_n_rows_for_term" symbol="dee_index_get_n_rows_for_term">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="term" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_n_terms" symbol="dee_index_get_n_terms">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</method>
-			<method name="get_supported_term_match_flags" symbol="dee_index_get_supported_term_match_flags">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</method>
-			<method name="lookup" symbol="dee_index_lookup">
-				<return-type type="DeeResultSet*"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="term" type="gchar*"/>
-					<parameter name="flags" type="DeeTermMatchFlag"/>
-				</parameters>
-			</method>
-			<method name="lookup_one" symbol="dee_index_lookup_one">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="term" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="analyzer" type="gpointer" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="model" type="DeeModel*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<vfunc name="foreach">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="start_term" type="gchar*"/>
-					<parameter name="func" type="DeeIndexIterFunc"/>
-					<parameter name="userdata" type="gpointer"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_rows_for_term">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="term" type="gchar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_terms">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_supported_term_match_flags">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="lookup">
-				<return-type type="DeeResultSet*"/>
-				<parameters>
-					<parameter name="self" type="DeeIndex*"/>
-					<parameter name="term" type="gchar*"/>
-					<parameter name="flags" type="DeeTermMatchFlag"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="DeePeer" parent="GObject" type-name="DeePeer" get-type="dee_peer_get_type">
-			<method name="get_swarm_leader" symbol="dee_peer_get_swarm_leader">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeePeer*"/>
-				</parameters>
-			</method>
-			<method name="get_swarm_name" symbol="dee_peer_get_swarm_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeePeer*"/>
-				</parameters>
-			</method>
-			<method name="is_swarm_leader" symbol="dee_peer_is_swarm_leader">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeePeer*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="dee_peer_new">
-				<return-type type="DeePeer*"/>
-				<parameters>
-					<parameter name="swarm_name" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<property name="swarm-leader" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="swarm-name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<signal name="peer-found" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="peer" type="DeePeer*"/>
-					<parameter name="name" type="char*"/>
-				</parameters>
-			</signal>
-			<signal name="peer-lost" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="peer" type="DeePeer*"/>
-					<parameter name="name" type="char*"/>
-				</parameters>
-			</signal>
-			<vfunc name="connected">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="peer" type="DeePeer*"/>
-					<parameter name="peer_name" type="gchar*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="DeeProxyModel" parent="DeeSerializableModel" type-name="DeeProxyModel" get-type="dee_proxy_model_get_type">
-			<implements>
-				<interface name="DeeModel"/>
-				<interface name="DeeSerializable"/>
-			</implements>
-			<property name="back-end" type="DeeModel*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="proxy-signals" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="DeeSequenceModel" parent="DeeSerializableModel" type-name="DeeSequenceModel" get-type="dee_sequence_model_get_type">
-			<implements>
-				<interface name="DeeModel"/>
-				<interface name="DeeSerializable"/>
-			</implements>
-			<constructor name="new" symbol="dee_sequence_model_new">
-				<return-type type="DeeModel*"/>
-			</constructor>
-		</object>
-		<object name="DeeSerializableModel" parent="GObject" type-name="DeeSerializableModel" get-type="dee_serializable_model_get_type">
-			<implements>
-				<interface name="DeeModel"/>
-				<interface name="DeeSerializable"/>
-			</implements>
-			<method name="get_seqnum" symbol="dee_serializable_model_get_seqnum">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="inc_seqnum" symbol="dee_serializable_model_inc_seqnum">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="set_seqnum" symbol="dee_serializable_model_set_seqnum">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="seqnum" type="guint64"/>
-				</parameters>
-			</method>
-			<vfunc name="get_seqnum">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="inc_seqnum">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_seqnum">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="seqnum" type="guint64"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="DeeSharedModel" parent="DeeProxyModel" type-name="DeeSharedModel" get-type="dee_shared_model_get_type">
-			<implements>
-				<interface name="DeeModel"/>
-				<interface name="DeeSerializable"/>
-			</implements>
-			<method name="flush_revision_queue" symbol="dee_shared_model_flush_revision_queue">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeSharedModel*"/>
-				</parameters>
-			</method>
-			<method name="get_peer" symbol="dee_shared_model_get_peer">
-				<return-type type="DeePeer*"/>
-				<parameters>
-					<parameter name="self" type="DeeSharedModel*"/>
-				</parameters>
-			</method>
-			<method name="get_swarm_name" symbol="dee_shared_model_get_swarm_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeSharedModel*"/>
-				</parameters>
-			</method>
-			<method name="is_leader" symbol="dee_shared_model_is_leader">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeSharedModel*"/>
-				</parameters>
-			</method>
-			<method name="is_synchronized" symbol="dee_shared_model_is_synchronized">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeSharedModel*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="dee_shared_model_new">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_back_end" symbol="dee_shared_model_new_with_back_end">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="back_end" type="DeeModel*"/>
-				</parameters>
-			</constructor>
-			<property name="peer" type="DeePeer*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="synchronized" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-		</object>
-		<object name="DeeTermList" parent="GObject" type-name="DeeTermList" get-type="dee_term_list_get_type">
-			<method name="add_term" symbol="dee_term_list_add_term">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-					<parameter name="term" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="clear" symbol="dee_term_list_clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-				</parameters>
-			</method>
-			<method name="get_term" symbol="dee_term_list_get_term">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-					<parameter name="n" type="guint"/>
-				</parameters>
-			</method>
-			<method name="num_terms" symbol="dee_term_list_num_terms">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-				</parameters>
-			</method>
-			<vfunc name="add_term">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-					<parameter name="term" type="gchar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_term">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-					<parameter name="n" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="num_terms">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeTermList*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<interface name="DeeModel" type-name="DeeModel" get-type="dee_model_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="append" symbol="dee_model_append">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="append_row" symbol="dee_model_append_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="append_valist" symbol="dee_model_append_valist">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="build_row" symbol="dee_model_build_row">
-				<return-type type="GVariant**"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="out_row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="build_row_valist" symbol="dee_model_build_row_valist">
-				<return-type type="GVariant**"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="out_row_members" type="GVariant**"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="clear" symbol="dee_model_clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="clear_tag" symbol="dee_model_clear_tag">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="tag" type="DeeModelTag*"/>
-				</parameters>
-			</method>
-			<method name="get" symbol="dee_model_get">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="get_bool" symbol="dee_model_get_bool">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_column_schema" symbol="dee_model_get_column_schema">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_double" symbol="dee_model_get_double">
-				<return-type type="gdouble"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_first_iter" symbol="dee_model_get_first_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="get_int32" symbol="dee_model_get_int32">
-				<return-type type="gint32"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_int64" symbol="dee_model_get_int64">
-				<return-type type="gint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_iter_at_row" symbol="dee_model_get_iter_at_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_last_iter" symbol="dee_model_get_last_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="get_n_columns" symbol="dee_model_get_n_columns">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="get_n_rows" symbol="dee_model_get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="get_position" symbol="dee_model_get_position">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="get_row" symbol="dee_model_get_row">
-				<return-type type="GVariant**"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="out_row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="get_schema" symbol="dee_model_get_schema">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="num_columns" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="get_string" symbol="dee_model_get_string">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_tag" symbol="dee_model_get_tag">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="tag" type="DeeModelTag*"/>
-				</parameters>
-			</method>
-			<method name="get_uchar" symbol="dee_model_get_uchar">
-				<return-type type="guchar"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_uint32" symbol="dee_model_get_uint32">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_uint64" symbol="dee_model_get_uint64">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="get_valist" symbol="dee_model_get_valist">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="get_value" symbol="dee_model_get_value">
-				<return-type type="GVariant*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</method>
-			<method name="insert" symbol="dee_model_insert">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="pos" type="guint"/>
-				</parameters>
-			</method>
-			<method name="insert_before" symbol="dee_model_insert_before">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="insert_before_valist" symbol="dee_model_insert_before_valist">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="insert_row" symbol="dee_model_insert_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="pos" type="guint"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="insert_row_before" symbol="dee_model_insert_row_before">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="insert_valist" symbol="dee_model_insert_valist">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="pos" type="guint"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="is_first" symbol="dee_model_is_first">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="is_last" symbol="dee_model_is_last">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="next" symbol="dee_model_next">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="prepend" symbol="dee_model_prepend">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="prepend_row" symbol="dee_model_prepend_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="prepend_valist" symbol="dee_model_prepend_valist">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="prev" symbol="dee_model_prev">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="register_tag" symbol="dee_model_register_tag">
-				<return-type type="DeeModelTag*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="tag_destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="remove" symbol="dee_model_remove">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="set" symbol="dee_model_set">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</method>
-			<method name="set_row" symbol="dee_model_set_row">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</method>
-			<method name="set_schema" symbol="dee_model_set_schema">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</method>
-			<method name="set_schema_full" symbol="dee_model_set_schema_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="column_schemas" type="gchar**"/>
-					<parameter name="num_columns" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_schema_valist" symbol="dee_model_set_schema_valist">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="set_tag" symbol="dee_model_set_tag">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="tag" type="DeeModelTag*"/>
-					<parameter name="value" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="set_valist" symbol="dee_model_set_valist">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="args" type="va_list*"/>
-				</parameters>
-			</method>
-			<method name="set_value" symbol="dee_model_set_value">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-					<parameter name="value" type="GVariant*"/>
-				</parameters>
-			</method>
-			<signal name="row-added" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="gpointer"/>
-				</parameters>
-			</signal>
-			<signal name="row-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="gpointer"/>
-				</parameters>
-			</signal>
-			<signal name="row-removed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="gpointer"/>
-				</parameters>
-			</signal>
-			<vfunc name="append_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_bool">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_column_schema">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_double">
-				<return-type type="gdouble"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_first_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_int32">
-				<return-type type="gint32"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_int64">
-				<return-type type="gint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_iter_at_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_last_iter">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_columns">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_position">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_schema">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="num_columns" type="guint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_string">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_tag">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="tag" type="DeeModelTag*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_uchar">
-				<return-type type="guchar"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_uint32">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_uint64">
-				<return-type type="guint64"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_value">
-				<return-type type="GVariant*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="insert_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="pos" type="guint"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="insert_row_before">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="is_first">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="is_last">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="next">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="prepend_row">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="prev">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="register_tag">
-				<return-type type="DeeModelTag*"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="tag_destroy" type="GDestroyNotify"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="remove">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_row">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="row_members" type="GVariant**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_schema_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="column_schemas" type="char**"/>
-					<parameter name="num_columns" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_tag">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="tag" type="DeeModelTag*"/>
-					<parameter name="value" type="gpointer"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_value">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeModel*"/>
-					<parameter name="iter" type="DeeModelIter*"/>
-					<parameter name="column" type="guint"/>
-					<parameter name="value" type="GVariant*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<interface name="DeeResourceManager" type-name="DeeResourceManager" get-type="dee_resource_manager_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="get_default" symbol="dee_resource_manager_get_default">
-				<return-type type="DeeResourceManager*"/>
-			</method>
-			<method name="load" symbol="dee_resource_manager_load">
-				<return-type type="GObject*"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-					<parameter name="resource_name" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="store" symbol="dee_resource_manager_store">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-					<parameter name="resource" type="DeeSerializable*"/>
-					<parameter name="resource_name" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<vfunc name="load">
-				<return-type type="GObject*"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-					<parameter name="resource_name" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="store">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeResourceManager*"/>
-					<parameter name="resource" type="DeeSerializable*"/>
-					<parameter name="resource_name" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<interface name="DeeResultSet" type-name="DeeResultSet" get-type="dee_result_set_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="get_model" symbol="dee_result_set_get_model">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<method name="get_n_rows" symbol="dee_result_set_get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<method name="has_next" symbol="dee_result_set_has_next">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<method name="next" symbol="dee_result_set_next">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<method name="peek" symbol="dee_result_set_peek">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<method name="seek" symbol="dee_result_set_seek">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-					<parameter name="pos" type="guint"/>
-				</parameters>
-			</method>
-			<method name="tell" symbol="dee_result_set_tell">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</method>
-			<vfunc name="get_model">
-				<return-type type="DeeModel*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_rows">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="has_next">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="next">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="peek">
-				<return-type type="DeeModelIter*"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="seek">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-					<parameter name="pos" type="guint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="tell">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="self" type="DeeResultSet*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<interface name="DeeSerializable" type-name="DeeSerializable" get-type="dee_serializable_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="externalize" symbol="dee_serializable_externalize">
-				<return-type type="GVariant*"/>
-				<parameters>
-					<parameter name="self" type="DeeSerializable*"/>
-				</parameters>
-			</method>
-			<method name="parse" symbol="dee_serializable_parse">
-				<return-type type="GObject*"/>
-				<parameters>
-					<parameter name="data" type="GVariant*"/>
-					<parameter name="type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="parse_external" symbol="dee_serializable_parse_external">
-				<return-type type="GObject*"/>
-				<parameters>
-					<parameter name="data" type="GVariant*"/>
-				</parameters>
-			</method>
-			<method name="register_parser" symbol="dee_serializable_register_parser">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="type" type="GType"/>
-					<parameter name="vtype" type="GVariantType*"/>
-					<parameter name="parse_func" type="DeeSerializableParseFunc"/>
-				</parameters>
-			</method>
-			<method name="serialize" symbol="dee_serializable_serialize">
-				<return-type type="GVariant*"/>
-				<parameters>
-					<parameter name="self" type="DeeSerializable*"/>
-				</parameters>
-			</method>
-			<vfunc name="serialize">
-				<return-type type="GVariant*"/>
-				<parameters>
-					<parameter name="self" type="DeeSerializable*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<constant name="DEE_PEER_DBUS_IFACE" type="char*" value="com.canonical.Dee.Peer"/>
-		<constant name="DEE_SEQUENCE_MODEL_DBUS_IFACE" type="char*" value="com.canonical.Dee.Model"/>
-		<constant name="DEE_SHARED_MODEL_DBUS_IFACE" type="char*" value="com.canonical.Dee.Model"/>
-	</namespace>
-</api>

=== removed file 'vapi/dee-1.0.metadata'
--- vapi/dee-1.0.metadata	2011-03-08 21:09:46 +0000
+++ vapi/dee-1.0.metadata	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-Dee cheader_filename="dee.h" gir_namespace="Dee" gir_version="0.5"
-dee_model_set_schema ellipsis="1"
-dee_model_set_schema_full.column_schemas is_array="1" array_length_pos="1.5" array_length_type="guint"
-dee_model_set_schema_full.num_columns hidden="1"
-dee_model_set_schema_full array_length_cname="num_columns" array_length_type="guint"
-dee_model_append ellipsis="1"
-dee_model_append_row.row_members is_array="1" no_array_length="1"
-dee_model_prepend ellipsis="1"
-dee_model_prepend_row.row_members is_array="1" no_array_length="1"
-dee_model_insert ellipsis="1"
-dee_model_insert_row.row_members is_array="1" no_array_length="1"
-dee_model_insert_before ellipsis="1"
-dee_model_insert_row_before.row_members is_array="1" no_array_length="1"
-dee_model_set ellipsis="1"
-dee_model_set_row.row_members is_array="1" no_array_length="1"
-dee_model_get ellipsis="1"
-dee_model_get_row.out_row_members is_array="1"
-dee_model_get_row transfer_ownership="0"
-dee_model_get_value transfer_ownership="1"
-dee_index_get_model transfer_ownership="0"
-dee_index_get_analyzer transfer_ownership="0"
-dee_index_lookup transfer_ownership="1"
-DeeIndex:model transfer_ownership="0"
-DeeIndex:analyzer type_name="Dee.Analyzer" transfer_ownership="0"
-DeeIndexIterFunc.rows transfer_ownership="0"
-DeeAnalyzer free_function="g_free"
-DeeModel::row_added.iter type_arguments="Dee.ModelIter"
-DeeModel::row_removed.iter type_arguments="Dee.ModelIter"
-DeeModel::row_changed.iter type_arguments="Dee.ModelIter"
-DeeModel::row_added hidden="1"
-DeeModel::row_removed hidden="1"
-DeeModel::row_changed hidden="1"
-dee_filter_model_new.filter transfer_ownership="0"
-DeeFilterModel:filter hidden="1" transfer_ownership="0"
-*_valist hidden="1"
-DeeSerializableParseFunc transfer_ownership="1" has_target="0"
-dee_serializable_serialize transfer_ownership="1"
-

=== removed file 'vapi/dee-1.0.namespace'
--- vapi/dee-1.0.namespace	2010-05-27 12:10:03 +0000
+++ vapi/dee-1.0.namespace	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Dee

=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2011-06-29 13:20:03 +0000
+++ vapi/dee-1.0.vapi	2011-10-21 10:55:26 +0000
@@ -1,17 +1,12 @@
 /* dee-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Dee", lower_case_cprefix = "dee_", gir_namespace = "Dee", gir_version = "0.5")]
+[CCode (cprefix = "Dee", gir_namespace = "Dee", gir_version = "0.5", lower_case_cprefix = "dee_")]
 namespace Dee {
+	[CCode (cheader_filename = "dee.h", free_function = "g_free")]
 	[Compact]
-	[CCode (free_function = "g_free", cheader_filename = "dee.h")]
 	public class Analyzer {
 		public weak Dee.AnalyzerFunc analyze;
 		public weak GLib.DestroyNotify destroy;
-		public void* reserved1;
-		public void* reserved2;
-		public void* reserved3;
-		public void* reserved4;
-		public void* reserved5;
 		public void* userdata;
 		[CCode (has_construct_function = false)]
 		public Analyzer.for_full_text_column (uint column);
@@ -22,16 +17,16 @@
 		[CCode (has_construct_function = false)]
 		public Analyzer.for_uint32_column (uint column);
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_file_resource_manager_get_type ()")]
 	public class FileResourceManager : GLib.Object, Dee.ResourceManager {
-		[CCode (type = "DeeResourceManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "DeeResourceManager*")]
 		public FileResourceManager (string primary_path);
 		public void add_search_path (string path);
 		public unowned string get_primary_path ();
 		public string primary_path { get; construct; }
 	}
+	[CCode (cheader_filename = "dee.h", free_function = "g_free")]
 	[Compact]
-	[CCode (free_function = "g_free", cheader_filename = "dee.h")]
 	public class Filter {
 		public weak GLib.DestroyNotify destroy;
 		public weak Dee.ModelMapFunc map_func;
@@ -48,9 +43,9 @@
 		[CCode (has_construct_function = false)]
 		public Filter.regex (uint column, GLib.Regex regex);
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_filter_model_get_type ()")]
 	public class FilterModel : Dee.ProxyModel, Dee.Model, Dee.Serializable {
-		[CCode (type = "DeeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "DeeModel*")]
 		public FilterModel (Dee.Filter filter, Dee.Model orig_model);
 		public unowned Dee.ModelIter append_iter (Dee.ModelIter iter);
 		public bool contains (Dee.ModelIter iter);
@@ -61,16 +56,16 @@
 		[NoAccessorMethod]
 		public Dee.Filter filter { owned get; construct; }
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_hash_index_get_type ()")]
 	public class HashIndex : Dee.Index {
 		[CCode (has_construct_function = false)]
 		public HashIndex (Dee.Model model, Dee.Analyzer analyzer);
 	}
-	[CCode (cheader_filename = "dee.h")]
-	public class Index : GLib.Object {
+	[CCode (cheader_filename = "dee.h", type_id = "dee_index_get_type ()")]
+	public abstract class Index : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Index ();
-		public virtual void @foreach (string start_term, Dee.IndexIterFunc func, void* userdata);
+		public virtual void @foreach (string start_term, Dee.IndexIterFunc func);
 		public unowned Dee.Analyzer get_analyzer ();
 		public unowned Dee.Model get_model ();
 		public virtual uint get_n_rows ();
@@ -82,15 +77,15 @@
 		public Dee.Analyzer analyzer { get; construct; }
 		public Dee.Model model { get; construct; }
 	}
+	[CCode (cheader_filename = "dee.h")]
 	[Compact]
-	[CCode (cheader_filename = "dee.h")]
 	public class ModelIter {
 	}
+	[CCode (cheader_filename = "dee.h")]
 	[Compact]
-	[CCode (cheader_filename = "dee.h")]
 	public class ModelTag {
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_peer_get_type ()")]
 	public class Peer : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Peer (string swarm_name);
@@ -105,7 +100,7 @@
 		public virtual signal void peer_found (string name);
 		public virtual signal void peer_lost (string name);
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_proxy_model_get_type ()")]
 	public class ProxyModel : Dee.SerializableModel, Dee.Model, Dee.Serializable {
 		[CCode (has_construct_function = false)]
 		protected ProxyModel ();
@@ -114,35 +109,35 @@
 		[NoAccessorMethod]
 		public bool proxy_signals { get; construct; }
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_sequence_model_get_type ()")]
 	public class SequenceModel : Dee.SerializableModel, Dee.Model, Dee.Serializable {
-		[CCode (type = "DeeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "DeeModel*")]
 		public SequenceModel ();
 	}
-	[CCode (cheader_filename = "dee.h")]
-	public class SerializableModel : GLib.Object, Dee.Model, Dee.Serializable {
+	[CCode (cheader_filename = "dee.h", type_id = "dee_serializable_model_get_type ()")]
+	public abstract class SerializableModel : GLib.Object, Dee.Model, Dee.Serializable {
 		[CCode (has_construct_function = false)]
 		protected SerializableModel ();
 		public virtual uint64 get_seqnum ();
 		public virtual uint64 inc_seqnum ();
 		public virtual void set_seqnum (uint64 seqnum);
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_shared_model_get_type ()")]
 	public class SharedModel : Dee.ProxyModel, Dee.Model, Dee.Serializable {
-		[CCode (type = "DeeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "DeeModel*")]
 		public SharedModel (string name);
 		public uint flush_revision_queue ();
 		public unowned Dee.Peer get_peer ();
 		public unowned string get_swarm_name ();
 		public bool is_leader ();
 		public bool is_synchronized ();
-		[CCode (type = "DeeModel*", has_construct_function = false)]
-		public SharedModel.with_back_end (string name, Dee.Model back_end);
+		[CCode (has_construct_function = false, type = "DeeModel*")]
+		public SharedModel.with_back_end (string name, owned Dee.Model back_end);
 		public Dee.Peer peer { get; construct; }
 		[NoAccessorMethod]
 		public bool synchronized { get; }
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_term_list_get_type ()")]
 	public class TermList : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected TermList ();
@@ -151,11 +146,10 @@
 		public virtual unowned string get_term (uint n);
 		public virtual uint num_terms ();
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_model_get_type ()")]
 	public interface Model : GLib.Object {
 		public unowned Dee.ModelIter append (...);
-		public abstract unowned Dee.ModelIter append_row ([CCode (array_length = false)] GLib.Variant[] row_members);
-		public unowned GLib.Variant build_row (out unowned GLib.Variant out_row_members);
+		public abstract unowned Dee.ModelIter append_row ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
 		public abstract void clear ();
 		public void clear_tag (Dee.ModelIter iter, Dee.ModelTag tag);
 		public void @get (Dee.ModelIter iter, ...);
@@ -170,40 +164,42 @@
 		public abstract uint get_n_columns ();
 		public abstract uint get_n_rows ();
 		public abstract uint get_position (Dee.ModelIter iter);
-		public unowned GLib.Variant get_row (Dee.ModelIter iter, GLib.Variant[] out_row_members);
-		public abstract unowned string get_schema (uint num_columns);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public GLib.Variant[] get_row (Dee.ModelIter iter, [CCode (array_length = false)] out GLib.Variant[] out_row_members = null);
+		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
+		public abstract unowned string[] get_schema ();
 		public abstract unowned string get_string (Dee.ModelIter iter, uint column);
 		public abstract void* get_tag (Dee.ModelIter iter, Dee.ModelTag tag);
-		public abstract uchar get_uchar (Dee.ModelIter iter, uint column);
+		public abstract uint8 get_uchar (Dee.ModelIter iter, uint column);
 		public abstract uint32 get_uint32 (Dee.ModelIter iter, uint column);
 		public abstract uint64 get_uint64 (Dee.ModelIter iter, uint column);
 		public abstract GLib.Variant get_value (Dee.ModelIter iter, uint column);
 		public unowned Dee.ModelIter insert (uint pos, ...);
 		public unowned Dee.ModelIter insert_before (Dee.ModelIter iter, ...);
-		public abstract unowned Dee.ModelIter insert_row (uint pos, [CCode (array_length = false)] GLib.Variant[] row_members);
-		public abstract unowned Dee.ModelIter insert_row_before (Dee.ModelIter iter, [CCode (array_length = false)] GLib.Variant[] row_members);
+		public abstract unowned Dee.ModelIter insert_row (uint pos, [CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
+		public abstract unowned Dee.ModelIter insert_row_before (Dee.ModelIter iter, [CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
 		public abstract bool is_first (Dee.ModelIter iter);
 		public abstract bool is_last (Dee.ModelIter iter);
 		public abstract unowned Dee.ModelIter next (Dee.ModelIter iter);
 		public unowned Dee.ModelIter prepend (...);
-		public abstract unowned Dee.ModelIter prepend_row ([CCode (array_length = false)] GLib.Variant[] row_members);
+		public abstract unowned Dee.ModelIter prepend_row ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
 		public abstract unowned Dee.ModelIter prev (Dee.ModelIter iter);
 		public abstract unowned Dee.ModelTag register_tag (GLib.DestroyNotify tag_destroy);
 		public abstract void remove (Dee.ModelIter iter);
 		public void @set (Dee.ModelIter iter, ...);
 		public abstract void set_row (Dee.ModelIter iter, [CCode (array_length = false)] GLib.Variant[] row_members);
 		public void set_schema (...);
-		public abstract void set_schema_full ([CCode (array_length_type = "guint", array_length_pos = 1.5)] string[] column_schemas);
+		public abstract void set_schema_full ([CCode (array_length_cname = "num_columns", array_length_pos = 1.1, array_length_type = "guint", array_null_terminated = true)] string[] column_schemas);
 		public abstract void set_tag (Dee.ModelIter iter, Dee.ModelTag tag, void* value);
 		public abstract void set_value (Dee.ModelIter iter, uint column, GLib.Variant value);
 		public virtual signal void row_added (Dee.ModelIter iter);
 		public virtual signal void row_changed (Dee.ModelIter iter);
 		public virtual signal void row_removed (Dee.ModelIter iter);
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_resource_manager_get_type ()")]
 	public interface ResourceManager : GLib.Object {
 		public static unowned Dee.ResourceManager get_default ();
-		public abstract unowned GLib.Object load (string resource_name) throws GLib.Error;
+		public abstract GLib.Object load (string resource_name) throws GLib.Error;
 		public abstract bool store (Dee.Serializable resource, string resource_name) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "dee.h")]
@@ -220,37 +216,39 @@
 		public abstract void seek (uint pos);
 		public abstract uint tell ();
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", type_id = "dee_serializable_get_type ()")]
 	public interface Serializable : GLib.Object {
-		public unowned GLib.Variant externalize ();
-		public static unowned GLib.Object parse (GLib.Variant data, GLib.Type type);
-		public static unowned GLib.Object parse_external (GLib.Variant data);
+		public GLib.Variant externalize ();
+		public static GLib.Object parse (GLib.Variant data, GLib.Type type);
+		public static GLib.Object parse_external (GLib.Variant data);
 		public static void register_parser (GLib.Type type, GLib.VariantType vtype, Dee.SerializableParseFunc parse_func);
 		public abstract GLib.Variant serialize ();
 	}
-	[CCode (cprefix = "DEE_SHARED_MODEL_ERROR_LEADER_", has_type_id = false, cheader_filename = "dee.h")]
-	public enum SharedModelError {
-		INVALIDATED
-	}
-	[CCode (cprefix = "DEE_TERM_MATCH_", has_type_id = false, cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", cprefix = "DEE_TERM_MATCH_")]
+	[Flags]
 	public enum TermMatchFlag {
 		EXACT,
 		PREFIX
 	}
-	[CCode (cheader_filename = "dee.h", has_target = false)]
-	public delegate void AnalyzerFunc (Dee.Model model, Dee.ModelIter iter, Dee.TermList out_terms, void* userdata);
-	[CCode (cheader_filename = "dee.h", has_target = false)]
-	public delegate bool IndexIterFunc (string key, Dee.ResultSet rows, void* userdata);
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", cprefix = "DEE_SHARED_MODEL_ERROR_LEADER_")]
+	public errordomain SharedModelError {
+		[CCode (cname = "DEE_SHARED_MODEL_ERROR_LEADER_INVALIDATED")]
+		LEADER_INVALIDATED
+	}
+	[CCode (cheader_filename = "dee.h", instance_pos = 3.9)]
+	public delegate void AnalyzerFunc (Dee.Model model, Dee.ModelIter iter, Dee.TermList out_terms);
+	[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")]
+	[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", has_target = false)]
 	public delegate GLib.Object SerializableParseFunc (GLib.Variant data);
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", cname = "DEE_PEER_DBUS_IFACE")]
 	public const string PEER_DBUS_IFACE;
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", cname = "DEE_SEQUENCE_MODEL_DBUS_IFACE")]
 	public const string SEQUENCE_MODEL_DBUS_IFACE;
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", cname = "DEE_SHARED_MODEL_DBUS_IFACE")]
 	public const string SHARED_MODEL_DBUS_IFACE;
 }

=== modified file 'vapi/generate_vapi'
--- vapi/generate_vapi	2010-08-05 12:39:35 +0000
+++ vapi/generate_vapi	2011-10-21 10:55:26 +0000
@@ -6,5 +6,4 @@
 # so its a little messy
 
 cd $(dirname $0)
-vala-gen-introspect dee-1.0 .
-vapigen --pkg gobject-2.0 --pkg glib-2.0 --pkg dbus-glib-1 --library dee-1.0 dee-1.0.gi dee-1.0-custom.vala
+vapigen --library dee-1.0 ../dee/Dee-0.5.gir --metadatadir=./ Dee-0.5-custom.vala