vala r1269 - in trunk: . vapi vapi/packages/gio-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Sat Apr 19 15:03:34 2008
New Revision: 1269
URL: http://svn.gnome.org/viewvc/vala?rev=1269&view=rev

Log:
2008-04-19  Juerg Billeter  <j bitron ch>

	* vapi/packages/gio-2.0/: fix g_file_monitor_* bindings,
	  patch by Jaap A. Haitsma, fixes bug 528881

	* vapi/gio-2.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/packages/gio-2.0/gio-2.0.metadata

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Sat Apr 19 15:03:34 2008
@@ -404,9 +404,9 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileMonitor : GLib.Object {
-		public static weak GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public static weak GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
-		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool is_cancelled ();
 		public void set_rate_limit (int limit_msecs);
 		public virtual bool cancel ();
@@ -730,7 +730,7 @@
 		[NoWrapper]
 		public abstract weak GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 		[NoWrapper]
-		public abstract weak GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract weak GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void mount_enclosing_volume (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
 		public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);

Modified: trunk/vapi/packages/gio-2.0/gio-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gio-2.0/gio-2.0.metadata	(original)
+++ trunk/vapi/packages/gio-2.0/gio-2.0.metadata	Sat Apr 19 15:03:34 2008
@@ -7,6 +7,8 @@
 g_file_copy_async.progress_callback_data hidden="1"
 g_file_load_contents.length is_out="1"
 g_file_load_contents_finish.length is_out="1"
+g_file_monitor_directory.cancellable nullable="1"
+g_file_monitor_file.cancellable nullable="1"
 g_file_move.progress_callback_data hidden="1"
 g_file_new_for_commandline_arg transfer_ownership="1"
 g_file_new_for_path transfer_ownership="1"