libzeitgeist

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

  1. various-fixes
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Merged at revision: 174
Proposed branch: lp:~mhr3/libzeitgeist/various-fixes
Merge into: lp:libzeitgeist
Diff against target: 116 lines (+12/-50)
4 files modified
bindings/generate_vapi (+0/-2)
bindings/zeitgeist-1.0-custom.vala (+0/-42)
bindings/zeitgeist-1.0.metadata (+10/-4)
bindings/zeitgeist-1.0.vapi (+2/-2)
To merge this branch: bzr merge lp:~mhr3/libzeitgeist/various-fixes
Reviewer Review Type Date Requested Status
LibZeitgeist Developers Pending
Review via email: mp+40424@code.launchpad.net

Description of the change

A few Vala binding fixes.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

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

lp:~mhr3/libzeitgeist/various-fixes updated
174. By Mikkel Kamstrup Erlandsen

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
10vapigen --pkg gobject-2.0 --pkg glib-2.0 --pkg gio-2.0 --library zeitgeist-1.0 zeitgeist-1.0.gi zeitgeist-1.0-custom.vala10vapigen --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
11# nasty hack to force usage of PtrArray in recent versions of vapigen11# nasty hack to force usage of PtrArray in recent versions of vapigen
12sed -i 's/GenericArray/PtrArray/g' zeitgeist-1.0.vapi12sed -i 's/GenericArray/PtrArray/g' zeitgeist-1.0.vapi
13# workaround a bug introduced in vapigen 0.9.3
14sed -i 's/void \(insert_events_from_ptrarray\)\(.*\);/GLib.Array \1\2 throws GLib.Error;/' zeitgeist-1.0.vapi
1513
=== 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 @@
32 }32 }
33}33}
3434
35namespace Zeitgeist.Symbol
36{
37 [CCode (cheader_filename = "zeitgeist.h")]
38 public static GLib.List<weak string> get_all_children (string symbol);
39 [CCode (cheader_filename = "zeitgeist.h")]
40 public static GLib.List<weak string> get_children (string symbol);
41 [CCode (cheader_filename = "zeitgeist.h")]
42 public static GLib.List<weak string> get_parents (string symbol);
43 [CCode (cheader_filename = "zeitgeist.h")]
44 public static bool is_a (string symbol, string parent);
45}
46
47namespace Zeitgeist.Timestamp35namespace Zeitgeist.Timestamp
48{36{
49 [CCode (cname = "ZEITGEIST_TIMESTAMP_SECOND", cheader_filename = "zeitgeist.h")]37 [CCode (cname = "ZEITGEIST_TIMESTAMP_SECOND", cheader_filename = "zeitgeist.h")]
@@ -63,36 +51,6 @@
6351
64 [CCode (cname = "ZEITGEIST_TIMESTAMP_YEAR", cheader_filename = "zeitgeist.h")]52 [CCode (cname = "ZEITGEIST_TIMESTAMP_YEAR", cheader_filename = "zeitgeist.h")]
65 public int64 YEAR;53 public int64 YEAR;
66
67 [CCode (cname = "zeitgeist_timestamp_for_now", cheader_filename = "zeitgeist.h")]
68 public int64 now ();
69
70 [CCode (cname = "zeitgeist_timestamp_from_timeval", cheader_filename = "zeitgeist.h")]
71 public int64 from_timeval (GLib.TimeVal tv);
72
73 [CCode (cname = "zeitgeist_timestamp_to_timeval", cheader_filename = "zeitgeist.h")]
74 public int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
75
76 [CCode (cname = "zeitgeist_timestamp_from_iso8601", cheader_filename = "zeitgeist.h")]
77 public int64 from_iso8601 (string datetime);
78
79 [CCode (cname = "zeitgeist_timestamp_to_iso8601", cheader_filename = "zeitgeist.h")]
80 public string to_iso8601 (int64 timestamp);
81
82 [CCode (cname = "zeitgeist_timestamp_from_date", cheader_filename = "zeitgeist.h")]
83 public int64 from_date (GLib.Date date);
84
85 [CCode (cname = "zeitgeist_timestamp_from_dmy", cheader_filename = "zeitgeist.h")]
86 public int64 from_dmy (GLib.DateDay day, GLib.DateMonth month, GLib.DateYear year);
87
88 [CCode (cname = "zeitgeist_timestamp_to_date", cheader_filename = "zeitgeist.h")]
89 public int64 to_date (int64 timestamp, out GLib.Date date);
90
91 [CCode (cname = "zeitgeist_timestamp_next_midnight", cheader_filename = "zeitgeist.h")]
92 public static int64 next_midnight (int64 timestamp);
93
94 [CCode (cname = "zeitgeist_timestamp_prev_midnight", cheader_filename = "zeitgeist.h")]
95 public static int64 prev_midnight (int64 timestamp);
96}54}
9755
98// vim:et:ai:cindent:ts=2 sts=2 sw=2:56// vim:et:ai:cindent:ts=2 sts=2 sw=2:
9957
=== 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 @@
39zeitgeist_event_new_full ellipsis="1"39zeitgeist_event_new_full ellipsis="1"
40zeitgeist_event_set_payload.payload transfer_ownership="1"40zeitgeist_event_set_payload.payload transfer_ownership="1"
41zeitgeist_monitor_new.event_templates transfer_ownership="1"41zeitgeist_monitor_new.event_templates transfer_ownership="1"
42#zeitgeist_monitor_get_templates type_name="GLib.PtrArray"
43#ZeitgeistMonitor:event-templates type_name="GLib.PtrArray"
4244
43Zeitgeist.Symbol cheader_filename="zeitgeist.h"45Zeitgeist.Symbol cheader_filename="zeitgeist.h"
44zeitgeist_symbol_get* hidden="1" #transfer_ownership="1" type_arguments="unowned string"46zeitgeist_symbol_get* parent="Symbol" transfer_ownership="1" type_arguments="unowned string"
45zeitgeist_symbol_is_a hidden="1"47zeitgeist_symbol_is_a parent="Symbol"
4648
47zeitgeist_data_source_registry_*.cancellable nullable="1"49zeitgeist_data_source_registry_*.cancellable nullable="1"
48zeitgeist_log_*.cancellable nullable="1"50zeitgeist_log_*.cancellable nullable="1"
49zeitgeist_index_*.cancellable nullable="1"51zeitgeist_index_*.cancellable nullable="1"
5052
51zeitgeist_timestamp_* hidden="1"53Zeitgeist.Timestamp cheader_filename="zeitgeist.h"
52ZEITGEIST_TIMESTAMP_* hidden="1"54zeitgeist_timestamp_* parent="Timestamp"
55zeitgeist_timestamp_for_now parent="Timestamp" name="now"
56zeitgeist_timestamp_to_date.date is_out="1"
57zeitgeist_timestamp_to_iso8601 parent="Timestamp" transfer_ownership="1"
58zeitgeist_timestamp_to_timeval.tv is_out="1"
5359
=== 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 @@
42 [CCode (cheader_filename = "zeitgeist.h")]42 [CCode (cheader_filename = "zeitgeist.h")]
43 public static int64 prev_midnight (int64 timestamp);43 public static int64 prev_midnight (int64 timestamp);
44 [CCode (cheader_filename = "zeitgeist.h")]44 [CCode (cheader_filename = "zeitgeist.h")]
45 public static int64 to_date (int64 timestamp, out GLib.Date date);45 public static void to_date (int64 timestamp, out GLib.Date date);
46 [CCode (cheader_filename = "zeitgeist.h")]46 [CCode (cheader_filename = "zeitgeist.h")]
47 public static string to_iso8601 (int64 timestamp);47 public static string to_iso8601 (int64 timestamp);
48 [CCode (cheader_filename = "zeitgeist.h")]48 [CCode (cheader_filename = "zeitgeist.h")]
49 public static int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);49 public static void to_timeval (int64 timestamp, out GLib.TimeVal tv);
50 }50 }
51 [CCode (cheader_filename = "zeitgeist.h")]51 [CCode (cheader_filename = "zeitgeist.h")]
52 public class DataSource : GLib.InitiallyUnowned {52 public class DataSource : GLib.InitiallyUnowned {

Subscribers

People subscribed via source and target branches