From b240dd8403fbf75cf72672d05ecc720d3ece4c86 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Sun, 15 Sep 2013 01:12:39 -0700 Subject: [PATCH] gio-2.0: re-add MenuModel.get_item_links G-I now marks this function as un-introspectable because it currently cannot deal with annotations on virtual methods without invokers, and annotations are required for this method because one of the arguments is a GHashTable. --- vapi/gio-2.0.vapi | 2 ++ vapi/metadata/Gio-2.0-custom.vala | 6 ++++++ vapi/metadata/Gio-2.0.metadata | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 4688fba78..51581e959 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -1465,6 +1465,8 @@ namespace GLib { [NoWrapper] public virtual void get_item_attributes (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable? attributes); public virtual GLib.MenuModel get_item_link (int item_index, string link); + [NoWrapper] + public virtual void get_item_links (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable? links); public virtual int get_n_items (); public virtual bool is_mutable (); public virtual GLib.MenuAttributeIter iterate_item_attributes (int item_index); diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index 7a03812d6..45a622154 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -14,6 +14,12 @@ namespace GLib { public void set_callback ([CCode (type = "GSourceFunc")] owned CancellableSourceFunc func); } + [CCode (cheader_filename = "gio/gio.h", type_id = "g_menu_model_get_type ()")] + public abstract class MenuModel : GLib.Object { + [NoWrapper] + public virtual void get_item_links (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable? links); + } + public class DBusConnection : GLib.Object, GLib.AsyncInitable, GLib.Initable { [CCode (cname = "g_dbus_connection_new", finish_function = "g_dbus_connection_new_finish")] public static async GLib.DBusConnection @new (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error; diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index 29cad7dab..3ee2d969d 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -142,7 +142,6 @@ MenuItem MenuModel .get_item_attribute skip=false .get_item_attributes.attributes out type="GLib.HashTable?" - .get_item_links.links out type="GLib.HashTable?" Mount .get_sort_key#virtual_method virtual OutputStream -- 2.47.2