vala r1362 - in trunk: . vapi

[juergbi svn gnome org]

Author: juergbi
Date: Sun May 11 10:38:12 2008
New Revision: 1362
URL: http://svn.gnome.org/viewvc/vala?rev=1362&view=rev

Log:
2008-05-11  Juerg Billeter  <j bitron ch>

	* vapi/Makefile.am:
	* vapi/glib-2.0.vapi:
	* vapi/gmodule-2.0.vapi:
	* vapi/gstreamer-0.10.deps:

	Move dynamic module loading support into separate VAPI file and
	improve bindings, fixes bug 531583


Added:
   trunk/vapi/gmodule-2.0.vapi
   trunk/vapi/gstreamer-0.10.deps
Modified:
   trunk/ChangeLog
   trunk/vapi/Makefile.am
   trunk/vapi/glib-2.0.vapi

Modified: trunk/vapi/Makefile.am
==============================================================================
--- trunk/vapi/Makefile.am	(original)
+++ trunk/vapi/Makefile.am	Sun May 11 10:38:12 2008
@@ -25,12 +25,14 @@
 	gio-2.0.vapi \
 	gio-unix-2.0.deps \
 	gio-unix-2.0.vapi \
+	gmodule-2.0.vapi \
 	gnome-desktop-2.0.deps \
 	gnome-desktop-2.0.vapi \
 	gnome-keyring-1.vapi \
 	gnome-vfs-2.0.vapi \
 	goocanvas.deps \
 	goocanvas.vapi \
+	gstreamer-0.10.deps \
 	gstreamer-0.10.vapi \
 	gstreamer-audio-0.10.deps \
 	gstreamer-audio-0.10.vapi \

Modified: trunk/vapi/glib-2.0.vapi
==============================================================================
--- trunk/vapi/glib-2.0.vapi	(original)
+++ trunk/vapi/glib-2.0.vapi	Sun May 11 10:38:12 2008
@@ -1276,27 +1276,7 @@
 		public int length_unlocked ();
 		public void sort_unlocked (CompareDataFunc func, void* user_data);
 	}
-	
-	/* Dynamic Loading of Modules */
-	
-	[CCode (free_function = "g_module_close")]
-	public class Module {
-		public static bool supported ();
-		public static string build_path (string directory, string module_name);
-		public static Module open (string file_name, ModuleFlags @flags);
-		public bool symbol (string symbol_name, void** symbol);
-		public weak string name ();
-		public void make_resident ();
-		public static weak string error ();
-	}
-	
-	[CCode (cprefix = "G_MODULE_")]
-	public enum ModuleFlags {
-		BIND_LAZY,
-		BIND_LOCAL,
-		BIND_MASK
-	}
-	
+
 	/* Memory Allocation */
 	
 	public static void* malloc (ulong n_bytes);

Added: trunk/vapi/gmodule-2.0.vapi
==============================================================================
--- (empty file)
+++ trunk/vapi/gmodule-2.0.vapi	Sun May 11 10:38:12 2008
@@ -0,0 +1,45 @@
+/* gmodule-2.0.vala
+ *
+ * Copyright (C) 2006-2008  JÃrg Billeter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	JÃrg Billeter <j bitron ch>
+ */
+
+[CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "gmodule.h")]
+namespace GLib {
+	/* Dynamic Loading of Modules */
+	
+	[CCode (free_function = "g_module_close", cheader_filename = "gmodule.h")]
+	public class Module {
+		public static bool supported ();
+		public static string build_path (string? directory, string module_name);
+		public static Module? open (string? file_name, ModuleFlags flags);
+		public bool symbol (string symbol_name, out void* symbol);
+		public weak string name ();
+		public void make_resident ();
+		public static weak string error ();
+	}
+	
+	[CCode (cprefix = "G_MODULE_")]
+	public enum ModuleFlags {
+		BIND_LAZY,
+		BIND_LOCAL,
+		BIND_MASK
+	}
+}
+

Added: trunk/vapi/gstreamer-0.10.deps
==============================================================================
--- (empty file)
+++ trunk/vapi/gstreamer-0.10.deps	Sun May 11 10:38:12 2008
@@ -0,0 +1 @@
+gmodule-2.0