From: Simon Wenner Date: Thu, 11 Feb 2010 21:32:35 +0000 (-0800) Subject: gnome-keyring-1: Add out to some parameters of *_sync methods. X-Git-Tag: 0.8.0~279 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cb7008091a34d1824b3f481bfbe57651b6cfcfc;p=thirdparty%2Fvala.git gnome-keyring-1: Add out to some parameters of *_sync methods. Fixes bug 609261. --- diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi index 7f34fc90b..cd37c2bad 100644 --- a/vapi/gnome-keyring-1.vapi +++ b/vapi/gnome-keyring-1.vapi @@ -19,6 +19,7 @@ namespace GnomeKeyring { [Compact] [CCode (copy_function = "gnome_keyring_attribute_list_copy", cheader_filename = "gnome-keyring.h")] public class AttributeList { + [CCode (array_length = false)] public GnomeKeyring.Attribute[] data; public uint len; public AttributeList (); @@ -91,30 +92,30 @@ namespace GnomeKeyring { public GnomeKeyring.AttributeType type; public void* value; } - [CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")] + [CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false, cheader_filename = "gnome-keyring.h")] public enum AccessRestriction { ASK, DENY, ALLOW } - [CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")] + [CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false, cheader_filename = "gnome-keyring.h")] public enum AccessType { READ, WRITE, REMOVE } - [CCode (cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = "0", cheader_filename = "gnome-keyring.h")] + [CCode (cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = false, cheader_filename = "gnome-keyring.h")] public enum AttributeType { STRING, UINT32 } - [CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = "0", cheader_filename = "gnome-keyring.h")] + [CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = false, 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")] + [CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = false, cheader_filename = "gnome-keyring.h")] public enum ItemType { APPLICATION_SECRET, ITEM_TYPE_MASK, @@ -126,7 +127,7 @@ namespace GnomeKeyring { PK_STORAGE, LAST_TYPE } - [CCode (cprefix = "GNOME_KEYRING_RESULT_", has_type_id = "0", cheader_filename = "gnome-keyring.h")] + [CCode (cprefix = "GNOME_KEYRING_RESULT_", has_type_id = false, cheader_filename = "gnome-keyring.h")] public enum Result { OK, DENIED, @@ -188,11 +189,11 @@ namespace GnomeKeyring { [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, GLib.List found); + public static GnomeKeyring.Result find_items_sync (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, out GLib.List 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, GLib.List found, ...); + public static GnomeKeyring.Result find_itemsv_sync (GnomeKeyring.ItemType type, out GLib.List 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")] @@ -228,7 +229,7 @@ namespace GnomeKeyring { [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, uint32 item_id); + 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")] @@ -236,7 +237,7 @@ namespace GnomeKeyring { [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, GLib.List acl); + public static GnomeKeyring.Result item_get_acl_sync (string? keyring, uint32 id, out GLib.List 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")] diff --git a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata index 0a63481ed..22529246a 100644 --- a/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata +++ b/vapi/packages/gnome-keyring-1/gnome-keyring-1.metadata @@ -88,11 +88,13 @@ GnomeKeyringItemType hidden="1" 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" 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" #network-item api gnome_keyring_set_network_password.callback transfer_ownership="1" @@ -139,6 +141,7 @@ 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" @@ -149,6 +152,7 @@ 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" 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"