From: Jürg Billeter Date: Mon, 25 Oct 2010 13:46:35 +0000 (+0200) Subject: gio-2.0: Update to GLib master X-Git-Tag: 0.11.1~3 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1100112046fc00c4620582d488278eff5197f95e;p=thirdparty%2Fvala.git gio-2.0: Update to GLib master --- diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 48aac82c9..97dd5e95a 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -57,38 +57,69 @@ namespace GLib { public virtual void launch_failed (string startup_notify_id); } [CCode (cheader_filename = "gio/gio.h")] - public class Application : GLib.Object, GLib.Initable { - [CCode (has_construct_function = false)] - public Application (string appid, [CCode (array_length_pos = 1.9)] ref unowned string[]? argv = null); - public void add_action (string name, string description); - public unowned string get_action_description (string name); - public bool get_action_enabled (string name); - public unowned string get_id (); - public static unowned GLib.Application get_instance (); - public void invoke_action (string name, GLib.Variant platform_data); - public unowned string list_actions (); + public class Application : GLib.Object, GLib.ActionGroup { + [CCode (has_construct_function = false)] + public Application (string application_id, GLib.ApplicationFlags flags); + [NoWrapper] + public virtual void add_platform_data (GLib.VariantBuilder builder); + [NoWrapper] + public virtual void after_emit (GLib.Variant platform_data); + [NoWrapper] + public virtual void before_emit (GLib.Variant platform_data); + public unowned string get_application_id (); + public GLib.ApplicationFlags get_flags (); + public uint get_inactivity_timeout (); + public bool get_is_registered (); + public bool get_is_remote (); + public void hold (); + public static bool id_is_valid (string application_id); + [NoWrapper] + public virtual bool local_command_line (string arguments, int exit_status); [CCode (cname = "g_application_quit_with_data")] public bool quit (GLib.Variant? platform_data = null); - public bool register (); - public void remove_action (string name); - public virtual void run (); - public void set_action_enabled (string name, bool enabled); - public static unowned GLib.Application try_new (string appid, int argc, out unowned string argv) throws GLib.Error; - public static unowned GLib.Application unregistered_try_new (string appid, int argc, out unowned string argv) throws GLib.Error; - [NoAccessorMethod] - public string application_id { owned get; construct; } - [NoAccessorMethod] - public GLib.Variant argv { owned get; construct; } - [NoAccessorMethod] - public bool default_quit { get; construct; } - [NoAccessorMethod] + [NoWrapper] + public virtual void quit_mainloop (); + public bool register (GLib.Cancellable? cancellable = null) throws GLib.Error; + public void release (); + public int run ([CCode (array_length_pos = 1.9)] string[]? argv = null); + [NoWrapper] + public virtual void run_mainloop (); + public void set_action_group (GLib.ActionGroup action_group); + public void set_application_id (string application_id); + public void set_flags (GLib.ApplicationFlags flags); + public void set_inactivity_timeout (uint inactivity_timeout); + public GLib.ActionGroup action_group { set; } + public string application_id { get; set construct; } + public GLib.ApplicationFlags flags { get; set; } + public uint inactivity_timeout { get; set; } + public bool is_registered { get; } public bool is_remote { get; } - [NoAccessorMethod] - public GLib.Variant platform_data { owned get; construct; } - public virtual signal void action_with_data (string action_name, GLib.Variant platform_data); - public virtual signal void prepare_activation (GLib.Variant arguments, GLib.Variant platform_data); [HasEmitter] - public virtual signal bool quit_with_data (GLib.Variant? platform_data); + public virtual signal void activate (); + public virtual signal int command_line (GLib.ApplicationCommandLine command_line); + [HasEmitter] + public virtual signal void open (GLib.File[] files, string hint); + public virtual signal void startup (); + } + [CCode (cheader_filename = "gio/gio.h")] + public class ApplicationCommandLine : GLib.Object { + [CCode (has_construct_function = false)] + protected ApplicationCommandLine (); + public string[] get_arguments (); + public unowned string get_cwd (); + public int get_exit_status (); + public bool get_is_remote (); + public GLib.Variant? get_platform_data (); + public void print (string format); + [NoWrapper] + public virtual void print_literal (string message); + public void printerr (string format); + [NoWrapper] + public virtual void printerr_literal (string message); + public void set_exit_status (int exit_status); + public GLib.Variant arguments { construct; } + public bool is_remote { get; } + public GLib.Variant platform_data { construct; } } [CCode (cheader_filename = "gio/gio.h")] public class BufferedInputStream : GLib.FilterInputStream { @@ -1010,6 +1041,22 @@ namespace GLib { public uint8[] buffer; } [CCode (cheader_filename = "gio/gio.h")] + public class Periodic : GLib.Object { + [CCode (has_construct_function = false)] + public Periodic (uint hz, int priority); + public uint add (GLib.PeriodicTickFunc callback, GLib.DestroyNotify notify); + public void block (); + public void damaged (GLib.PeriodicRepairFunc callback, GLib.DestroyNotify notify); + public uint get_hz (); + public int get_priority (); + public void remove (uint tag); + public void unblock (); + public uint hz { get; construct; } + public int priority { get; construct; } + public virtual signal void repair (); + public virtual signal void tick (uint64 p0); + } + [CCode (cheader_filename = "gio/gio.h")] public class Permission : GLib.Object { [CCode (has_construct_function = false)] protected Permission (); @@ -1083,6 +1130,7 @@ namespace GLib { public bool get_has_unapplied (); public int get_int (string key); public void* get_mapped (string key, GLib.SettingsGetMapping mapping); + public unowned GLib.Variant get_range (string key); public unowned string get_string (string key); [CCode (array_length = false, array_null_terminated = true)] public string[] get_strv (string key); @@ -1092,8 +1140,10 @@ namespace GLib { public string[] list_children (); [CCode (array_length = false, array_null_terminated = true)] public string[] list_keys (); + public static unowned string list_relocatable_schemas (); [CCode (array_length = false, array_null_terminated = true)] public static unowned string[] list_schemas (); + public bool range_check (string key, GLib.Variant value); public void reset (string key); public void revert (); [CCode (sentinel = "")] @@ -1498,15 +1548,15 @@ namespace GLib { } [CCode (cheader_filename = "gio/gio.h")] public interface ActionGroup : GLib.Object { - public abstract void activate (string action_name, GLib.Variant parameter); - public abstract bool get_enabled (string action_name); - public abstract unowned GLib.VariantType get_parameter_type (string action_name); - public abstract unowned GLib.Variant get_state (string action_name); - public abstract unowned GLib.Variant get_state_hint (string action_name); - public abstract unowned GLib.VariantType get_state_type (string action_name); + public abstract void activate_action (string action_name, GLib.Variant parameter); + public abstract void change_action_state (string action_name, GLib.Variant value); + public abstract bool get_action_enabled (string action_name); + public abstract unowned GLib.VariantType get_action_parameter_type (string action_name); + public abstract unowned GLib.Variant get_action_state (string action_name); + public abstract unowned GLib.Variant get_action_state_hint (string action_name); + public abstract unowned GLib.VariantType get_action_state_type (string action_name); public abstract bool has_action (string action_name); public abstract unowned string list_actions (); - public abstract void set_state (string action_name, GLib.Variant value); [HasEmitter] public signal void action_added (string action_name); [HasEmitter] @@ -1794,6 +1844,15 @@ namespace GLib { SUPPORTS_URIS, SUPPORTS_STARTUP_NOTIFICATION } + [CCode (cprefix = "G_APPLICATION_", cheader_filename = "gio/gio.h")] + [Flags] + public enum ApplicationFlags { + FLAGS_NONE, + IS_SERVICE, + IS_LAUNCHER, + HANDLES_OPEN, + HANDLES_COMMAND_LINE + } [CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")] [Flags] public enum AskPasswordFlags { @@ -2266,6 +2325,10 @@ namespace GLib { public delegate bool FileReadMoreCallback (string file_contents, int64 file_size, void* callback_data); [CCode (cheader_filename = "gio/gio.h")] public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable); + [CCode (cheader_filename = "gio/gio.h")] + public delegate void PeriodicRepairFunc (GLib.Periodic periodic); + [CCode (cheader_filename = "gio/gio.h")] + public delegate void PeriodicTickFunc (GLib.Periodic periodic, uint64 timestamp); [CCode (cheader_filename = "gio/gio.h", has_target = false)] public delegate void* ReallocFunc (void* data, size_t size); [CCode (cheader_filename = "gio/gio.h")] diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi index 769c3040c..40155ebf1 100644 --- a/vapi/gio-unix-2.0.vapi +++ b/vapi/gio-unix-2.0.vapi @@ -128,16 +128,10 @@ namespace GLib { [NoAccessorMethod] public GLib.ByteArray path_as_array { owned get; construct; } } - [CCode (cheader_filename = "gio/gunixmounts.h")] - public interface DesktopAppInfoLookup : GLib.Object { - public abstract unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme); - } [CCode (cheader_filename = "gio/gfiledescriptorbased.h")] public interface FileDescriptorBased : GLib.Object { public abstract int get_fd (); } - [CCode (cheader_filename = "gio/gunixmounts.h")] - 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 is_mount_path_system_internal (string mount_path); [CCode (cname = "g_unix_mount_points_changed_since", 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 2bd855629..3059b2e69 100644 --- a/vapi/packages/gio-2.0/gio-2.0.gi +++ b/vapi/packages/gio-2.0/gio-2.0.gi @@ -570,6 +570,21 @@ + + + + + + + + + + + + + + + @@ -1347,6 +1362,13 @@ + + + + + + + @@ -1514,155 +1536,269 @@ - + - + - - - + - - - + + - - - + + - - - - - + + - - - + - - + + + + + + + + - - - + + - - + + - + + + + + - + - + + + + + + + + + - + - - + - - + + - - - - + + - - + + - - - - + + - - - + + + + + - - - + - - - + + + + + + + + - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5559,6 +5695,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6057,6 +6266,13 @@ + + + + + + + @@ -6097,6 +6313,9 @@ + + + @@ -6128,6 +6347,14 @@ + + + + + + + + @@ -7903,7 +8130,7 @@ - + @@ -7941,7 +8168,7 @@ - + @@ -7949,35 +8176,43 @@ - + + + + + + + + + - + - + - + - + @@ -7997,14 +8232,6 @@ - - - - - - - - @@ -8035,7 +8262,7 @@ - + @@ -8043,35 +8270,43 @@ - + + + + + + + + + - + - + - + - + @@ -8091,14 +8326,6 @@ - - - - - - - - diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index 7a0eb7824..09f437b4c 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -217,12 +217,19 @@ g_memory_output_stream_*.destroy_function nullable="1" g_*_stream_close error_types="IOError" g_*_stream_close_finish error_types="IOError" -g_application_new.argc hidden="1" -g_application_new.argv is_array="1" is_ref="1" array_length_pos="1.9" nullable="1" default_value="null" +g_application_run.argc hidden="1" +g_application_run.argv is_array="1" array_length_pos="1.9" nullable="1" default_value="null" g_application_is_remote hidden="1" +GApplication::activate has_emitter="1" +GApplication::open has_emitter="1" +GApplication::open.files type_name="File" is_array="1" +GApplication::open.n_files hidden="1" GApplication::quit_with_data has_emitter="1" GApplication::quit_with_data.platform_data nullable="1" default_value="null" GApplication:register hidden="1" +g_application_command_line_get_arguments is_array="1" transfer_ownership="1" +g_application_command_line_get_arguments.argc hidden="1" +g_application_command_line_get_platform_data nullable="1" transfer_ownership="1" GActionGroup::action_added has_emitter="1" GActionGroup::action_removed has_emitter="1" GActionGroup::action_enabled_changed has_emitter="1" 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 0dce1a1d9..e49924567 100644 --- a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi +++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi @@ -497,25 +497,6 @@ - - - - - - - - - - - - - - - - - - - @@ -533,6 +514,5 @@ -