From a1771173d79faaa07629bed0b378cc138df2a8fc Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Fri, 21 Mar 2008 10:25:06 +0000 Subject: [PATCH] fix g_file_copy, g_file_copy_async, and g_file_move bindings, fixes bug 2008-03-21 Juerg Billeter * vapi/packages/gio-2.0/: fix g_file_copy, g_file_copy_async, and g_file_move bindings, fixes bug 523544 * vapi/gio-2.0.vapi: regenerated svn path=/trunk/; revision=1144 --- ChangeLog | 7 +++++++ vapi/gio-2.0.vapi | 6 +++--- vapi/packages/gio-2.0/gio-2.0.metadata | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6146dc..003dd7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-03-21 Jürg Billeter + * vapi/packages/gio-2.0/: fix g_file_copy, g_file_copy_async, and + g_file_move bindings, fixes bug 523544 + + * vapi/gio-2.0.vapi: regenerated + +2008-03-21 Jürg Billeter + * vapi/glib-2.0.vapi: fix g_shell_parse_argv binding, fixes bug 523277 diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 12713ed..c94e2b8 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -696,8 +696,8 @@ namespace GLib { public abstract weak GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void append_to_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback); public abstract weak GLib.FileOutputStream append_to_finish (GLib.AsyncResult res) throws GLib.Error; - public abstract bool copy (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error; - public abstract void copy_async (GLib.File destination, GLib.FileCopyFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data, GLib.AsyncReadyCallback callback); + public abstract bool copy (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback) throws GLib.Error; + public abstract void copy_async (GLib.File destination, GLib.FileCopyFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, GLib.AsyncReadyCallback callback); public abstract bool copy_finish (GLib.AsyncResult res) throws GLib.Error; public abstract weak GLib.FileOutputStream create (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void create_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback); @@ -735,7 +735,7 @@ namespace GLib { 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); public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error; - public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error; + public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback) throws GLib.Error; [NoWrapper] public abstract bool prefix_matches (GLib.File file); public abstract weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error; diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index 0927354..06db152 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -1,6 +1,9 @@ GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gio.h" g_app_info_launch.envp is_array="1" g_app_info_launch_uris.envp is_array="1" +g_file_copy.progress_callback_data hidden="1" +g_file_copy_async.progress_callback_data hidden="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" g_file_new_for_uri transfer_ownership="1" -- 2.7.4