From: Evan Nemerson Date: Wed, 10 Nov 2010 09:45:22 +0000 (-0800) Subject: gdu, gdu-gtk: Regenerate bindings and add generic type arguments X-Git-Tag: 0.11.3~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dab02f2c369e084e53e9f13f7c48ed64ccd6e18;p=thirdparty%2Fvala.git gdu, gdu-gtk: Regenerate bindings and add generic type arguments --- diff --git a/vapi/gdu-gtk.vapi b/vapi/gdu-gtk.vapi index 977e4d5f2..08ef5a751 100644 --- a/vapi/gdu-gtk.vapi +++ b/vapi/gdu-gtk.vapi @@ -6,9 +6,9 @@ namespace Gdu { public class AddComponentLinuxMdDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable { [CCode (type = "GtkWidget*", has_construct_function = false)] public AddComponentLinuxMdDialog (Gtk.Window parent, Gdu.AddComponentLinuxMdFlags flags, Gdu.LinuxMdDrive linux_md_drive); - public unowned GLib.PtrArray get_drives (); + public unowned GLib.GenericArray get_drives (); public uint64 get_size (); - public GLib.PtrArray drives { get; } + public GLib.GenericArray drives { get; } [NoAccessorMethod] public Gdu.AddComponentLinuxMdFlags flags { get; construct; } public uint64 size { get; } @@ -49,12 +49,12 @@ namespace Gdu { [CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")] public class ButtonTable : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { [CCode (type = "GtkWidget*", has_construct_function = false)] - public ButtonTable (uint num_columns, GLib.PtrArray elements); - public unowned GLib.PtrArray get_elements (); + public ButtonTable (uint num_columns, GLib.GenericArray elements); + public GLib.GenericArray get_elements (); public uint get_num_columns (); - public void set_elements (GLib.PtrArray elements); + public void set_elements (GLib.GenericArray elements); public void set_num_columns (uint num_columns); - public GLib.PtrArray elements { get; set construct; } + public GLib.GenericArray elements { get; set construct; } public uint num_columns { get; set construct; } } [Compact] @@ -97,12 +97,12 @@ namespace Gdu { [CCode (type = "GtkWidget*", has_construct_function = false)] public CreateLinuxMdDialog (Gtk.Window parent, Gdu.Pool pool); public uint64 get_component_size (); - public unowned GLib.PtrArray get_drives (); + public GLib.GenericArray get_drives (); public unowned string get_level (); public uint64 get_size (); public uint64 get_stripe_size (); public uint64 component_size { get; } - public GLib.PtrArray drives { get; } + public GLib.GenericArray drives { get; } public string level { get; } public string name { get; } [NoAccessorMethod] @@ -168,16 +168,18 @@ namespace Gdu { [CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")] public class DetailsTable : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { [CCode (type = "GtkWidget*", has_construct_function = false)] - public DetailsTable (uint num_columns, GLib.PtrArray elements); - public unowned GLib.PtrArray get_elements (); + public DetailsTable (uint num_columns, GLib.GenericArray elements); + public GLib.GenericArray get_elements (); public uint get_num_columns (); - public void set_elements (GLib.PtrArray elements); + public void set_elements (GLib.GenericArray elements); public void set_num_columns (uint num_columns); - public GLib.PtrArray elements { get; set construct; } + public GLib.GenericArray elements { get; set construct; } public uint num_columns { get; set construct; } } [CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")] public class Dialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { + [CCode (has_construct_function = false)] + protected Dialog (); public unowned Gdu.Device get_device (); public unowned Gdu.Pool get_pool (); public unowned Gdu.Presentable get_presentable (); @@ -193,7 +195,7 @@ namespace Gdu { public uint64 get_largest_segment_for_all (); public uint64 get_largest_segment_for_selected (); public uint get_num_available_disks (); - public unowned GLib.PtrArray get_selected_drives (); + public unowned GLib.GenericArray get_selected_drives (); public void set_component_size (uint64 component_size); public uint64 component_size { get; set; } [NoAccessorMethod] @@ -203,7 +205,7 @@ namespace Gdu { public uint num_available_disks { get; } [NoAccessorMethod] public Gdu.Pool pool { owned get; construct; } - public GLib.PtrArray selected_drives { get; } + public GLib.GenericArray selected_drives { get; } public virtual signal void changed (); public virtual signal unowned string is_drive_ignored (Gdu.Drive drive); } @@ -305,13 +307,13 @@ namespace Gdu { [CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")] public class PoolTreeModel : Gtk.TreeStore, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable, Gtk.Buildable { [CCode (has_construct_function = false)] - public PoolTreeModel (GLib.PtrArray pools, Gdu.Presentable root, Gdu.PoolTreeModelFlags flags); + public PoolTreeModel (GLib.GenericArray pools, Gdu.Presentable root, Gdu.PoolTreeModelFlags flags); public bool get_iter_for_presentable (Gdu.Presentable presentable, Gtk.TreeIter out_iter); - public void set_pools (GLib.PtrArray pools); + public void set_pools (GLib.GenericArray pools); [NoAccessorMethod] public Gdu.PoolTreeModelFlags flags { get; construct; } [NoAccessorMethod] - public GLib.PtrArray pools { owned get; set construct; } + public GLib.GenericArray pools { owned get; set construct; } [NoAccessorMethod] public Gdu.Presentable root { owned get; construct; } } diff --git a/vapi/gdu.vapi b/vapi/gdu.vapi index 4cc9d9474..f0b49e807 100644 --- a/vapi/gdu.vapi +++ b/vapi/gdu.vapi @@ -4,6 +4,8 @@ namespace Gdu { [CCode (cheader_filename = "gdu/gdu.h")] public class Adapter : GLib.Object { + [CCode (has_construct_function = false)] + protected Adapter (); public unowned string get_driver (); public unowned string get_fabric (); public unowned string get_model (); @@ -17,6 +19,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Device : GLib.Object { + [CCode (has_construct_function = false)] + protected Device (); public void* drive_ata_smart_get_blob (size_t out_size); public bool drive_ata_smart_get_is_available (); public unowned string drive_ata_smart_get_status (); @@ -149,7 +153,7 @@ namespace Gdu { public void op_linux_lvm2_lv_stop (Gdu.DeviceLinuxLvm2LVStopCompletedFunc callback); public void op_linux_md_add_spare (string component_objpath, Gdu.DeviceLinuxMdAddSpareCompletedFunc callback); public void op_linux_md_check (string options, Gdu.DeviceLinuxMdCheckCompletedFunc callback); - public void op_linux_md_expand (GLib.PtrArray component_objpaths, Gdu.DeviceLinuxMdExpandCompletedFunc callback); + public void op_linux_md_expand (GLib.GenericArray component_objpaths, Gdu.DeviceLinuxMdExpandCompletedFunc callback); public void op_linux_md_remove_component (string component_objpath, Gdu.DeviceLinuxMdRemoveComponentCompletedFunc callback); public void op_linux_md_stop (Gdu.DeviceLinuxMdStopCompletedFunc callback); public void op_luks_change_passphrase (string old_secret, string new_secret, Gdu.DeviceLuksChangePassphraseCompletedFunc callback); @@ -184,6 +188,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Drive : GLib.Object, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected Drive (); public virtual void activate (Gdu.DriveActivateFunc callback); public virtual bool can_activate (bool out_degraded); public virtual bool can_create_volume (bool out_is_uninitialized, uint64 out_largest_contiguous_free_segment, uint64 out_total_free, out unowned Gdu.Presentable out_presentable); @@ -198,6 +204,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Expander : GLib.Object { + [CCode (has_construct_function = false)] + protected Expander (); public unowned string get_adapter (); public unowned string get_model (); public unowned string get_native_path (); @@ -212,12 +220,16 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Hub : GLib.Object, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected Hub (); public unowned Gdu.Adapter get_adapter (); public unowned Gdu.Expander get_expander (); public Gdu.HubUsage get_usage (); } [CCode (cheader_filename = "gdu/gdu.h")] public class KnownFilesystem : GLib.Object { + [CCode (has_construct_function = false)] + protected KnownFilesystem (); public bool get_can_create (); public bool get_can_mount (); public unowned string get_id (); @@ -235,11 +247,15 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class LinuxLvm2Volume : Gdu.Volume, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected LinuxLvm2Volume (); public unowned string get_group_uuid (); public unowned string get_uuid (); } [CCode (cheader_filename = "gdu/gdu.h")] public class LinuxLvm2VolumeGroup : Gdu.Drive, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected LinuxLvm2VolumeGroup (); public unowned string get_compute_new_lv_name (); public bool get_lv_info (string lv_uuid, uint out_position, string out_name, uint64 out_size); public uint get_num_lvs (); @@ -250,9 +266,13 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class LinuxLvm2VolumeHole : Gdu.VolumeHole, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected LinuxLvm2VolumeHole (); } [CCode (cheader_filename = "gdu/gdu.h")] public class LinuxMdDrive : Gdu.Drive, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected LinuxMdDrive (); public Gdu.LinuxMdDriveSlaveFlags get_slave_flags (Gdu.Device slave); public unowned string get_slave_state_markup (Gdu.Device slave); public unowned GLib.List get_slaves (); @@ -261,6 +281,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Machine : GLib.Object, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected Machine (); } [CCode (cheader_filename = "gdu/gdu.h")] public class Pool : GLib.Object { @@ -300,8 +322,8 @@ namespace Gdu { public void op_linux_lvm2_vg_set_name (string uuid, string new_name, Gdu.PoolLinuxLvm2VGSetNameCompletedFunc callback); public void op_linux_lvm2_vg_start (string uuid, Gdu.PoolLinuxLvm2VGStartCompletedFunc callback); public void op_linux_lvm2_vg_stop (string uuid, Gdu.PoolLinuxLvm2VGStopCompletedFunc callback); - public void op_linux_md_create (GLib.PtrArray component_objpaths, string level, uint64 stripe_size, string name, Gdu.PoolLinuxMdCreateCompletedFunc callback); - public void op_linux_md_start (GLib.PtrArray component_objpaths, Gdu.PoolLinuxMdStartCompletedFunc callback); + public void op_linux_md_create (GLib.GenericArray component_objpaths, string level, uint64 stripe_size, string name, Gdu.PoolLinuxMdCreateCompletedFunc callback); + public void op_linux_md_start (GLib.GenericArray component_objpaths, Gdu.PoolLinuxMdStartCompletedFunc callback); public bool supports_luks_devices (); public virtual signal void adapter_added (Gdu.Adapter adapter); public virtual signal void adapter_changed (Gdu.Adapter adapter); @@ -324,6 +346,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Port : GLib.Object { + [CCode (has_construct_function = false)] + protected Port (); public unowned string get_adapter (); public unowned string get_connector_type (); public unowned string get_native_path (); @@ -336,6 +360,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Process : GLib.Object { + [CCode (has_construct_function = false)] + protected Process (); public unowned GLib.AppInfo get_app_info (); public unowned string get_command_line (); public int get_id (); @@ -343,6 +369,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class Volume : GLib.Object, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected Volume (); public unowned Gdu.Drive get_drive (); public virtual Gdu.VolumeFlags get_flags (); public virtual bool is_allocated (); @@ -350,6 +378,8 @@ namespace Gdu { } [CCode (cheader_filename = "gdu/gdu.h")] public class VolumeHole : GLib.Object, Gdu.Presentable { + [CCode (has_construct_function = false)] + protected VolumeHole (); } [CCode (cheader_filename = "gdu/gdu.h")] public interface Presentable : GLib.Object { @@ -431,7 +461,7 @@ namespace Gdu { [CCode (cheader_filename = "gdu/gdu.h")] public delegate void DeviceDriveAtaSmartRefreshDataCompletedFunc (Gdu.Device device, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] - public delegate void DeviceDriveBenchmarkCompletedFunc (Gdu.Device device, GLib.PtrArray read_transfer_rate_results, GLib.PtrArray write_transfer_rate_results, GLib.PtrArray access_time_results, GLib.Error error); + public delegate void DeviceDriveBenchmarkCompletedFunc (Gdu.Device device, GLib.GenericArray read_transfer_rate_results, GLib.GenericArray write_transfer_rate_results, GLib.GenericArray access_time_results, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] public delegate void DeviceDriveDetachCompletedFunc (Gdu.Device device, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] diff --git a/vapi/packages/gdu-gtk/gdu-gtk.metadata b/vapi/packages/gdu-gtk/gdu-gtk.metadata index 1e882bf60..04b9ca98c 100644 --- a/vapi/packages/gdu-gtk/gdu-gtk.metadata +++ b/vapi/packages/gdu-gtk/gdu-gtk.metadata @@ -1,3 +1,20 @@ Gdu cheader_filename="gdu-gtk/gdu-gtk.h" +GduAddComponentLinuxMdDialog:drives type_name="GLib.GenericArray" +gdu_add_component_linux_md_dialog_get_drives type_name="GLib.GenericArray" +GduButtonTable:elements type_name="GLib.GenericArray" +gdu_button_table_new.elements type_name="GLib.GenericArray" +gdu_button_table_get_elements type_name="GLib.GenericArray" transfer_ownership="1" +gdu_button_table_set_elements.elements type_name="GLib.GenericArray" +GduCreateLinuxMdDialog:drives type_name="GLib.GenericArray" +gdu_create_linux_md_dialog_get_drives type_name="GLib.GenericArray" transfer_ownership="1" +GduDetailsTable:elements type_name="GLib.GenericArray" +gdu_details_table_new.elements type_name="GLib.GenericArray" +gdu_details_table_get_elements type_name="GLib.GenericArray" transfer_ownership="1" +gdu_details_table_set_elements.elements type_name="GLib.GenericArray" +GduDiskSelectionWidget:selected-drives type_name="GLib.GenericArray" +gdu_disk_selection_widget_get_selected_drives type_name="GLib.GenericArray" GduGError name="Error" +GduPoolTreeModel:pools type_name="GLib.GenericArray" +gdu_pool_tree_model_new.pools type_name="GLib.GenericArray" +gdu_pool_tree_model_set_pools.pools type_name="GLib.GenericArray" GduTimeLabelBoxedGTimeVal namespace="GLib" name="TimeVal" diff --git a/vapi/packages/gdu/gdu.metadata b/vapi/packages/gdu/gdu.metadata index 86b1c82d8..f8284e861 100644 --- a/vapi/packages/gdu/gdu.metadata +++ b/vapi/packages/gdu/gdu.metadata @@ -1,3 +1,4 @@ Gdu cheader_filename="gdu/gdu.h" +*.component_objpaths type_name="GLib.GenericArray" dev_t name="ulong" uid_t name="ulong"