From 64c2ea27217b05e9bc6af80ad043691d8b1785e4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Sep 2009 21:40:51 +0200
Subject: vala: wrap version macros

---
 canberra.vapi | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/canberra.vapi b/canberra.vapi
index 6d36b06..e14bf4c 100644
--- a/canberra.vapi
+++ b/canberra.vapi
@@ -18,14 +18,15 @@
   <http://www.gnu.org/licenses/>.
 ***/
 
-using Posix;
-
 [CCode (cprefix = "CA_", lower_case_cprefix = "ca_", cheader_filename = "canberra.h")]
 namespace Canberra {
 
-    //
-    // properties
-    //
+    public static const int MAJOR;
+    public static const int MINOR;
+
+    [CCode (cname="CA_CHECK_VERSION")]
+    public static bool CHECK_VERSION(int major, int minor);
+
     public static const string PROP_MEDIA_NAME;
     public static const string PROP_MEDIA_TITLE;
     public static const string PROP_MEDIA_ARTIST;
@@ -65,9 +66,6 @@ namespace Canberra {
     public static const string PROP_CANBERRA_XDG_THEME_OUTPUT_PROFILE;
     public static const string PROP_CANBERRA_ENABLE;
 
-    //
-    // errors
-    //
     [CCode (cname = "CA_SUCCESS")]
     public static const int SUCCESS;
 
@@ -94,14 +92,8 @@ namespace Canberra {
 
     public unowned string? strerror(int code);
 
-    //
-    // callback
-    //
-    public delegate void FinishCallback(Context context, uint32 id, Error code);
+    public delegate void FinishCallback(Context c, uint32 id, int code);
 
-    //
-    // property list
-    //
     [Compact]
     [CCode (cname = "ca_proplist", free_function = "")]
     public class Proplist {
@@ -118,6 +110,7 @@ namespace Canberra {
     [CCode (cname = "ca_context", free_function = "")]
     public class Context {
 
+
         public static int create(out Context context);
         public int destroy();
         public int set_driver(string? driver = null);
-- 
cgit