update to glib 2.15.1

2008-01-10  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gio-2.0/: update to glib 2.15.1

	* vapi/gio-2.0.vapi: regenerated

svn path=/trunk/; revision=827

diff --git a/ChangeLog b/ChangeLog
index eac85ac..52cea3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-10  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gio-2.0/: update to glib 2.15.1
+
+       * vapi/gio-2.0.vapi: regenerated
+
+2008-01-10  Jürg Billeter  <j@bitron.ch>
+
        * gobject/valaccodegeneratorinvocationexpression.vala,
          gobject/valaccodegeneratormethod.vala, compiler/valacompiler.vala,
          vapi/glib-2.0.vapi, vapigen/valavapigen.vala: fix memory management

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 6873a07..76fb5e0 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -280,18 +280,6 @@ namespace GLib {
                public weak GLib.DataStreamByteOrder byte_order { get; set; }
        }
        [CCode (cheader_filename = "gio/gio.h")]
-       public class DirectoryMonitor : GLib.Object {
-               public virtual bool cancel ();
-               public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
-               public bool is_cancelled ();
-               public void set_rate_limit (int limit_msecs);
-               [NoAccessorMethod]
-               public weak bool cancelled { get; }
-               [NoAccessorMethod]
-               public weak int rate_limit { get; set; }
-               public signal void changed (GLib.File child, GLib.File other_file, int event_type);
-       }
-       [CCode (cheader_filename = "gio/gio.h")]
        public class FileEnumerator : GLib.Object {
                public bool close (GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -379,7 +367,7 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        public class FileMonitor : GLib.Object {
                public virtual bool cancel ();
-               public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
+               public static weak GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
                public void emit_event (GLib.File file, GLib.File other_file, GLib.FileMonitorEvent event_type);
                public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
                public bool is_cancelled ();
@@ -388,7 +376,7 @@ namespace GLib {
                public weak bool cancelled { get; }
                [NoAccessorMethod]
                public weak int rate_limit { get; set; }
-               public signal void changed (GLib.File file, GLib.File other_file, int event_type);
+               public signal void changed (GLib.File file, GLib.File other_file, GLib.FileMonitorEvent event_type);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class FileOutputStream : GLib.OutputStream, GLib.Seekable {
@@ -447,23 +435,15 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
-               public static weak GLib.InputStream from_data (pointer data, long len);
-               public pointer get_data ();
-               public ulong get_data_size ();
-               public void set_free_data (bool free_data);
+               public void add_data (pointer data, long len, GLib.DestroyNotify destroy);
+               public MemoryInputStream ();
+               public MemoryInputStream.from_data (pointer data, long len, GLib.DestroyNotify destroy);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
-               public weak GLib.ByteArray get_data ();
-               public MemoryOutputStream (GLib.ByteArray data);
-               public void set_free_data (bool free_data);
-               public void set_max_size (uint max_size);
-               [NoAccessorMethod]
-               public weak pointer data { get; set construct; }
-               [NoAccessorMethod]
-               public weak bool free_array { get; set; }
-               [NoAccessorMethod]
-               public weak uint size_limit { get; set; }
+               public pointer get_data ();
+               public ulong get_size ();
+               public MemoryOutputStream (pointer data, ulong len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify destroy);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MountOperation : GLib.Object {
@@ -486,8 +466,8 @@ namespace GLib {
                public weak string password { get; set; }
                public weak GLib.PasswordSave password_save { get; set; }
                public weak string username { get; set; }
-               public signal bool ask_password (string message, string default_user, string default_domain, uint flags);
-               public signal bool ask_question (string message, pointer choices);
+               public signal bool ask_password (string message, string default_user, string default_domain, GLib.AskPasswordFlags flags);
+               public signal bool ask_question (string message, string[] choices);
                [HasEmitter]
                public signal void reply (bool abort);
        }
@@ -593,7 +573,8 @@ namespace GLib {
                public abstract bool remove_supports_type (string content_type) throws GLib.Error;
                public abstract bool set_as_default_for_extension (string extension) throws GLib.Error;
                public abstract bool set_as_default_for_type (string content_type) throws GLib.Error;
-               public abstract bool should_show (string desktop_env);
+               public abstract bool should_show ();
+               public abstract bool supports_files ();
                public abstract bool supports_uris ();
        }
        [CCode (cheader_filename = "gio/gio.h")]
@@ -759,6 +740,7 @@ namespace GLib {
        public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data);
        public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, pointer callback_data);
        public static delegate void IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable, pointer user_data);
+       public static delegate pointer ReallocFunc (pointer data, ulong size);
        public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
        public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
        public const string FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;
@@ -784,6 +766,7 @@ namespace GLib {
        public const string FILE_ATTRIBUTE_OWNER_GROUP;
        public const string FILE_ATTRIBUTE_OWNER_USER;
        public const string FILE_ATTRIBUTE_OWNER_USER_REAL;
+       public const string FILE_ATTRIBUTE_SELINUX_CONTEXT;
        public const string FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
        public const string FILE_ATTRIBUTE_STANDARD_COPY_NAME;
        public const string FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME;

diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index 6193a5a..d710c7f 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -137,6 +137,13 @@
                                <parameter name="user_data" type="gpointer"/>
                        </parameters>
                </callback>
+               <callback name="GReallocFunc">
+                       <return-type type="gpointer"/>
+                       <parameters>
+                               <parameter name="data" type="gpointer"/>
+                               <parameter name="size" type="gsize"/>
+                       </parameters>
+               </callback>
                <callback name="GSimpleAsyncThreadFunc">
                        <return-type type="void"/>
                        <parameters>
@@ -867,53 +874,6 @@
                        </method>
                        <property name="byte-order" type="GDataStreamByteOrder" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
-               <object name="GDirectoryMonitor" parent="GObject" type-name="GDirectoryMonitor" get-type="g_directory_monitor_get_type">
-                       <method name="cancel" symbol="g_directory_monitor_cancel">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                               </parameters>
-                       </method>
-                       <method name="emit_event" symbol="g_directory_monitor_emit_event">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                                       <parameter name="child" type="GFile*"/>
-                                       <parameter name="other_file" type="GFile*"/>
-                                       <parameter name="event_type" type="GFileMonitorEvent"/>
-                               </parameters>
-                       </method>
-                       <method name="is_cancelled" symbol="g_directory_monitor_is_cancelled">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_rate_limit" symbol="g_directory_monitor_set_rate_limit">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                                       <parameter name="limit_msecs" type="int"/>
-                               </parameters>
-                       </method>
-                       <property name="cancelled" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="rate-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                                       <parameter name="child" type="GFile*"/>
-                                       <parameter name="other_file" type="GFile*"/>
-                                       <parameter name="event_type" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="cancel">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="monitor" type="GDirectoryMonitor*"/>
-                               </parameters>
-                       </vfunc>
-               </object>
                <object name="GFileEnumerator" parent="GObject" type-name="GFileEnumerator" get-type="g_file_enumerator_get_type">
                        <method name="close" symbol="g_file_enumerator_close">
                                <return-type type="gboolean"/>
@@ -1559,7 +1519,7 @@
                                </parameters>
                        </method>
                        <method name="directory" symbol="g_file_monitor_directory">
-                               <return-type type="GDirectoryMonitor*"/>
+                               <return-type type="GFileMonitor*"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
@@ -1604,7 +1564,7 @@
                                        <parameter name="monitor" type="GFileMonitor*"/>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="other_file" type="GFile*"/>
-                                       <parameter name="event_type" type="gint"/>
+                                       <parameter name="event_type" type="GFileMonitorEvent"/>
                                </parameters>
                        </signal>
                        <vfunc name="cancel">
@@ -2046,66 +2006,52 @@
                        <implements>
                                <interface name="GSeekable"/>
                        </implements>
-                       <method name="from_data" symbol="g_memory_input_stream_from_data">
-                               <return-type type="GInputStream*"/>
+                       <method name="add_data" symbol="g_memory_input_stream_add_data">
+                               <return-type type="void"/>
                                <parameters>
+                                       <parameter name="stream" type="GMemoryInputStream*"/>
                                        <parameter name="data" type="void*"/>
                                        <parameter name="len" type="gssize"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
                        </method>
-                       <method name="get_data" symbol="g_memory_input_stream_get_data">
-                               <return-type type="void*"/>
-                               <parameters>
-                                       <parameter name="stream" type="GMemoryInputStream*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_data_size" symbol="g_memory_input_stream_get_data_size">
-                               <return-type type="gsize"/>
-                               <parameters>
-                                       <parameter name="stream" type="GMemoryInputStream*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_free_data" symbol="g_memory_input_stream_set_free_data">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="g_memory_input_stream_new">
+                               <return-type type="GInputStream*"/>
+                       </constructor>
+                       <constructor name="new_from_data" symbol="g_memory_input_stream_new_from_data">
+                               <return-type type="GInputStream*"/>
                                <parameters>
-                                       <parameter name="stream" type="GMemoryInputStream*"/>
-                                       <parameter name="free_data" type="gboolean"/>
+                                       <parameter name="data" type="void*"/>
+                                       <parameter name="len" type="gssize"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
-                       </method>
+                       </constructor>
                </object>
                <object name="GMemoryOutputStream" parent="GOutputStream" type-name="GMemoryOutputStream" get-type="g_memory_output_stream_get_type">
                        <implements>
                                <interface name="GSeekable"/>
                        </implements>
                        <method name="get_data" symbol="g_memory_output_stream_get_data">
-                               <return-type type="GByteArray*"/>
+                               <return-type type="gpointer"/>
                                <parameters>
                                        <parameter name="ostream" type="GMemoryOutputStream*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="g_memory_output_stream_new">
-                               <return-type type="GOutputStream*"/>
-                               <parameters>
-                                       <parameter name="data" type="GByteArray*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_free_data" symbol="g_memory_output_stream_set_free_data">
-                               <return-type type="void"/>
+                       <method name="get_size" symbol="g_memory_output_stream_get_size">
+                               <return-type type="gsize"/>
                                <parameters>
                                        <parameter name="ostream" type="GMemoryOutputStream*"/>
-                                       <parameter name="free_data" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_max_size" symbol="g_memory_output_stream_set_max_size">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="g_memory_output_stream_new">
+                               <return-type type="GOutputStream*"/>
                                <parameters>
-                                       <parameter name="ostream" type="GMemoryOutputStream*"/>
-                                       <parameter name="max_size" type="guint"/>
+                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="len" type="gsize"/>
+                                       <parameter name="realloc_fn" type="GReallocFunc"/>
+                                       <parameter name="destroy" type="GDestroyNotify"/>
                                </parameters>
-                       </method>
-                       <property name="data" type="gpointer" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="free-array" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="size-limit" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       </constructor>
                </object>
                <object name="GMountOperation" parent="GObject" type-name="GMountOperation" get-type="g_mount_operation_get_type">
                        <method name="get_anonymous" symbol="g_mount_operation_get_anonymous">
@@ -2209,7 +2155,7 @@
                                        <parameter name="message" type="char*"/>
                                        <parameter name="default_user" type="char*"/>
                                        <parameter name="default_domain" type="char*"/>
-                                       <parameter name="flags" type="guint"/>
+                                       <parameter name="flags" type="GAskPasswordFlags"/>
                                </parameters>
                        </signal>
                        <signal name="ask-question" when="LAST">
@@ -2217,7 +2163,7 @@
                                <parameters>
                                        <parameter name="op" type="GMountOperation*"/>
                                        <parameter name="message" type="char*"/>
-                                       <parameter name="choices" type="gpointer"/>
+                                       <parameter name="choices" type="char*[]"/>
                                </parameters>
                        </signal>
                        <signal name="reply" when="LAST">
@@ -3030,7 +2976,12 @@
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="appinfo" type="GAppInfo*"/>
-                                       <parameter name="desktop_env" type="char*"/>
+                               </parameters>
+                       </method>
+                       <method name="supports_files" symbol="g_app_info_supports_files">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="appinfo" type="GAppInfo*"/>
                                </parameters>
                        </method>
                        <method name="supports_uris" symbol="g_app_info_supports_uris">
@@ -3142,7 +3093,12 @@
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="appinfo" type="GAppInfo*"/>
-                                       <parameter name="desktop_env" type="char*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="supports_files">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="appinfo" type="GAppInfo*"/>
                                </parameters>
                        </vfunc>
                        <vfunc name="supports_uris">
@@ -4344,7 +4300,7 @@
                                </parameters>
                        </vfunc>
                        <vfunc name="monitor_dir">
-                               <return-type type="GDirectoryMonitor*"/>
+                               <return-type type="GFileMonitor*"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
@@ -5217,6 +5173,7 @@
                <constant name="G_FILE_ATTRIBUTE_OWNER_GROUP" type="char*" value="owner::group"/>
                <constant name="G_FILE_ATTRIBUTE_OWNER_USER" type="char*" value="owner::user"/>
                <constant name="G_FILE_ATTRIBUTE_OWNER_USER_REAL" type="char*" value="owner::user-real"/>
+               <constant name="G_FILE_ATTRIBUTE_SELINUX_CONTEXT" type="char*" value="selinux::context"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE" type="char*" value="standard::content-type"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_COPY_NAME" type="char*" value="standard::copy-name"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME" type="char*" value="standard::display-name"/>