update to glib 2.15.5

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

	* vapi/packages/gio-2.0/, vapi/packages/gio-unix-2.0/: update to
	  glib 2.15.5

	* vapi/gio-2.0.vapi, vapi/gio-unix-2.0.vapi: regenerated

svn path=/trunk/; revision=1023

diff --git a/ChangeLog b/ChangeLog
index 04c2d00..e16d632 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-02-19  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gio-2.0/, vapi/packages/gio-unix-2.0/: update to
+         glib 2.15.5
+
+       * vapi/gio-2.0.vapi, vapi/gio-unix-2.0.vapi: regenerated
+
+2008-02-19  Jürg Billeter  <j@bitron.ch>
+
        * vapi/packages/pango/: fix pango_layout_get_pixel_size binding
 
        * vapi/pango.vapi: regenerated

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index cb342a3..50651c3 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -87,6 +87,10 @@ namespace GLib {
                WOULD_MERGE,
                FAILED_HANDLED,
        }
+       [CCode (cprefix = "G_MOUNT_MOUNT_", cheader_filename = "gio/gio.h")]
+       public enum MountMountFlags {
+               NONE,
+       }
        [CCode (cprefix = "G_MOUNT_OPERATION_", cheader_filename = "gio/gio.h")]
        public enum MountOperationResult {
                HANDLED,
@@ -104,6 +108,7 @@ namespace GLib {
        public enum AppInfoCreateFlags {
                NONE,
                NEEDS_TERMINAL,
+               SUPPORTS_URIS,
        }
        [CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
        [Flags]
@@ -203,8 +208,8 @@ namespace GLib {
                public weak GLib.List get_extensions ();
                public GLib.Type get_required_type ();
                public static weak GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
-               public static weak GLib.IOExtensionPoint lookup (string extension_point);
-               public static weak GLib.IOExtensionPoint register (string extension_point);
+               public static weak GLib.IOExtensionPoint lookup (string name);
+               public static weak GLib.IOExtensionPoint register (string name);
                public void set_required_type (GLib.Type type);
        }
        [CCode (cheader_filename = "gio/gio.h")]
@@ -248,7 +253,7 @@ namespace GLib {
                public bool get_auto_grow ();
                public ulong get_buffer_size ();
                public BufferedOutputStream (GLib.OutputStream base_stream);
-               public BufferedOutputStream.sized (GLib.OutputStream base_stream, uint size);
+               public BufferedOutputStream.sized (GLib.OutputStream base_stream, ulong size);
                public void set_auto_grow (bool auto_grow);
                public void set_buffer_size (ulong size);
                public weak bool auto_grow { get; set; }
@@ -603,6 +608,7 @@ namespace GLib {
                public static weak GLib.List get_all_for_type (string content_type);
                public static weak GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
                public static weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
+               public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext launch_context) throws GLib.Error;
                public abstract bool add_supports_type (string content_type) throws GLib.Error;
                public abstract bool can_remove_supports_type ();
                public abstract weak GLib.AppInfo dup ();
@@ -661,6 +667,7 @@ 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 bool query_exists (GLib.Cancellable cancellable);
                public weak 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;
@@ -711,9 +718,9 @@ namespace GLib {
                public abstract weak GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                [NoWrapper]
                public abstract weak GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-               public abstract void mount_enclosing_volume (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void mount_enclosing_volume (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult _result) throws GLib.Error;
-               public abstract void mount_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                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 weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
@@ -764,7 +771,7 @@ namespace GLib {
                public abstract weak GLib.File get_root ();
                public abstract weak string get_uuid ();
                public abstract weak GLib.Volume get_volume ();
-               public abstract void remount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void remount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool remount_finish (GLib.AsyncResult _result) throws GLib.Error;
                public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool unmount_finish (GLib.AsyncResult _result) throws GLib.Error;
@@ -783,7 +790,7 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public interface Volume : GLib.Object {
-               public void mount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public void mount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool can_eject ();
                public abstract bool can_mount ();
                public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -797,7 +804,8 @@ namespace GLib {
                public abstract weak string get_uuid ();
                public abstract bool mount_finish (GLib.AsyncResult _result) throws GLib.Error;
                [NoWrapper]
-               public abstract void mount_fn (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract void mount_fn (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool should_automount ();
                public signal void changed ();
                public signal void removed ();
        }
@@ -834,6 +842,7 @@ namespace GLib {
        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_DESCRIPTION;
        public const string FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME;
        public const string FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
        public const string FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE;

diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index 5f711fe..e24328f 100644 (file)
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -42,6 +42,11 @@ namespace GLib {
        public class UnixOutputStream : GLib.OutputStream {
                public UnixOutputStream (int fd, bool close_fd_at_close);
        }
+       [CCode (cheader_filename = "gio/gunixmounts.h")]
+       public interface DesktopAppInfoLookup : GLib.Object {
+               public abstract weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
+       }
+       public const string DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME;
        [CCode (cname = "g_unix_is_mount_path_system_internal", cheader_filename = "gio/gunixmounts.h")]
        public static bool g_unix_is_mount_path_system_internal (string mount_path);
        [CCode (cname = "g_unix_mount_at", cheader_filename = "gio/gunixmounts.h")]

diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index 07be4ed..4950afb 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -301,13 +301,13 @@
                        <method name="lookup" symbol="g_io_extension_point_lookup">
                                <return-type type="GIOExtensionPoint*"/>
                                <parameters>
-                                       <parameter name="extension_point" type="char*"/>
+                                       <parameter name="name" type="char*"/>
                                </parameters>
                        </method>
                        <method name="register" symbol="g_io_extension_point_register">
                                <return-type type="GIOExtensionPoint*"/>
                                <parameters>
-                                       <parameter name="extension_point" type="char*"/>
+                                       <parameter name="name" type="char*"/>
                                </parameters>
                        </method>
                        <method name="set_required_type" symbol="g_io_extension_point_set_required_type">
@@ -422,6 +422,9 @@
                        <member name="G_IO_ERROR_WOULD_MERGE" value="29"/>
                        <member name="G_IO_ERROR_FAILED_HANDLED" value="30"/>
                </enum>
+               <enum name="GMountMountFlags">
+                       <member name="G_MOUNT_MOUNT_NONE" value="0"/>
+               </enum>
                <enum name="GMountOperationResult">
                        <member name="G_MOUNT_OPERATION_HANDLED" value="0"/>
                        <member name="G_MOUNT_OPERATION_ABORTED" value="1"/>
@@ -435,6 +438,7 @@
                <flags name="GAppInfoCreateFlags">
                        <member name="G_APP_INFO_CREATE_NONE" value="0"/>
                        <member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value="1"/>
+                       <member name="G_APP_INFO_CREATE_SUPPORTS_URIS" value="2"/>
                </flags>
                <flags name="GAskPasswordFlags">
                        <member name="G_ASK_PASSWORD_NEED_PASSWORD" value="1"/>
@@ -666,7 +670,7 @@
                                <return-type type="GOutputStream*"/>
                                <parameters>
                                        <parameter name="base_stream" type="GOutputStream*"/>
-                                       <parameter name="size" type="guint"/>
+                                       <parameter name="size" type="gsize"/>
                                </parameters>
                        </constructor>
                        <method name="set_auto_grow" symbol="g_buffered_output_stream_set_auto_grow">
@@ -2962,6 +2966,14 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
+                       <method name="launch_default_for_uri" symbol="g_app_info_launch_default_for_uri">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="uri" type="char*"/>
+                                       <parameter name="launch_context" type="GAppLaunchContext*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
                        <method name="launch_uris" symbol="g_app_info_launch_uris">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -3743,6 +3755,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="location" type="GFile*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -3761,6 +3774,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -3811,6 +3825,14 @@
                                        <parameter name="parse_name" type="char*"/>
                                </parameters>
                        </method>
+                       <method name="query_default_handler" symbol="g_file_query_default_handler">
+                               <return-type type="GAppInfo*"/>
+                               <parameters>
+                                       <parameter name="file" type="GFile*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
                        <method name="query_exists" symbol="g_file_query_exists">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -4439,6 +4461,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="location" type="GFile*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -4457,6 +4480,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -4870,6 +4894,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -4984,6 +5009,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -5177,6 +5203,7 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
@@ -5191,6 +5218,12 @@
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
+                       <method name="should_automount" symbol="g_volume_should_automount">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="volume" type="GVolume*"/>
+                               </parameters>
+                       </method>
                        <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
@@ -5288,12 +5321,19 @@
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="flags" type="GMountMountFlags"/>
                                        <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="should_automount">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="volume" type="GVolume*"/>
+                               </parameters>
+                       </vfunc>
                </interface>
                <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE" type="char*" value="access::can-delete"/>
                <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE" type="char*" value="access::can-execute"/>
@@ -5322,6 +5362,7 @@
                <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_DESCRIPTION" type="char*" value="standard::description"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME" type="char*" value="standard::display-name"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME" type="char*" value="standard::edit-name"/>
                <constant name="G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE" type="char*" value="standard::fast-content-type"/>

diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
index b752127..a041803 100644 (file)
--- a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
+++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
@@ -242,5 +242,25 @@
                                </parameters>
                        </constructor>
                </object>
+               <interface name="GDesktopAppInfoLookup" type-name="GDesktopAppInfoLookup" get-type="g_desktop_app_info_lookup_get_type">
+                       <requires>
+                               <interface name="GObject"/>
+                       </requires>
+                       <method name="get_default_for_uri_scheme" symbol="g_desktop_app_info_lookup_get_default_for_uri_scheme">
+                               <return-type type="GAppInfo*"/>
+                               <parameters>
+                                       <parameter name="lookup" type="GDesktopAppInfoLookup*"/>
+                                       <parameter name="uri_scheme" type="char*"/>
+                               </parameters>
+                       </method>
+                       <vfunc name="get_default_for_uri_scheme">
+                               <return-type type="GAppInfo*"/>
+                               <parameters>
+                                       <parameter name="lookup" type="GDesktopAppInfoLookup*"/>
+                                       <parameter name="uri_scheme" type="char*"/>
+                               </parameters>
+                       </vfunc>
+               </interface>
+               <constant name="G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME" type="char*" value="gio-desktop-app-info-lookup"/>
        </namespace>
 </api>