From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 22 May 2010 17:48:24 +0000 (-0700)
Subject: gnome-keyring-1: fix GetStringCallback.str and NETWORK_PASSWORD
X-Git-Tag: 0.9.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=498bfcec6bd9b646c51c518406ca21fc5aa61fa5;p=thirdparty%2Fvala.git

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

diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
index 67a3a0534..722b22ff0 100644
--- 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 ba70e550b..14e4093f2 100644
--- 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 7f8eb0e14..49bfb4eb8 100644
--- 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"