GNOME.org
 

[vala] gio-2.0: various ownership and type_arguments fixes for generics

commit 28a4035f884b1de99d7d48ce4d08dcf89f84e3a2
Author: Evan Nemerson <evan coeus-group com>
Date:   Fri Mar 26 19:03:07 2010 -0700

    gio-2.0: various ownership and type_arguments fixes for generics

 vapi/gio-2.0.vapi                      |   32 +++++++++++++++-----------------
 vapi/packages/gio-2.0/gio-2.0.metadata |   23 ++++++++++++++++++-----
 2 files changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 5275479..87de1b2 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -6,8 +6,8 @@ namespace GLib {
 	public class AppLaunchContext : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public AppLaunchContext ();
-		public virtual unowned string get_display (GLib.AppInfo info, GLib.List files);
-		public virtual unowned string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
+		public virtual unowned string get_display (GLib.AppInfo info, GLib.List<GLib.File> files);
+		public virtual unowned string get_startup_notify_id (GLib.AppInfo info, GLib.List<GLib.File> files);
 		public virtual void launch_failed (string startup_notify_id);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -117,7 +117,7 @@ namespace GLib {
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public EmblemedIcon (GLib.Icon icon, GLib.Emblem emblem);
 		public void add_emblem (GLib.Emblem emblem);
-		public unowned GLib.List get_emblems ();
+		public unowned GLib.List<GLib.Emblem> get_emblems ();
 		public unowned GLib.Icon get_icon ();
 	}
 	[Compact]
@@ -342,7 +342,7 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOExtensionPoint {
 		public unowned GLib.IOExtension get_extension_by_name (string name);
-		public unowned GLib.List get_extensions ();
+		public unowned GLib.List<GLib.IOExtension> get_extensions ();
 		public GLib.Type get_required_type ();
 		public static unowned GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
 		public static unowned GLib.IOExtensionPoint lookup (string name);
@@ -562,8 +562,6 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Resolver : GLib.Object {
 		public static GLib.Quark error_quark ();
-		public static void free_addresses (GLib.List addresses);
-		public static void free_targets (GLib.List targets);
 		public static unowned GLib.Resolver get_default ();
 		public virtual unowned string lookup_by_address (GLib.InetAddress address, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual async unowned string lookup_by_address_async (GLib.InetAddress address, GLib.Cancellable? cancellable) throws GLib.Error;
@@ -813,7 +811,7 @@ namespace GLib {
 		public uint16 get_port ();
 		public uint16 get_priority ();
 		public uint16 get_weight ();
-		public static unowned GLib.List list_sort (GLib.List targets);
+		public static GLib.List<GLib.SrvTarget> list_sort (owned GLib.List<GLib.SrvTarget> targets);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class TcpConnection : GLib.SocketConnection {
@@ -875,11 +873,11 @@ namespace GLib {
 	public class VolumeMonitor : GLib.Object {
 		public virtual unowned GLib.Volume adopt_orphan_mount (GLib.Mount mount);
 		public static GLib.VolumeMonitor @get ();
-		public virtual GLib.List get_connected_drives ();
+		public virtual GLib.List<GLib.Drive> get_connected_drives ();
 		public virtual GLib.Mount get_mount_for_uuid (string uuid);
-		public virtual GLib.List get_mounts ();
+		public virtual GLib.List<GLib.Mount> get_mounts ();
 		public virtual GLib.Volume get_volume_for_uuid (string uuid);
-		public virtual GLib.List get_volumes ();
+		public virtual GLib.List<GLib.Volume> get_volumes ();
 		[NoWrapper]
 		public virtual bool is_supported ();
 		public virtual signal void drive_changed (GLib.Drive drive);
@@ -906,8 +904,8 @@ namespace GLib {
 		public abstract bool do_delete ();
 		public abstract unowned GLib.AppInfo dup ();
 		public abstract bool equal (GLib.AppInfo appinfo2);
-		public static unowned GLib.List get_all ();
-		public static unowned GLib.List get_all_for_type (string content_type);
+		public static GLib.List<GLib.AppInfo> get_all ();
+		public static GLib.List<GLib.AppInfo> get_all_for_type (string content_type);
 		public abstract unowned string get_commandline ();
 		public static unowned GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
 		public static unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
@@ -916,9 +914,9 @@ namespace GLib {
 		public abstract unowned GLib.Icon get_icon ();
 		public abstract unowned string get_id ();
 		public abstract unowned string get_name ();
-		public abstract bool launch (GLib.List? files, GLib.AppLaunchContext? launch_context) throws GLib.Error;
+		public abstract bool launch (GLib.List<GLib.File>? files, GLib.AppLaunchContext? launch_context) throws GLib.Error;
 		public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error;
-		public abstract bool launch_uris (GLib.List? uris, GLib.AppLaunchContext launch_context) throws GLib.Error;
+		public abstract bool launch_uris (GLib.List<string>? uris, GLib.AppLaunchContext launch_context) throws GLib.Error;
 		public abstract bool remove_supports_type (string content_type) throws GLib.Error;
 		public static void reset_type_associations (string content_type);
 		public abstract bool set_as_default_for_extension (string extension) throws GLib.Error;
@@ -957,7 +955,7 @@ namespace GLib {
 		public abstract unowned string get_identifier (string kind);
 		public abstract unowned string get_name ();
 		public abstract GLib.DriveStartStopType get_start_stop_type ();
-		public abstract unowned GLib.List get_volumes ();
+		public abstract GLib.List<GLib.Volume> get_volumes ();
 		public abstract bool has_media ();
 		public abstract bool has_volumes ();
 		public abstract bool is_media_check_automatic ();
@@ -1619,13 +1617,13 @@ namespace GLib {
 	[CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_unknown (string type);
 	[CCode (cname = "g_content_types_get_registered", cheader_filename = "gio/gio.h")]
-	public static unowned GLib.List g_content_types_get_registered ();
+	public static GLib.List<string> g_content_types_get_registered ();
 	[CCode (cname = "g_io_error_from_errno", cheader_filename = "gio/gio.h")]
 	public static unowned GLib.IOError g_io_error_from_errno (int err_no);
 	[CCode (cname = "g_io_error_quark", cheader_filename = "gio/gio.h")]
 	public static GLib.Quark g_io_error_quark ();
 	[CCode (cname = "g_io_modules_load_all_in_directory", cheader_filename = "gio/gio.h")]
-	public static unowned GLib.List g_io_modules_load_all_in_directory (string dirname);
+	public static GLib.List<weak GLib.TypeModule> g_io_modules_load_all_in_directory (string dirname);
 	[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
 	public static void g_io_scheduler_cancel_all_jobs ();
 	[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 17defe2..b7c3d6d 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -1,12 +1,17 @@
 GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gio.h" gir_namespace="Gio" gir_version="2.0"
+g_app_info_get_all type_arguments="AppInfo" transfer_ownership="1"
+g_app_info_get_all_for_type type_arguments="AppInfo" transfer_ownership="1"
 g_app_info_launch.envp is_array="1"
 g_app_info_launch.launch_context nullable="1"
 g_app_info_launch_default_for_uri.launch_context nullable="1"
 g_app_info_launch_uris.envp is_array="1"
+g_app_launch_context_get_display.files type_arguments="File"
+g_app_launch_context_get_startup_notify_id.files type_arguments="File"
 GAsyncReadyCallback.source_object nullable="1"
 g_buffered_input_stream_peek_buffer.count is_out="1"
 g_content_type_guess.data_size hidden="1"
 g_content_type_guess.result_uncertain is_out="1"
+g_content_types_get_registered type_arguments="string" transfer_ownership="1"
 g_data_input_stream_read_line nullable="1" transfer_ownership="1"
 g_data_input_stream_read_line.length is_out="1"
 g_data_input_stream_read_line_finish nullable="1" transfer_ownership="1"
@@ -17,9 +22,11 @@ g_data_input_stream_read_until_finish nullable="1" transfer_ownership="1"
 g_data_input_stream_read_until_finish.length is_out="1"
 g_drive_eject async="1"
 g_drive_eject_with_operation async="1"
+g_drive_get_volumes type_arguments="Volume" transfer_ownership="1"
 g_drive_poll_for_media async="1"
 g_drive_start async="1"
 g_drive_stop async="1"
+g_emblemed_icon_get_emblems type_arguments="Emblem"
 g_file_append_to transfer_ownership="1"
 g_file_append_to_finish transfer_ownership="1"
 g_file_copy.progress_callback_data hidden="1"
@@ -84,6 +91,8 @@ g_file_unmount_mountable_with_operation async="1"
 g_inet_address_to_string transfer_ownership="1"
 g_input_stream_read_all.bytes_read is_out="1"
 GIOErrorEnum rename_to="IOError" errordomain="1"
+g_io_extension_point_get_extensions type_arguments="IOExtension"
+g_io_modules_load_all_in_directory type_arguments="unowned TypeModule" transfer_ownership="1"
 g_memory_input_stream_add_data.destroy nullable="1"
 g_memory_input_stream_new_from_data.destroy nullable="1"
 g_mount_eject async="1"
@@ -94,6 +103,8 @@ g_mount_unmount async="1"
 g_mount_unmount_with_operation async="1"
 GMountOperation::reply has_emitter="1"
 g_output_stream_write_all.bytes_written is_out="1"
+g_resolver_free_addresses hidden="1"
+g_resolver_free_targets hidden="1"
 g_resolver_lookup_by_name transfer_ownership="1" type_arguments="InetAddress"
 g_resolver_lookup_by_name_finish transfer_ownership="1" type_arguments="InetAddress"
 g_resolver_lookup_service transfer_ownership="1" type_arguments="SrvTarget"
@@ -103,6 +114,8 @@ g_seekable_truncate_fn hidden="1"
 g_socket_listener_add_address.source_object nullable="1"
 g_socket_listener_add_inet_port.source_object nullable="1"
 g_socket_listener_add_socket.source_object nullable="1"
+g_srv_target_list_sort type_arguments="SrvTarget" transfer_ownership="1"
+g_srv_target_list_sort.targets type_arguments="SrvTarget" transfer_ownership="1"
 g_themed_icon_new_from_names.iconnames is_array="1"
 g_themed_icon_new_from_names.len hidden="1"
 g_themed_icon_get_names is_array="1" no_array_length="1"
@@ -138,8 +151,8 @@ g_file_info_get_attribute_data.value_pp nullable="1"
 g_file_info_get_attribute_data.status nullable="1"
 
 g_app_info_create_from_commandline.app_name nullable="1"
-g_app_info_launch.files nullable="1"
-g_app_info_launch_uris.uris nullable="1"
+g_app_info_launch.files nullable="1" type_arguments="File"
+g_app_info_launch_uris.uris nullable="1" type_arguments="string"
 
 g_loadable_icon_load.type nullable="1"
 g_loadable_icon_load_finish.type nullable="1"
@@ -162,8 +175,8 @@ g_simple_async_result_new.source_object nullable="1"
 GSocketService::incoming.source_object nullable="1"
 
 g_volume_monitor_get transfer_ownership="1"
-g_volume_monitor_get_connected_drives transfer_ownership="1"
+g_volume_monitor_get_connected_drives type_arguments="Drive" transfer_ownership="1"
 g_volume_monitor_get_mount_for_uuid transfer_ownership="1"
-g_volume_monitor_get_mounts transfer_ownership="1"
+g_volume_monitor_get_mounts type_arguments="Mount" transfer_ownership="1"
 g_volume_monitor_get_volume_for_uuid transfer_ownership="1"
-g_volume_monitor_get_volumes transfer_ownership="1"
+g_volume_monitor_get_volumes type_arguments="Volume" transfer_ownership="1"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]