vala r1053 - in trunk: vala vapi

[rasa svn gnome org]

Author: rasa
Date: Mon Feb 25 21:17:28 2008
New Revision: 1053
URL: http://svn.gnome.org/viewvc/vala?rev=1053&view=rev

Log:
2008-02-25  Raffaele Sandrini  <raffaele sandrini ch>

	* vala/valadelegate.vala, vala/valainterfacewriter.vala: write and
	  process cheader_filename CCode attribute parameter for delegates
	* vapi/gio-2.0.vapi: regenerated


Modified:
   trunk/vala/valadelegate.vala
   trunk/vala/valainterfacewriter.vala
   trunk/vapi/gio-2.0.vapi

Modified: trunk/vala/valadelegate.vala
==============================================================================
--- trunk/vala/valadelegate.vala	(original)
+++ trunk/vala/valadelegate.vala	Mon Feb 25 21:17:28 2008
@@ -230,6 +230,12 @@
 		if (a.has_argument ("delegate_target_pos")) {
 			cdelegate_target_parameter_position = a.get_double ("delegate_target_pos");
 		}
+		if (a.has_argument ("cheader_filename")) {
+			var val = a.get_string ("cheader_filename");
+			foreach (string filename in val.split (",")) {
+				add_cheader_filename (filename);
+			}
+		}
 	}
 	
 	/**

Modified: trunk/vala/valainterfacewriter.vala
==============================================================================
--- trunk/vala/valainterfacewriter.vala	(original)
+++ trunk/vala/valainterfacewriter.vala	Mon Feb 25 21:17:28 2008
@@ -523,8 +523,23 @@
 		if (!check_accessibility (cb)) {
 			return;
 		}
-		
+
+		write_indent ();
+
+		var first = true;
+		string cheaders;
+		foreach (string cheader in cb.get_cheader_filenames ()) {
+			if (first) {
+				cheaders = cheader;
+				first = false;
+			} else {
+				cheaders = "%s,%s".printf (cheaders, cheader);
+			}
+		}
+		write_string ("[CCode (cheader_filename = \"%s\")]".printf (cheaders));
+
 		write_indent ();
+
 		write_accessibility (cb);
 		if (!cb.instance) {
 			write_string ("static ");

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Mon Feb 25 21:17:28 2008
@@ -809,11 +809,17 @@
 		public signal void changed ();
 		public signal void removed ();
 	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, pointer callback_data);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public static delegate pointer ReallocFunc (pointer data, ulong size);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;