Merge lp:~mhr3/dee/gir-compare-row-func into lp:dee

[Michal Hruby]

Fix DeeCompareRowFunc gir annotation.

Fix DeeCompareRowFunc gir annotation.

[Mikkel Kamstrup Erlandsen (kamstrup)]

My gut says that this wont fix the case for pygi, but let's get this in.

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Ah, right. I think https://bugzilla.gnome.org/show_bug.cgi?id=667244 explains the pygi situation.

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/dee-model.h'
--- src/dee-model.h	2012-02-21 08:54:47 +0000
+++ src/dee-model.h	2012-03-19 11:24:18 +0000
@@ -64,8 +64,8 @@
 
 /**
  * DeeCompareRowFunc:
- * @row1: The model being indexed
- * @row2: The row to extract terms for
+ * @row1: (array): The model being indexed
+ * @row2: (array): The row to extract terms for
  * @user_data: (closure): User data to pass to comparison function
  *
  * Compares @row1 and @row2. Mainly used with dee_model_insert_sorted() and
 
=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2012-02-28 10:56:27 +0000
+++ vapi/dee-1.0.vapi	2012-03-19 11:24:18 +0000
@@ -341,7 +341,7 @@
 	[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 int CompareRowFunc (GLib.Variant row1, GLib.Variant row2);
+	public delegate int CompareRowFunc ([CCode (array_length = false)] GLib.Variant[] row1, [CCode (array_length = false)] GLib.Variant[] row2);
 	[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)]