From: Alistair Thomas <astavale@yahoo.co.uk>
Date: Wed, 13 Dec 2017 15:31:25 +0000 (+0000)
Subject: vapi: Remove libgnome-keyring binding
X-Git-Tag: 0.39.3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc7609ead79f6f98e7296ea850188ac6fc6ac05;p=thirdparty%2Fvala.git

vapi: Remove libgnome-keyring binding

This binding has been upstreamed since 28 June 2012. See
https://git.gnome.org/browse/libgnome-keyring/commit/?id=ea1476c1a941d71d6d7be90aa6fc5b8ba8da7c83

https://bugzilla.gnome.org/show_bug.cgi?id=776022
---

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 5dc785a95..1d637ef27 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -75,7 +75,6 @@ dist_vapi_DATA = \
 	gnet-2.0.vapi \
 	gnome-desktop-2.0.deps \
 	gnome-desktop-2.0.vapi \
-	gnome-keyring-1.vapi \
 	gnome-vfs-2.0.vapi \
 	gnutls.vapi \
 	gobject-2.0.vapi \
@@ -340,7 +339,6 @@ GIDL_BINDINGS = \
 	gdk-gtk \
 	gio-unix-2.0 \
 	gnome-desktop-2.0 \
-	gnome-keyring-1 \
 	gnome-vfs-2.0 \
 	goocanvas \
 	gstreamer-0.10 \
@@ -561,9 +559,6 @@ gio-unix-2.0:
 gnome-desktop-2.0:
 	$(GENVAPI) --library $(srcdir)/gnome-desktop-2.0 $(PACKAGESDIR)/gnome-desktop-2.0/gnome-desktop-2.0.gi
 
-gnome-keyring-1:
-	$(GENVAPI) --library $(srcdir)/gnome-keyring-1 $(PACKAGESDIR)/gnome-keyring-1/gnome-keyring-1-custom.vala $(PACKAGESDIR)/gnome-keyring-1/gnome-keyring-1.gi
-
 gnome-vfs-2.0:
 	$(GENVAPI) --library $(srcdir)/gnome-vfs-2.0 $(PACKAGESDIR)/gnome-vfs-2.0/gnome-vfs-2.0-custom.vala $(PACKAGESDIR)/gnome-vfs-2.0/gnome-vfs-2.0.gi
 
diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
deleted file mode 100644
index e016a9ac4..000000000
--- a/vapi/gnome-keyring-1.vapi
+++ /dev/null
@@ -1,320 +0,0 @@
-/* gnome-keyring-1.vapi generated by vapigen, do not modify. */
-
-[Version (deprecated_since = "3.5.4", replacement = "bindings distributed with libgnome-keyring")]
-namespace GnomeKeyring {
-	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_access_control_copy")]
-	[Compact]
-	public class AccessControl {
-		[CCode (has_construct_function = false)]
-		public AccessControl (GnomeKeyring.ApplicationRef application, GnomeKeyring.AccessType types_allowed);
-		public GnomeKeyring.AccessControl copy ();
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_application_ref_copy")]
-	[Compact]
-	public class ApplicationRef {
-		[CCode (has_construct_function = false)]
-		public ApplicationRef ();
-		public GnomeKeyring.ApplicationRef copy ();
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_attribute_list_copy", free_function = "gnome_keyring_attribute_list_free")]
-	[Compact]
-	public class AttributeList {
-		[CCode (array_length = false)]
-		public GnomeKeyring.Attribute[] data;
-		public uint len;
-		public AttributeList ();
-		public void append_string (string name, string value);
-		public void append_uint32 (string name, uint32 value);
-		public GnomeKeyring.AttributeList copy ();
-		public GnomeKeyring.Attribute index (int i);
-	}
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	[Compact]
-	public class Found {
-		public weak GnomeKeyring.AttributeList attributes;
-		public uint item_id;
-		public weak string keyring;
-		public weak string secret;
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_info_copy")]
-	[Compact]
-	public class Info {
-		public GnomeKeyring.Info copy ();
-		public ulong get_ctime ();
-		public bool get_is_locked ();
-		public bool get_lock_on_idle ();
-		public uint32 get_lock_timeout ();
-		public ulong get_mtime ();
-		public void set_lock_on_idle (bool value);
-		public void set_lock_timeout (uint32 value);
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_item_info_copy")]
-	[Compact]
-	public class ItemInfo {
-		[CCode (has_construct_function = false)]
-		public ItemInfo ();
-		public GnomeKeyring.ItemInfo copy ();
-		public ulong get_ctime ();
-		public unowned string get_display_name ();
-		public ulong get_mtime ();
-		public unowned string get_secret ();
-		public void set_display_name (string value);
-		public void set_secret (string value);
-		public void set_type (GnomeKeyring.ItemType type);
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", free_function = "gnome_keyring_network_password_free")]
-	[Compact]
-	public class NetworkPasswordData {
-		public weak string authtype;
-		public weak string domain;
-		public uint32 item_id;
-		public weak string keyring;
-		public weak string object;
-		public weak string password;
-		public uint32 port;
-		public weak string protocol;
-		public weak string server;
-		public weak string user;
-	}
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	[Compact]
-	public class PasswordSchema {
-		public void* attributes;
-		public GnomeKeyring.ItemType item_type;
-		public void* reserved1;
-		public void* reserved2;
-		public void* reserved3;
-	}
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public struct Attribute {
-		public weak string name;
-		public GnomeKeyring.AttributeType type;
-		public void* value;
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false)]
-	public enum AccessRestriction {
-		ASK,
-		DENY,
-		ALLOW
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false)]
-	public enum AccessType {
-		READ,
-		WRITE,
-		REMOVE
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = false)]
-	public enum AttributeType {
-		STRING,
-		UINT32
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = false)]
-	public enum ItemInfoFlags {
-		ALL,
-		BASICS,
-		SECRET
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ITEM_", has_type_id = false)]
-	public enum ItemType {
-		APPLICATION_SECRET,
-		ITEM_TYPE_MASK,
-		GENERIC_SECRET,
-		NETWORK_PASSWORD,
-		NOTE,
-		CHAINED_KEYRING_PASSWORD,
-		ENCRYPTION_KEY_PASSWORD,
-		PK_STORAGE,
-		LAST_TYPE
-	}
-	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_RESULT_", has_type_id = false)]
-	public enum Result {
-		OK,
-		DENIED,
-		NO_KEYRING_DAEMON,
-		ALREADY_UNLOCKED,
-		NO_SUCH_KEYRING,
-		BAD_ARGUMENTS,
-		IO_ERROR,
-		CANCELLED,
-		KEYRING_ALREADY_EXISTS,
-		NO_MATCH
-	}
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationDoneCallback (GnomeKeyring.Result result);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetAttributesCallback (GnomeKeyring.Result result, GnomeKeyring.AttributeList attributes);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetIntCallback (GnomeKeyring.Result result, uint32 val);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetItemInfoCallback (GnomeKeyring.Result result, GnomeKeyring.ItemInfo info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetKeyringInfoCallback (GnomeKeyring.Result result, GnomeKeyring.Info info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetListCallback (GnomeKeyring.Result result, GLib.List<GnomeKeyring.NetworkPasswordData> list);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetStringCallback (GnomeKeyring.Result result, string? str);
-	[CCode (cheader_filename = "gnome-keyring.h", cname = "GNOME_KEYRING_NETWORK_PASSWORD")]
-	public static GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public const string DEFAULT;
-	[CCode (cheader_filename = "gnome-keyring.h", cname = "GNOME_KEYRING_SESSION")]
-	public const string SESSION;
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GLib.List<GnomeKeyring.AccessControl> acl_copy (GLib.List<GnomeKeyring.AccessControl> list);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void cancel_request (void* request);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* change_password (string keyring, string? original, string? password, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result change_password_sync (string keyring, string? original, string? password);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* create (string keyring_name, string? password, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result create_sync (string keyring_name, string? password);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result daemon_prepare_environment_sync ();
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result daemon_set_display_sync (string display);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* @delete (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* delete_password (GnomeKeyring.PasswordSchema schema, owned GnomeKeyring.OperationDoneCallback callback, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result delete_password_sync (GnomeKeyring.PasswordSchema schema, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result delete_sync (string keyring);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_items (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, owned GnomeKeyring.OperationGetListCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_items_sync (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, out GLib.List<GnomeKeyring.Found> found);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_itemsv (GnomeKeyring.ItemType type, owned GnomeKeyring.OperationGetListCallback callback, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_itemsv_sync (GnomeKeyring.ItemType type, out GLib.List<GnomeKeyring.Found> found, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_network_password (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, owned GnomeKeyring.OperationGetListCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_network_password_sync (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, out GLib.List<GnomeKeyring.NetworkPasswordData> results);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_password (GnomeKeyring.PasswordSchema schema, owned GnomeKeyring.OperationGetStringCallback callback, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_password_sync (GnomeKeyring.PasswordSchema schema, out unowned string password, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void free_password (string password);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* get_default_keyring (owned GnomeKeyring.OperationGetStringCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result get_default_keyring_sync (out unowned string keyring);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* get_info (string? keyring, owned GnomeKeyring.OperationGetKeyringInfoCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result get_info_sync (string? keyring, out unowned GnomeKeyring.Info info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static bool is_available ();
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.AccessType item_ac_get_access_type (GnomeKeyring.AccessControl ac);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static unowned string item_ac_get_display_name (GnomeKeyring.AccessControl ac);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static unowned string item_ac_get_path_name (GnomeKeyring.AccessControl ac);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void item_ac_set_access_type (GnomeKeyring.AccessControl ac, GnomeKeyring.AccessType value);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void item_ac_set_display_name (GnomeKeyring.AccessControl ac, string value);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void item_ac_set_path_name (GnomeKeyring.AccessControl ac, string value);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_create (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, owned GnomeKeyring.OperationGetIntCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_create_sync (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, out uint32 item_id);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_delete (string? keyring, uint32 id, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_delete_sync (string? keyring, uint32 id);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_acl (string? keyring, uint32 id, owned GnomeKeyring.OperationGetListCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_acl_sync (string? keyring, uint32 id, out GLib.List<GnomeKeyring.AccessControl> acl);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_attributes (string? keyring, uint32 id, owned GnomeKeyring.OperationGetAttributesCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_attributes_sync (string? keyring, uint32 id, out unowned GnomeKeyring.AttributeList attributes);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_info (string? keyring, uint32 id, owned GnomeKeyring.OperationGetItemInfoCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_info_full (string? keyring, uint32 id, uint32 flags, owned GnomeKeyring.OperationGetItemInfoCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_info_full_sync (string? keyring, uint32 id, uint32 flags, out unowned GnomeKeyring.ItemInfo info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_info_sync (string keyring, uint32 id, out unowned GnomeKeyring.ItemInfo info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_grant_access_rights (string? keyring, string display_name, string full_path, uint32 id, GnomeKeyring.AccessType rights, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_grant_access_rights_sync (string? keyring, string display_name, string full_path, uint32 id, GnomeKeyring.AccessType rights);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_acl (string? keyring, uint32 id, GLib.List<GnomeKeyring.AccessControl> acl, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_acl_sync (string? keyring, uint32 id, GLib.List<GnomeKeyring.AccessControl> acl);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_attributes (string? keyring, uint32 id, GnomeKeyring.AttributeList attributes, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_attributes_sync (string? keyring, uint32 id, GnomeKeyring.AttributeList attributes);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_info (string? keyring, uint32 id, GnomeKeyring.ItemInfo info, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_info_sync (string? keyring, uint32 id, GnomeKeyring.ItemInfo info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* list_item_ids (string? keyring, owned GnomeKeyring.OperationGetListCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result list_item_ids_sync (string? keyring, out GLib.List<uint> ids);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* list_keyring_names (owned GnomeKeyring.OperationGetListCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result list_keyring_names_sync (out GLib.List<string> keyrings);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* @lock (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* lock_all (owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result lock_all_sync ();
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result lock_sync (string? keyring);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* memory_alloc (ulong sz);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void memory_free (void* p);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static bool memory_is_secure (void* p);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* memory_realloc (void* p, ulong sz);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static unowned string memory_strdup (string str);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* memory_try_alloc (ulong sz);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* memory_try_realloc (void* p, ulong sz);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void network_password_free (GnomeKeyring.NetworkPasswordData data);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static unowned string result_to_message (GnomeKeyring.Result res);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_default_keyring (string keyring, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result set_default_keyring_sync (string keyring);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_info (string? keyring, GnomeKeyring.Info info, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result set_info_sync (string? keyring, GnomeKeyring.Info info);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_network_password (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, string? password, owned GnomeKeyring.OperationGetIntCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result set_network_password_sync (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, string? password, out uint32 item_id);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* store_password (GnomeKeyring.PasswordSchema schema, string? keyring, string display_name, string password, owned GnomeKeyring.OperationDoneCallback callback, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result store_password_sync (GnomeKeyring.PasswordSchema schema, string? keyring, string display_name, string password, ...);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* unlock (string? keyring, string? password, owned GnomeKeyring.OperationDoneCallback callback);
-	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result unlock_sync (string? keyring, string? password);
-}
diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala b/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
deleted file mode 100644
index 14e4093f2..000000000
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
+++ /dev/null
@@ -1,45 +0,0 @@
-namespace GnomeKeyring
-{
-	public const string DEFAULT;
-	[CCode (cname = "GNOME_KEYRING_NETWORK_PASSWORD")]
-	public GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
-
-	[Compact]
-	[CCode (free_function = "gnome_keyring_network_password_free")]
-	public class NetworkPasswordData {
-	}
-
-	[Compact]
-	[CCode (free_function = "gnome_keyring_attribute_list_free")]
-	public class AttributeList {
-		public extern AttributeList ();
-		public extern Attribute index (int i);
-		
-		[CCode (array_length = false)]
-		public Attribute[] data;
-		public uint len;
-	}
-
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
-	public enum ItemType {
-		APPLICATION_SECRET,
-		ITEM_TYPE_MASK,
-		GENERIC_SECRET,
-		NETWORK_PASSWORD,
-		NOTE,
-		CHAINED_KEYRING_PASSWORD,
-		ENCRYPTION_KEY_PASSWORD,
-		PK_STORAGE,
-		LAST_TYPE
-	}
-
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
-	public enum ItemInfoFlags {
-		ALL,
-		BASICS,
-		SECRET
-	}
-
-	[CCode (cname = "GNOME_KEYRING_SESSION")]
-	public const string SESSION;
-}
diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.files b/vapi/packages/gnome-keyring-1/gnome-keyring-1.files
deleted file mode 100644
index 9f9745739..000000000
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.files
+++ /dev/null
@@ -1 +0,0 @@
-include/gnome-keyring-1/
diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.gi b/vapi/packages/gnome-keyring-1/gnome-keyring-1.gi
deleted file mode 100644
index b51a9a352..000000000
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.gi
+++ /dev/null
@@ -1,1005 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="GnomeKeyring">
-		<function name="acl_copy" symbol="gnome_keyring_acl_copy">
-			<return-type type="GList*"/>
-			<parameters>
-				<parameter name="list" type="GList*"/>
-			</parameters>
-		</function>
-		<function name="acl_free" symbol="gnome_keyring_acl_free">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="acl" type="GList*"/>
-			</parameters>
-		</function>
-		<function name="cancel_request" symbol="gnome_keyring_cancel_request">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="request" type="gpointer"/>
-			</parameters>
-		</function>
-		<function name="change_password" symbol="gnome_keyring_change_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="original" type="char*"/>
-				<parameter name="password" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="change_password_sync" symbol="gnome_keyring_change_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="original" type="char*"/>
-				<parameter name="password" type="char*"/>
-			</parameters>
-		</function>
-		<function name="create" symbol="gnome_keyring_create">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring_name" type="char*"/>
-				<parameter name="password" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="create_sync" symbol="gnome_keyring_create_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring_name" type="char*"/>
-				<parameter name="password" type="char*"/>
-			</parameters>
-		</function>
-		<function name="daemon_prepare_environment_sync" symbol="gnome_keyring_daemon_prepare_environment_sync">
-			<return-type type="GnomeKeyringResult"/>
-		</function>
-		<function name="daemon_set_display_sync" symbol="gnome_keyring_daemon_set_display_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="display" type="char*"/>
-			</parameters>
-		</function>
-		<function name="delete" symbol="gnome_keyring_delete">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="delete_password" symbol="gnome_keyring_delete_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="delete_password_sync" symbol="gnome_keyring_delete_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-			</parameters>
-		</function>
-		<function name="delete_sync" symbol="gnome_keyring_delete_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-			</parameters>
-		</function>
-		<function name="find_items" symbol="gnome_keyring_find_items">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="find_items_sync" symbol="gnome_keyring_find_items_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="found" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="find_itemsv" symbol="gnome_keyring_find_itemsv">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="find_itemsv_sync" symbol="gnome_keyring_find_itemsv_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="found" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="find_network_password" symbol="gnome_keyring_find_network_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="user" type="char*"/>
-				<parameter name="domain" type="char*"/>
-				<parameter name="server" type="char*"/>
-				<parameter name="object" type="char*"/>
-				<parameter name="protocol" type="char*"/>
-				<parameter name="authtype" type="char*"/>
-				<parameter name="port" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="find_network_password_sync" symbol="gnome_keyring_find_network_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="user" type="char*"/>
-				<parameter name="domain" type="char*"/>
-				<parameter name="server" type="char*"/>
-				<parameter name="object" type="char*"/>
-				<parameter name="protocol" type="char*"/>
-				<parameter name="authtype" type="char*"/>
-				<parameter name="port" type="guint32"/>
-				<parameter name="results" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="find_password" symbol="gnome_keyring_find_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetStringCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="find_password_sync" symbol="gnome_keyring_find_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-				<parameter name="password" type="gchar**"/>
-			</parameters>
-		</function>
-		<function name="free_password" symbol="gnome_keyring_free_password">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="password" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="get_default_keyring" symbol="gnome_keyring_get_default_keyring">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="callback" type="GnomeKeyringOperationGetStringCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="get_default_keyring_sync" symbol="gnome_keyring_get_default_keyring_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char**"/>
-			</parameters>
-		</function>
-		<function name="get_info" symbol="gnome_keyring_get_info">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetKeyringInfoCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="get_info_sync" symbol="gnome_keyring_get_info_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="info" type="GnomeKeyringInfo**"/>
-			</parameters>
-		</function>
-		<function name="is_available" symbol="gnome_keyring_is_available">
-			<return-type type="gboolean"/>
-		</function>
-		<function name="item_ac_get_access_type" symbol="gnome_keyring_item_ac_get_access_type">
-			<return-type type="GnomeKeyringAccessType"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-			</parameters>
-		</function>
-		<function name="item_ac_get_display_name" symbol="gnome_keyring_item_ac_get_display_name">
-			<return-type type="char*"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-			</parameters>
-		</function>
-		<function name="item_ac_get_path_name" symbol="gnome_keyring_item_ac_get_path_name">
-			<return-type type="char*"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-			</parameters>
-		</function>
-		<function name="item_ac_set_access_type" symbol="gnome_keyring_item_ac_set_access_type">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-				<parameter name="value" type="GnomeKeyringAccessType"/>
-			</parameters>
-		</function>
-		<function name="item_ac_set_display_name" symbol="gnome_keyring_item_ac_set_display_name">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-				<parameter name="value" type="char*"/>
-			</parameters>
-		</function>
-		<function name="item_ac_set_path_name" symbol="gnome_keyring_item_ac_set_path_name">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-				<parameter name="value" type="char*"/>
-			</parameters>
-		</function>
-		<function name="item_create" symbol="gnome_keyring_item_create">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="display_name" type="char*"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="secret" type="char*"/>
-				<parameter name="update_if_exists" type="gboolean"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetIntCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_create_sync" symbol="gnome_keyring_item_create_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="type" type="GnomeKeyringItemType"/>
-				<parameter name="display_name" type="char*"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="secret" type="char*"/>
-				<parameter name="update_if_exists" type="gboolean"/>
-				<parameter name="item_id" type="guint32*"/>
-			</parameters>
-		</function>
-		<function name="item_delete" symbol="gnome_keyring_item_delete">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_delete_sync" symbol="gnome_keyring_item_delete_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-			</parameters>
-		</function>
-		<function name="item_get_acl" symbol="gnome_keyring_item_get_acl">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_get_acl_sync" symbol="gnome_keyring_item_get_acl_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="acl" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="item_get_attributes" symbol="gnome_keyring_item_get_attributes">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetAttributesCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_get_attributes_sync" symbol="gnome_keyring_item_get_attributes_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList**"/>
-			</parameters>
-		</function>
-		<function name="item_get_info" symbol="gnome_keyring_item_get_info">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetItemInfoCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_get_info_full" symbol="gnome_keyring_item_get_info_full">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="flags" type="guint32"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetItemInfoCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_get_info_full_sync" symbol="gnome_keyring_item_get_info_full_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="flags" type="guint32"/>
-				<parameter name="info" type="GnomeKeyringItemInfo**"/>
-			</parameters>
-		</function>
-		<function name="item_get_info_sync" symbol="gnome_keyring_item_get_info_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="info" type="GnomeKeyringItemInfo**"/>
-			</parameters>
-		</function>
-		<function name="item_grant_access_rights" symbol="gnome_keyring_item_grant_access_rights">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="gchar*"/>
-				<parameter name="display_name" type="gchar*"/>
-				<parameter name="full_path" type="gchar*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="rights" type="GnomeKeyringAccessType"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_grant_access_rights_sync" symbol="gnome_keyring_item_grant_access_rights_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="display_name" type="char*"/>
-				<parameter name="full_path" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="rights" type="GnomeKeyringAccessType"/>
-			</parameters>
-		</function>
-		<function name="item_set_acl" symbol="gnome_keyring_item_set_acl">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="acl" type="GList*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_set_acl_sync" symbol="gnome_keyring_item_set_acl_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="acl" type="GList*"/>
-			</parameters>
-		</function>
-		<function name="item_set_attributes" symbol="gnome_keyring_item_set_attributes">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_set_attributes_sync" symbol="gnome_keyring_item_set_attributes_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-			</parameters>
-		</function>
-		<function name="item_set_info" symbol="gnome_keyring_item_set_info">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="info" type="GnomeKeyringItemInfo*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="item_set_info_sync" symbol="gnome_keyring_item_set_info_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="id" type="guint32"/>
-				<parameter name="info" type="GnomeKeyringItemInfo*"/>
-			</parameters>
-		</function>
-		<function name="list_item_ids" symbol="gnome_keyring_list_item_ids">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="list_item_ids_sync" symbol="gnome_keyring_list_item_ids_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="ids" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="list_keyring_names" symbol="gnome_keyring_list_keyring_names">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="callback" type="GnomeKeyringOperationGetListCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="list_keyring_names_sync" symbol="gnome_keyring_list_keyring_names_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyrings" type="GList**"/>
-			</parameters>
-		</function>
-		<function name="lock" symbol="gnome_keyring_lock">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="lock_all" symbol="gnome_keyring_lock_all">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="lock_all_sync" symbol="gnome_keyring_lock_all_sync">
-			<return-type type="GnomeKeyringResult"/>
-		</function>
-		<function name="lock_sync" symbol="gnome_keyring_lock_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-			</parameters>
-		</function>
-		<function name="memory_alloc" symbol="gnome_keyring_memory_alloc">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="sz" type="gulong"/>
-			</parameters>
-		</function>
-		<function name="memory_free" symbol="gnome_keyring_memory_free">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="p" type="gpointer"/>
-			</parameters>
-		</function>
-		<function name="memory_is_secure" symbol="gnome_keyring_memory_is_secure">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="p" type="gpointer"/>
-			</parameters>
-		</function>
-		<function name="memory_realloc" symbol="gnome_keyring_memory_realloc">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="p" type="gpointer"/>
-				<parameter name="sz" type="gulong"/>
-			</parameters>
-		</function>
-		<function name="memory_strdup" symbol="gnome_keyring_memory_strdup">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="str" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="memory_try_alloc" symbol="gnome_keyring_memory_try_alloc">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="sz" type="gulong"/>
-			</parameters>
-		</function>
-		<function name="memory_try_realloc" symbol="gnome_keyring_memory_try_realloc">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="p" type="gpointer"/>
-				<parameter name="sz" type="gulong"/>
-			</parameters>
-		</function>
-		<function name="network_password_free" symbol="gnome_keyring_network_password_free">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="data" type="GnomeKeyringNetworkPasswordData*"/>
-			</parameters>
-		</function>
-		<function name="network_password_list_free" symbol="gnome_keyring_network_password_list_free">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="list" type="GList*"/>
-			</parameters>
-		</function>
-		<function name="result_to_message" symbol="gnome_keyring_result_to_message">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="res" type="GnomeKeyringResult"/>
-			</parameters>
-		</function>
-		<function name="set_default_keyring" symbol="gnome_keyring_set_default_keyring">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="set_default_keyring_sync" symbol="gnome_keyring_set_default_keyring_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-			</parameters>
-		</function>
-		<function name="set_info" symbol="gnome_keyring_set_info">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="info" type="GnomeKeyringInfo*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="set_info_sync" symbol="gnome_keyring_set_info_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="info" type="GnomeKeyringInfo*"/>
-			</parameters>
-		</function>
-		<function name="set_network_password" symbol="gnome_keyring_set_network_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="user" type="char*"/>
-				<parameter name="domain" type="char*"/>
-				<parameter name="server" type="char*"/>
-				<parameter name="object" type="char*"/>
-				<parameter name="protocol" type="char*"/>
-				<parameter name="authtype" type="char*"/>
-				<parameter name="port" type="guint32"/>
-				<parameter name="password" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationGetIntCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="set_network_password_sync" symbol="gnome_keyring_set_network_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="user" type="char*"/>
-				<parameter name="domain" type="char*"/>
-				<parameter name="server" type="char*"/>
-				<parameter name="object" type="char*"/>
-				<parameter name="protocol" type="char*"/>
-				<parameter name="authtype" type="char*"/>
-				<parameter name="port" type="guint32"/>
-				<parameter name="password" type="char*"/>
-				<parameter name="item_id" type="guint32*"/>
-			</parameters>
-		</function>
-		<function name="store_password" symbol="gnome_keyring_store_password">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-				<parameter name="keyring" type="gchar*"/>
-				<parameter name="display_name" type="gchar*"/>
-				<parameter name="password" type="gchar*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="store_password_sync" symbol="gnome_keyring_store_password_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="schema" type="GnomeKeyringPasswordSchema*"/>
-				<parameter name="keyring" type="gchar*"/>
-				<parameter name="display_name" type="gchar*"/>
-				<parameter name="password" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="string_list_free" symbol="gnome_keyring_string_list_free">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="strings" type="GList*"/>
-			</parameters>
-		</function>
-		<function name="unlock" symbol="gnome_keyring_unlock">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="password" type="char*"/>
-				<parameter name="callback" type="GnomeKeyringOperationDoneCallback"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy_data" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="unlock_sync" symbol="gnome_keyring_unlock_sync">
-			<return-type type="GnomeKeyringResult"/>
-			<parameters>
-				<parameter name="keyring" type="char*"/>
-				<parameter name="password" type="char*"/>
-			</parameters>
-		</function>
-		<callback name="GnomeKeyringOperationDoneCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetAttributesCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetIntCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="val" type="guint32"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetItemInfoCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="info" type="GnomeKeyringItemInfo*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetKeyringInfoCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="info" type="GnomeKeyringInfo*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetListCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="list" type="GList*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GnomeKeyringOperationGetStringCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="result" type="GnomeKeyringResult"/>
-				<parameter name="string" type="char*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<struct name="GnomeKeyringAccessControl">
-			<method name="copy" symbol="gnome_keyring_access_control_copy">
-				<return-type type="GnomeKeyringAccessControl*"/>
-				<parameters>
-					<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gnome_keyring_access_control_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ac" type="GnomeKeyringAccessControl*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gnome_keyring_access_control_new">
-				<return-type type="GnomeKeyringAccessControl*"/>
-				<parameters>
-					<parameter name="application" type="GnomeKeyringApplicationRef*"/>
-					<parameter name="types_allowed" type="GnomeKeyringAccessType"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="GnomeKeyringApplicationRef">
-			<method name="copy" symbol="gnome_keyring_application_ref_copy">
-				<return-type type="GnomeKeyringApplicationRef*"/>
-				<parameters>
-					<parameter name="app" type="GnomeKeyringApplicationRef*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gnome_keyring_application_ref_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app" type="GnomeKeyringApplicationRef*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gnome_keyring_application_ref_new">
-				<return-type type="GnomeKeyringApplicationRef*"/>
-			</method>
-		</struct>
-		<struct name="GnomeKeyringAttribute">
-			<field name="name" type="char*"/>
-			<field name="type" type="GnomeKeyringAttributeType"/>
-			<field name="value" type="gpointer"/>
-		</struct>
-		<struct name="GnomeKeyringAttributeList">
-			<method name="append_string" symbol="gnome_keyring_attribute_list_append_string">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-					<parameter name="name" type="char*"/>
-					<parameter name="value" type="char*"/>
-				</parameters>
-			</method>
-			<method name="append_uint32" symbol="gnome_keyring_attribute_list_append_uint32">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-					<parameter name="name" type="char*"/>
-					<parameter name="value" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="copy" symbol="gnome_keyring_attribute_list_copy">
-				<return-type type="GnomeKeyringAttributeList*"/>
-				<parameters>
-					<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gnome_keyring_attribute_list_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="attributes" type="GnomeKeyringAttributeList*"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="GnomeKeyringFound">
-			<method name="free" symbol="gnome_keyring_found_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="found" type="GnomeKeyringFound*"/>
-				</parameters>
-			</method>
-			<method name="list_free" symbol="gnome_keyring_found_list_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="found_list" type="GList*"/>
-				</parameters>
-			</method>
-			<field name="keyring" type="char*"/>
-			<field name="item_id" type="guint"/>
-			<field name="attributes" type="GnomeKeyringAttributeList*"/>
-			<field name="secret" type="char*"/>
-		</struct>
-		<struct name="GnomeKeyringInfo">
-			<method name="copy" symbol="gnome_keyring_info_copy">
-				<return-type type="GnomeKeyringInfo*"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gnome_keyring_info_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_ctime" symbol="gnome_keyring_info_get_ctime">
-				<return-type type="time_t"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_is_locked" symbol="gnome_keyring_info_get_is_locked">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_lock_on_idle" symbol="gnome_keyring_info_get_lock_on_idle">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_lock_timeout" symbol="gnome_keyring_info_get_lock_timeout">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_mtime" symbol="gnome_keyring_info_get_mtime">
-				<return-type type="time_t"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-				</parameters>
-			</method>
-			<method name="set_lock_on_idle" symbol="gnome_keyring_info_set_lock_on_idle">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-					<parameter name="value" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_lock_timeout" symbol="gnome_keyring_info_set_lock_timeout">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyring_info" type="GnomeKeyringInfo*"/>
-					<parameter name="value" type="guint32"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="GnomeKeyringItemInfo">
-			<method name="copy" symbol="gnome_keyring_item_info_copy">
-				<return-type type="GnomeKeyringItemInfo*"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="gnome_keyring_item_info_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_ctime" symbol="gnome_keyring_item_info_get_ctime">
-				<return-type type="time_t"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_display_name" symbol="gnome_keyring_item_info_get_display_name">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_mtime" symbol="gnome_keyring_item_info_get_mtime">
-				<return-type type="time_t"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_secret" symbol="gnome_keyring_item_info_get_secret">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gnome_keyring_item_info_new">
-				<return-type type="GnomeKeyringItemInfo*"/>
-			</method>
-			<method name="set_display_name" symbol="gnome_keyring_item_info_set_display_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-					<parameter name="value" type="char*"/>
-				</parameters>
-			</method>
-			<method name="set_secret" symbol="gnome_keyring_item_info_set_secret">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-					<parameter name="value" type="char*"/>
-				</parameters>
-			</method>
-			<method name="set_type" symbol="gnome_keyring_item_info_set_type">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item_info" type="GnomeKeyringItemInfo*"/>
-					<parameter name="type" type="GnomeKeyringItemType"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="GnomeKeyringNetworkPasswordData">
-			<field name="keyring" type="char*"/>
-			<field name="item_id" type="guint32"/>
-			<field name="protocol" type="char*"/>
-			<field name="server" type="char*"/>
-			<field name="object" type="char*"/>
-			<field name="authtype" type="char*"/>
-			<field name="port" type="guint32"/>
-			<field name="user" type="char*"/>
-			<field name="domain" type="char*"/>
-			<field name="password" type="char*"/>
-		</struct>
-		<struct name="GnomeKeyringPasswordSchema">
-			<field name="item_type" type="GnomeKeyringItemType"/>
-			<field name="attributes" type="gpointer[]"/>
-			<field name="reserved1" type="gpointer"/>
-			<field name="reserved2" type="gpointer"/>
-			<field name="reserved3" type="gpointer"/>
-		</struct>
-		<enum name="GnomeKeyringAccessRestriction">
-			<member name="GNOME_KEYRING_ACCESS_ASK" value="0"/>
-			<member name="GNOME_KEYRING_ACCESS_DENY" value="1"/>
-			<member name="GNOME_KEYRING_ACCESS_ALLOW" value="2"/>
-		</enum>
-		<enum name="GnomeKeyringAccessType">
-			<member name="GNOME_KEYRING_ACCESS_READ" value="1"/>
-			<member name="GNOME_KEYRING_ACCESS_WRITE" value="2"/>
-			<member name="GNOME_KEYRING_ACCESS_REMOVE" value="4"/>
-		</enum>
-		<enum name="GnomeKeyringAttributeType">
-			<member name="GNOME_KEYRING_ATTRIBUTE_TYPE_STRING" value="0"/>
-			<member name="GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32" value="1"/>
-		</enum>
-		<enum name="GnomeKeyringItemInfoFlags">
-			<member name="GNOME_KEYRING_ITEM_INFO_BASICS" value="0"/>
-			<member name="GNOME_KEYRING_ITEM_INFO_SECRET" value="1"/>
-		</enum>
-		<enum name="GnomeKeyringItemType">
-			<member name="GNOME_KEYRING_ITEM_GENERIC_SECRET" value="0"/>
-			<member name="GNOME_KEYRING_ITEM_NETWORK_PASSWORD" value="1"/>
-			<member name="GNOME_KEYRING_ITEM_NOTE" value="2"/>
-			<member name="GNOME_KEYRING_ITEM_CHAINED_KEYRING_PASSWORD" value="3"/>
-			<member name="GNOME_KEYRING_ITEM_ENCRYPTION_KEY_PASSWORD" value="4"/>
-			<member name="GNOME_KEYRING_ITEM_PK_STORAGE" value="256"/>
-			<member name="GNOME_KEYRING_ITEM_LAST_TYPE" value="257"/>
-		</enum>
-		<enum name="GnomeKeyringResult">
-			<member name="GNOME_KEYRING_RESULT_OK" value="0"/>
-			<member name="GNOME_KEYRING_RESULT_DENIED" value="1"/>
-			<member name="GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON" value="2"/>
-			<member name="GNOME_KEYRING_RESULT_ALREADY_UNLOCKED" value="3"/>
-			<member name="GNOME_KEYRING_RESULT_NO_SUCH_KEYRING" value="4"/>
-			<member name="GNOME_KEYRING_RESULT_BAD_ARGUMENTS" value="5"/>
-			<member name="GNOME_KEYRING_RESULT_IO_ERROR" value="6"/>
-			<member name="GNOME_KEYRING_RESULT_CANCELLED" value="7"/>
-			<member name="GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS" value="8"/>
-			<member name="GNOME_KEYRING_RESULT_NO_MATCH" value="9"/>
-		</enum>
-		<constant name="GNOME_KEYRING_ITEM_APPLICATION_SECRET" type="int" value="16777216"/>
-		<constant name="GNOME_KEYRING_ITEM_INFO_ALL" type="int" value="0"/>
-		<constant name="GNOME_KEYRING_ITEM_TYPE_MASK" type="int" value="65535"/>
-		<constant name="GNOME_KEYRING_SESSION" type="char*" value="session"/>
-	</namespace>
-</api>
diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
deleted file mode 100644
index 0631da827..000000000
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
+++ /dev/null
@@ -1,207 +0,0 @@
-GnomeKeyring cheader_filename="gnome-keyring.h" deprecated_since="3.5.4" replacement="bindings distributed with libgnome-keyring"
-
-#Simple password api
-GNOME_KEYRING_SESSION hidden="1"
-gnome_keyring_store_password ellipsis="1"
-gnome_keyring_store_password.keyring nullable="1"
-gnome_keyring_store_password.callback transfer_ownership="1"
-gnome_keyring_store_password.data hidden="1"
-gnome_keyring_store_password.destroy_data hidden="1"
-gnome_keyring_store_password_sync ellipsis="1"
-gnome_keyring_store_password_sync.keyring nullable="1"
-gnome_keyring_find_password ellipsis="1"
-gnome_keyring_find_password.keyring nullable="1"
-gnome_keyring_find_password.callback transfer_ownership="1"
-gnome_keyring_find_password.data hidden="1"
-gnome_keyring_find_password.destroy_data hidden="1"
-gnome_keyring_find_password_sync ellipsis="1"
-gnome_keyring_find_password_sync.password is_out="1"
-gnome_keyring_delete_password ellipsis="1"
-gnome_keyring_delete_password.keyring nullable="1"
-gnome_keyring_delete_password.callback transfer_ownership="1"
-gnome_keyring_delete_password.data hidden="1"
-gnome_keyring_delete_password.destroy_data hidden="1"
-gnome_keyring_delete_password_sync ellipsis="1"
-GnomeKeyringOperationGetStringCallback.string nullable="1"
-
-#keyrings
-gnome_keyring_@lock.callback transfer_ownership="1"
-gnome_keyring_@lock.data hidden="1"
-gnome_keyring_@lock.destroy_data hidden="1"
-gnome_keyring_@lock.keyring nullable="1"
-gnome_keyring_lock_sync.keyring nullable="1"
-gnome_keyring_lock_all.callback transfer_ownership="1"
-gnome_keyring_lock_all.data hidden="1"
-gnome_keyring_lock_all.destroy_data hidden="1"
-gnome_keyring_set_default_keyring.callback transfer_ownership="1"
-gnome_keyring_set_default_keyring.data hidden="1"
-gnome_keyring_set_default_keyring.destroy_data hidden="1"
-gnome_keyring_set_info.callback transfer_ownership="1"
-gnome_keyring_set_info.data hidden="1"
-gnome_keyring_set_info.destroy_data hidden="1"
-gnome_keyring_set_info.keyring nullable="1"
-gnome_keyring_set_info_sync.keyring nullable="1"
-gnome_keyring_unlock.callback transfer_ownership="1"
-gnome_keyring_unlock.data hidden="1"
-gnome_keyring_unlock.destroy_data hidden="1"
-gnome_keyring_unlock.keyring nullable="1"
-gnome_keyring_unlock.password nullable="1"
-gnome_keyring_unlock_sync.keyring nullable="1"
-gnome_keyring_unlock_sync.password nullable="1"
-gnome_keyring_get_default_keyring.callback transfer_ownership="1"
-gnome_keyring_get_default_keyring.data hidden="1"
-gnome_keyring_get_default_keyring.destroy_data hidden="1"
-gnome_keyring_get_info.callback transfer_ownership="1"
-gnome_keyring_get_info.data hidden="1"
-gnome_keyring_get_info.destroy_data hidden="1"
-gnome_keyring_get_info.keyring nullable="1"
-gnome_keyring_get_info_sync.keyring nullable="1"
-gnome_keyring_change_password.callback transfer_ownership="1"
-gnome_keyring_change_password.data hidden="1"
-gnome_keyring_change_password.destroy_data hidden="1"
-gnome_keyring_change_password.original nullable="1"
-gnome_keyring_change_password.password nullable="1"
-gnome_keyring_change_password_sync.original nullable="1"
-gnome_keyring_change_password_sync.password nullable="1"
-gnome_keyring_create.callback transfer_ownership="1"
-gnome_keyring_create.data hidden="1"
-gnome_keyring_create.destroy_data hidden="1"
-gnome_keyring_create.password nullable="1"
-gnome_keyring_create_sync.password nullable="1"
-gnome_keyring_@delete.callback transfer_ownership="1"
-gnome_keyring_@delete.data hidden="1"
-gnome_keyring_@delete.destroy_data hidden="1"
-gnome_keyring_list_item_ids.callback transfer_ownership="1"
-gnome_keyring_list_item_ids.data hidden="1"
-gnome_keyring_list_item_ids.destroy_data hidden="1"
-gnome_keyring_list_item_ids.keyring nullable="1"
-gnome_keyring_list_item_ids_sync.keyring nullable="1"
-gnome_keyring_list_item_ids_sync.ids type_arguments="uint" is_out="1" takes_ownership="1"
-gnome_keyring_list_keyring_names.callback transfer_ownership="1"
-gnome_keyring_list_keyring_names.data hidden="1"
-gnome_keyring_list_keyring_names.destroy_data hidden="1"
-gnome_keyring_list_keyring_names_sync.keyrings transfer_ownership="1" is_out="1" type_arguments="string"
-GnomeKeyringItemInfoFlags hidden="1"
-GNOME_KEYRING_ITEM_APPLICATION_SECRET hidden="1"
-GNOME_KEYRING_ITEM_INFO_ALL hidden="1"
-GNOME_KEYRING_ITEM_TYPE_MASK hidden="1"
-GnomeKeyringItemType hidden="1"
-
-#find item api
-gnome_keyring_find_items.callback transfer_ownership="1"
-gnome_keyring_find_items.data hidden="1"
-gnome_keyring_find_items.destroy_data hidden="1"
-gnome_keyring_find_items_sync.found is_out="1" takes_ownership="1" type_arguments="Found"
-gnome_keyring_find_itemsv ellipsis="1"
-gnome_keyring_find_itemsv.callback transfer_ownership="1"
-gnome_keyring_find_itemsv.data hidden="1"
-gnome_keyring_find_itemsv.destroy_data hidden="1"
-gnome_keyring_find_itemsv_sync ellipsis="1"
-gnome_keyring_find_itemsv_sync.found is_out="1" takes_ownership="1" type_arguments="Found"
-gnome_keyring_found_list_free hidden="1"
-
-#network-item api
-gnome_keyring_set_network_password.callback transfer_ownership="1"
-gnome_keyring_set_network_password.data hidden="1"
-gnome_keyring_set_network_password.keyring nullable="1"
-gnome_keyring_set_network_password.user nullable="1"
-gnome_keyring_set_network_password.domain nullable="1"
-gnome_keyring_set_network_password.server nullable="1"
-gnome_keyring_set_network_password.object nullable="1"
-gnome_keyring_set_network_password.protocol nullable="1"
-gnome_keyring_set_network_password.authtype nullable="1"
-gnome_keyring_set_network_password.password nullable="1"
-gnome_keyring_set_network_password.destroy_data hidden="1"
-gnome_keyring_set_network_password_sync.keyring nullable="1"
-gnome_keyring_set_network_password_sync.user nullable="1"
-gnome_keyring_set_network_password_sync.domain nullable="1"
-gnome_keyring_set_network_password_sync.server nullable="1"
-gnome_keyring_set_network_password_sync.object nullable="1"
-gnome_keyring_set_network_password_sync.protocol nullable="1"
-gnome_keyring_set_network_password_sync.authtype nullable="1"
-gnome_keyring_set_network_password_sync.password nullable="1"
-gnome_keyring_set_network_password_sync.item_id is_out="1"
-gnome_keyring_find_network_password.callback transfer_ownership="1"
-gnome_keyring_find_network_password.data hidden="1"
-gnome_keyring_find_network_password.user nullable="1"
-gnome_keyring_find_network_password.domain nullable="1"
-gnome_keyring_find_network_password.server nullable="1"
-gnome_keyring_find_network_password.object nullable="1"
-gnome_keyring_find_network_password.protocol nullable="1"
-gnome_keyring_find_network_password.authtype nullable="1"
-gnome_keyring_find_network_password.destroy_data hidden="1"
-gnome_keyring_find_network_password_sync.user nullable="1"
-gnome_keyring_find_network_password_sync.domain nullable="1"
-gnome_keyring_find_network_password_sync.server nullable="1"
-gnome_keyring_find_network_password_sync.object nullable="1"
-gnome_keyring_find_network_password_sync.protocol nullable="1"
-gnome_keyring_find_network_password_sync.authtype nullable="1"
-gnome_keyring_find_network_password_sync.results is_out="1" transfer_ownership="1" type_arguments="NetworkPasswordData"
-gnome_keyring_network_password_list_free hidden="1"
-
-#item api
-GnomeKeyringAttribute is_value_type="1"
-gnome_keyring_item_create.callback transfer_ownership="1"
-gnome_keyring_item_create.data hidden="1"
-gnome_keyring_item_create.keyring nullable="1"
-gnome_keyring_item_create.destroy_data hidden="1"
-gnome_keyring_item_create_sync.keyring nullable="1"
-gnome_keyring_item_create_sync.item_id is_out="1"
-gnome_keyring_item_delete.callback transfer_ownership="1"
-gnome_keyring_item_delete.data hidden="1"
-gnome_keyring_item_delete.keyring nullable="1"
-gnome_keyring_item_delete.destroy_data hidden="1"
-gnome_keyring_item_delete_sync.keyring nullable="1"
-gnome_keyring_item_get_acl.callback transfer_ownership="1"
-gnome_keyring_item_get_acl.data hidden="1"
-gnome_keyring_item_get_acl.keyring nullable="1"
-gnome_keyring_item_get_acl.destroy_data hidden="1"
-gnome_keyring_item_get_acl_sync.keyring nullable="1"
-gnome_keyring_item_get_acl_sync.acl is_out="1" takes_ownership="1" type_arguments="AccessControl"
-gnome_keyring_item_set_acl.callback transfer_ownership="1"
-gnome_keyring_item_set_acl.data hidden="1"
-gnome_keyring_item_set_acl.keyring nullable="1"
-gnome_keyring_item_set_acl.acl type_arguments="AccessControl"
-gnome_keyring_item_set_acl.destroy_data hidden="1"
-gnome_keyring_item_set_acl_sync.keyring nullable="1"
-gnome_keyring_item_set_acl_sync.acl type_arguments="AccessControl"
-gnome_keyring_item_get_attributes.callback transfer_ownership="1"
-gnome_keyring_item_get_attributes.data hidden="1"
-gnome_keyring_item_get_attributes.keyring nullable="1"
-gnome_keyring_item_get_attributes.destroy_data hidden="1"
-gnome_keyring_item_get_attributes_sync.keyring nullable="1"
-gnome_keyring_item_set_attributes.callback transfer_ownership="1"
-gnome_keyring_item_set_attributes.data hidden="1"
-gnome_keyring_item_set_attributes.keyring nullable="1"
-gnome_keyring_item_set_attributes.destroy_data hidden="1"
-gnome_keyring_item_set_attributes_sync.keyring nullable="1"
-gnome_keyring_item_get_info.callback transfer_ownership="1"
-gnome_keyring_item_get_info.data hidden="1"
-gnome_keyring_item_get_info.keyring nullable="1"
-gnome_keyring_item_get_info.destroy_data hidden="1"
-gnome_keyring_item_get_info_full.callback transfer_ownership="1"
-gnome_keyring_item_get_info_full.data hidden="1"
-gnome_keyring_item_get_info_full.keyring nullable="1"
-gnome_keyring_item_get_info_full.destroy_data hidden="1"
-gnome_keyring_item_get_info_full_sync.keyring nullable="1"
-gnome_keyring_item_set_info.callback transfer_ownership="1"
-gnome_keyring_item_set_info.data hidden="1"
-gnome_keyring_item_set_info.keyring nullable="1"
-gnome_keyring_item_set_info.destroy_data hidden="1"
-gnome_keyring_item_set_info_sync.keyring nullable="1"
-gnome_keyring_item_grant_access_rights.callback transfer_ownership="1"
-gnome_keyring_item_grant_access_rights.data hidden="1"
-gnome_keyring_item_grant_access_rights.keyring nullable="1"
-gnome_keyring_item_grant_access_rights.destroy_data hidden="1"
-gnome_keyring_item_grant_access_rights_sync.keyring nullable="1"
-
-gnome_keyring_acl_copy transfer_ownership="1" type_arguments="AccessControl"
-gnome_keyring_acl_copy.list type_arguments="AccessControl"
-gnome_keyring_acl_free hidden="1"
-gnome_keyring_access_control_copy transfer_ownership="1"
-gnome_keyring_application_ref_copy transfer_ownership="1"
-gnome_keyring_attribute_list_copy transfer_ownership="1"
-gnome_keyring_info_copy transfer_ownership="1"
-gnome_keyring_item_info_copy transfer_ownership="1"
-GnomeKeyringOperationGetListCallback.list type_arguments="NetworkPasswordData"
-gnome_keyring_string_list_free hidden="1"
diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.namespace b/vapi/packages/gnome-keyring-1/gnome-keyring-1.namespace
deleted file mode 100644
index 1543bab0c..000000000
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.namespace
+++ /dev/null
@@ -1 +0,0 @@
-GnomeKeyring