gnome-keyring-1: Fix GNOME_KEYRING_ constant bindings

Fixes bug 556632.

diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
index 60167708c5172fb789b9f6fda99e5840121b3f49..01a2987191eb53d0bd9d3497f69853186901981e 100644 (file)
--- a/vapi/gnome-keyring-1.vapi
+++ b/vapi/gnome-keyring-1.vapi
@@ -108,11 +108,14 @@ namespace GnomeKeyring {
        }
        [CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
        public enum ItemInfoFlags {
+               ALL,
                BASICS,
                SECRET
        }
        [CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
        public enum ItemType {
+               APPLICATION_SECRET,
+               ITEM_TYPE_MASK,
                GENERIC_SECRET,
                NETWORK_PASSWORD,
                NOTE,
@@ -151,16 +154,10 @@ namespace GnomeKeyring {
        [CCode (cheader_filename = "gnome-keyring.h")]
        public const string DEFAULT;
        [CCode (cheader_filename = "gnome-keyring.h")]
-       public const int GNOME_KEYRING_ITEM_APPLICATION_SECRET;
-       [CCode (cheader_filename = "gnome-keyring.h")]
-       public const int GNOME_KEYRING_ITEM_INFO_ALL;
-       [CCode (cheader_filename = "gnome-keyring.h")]
-       public const int GNOME_KEYRING_ITEM_TYPE_MASK;
-       [CCode (cheader_filename = "gnome-keyring.h")]
-       public const string GNOME_KEYRING_SESSION;
-       [CCode (cheader_filename = "gnome-keyring.h")]
        public const GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
        [CCode (cheader_filename = "gnome-keyring.h")]
+       public const string SESSION;
+       [CCode (cheader_filename = "gnome-keyring.h")]
        public static unowned GLib.List acl_copy (GLib.List list);
        [CCode (cheader_filename = "gnome-keyring.h")]
        public static void acl_free (GLib.List acl);

diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala b/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
index 5289eb76fd13992359deaf5f75633a9fbbfcc3c1..c393c1198839604992be63ea6e3b9208a343cea4 100644 (file)
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
+++ b/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
@@ -16,4 +16,27 @@ namespace GnomeKeyring
                public Attribute[] data;
                public uint len;
        }
+
+       [CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = "0", 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 = "0", 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.metadata b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
index 5d62c7294d1ed57b42433db54b0ba4641332fe62..fcb534e6e2dc8032c63987628cee9c6f0623e90c 100644 (file)
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
+++ b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
@@ -1,6 +1,7 @@
 GnomeKeyring cheader_filename="gnome-keyring.h"
 
 #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"
@@ -77,6 +78,11 @@ gnome_keyring_list_item_ids_sync.ids type_arguments="uint" is_out="1" takes_owne
 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"
+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"