gnome-keyring-1: fix GetStringCallback.str and NETWORK_PASSWORD

diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
index 67a3a0534712f72c855952b14877242041b0c89c..722b22ff00435ab3b6a821b5ef2af8b614ab01be 100644 (file)
--- a/vapi/gnome-keyring-1.vapi
+++ b/vapi/gnome-keyring-1.vapi
@@ -152,8 +152,8 @@ namespace GnomeKeyring {
        [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")]
+       public delegate void OperationGetStringCallback (GnomeKeyring.Result result, string? str);
+       [CCode (cname = "GNOME_KEYRING_NETWORK_PASSWORD", cheader_filename = "gnome-keyring.h")]
        public static GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
        [CCode (cheader_filename = "gnome-keyring.h")]
        public const string DEFAULT;

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 ba70e550b21cce0c61e972cc03af3823f4b05e52..14e4093f29129d19f17643696f4cb9949cff807c 100644 (file)
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
+++ b/vapi/packages/gnome-keyring-1/gnome-keyring-1-custom.vala
@@ -1,6 +1,7 @@
 namespace GnomeKeyring
 {
        public const string DEFAULT;
+       [CCode (cname = "GNOME_KEYRING_NETWORK_PASSWORD")]
        public GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
 
        [Compact]

diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
index 7f8eb0e1461c6983dc13205b0467443bf49435a4..49bfb4eb8af81e081c31bd4ec6fce7bdd537ec16 100644 (file)
--- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
+++ b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata
@@ -21,6 +21,7 @@ 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"