From 9f3068ab37454043cf523124aae3b89c3843701e Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Sat, 19 Apr 2008 15:03:34 +0000 Subject: [PATCH] fix g_file_monitor_* bindings, patch by Jaap A. Haitsma, fixes bug 528881 2008-04-19 Juerg Billeter * vapi/packages/gio-2.0/: fix g_file_monitor_* bindings, patch by Jaap A. Haitsma, fixes bug 528881 * vapi/gio-2.0.vapi: regenerated svn path=/trunk/; revision=1269 --- ChangeLog | 7 +++++++ vapi/gio-2.0.vapi | 6 +++--- vapi/packages/gio-2.0/gio-2.0.metadata | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 937d842..efb33f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-04-19 Jürg Billeter + * vapi/packages/gio-2.0/: fix g_file_monitor_* bindings, + patch by Jaap A. Haitsma, fixes bug 528881 + + * vapi/gio-2.0.vapi: regenerated + +2008-04-19 Jürg Billeter + * vala/valasemanticanalyzer.vala, vala/valasignal.vala, gobject/valaccodeassignmentbinding.vala: don't mangle D-Bus signal names, fixes bug 528774 diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 49435b0..0c2401f 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -404,9 +404,9 @@ namespace GLib { } [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 @@ namespace GLib { [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); diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index 40aa4ff..e8a46c4 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -7,6 +7,8 @@ g_file_copy.progress_callback_data hidden="1" 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" -- 2.7.4