updated to gio 0.1.2

2007-11-20  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gio-2.0/gio-2.0.gi: updated to gio 0.1.2

	* vapi/gio-2.0.vapi: regenerated

svn path=/trunk/; revision=690

diff --git a/ChangeLog b/ChangeLog
index d286d11..85e0fc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-20  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gio-2.0/gio-2.0.gi: updated to gio 0.1.2
+
+       * vapi/gio-2.0.vapi: regenerated
+
+2007-11-20  Jürg Billeter  <j@bitron.ch>
+
        * vapigen/valagidlparser.vala: detect out parameters of value types, add
          support for array return types
 

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index f1c8393..bedc7b4 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -154,7 +154,7 @@ namespace GLib {
        }
        [CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gvfs.h")]
        public class FileAttributeMatcher {
-               public bool enumerate_namespace (string @namespace);
+               public bool enumerate_namespace (string ns);
                public weak string enumerate_next ();
                public bool matches (string attribute);
                public bool matches_only (string attribute);
@@ -218,7 +218,7 @@ namespace GLib {
                public virtual long fill (long count, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void fill_async (long count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public virtual long fill_finish (GLib.AsyncResult result) throws GLib.Error;
-               public ulong get_availible ();
+               public ulong get_available ();
                public ulong get_buffer_size ();
                public BufferedInputStream (GLib.InputStream base_stream);
                public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
@@ -449,7 +449,7 @@ namespace GLib {
        public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
                public weak GLib.ByteArray get_data ();
                public MemoryOutputStream (GLib.ByteArray data);
-               public void set_free_on_close (bool free_on_close);
+               public void set_free_data (bool free_data);
                public void set_max_size (uint max_size);
                [NoAccessorMethod]
                public weak pointer data { get; set construct; }
@@ -539,9 +539,8 @@ namespace GLib {
                public virtual weak GLib.File get_file_for_path (string path);
                public virtual weak GLib.File get_file_for_uri (string uri);
                public static weak GLib.Vfs get_local ();
-               public virtual weak string get_name ();
-               public virtual int get_priority ();
                public virtual weak string get_supported_uri_schemes ();
+               public virtual bool is_active ();
                public virtual weak GLib.File parse_name (string parse_name);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
@@ -588,14 +587,14 @@ namespace GLib {
        public interface Drive : GLib.Object {
                public abstract bool can_eject ();
                public abstract bool can_mount ();
-               public abstract void eject (GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void eject (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
                public abstract weak GLib.List get_volumes ();
                public abstract bool has_volumes ();
                public abstract bool is_automounted ();
-               public abstract void mount (GLib.MountOperation mount_operation, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void mount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool mount_finish (GLib.AsyncResult result) throws GLib.Error;
                public signal void changed ();
        }
@@ -700,13 +699,13 @@ namespace GLib {
        public interface Volume : GLib.Object {
                public abstract bool can_eject ();
                public abstract bool can_unmount ();
-               public abstract void eject (GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void eject (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract weak GLib.Drive get_drive ();
                public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
                public abstract weak GLib.File get_root ();
-               public abstract void unmount (GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void unmount (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool unmount_finish (GLib.AsyncResult result) throws GLib.Error;
                public signal void changed ();
        }

diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index 49ad067..ecd3d04 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -267,7 +267,7 @@
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="matcher" type="GFileAttributeMatcher*"/>
-                                       <parameter name="namespace" type="char*"/>
+                                       <parameter name="ns" type="char*"/>
                                </parameters>
                        </method>
                        <method name="enumerate_next" symbol="g_file_attribute_matcher_enumerate_next">
@@ -673,7 +673,7 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <method name="get_availible" symbol="g_buffered_input_stream_get_availible">
+                       <method name="get_available" symbol="g_buffered_input_stream_get_available">
                                <return-type type="gsize"/>
                                <parameters>
                                        <parameter name="stream" type="GBufferedInputStream*"/>
@@ -2245,11 +2245,11 @@
                                        <parameter name="data" type="GByteArray*"/>
                                </parameters>
                        </constructor>
-                       <method name="set_free_on_close" symbol="g_memory_output_stream_set_free_on_close">
+                       <method name="set_free_data" symbol="g_memory_output_stream_set_free_data">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="ostream" type="GMemoryOutputStream*"/>
-                                       <parameter name="free_on_close" type="gboolean"/>
+                                       <parameter name="free_data" type="gboolean"/>
                                </parameters>
                        </method>
                        <method name="set_max_size" symbol="g_memory_output_stream_set_max_size">
@@ -2838,20 +2838,14 @@
                        <method name="get_local" symbol="g_vfs_get_local">
                                <return-type type="GVfs*"/>
                        </method>
-                       <method name="get_name" symbol="g_vfs_get_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="vfs" type="GVfs*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_priority" symbol="g_vfs_get_priority">
-                               <return-type type="int"/>
+                       <method name="get_supported_uri_schemes" symbol="g_vfs_get_supported_uri_schemes">
+                               <return-type type="gchar**"/>
                                <parameters>
                                        <parameter name="vfs" type="GVfs*"/>
                                </parameters>
                        </method>
-                       <method name="get_supported_uri_schemes" symbol="g_vfs_get_supported_uri_schemes">
-                               <return-type type="gchar**"/>
+                       <method name="is_active" symbol="g_vfs_is_active">
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="vfs" type="GVfs*"/>
                                </parameters>
@@ -2877,20 +2871,14 @@
                                        <parameter name="uri" type="char*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="get_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="vfs" type="GVfs*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="get_priority">
-                               <return-type type="int"/>
+                       <vfunc name="get_supported_uri_schemes">
+                               <return-type type="gchar**"/>
                                <parameters>
                                        <parameter name="vfs" type="GVfs*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="get_supported_uri_schemes">
-                               <return-type type="gchar**"/>
+                       <vfunc name="is_active">
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="vfs" type="GVfs*"/>
                                </parameters>
@@ -3282,6 +3270,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -3329,6 +3318,7 @@
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -3363,6 +3353,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -3410,6 +3401,7 @@
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -4826,6 +4818,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -4866,6 +4859,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -4900,6 +4894,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
@@ -4940,6 +4935,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>