update to glib 2.15.2

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

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

	* vapi/gio-2.0.vapi: regenerated

svn path=/trunk/; revision=862

diff --git a/ChangeLog b/ChangeLog
index ea989bd..cc1fed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-19  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gio-2.0/: update to glib 2.15.2
+
+       * vapi/gio-2.0.vapi: regenerated
+
+2008-01-19  Jürg Billeter  <j@bitron.ch>
+
        * vala/valainterfacewriter.vala, vala/valasemanticanalyzer.vala: VAPI
          classes don't specify overridden methods or properties, fix generic
          type argument tracing to use the same algorithm as inherited symbol

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 76857db..66d78d3 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -87,6 +87,12 @@ namespace GLib {
                WOULD_MERGE,
                FAILED_HANDLED,
        }
+       [CCode (cprefix = "G_MOUNT_OPERATION_", cheader_filename = "gio/gio.h")]
+       public enum MountOperationResult {
+               HANDLED,
+               ABORTED,
+               UNHANDLED,
+       }
        [CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
        public enum PasswordSave {
                NEVER,
@@ -367,9 +373,9 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        public class FileMonitor : GLib.Object {
                public virtual bool cancel ();
-               public static weak GLib.FileMonitor 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) throws GLib.Error;
                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 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);
                [NoAccessorMethod]
@@ -466,10 +472,10 @@ 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, GLib.AskPasswordFlags flags);
-               public signal bool ask_question (string message, string[] choices);
+               public signal void ask_password (string message, string default_user, string default_domain, GLib.AskPasswordFlags flags);
+               public signal void ask_question (string message, string[] choices);
                [HasEmitter]
-               public signal void reply (bool abort);
+               public signal void reply (GLib.MountOperationResult result);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class NativeVolumeMonitor : GLib.VolumeMonitor {
@@ -521,6 +527,7 @@ namespace GLib {
                public ThemedIcon (string iconname);
                [NoArrayLength]
                public ThemedIcon.from_names (string[] iconnames, int len);
+               public ThemedIcon.with_default_fallbacks (string iconname);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class Vfs : GLib.Object {

diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index d710c7f..3ca4fa1 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -353,6 +353,11 @@
                        <member name="G_IO_ERROR_WOULD_MERGE" value="29"/>
                        <member name="G_IO_ERROR_FAILED_HANDLED" value="30"/>
                </enum>
+               <enum name="GMountOperationResult">
+                       <member name="G_MOUNT_OPERATION_HANDLED" value="0"/>
+                       <member name="G_MOUNT_OPERATION_ABORTED" value="1"/>
+                       <member name="G_MOUNT_OPERATION_UNHANDLED" value="2"/>
+               </enum>
                <enum name="GPasswordSave">
                        <member name="G_PASSWORD_SAVE_NEVER" value="0"/>
                        <member name="G_PASSWORD_SAVE_FOR_SESSION" value="1"/>
@@ -1524,6 +1529,7 @@
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
                        <method name="emit_event" symbol="g_file_monitor_emit_event">
@@ -1541,6 +1547,7 @@
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
                        <method name="is_cancelled" symbol="g_file_monitor_is_cancelled">
@@ -2097,7 +2104,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="op" type="GMountOperation*"/>
-                                       <parameter name="abort" type="gboolean"/>
+                                       <parameter name="result" type="GMountOperationResult"/>
                                </parameters>
                        </method>
                        <method name="set_anonymous" symbol="g_mount_operation_set_anonymous">
@@ -2149,7 +2156,7 @@
                        <property name="password-save" type="GPasswordSave" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="username" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <signal name="ask-password" when="LAST">
-                               <return-type type="gboolean"/>
+                               <return-type type="void"/>
                                <parameters>
                                        <parameter name="op" type="GMountOperation*"/>
                                        <parameter name="message" type="char*"/>
@@ -2159,7 +2166,7 @@
                                </parameters>
                        </signal>
                        <signal name="ask-question" when="LAST">
-                               <return-type type="gboolean"/>
+                               <return-type type="void"/>
                                <parameters>
                                        <parameter name="op" type="GMountOperation*"/>
                                        <parameter name="message" type="char*"/>
@@ -2170,7 +2177,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="op" type="GMountOperation*"/>
-                                       <parameter name="abort" type="gboolean"/>
+                                       <parameter name="result" type="GMountOperationResult"/>
                                </parameters>
                        </signal>
                </object>
@@ -2609,6 +2616,12 @@
                                        <parameter name="len" type="int"/>
                                </parameters>
                        </constructor>
+                       <constructor name="new_with_default_fallbacks" symbol="g_themed_icon_new_with_default_fallbacks">
+                               <return-type type="GIcon*"/>
+                               <parameters>
+                                       <parameter name="iconname" type="char*"/>
+                               </parameters>
+                       </constructor>
                </object>
                <object name="GVfs" parent="GObject" type-name="GVfs" get-type="g_vfs_get_type">
                        <method name="get_default" symbol="g_vfs_get_default">
@@ -4305,6 +4318,7 @@
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
                        <vfunc name="monitor_file">
@@ -4313,6 +4327,7 @@
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="flags" type="GFileMonitorFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
                        <vfunc name="mount_enclosing_volume">