Various GFile binding fixes

2008-06-18  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/gio-2.0/gio-2.0.metadata:

	Various GFile binding fixes

	* vapi/gio-2.0.vapi: regenerated

svn path=/trunk/; revision=1613

diff --git a/ChangeLog b/ChangeLog
index ea15d78..cc37c1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-18  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gio-2.0/gio-2.0.metadata:
+
+       Various GFile binding fixes
+
+       * vapi/gio-2.0.vapi: regenerated
+
 2008-06-18  Jaap A. Haitsma  <jaap@haitsma.org>
 
        * vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala:

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 6e11f14..8739a8d 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -683,7 +683,7 @@ namespace GLib {
        public interface File : GLib.Object {
                public bool copy_attributes (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public bool @delete (GLib.Cancellable? cancellable) throws GLib.Error;
-               public weak GLib.File get_child (string name);
+               public GLib.File get_child (string name);
                public bool has_prefix (GLib.File prefix);
                public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
                public void load_contents_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
@@ -695,10 +695,10 @@ namespace GLib {
                public static GLib.File new_for_path (string path);
                public static GLib.File new_for_uri (string uri);
                public static weak GLib.File parse_name (string parse_name);
-               public weak GLib.AppInfo query_default_handler (GLib.Cancellable? cancellable) throws GLib.Error;
+               public GLib.AppInfo query_default_handler (GLib.Cancellable? cancellable) throws GLib.Error;
                public bool query_exists (GLib.Cancellable? cancellable);
                public GLib.FileType query_file_type (GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable);
-               public weak GLib.FileInputStream read (GLib.Cancellable? cancellable) throws GLib.Error;
+               public GLib.FileInputStream read (GLib.Cancellable? cancellable) throws GLib.Error;
                public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
                public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
@@ -708,35 +708,35 @@ namespace GLib {
                public bool set_attribute_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-               public abstract weak GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+               public abstract 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 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) 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 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);
-               public abstract weak GLib.FileOutputStream create_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract GLib.FileOutputStream create_finish (GLib.AsyncResult res) throws GLib.Error;
                [NoWrapper]
                public abstract bool delete_file (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract weak GLib.File dup ();
                public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public abstract bool eject_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
-               public abstract weak GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+               public abstract GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract void enumerate_children_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public abstract weak GLib.FileEnumerator enumerate_children_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract GLib.FileEnumerator enumerate_children_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract bool equal (GLib.File file2);
-               public abstract weak GLib.Mount find_enclosing_mount (GLib.Cancellable? cancellable) throws GLib.Error;
+               public abstract GLib.Mount find_enclosing_mount (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract void find_enclosing_mount_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public abstract weak GLib.Mount find_enclosing_mount_finish (GLib.AsyncResult res) throws GLib.Error;
-               public abstract weak string get_basename ();
-               public abstract weak GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
-               public abstract weak GLib.File get_parent ();
-               public abstract weak string get_parse_name ();
-               public abstract weak string get_path ();
-               public abstract weak string get_relative_path (GLib.File descendant);
-               public abstract weak string get_uri ();
-               public abstract weak string get_uri_scheme ();
+               public abstract GLib.Mount find_enclosing_mount_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract string get_basename ();
+               public abstract GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
+               public abstract GLib.File get_parent ();
+               public abstract string get_parse_name ();
+               public abstract string get_path ();
+               public abstract string get_relative_path (GLib.File descendant);
+               public abstract string get_uri ();
+               public abstract string get_uri_scheme ();
                public abstract bool has_uri_scheme (string uri_scheme);
                public abstract uint hash (void* file);
                public abstract bool is_native ();
@@ -762,13 +762,13 @@ namespace GLib {
                public abstract weak GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract weak GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract void read_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public abstract weak GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
                [NoWrapper]
                public abstract weak GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error;
-               public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-               public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
-               public abstract weak GLib.File resolve_relative_path (string relative_path);
+               public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+               public abstract void replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public abstract GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract GLib.File resolve_relative_path (string relative_path);
                public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, void* value_p, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public abstract bool set_attributes_finish (GLib.AsyncResult _result, out weak GLib.FileInfo info) 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 cc13af2..4259852 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -3,9 +3,26 @@ g_app_info_launch.envp is_array="1"
 g_app_info_launch_uris.envp is_array="1"
 g_data_input_stream_read_line.length is_out="1"
 g_data_input_stream_read_until.length is_out="1"
+g_file_append_to transfer_ownership="1"
+g_file_append_to_finish transfer_ownership="1"
 g_file_copy.progress_callback_data hidden="1"
 g_file_copy_async.progress_callback_data hidden="1"
+g_file_create transfer_ownership="1"
+g_file_create_finish transfer_ownership="1"
+g_file_enumerate_children transfer_ownership="1"
+g_file_enumerate_children_finish transfer_ownership="1"
 g_file_enumerator_next_files_finish type_arguments="FileInfo"
+g_file_find_enclosing_mount transfer_ownership="1"
+g_file_find_enclosing_mount_finish transfer_ownership="1"
+g_file_get_basename transfer_ownership="1"
+g_file_get_child transfer_ownership="1"
+g_file_get_child_for_display_name transfer_ownership="1"
+g_file_get_parent transfer_ownership="1"
+g_file_get_parse_name transfer_ownership="1"
+g_file_get_path transfer_ownership="1"
+g_file_get_relative_path transfer_ownership="1"
+g_file_get_uri transfer_ownership="1"
+g_file_get_uri_scheme transfer_ownership="1"
 g_file_load_contents.length is_out="1"
 g_file_load_contents_finish.length is_out="1"
 GFileMonitor::changed.other_file nullable="1"
@@ -13,6 +30,14 @@ 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"
+g_file_query_default_handler transfer_ownership="1"
+g_file_read transfer_ownership="1"
+g_file_read_finish transfer_ownership="1"
+g_file_replace transfer_ownership="1"
+g_file_replace.etag nullable="1"
+g_file_replace_async.etag nullable="1"
+g_file_replace_finish transfer_ownership="1"
+g_file_resolve_relative_path transfer_ownership="1"
 g_input_stream_read_all.bytes_read is_out="1"
 GIOErrorEnum rename_to="IOError" errordomain="1"
 GMountOperation::reply has_emitter="1"