Merge lp:~mhr3/libzeitgeist/various-fixes into lp:libzeitgeist

[Michal Hruby]

A few Vala binding fixes.

[Michal Hruby (mhr3)]

Please note that the new metadata attributes require vapigen 0.11+, still the .vapi it produced is good...

[lp:~mhr3/libzeitgeist/various-fixes]

174. By Mikkel Kamstrup Erlandsen on 2010-11-09

Merge Michal Hruby's branch lp:~mhr3/libzeitgeist/various-fixes:

 * Clean up the VAPI generation a bit. From now on we require vapigen >= 0.11

=== modified file 'bindings/generate_vapi'
--- bindings/generate_vapi	2010-07-21 13:18:24 +0000
+++ bindings/generate_vapi	2010-11-09 13:01:21 +0000
@@ -10,5 +10,3 @@
 vapigen --pkg gobject-2.0 --pkg glib-2.0 --pkg gio-2.0 --library zeitgeist-1.0 zeitgeist-1.0.gi zeitgeist-1.0-custom.vala
 # nasty hack to force usage of PtrArray in recent versions of vapigen
 sed -i 's/GenericArray/PtrArray/g' zeitgeist-1.0.vapi
-# workaround a bug introduced in vapigen 0.9.3
-sed -i 's/void \(insert_events_from_ptrarray\)\(.*\);/GLib.Array \1\2 throws GLib.Error;/' zeitgeist-1.0.vapi

=== modified file 'bindings/zeitgeist-1.0-custom.vala'
--- bindings/zeitgeist-1.0-custom.vala	2010-08-09 22:04:01 +0000
+++ bindings/zeitgeist-1.0-custom.vala	2010-11-09 13:01:21 +0000
@@ -32,18 +32,6 @@
   }
 }
 
-namespace Zeitgeist.Symbol
-{
-  [CCode (cheader_filename = "zeitgeist.h")]
-  public static GLib.List<weak string> get_all_children (string symbol);
-  [CCode (cheader_filename = "zeitgeist.h")]
-  public static GLib.List<weak string> get_children (string symbol);
-  [CCode (cheader_filename = "zeitgeist.h")]
-  public static GLib.List<weak string> get_parents (string symbol);
-  [CCode (cheader_filename = "zeitgeist.h")]
-  public static bool is_a (string symbol, string parent);
-}
-
 namespace Zeitgeist.Timestamp
 {
   [CCode (cname = "ZEITGEIST_TIMESTAMP_SECOND", cheader_filename = "zeitgeist.h")]
@@ -63,36 +51,6 @@
 
   [CCode (cname = "ZEITGEIST_TIMESTAMP_YEAR", cheader_filename = "zeitgeist.h")]
   public int64 YEAR;
-
-  [CCode (cname = "zeitgeist_timestamp_for_now", cheader_filename = "zeitgeist.h")]
-  public int64 now ();
-
-  [CCode (cname = "zeitgeist_timestamp_from_timeval", cheader_filename = "zeitgeist.h")]
-  public int64 from_timeval (GLib.TimeVal tv);
-
-  [CCode (cname = "zeitgeist_timestamp_to_timeval", cheader_filename = "zeitgeist.h")]
-  public int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
-
-  [CCode (cname = "zeitgeist_timestamp_from_iso8601", cheader_filename = "zeitgeist.h")]
-  public int64 from_iso8601 (string datetime);
-
-  [CCode (cname = "zeitgeist_timestamp_to_iso8601", cheader_filename = "zeitgeist.h")]
-  public string to_iso8601 (int64 timestamp);
-
-  [CCode (cname = "zeitgeist_timestamp_from_date", cheader_filename = "zeitgeist.h")]
-  public int64 from_date (GLib.Date date);
-
-  [CCode (cname = "zeitgeist_timestamp_from_dmy", cheader_filename = "zeitgeist.h")]
-  public int64 from_dmy (GLib.DateDay day, GLib.DateMonth month, GLib.DateYear year);
-
-  [CCode (cname = "zeitgeist_timestamp_to_date", cheader_filename = "zeitgeist.h")]
-  public int64 to_date (int64 timestamp, out GLib.Date date);
-  
-  [CCode (cname = "zeitgeist_timestamp_next_midnight", cheader_filename = "zeitgeist.h")]
-  public static int64 next_midnight (int64 timestamp);
-  
-  [CCode (cname = "zeitgeist_timestamp_prev_midnight", cheader_filename = "zeitgeist.h")]
-  public static int64 prev_midnight (int64 timestamp);
 }
 
 // vim:et:ai:cindent:ts=2 sts=2 sw=2:

=== modified file 'bindings/zeitgeist-1.0.metadata'
--- bindings/zeitgeist-1.0.metadata	2010-08-09 22:04:01 +0000
+++ bindings/zeitgeist-1.0.metadata	2010-11-09 13:01:21 +0000
@@ -39,14 +39,20 @@
 zeitgeist_event_new_full ellipsis="1"
 zeitgeist_event_set_payload.payload transfer_ownership="1"
 zeitgeist_monitor_new.event_templates transfer_ownership="1"
+#zeitgeist_monitor_get_templates type_name="GLib.PtrArray"
+#ZeitgeistMonitor:event-templates type_name="GLib.PtrArray"
 
 Zeitgeist.Symbol cheader_filename="zeitgeist.h"
-zeitgeist_symbol_get* hidden="1" #transfer_ownership="1" type_arguments="unowned string"
-zeitgeist_symbol_is_a hidden="1"
+zeitgeist_symbol_get* parent="Symbol" transfer_ownership="1" type_arguments="unowned string"
+zeitgeist_symbol_is_a parent="Symbol"
 
 zeitgeist_data_source_registry_*.cancellable nullable="1"
 zeitgeist_log_*.cancellable nullable="1"
 zeitgeist_index_*.cancellable nullable="1"
 
-zeitgeist_timestamp_* hidden="1"
-ZEITGEIST_TIMESTAMP_* hidden="1"
+Zeitgeist.Timestamp cheader_filename="zeitgeist.h"
+zeitgeist_timestamp_* parent="Timestamp"
+zeitgeist_timestamp_for_now parent="Timestamp" name="now"
+zeitgeist_timestamp_to_date.date is_out="1"
+zeitgeist_timestamp_to_iso8601 parent="Timestamp" transfer_ownership="1"
+zeitgeist_timestamp_to_timeval.tv is_out="1"

=== modified file 'bindings/zeitgeist-1.0.vapi'
--- bindings/zeitgeist-1.0.vapi	2010-08-09 22:04:01 +0000
+++ bindings/zeitgeist-1.0.vapi	2010-11-09 13:01:21 +0000
@@ -42,11 +42,11 @@
 		[CCode (cheader_filename = "zeitgeist.h")]
 		public static int64 prev_midnight (int64 timestamp);
 		[CCode (cheader_filename = "zeitgeist.h")]
-		public static int64 to_date (int64 timestamp, out GLib.Date date);
+		public static void to_date (int64 timestamp, out GLib.Date date);
 		[CCode (cheader_filename = "zeitgeist.h")]
 		public static string to_iso8601 (int64 timestamp);
 		[CCode (cheader_filename = "zeitgeist.h")]
-		public static int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
+		public static void to_timeval (int64 timestamp, out GLib.TimeVal tv);
 	}
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public class DataSource : GLib.InitiallyUnowned {