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.

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 4688fba78a73fb8db68dc0be3171b864a11299ef..51581e959c67708c0a2f9063d77a10ed8379f137 100644 (file)
--- 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<string,GLib.Variant>? 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<string,GLib.MenuModel>? 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 7a03812d6903f193c0a0a05bf19f4c2d5df84341..45a6221547693dbc2efdd324fd340a340947a6c2 100644 (file)
--- 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<string,GLib.MenuModel>? 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 29cad7dab649488688d203f1451658d1a1731a58..3ee2d969dbaebde587b5a7db75b7c4bbecfa7534 100644 (file)
--- 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<string,GLib.Variant>?"
-  .get_item_links.links out type="GLib.HashTable<string,GLib.MenuModel>?"
 Mount
   .get_sort_key#virtual_method virtual
 OutputStream