Eric Gregory
parent
3198df0d62
commit
c7618b3cf0
7 changed files with 116 additions and 347 deletions
|
|
@ -1,319 +0,0 @@
|
|||
/* gnome-keyring-1.vapi generated by vapigen, do not modify. */
|
||||
|
||||
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);
|
||||
}
|
||||
82
bindings/vapi/libsecret-1.vapi
Normal file
82
bindings/vapi/libsecret-1.vapi
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
/* libsecret-1.vapi generated by vapigen-0.18 and hand-edited to add SCHEMA_COMPAT_NETWORK */
|
||||
|
||||
[CCode (cprefix = "Secret", gir_namespace = "Secret", gir_version = "1", lower_case_cprefix = "secret_")]
|
||||
namespace Secret {
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_SCHEMA_COMPAT_NETWORK")]
|
||||
public Secret.Schema SCHEMA_COMPAT_NETWORK;
|
||||
|
||||
[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_get_type ()")]
|
||||
[Compact]
|
||||
public class Schema {
|
||||
[CCode (array_length = false, array_null_terminated = true)]
|
||||
public weak Secret.SchemaAttribute[] attributes;
|
||||
public Secret.SchemaFlags flags;
|
||||
public weak string name;
|
||||
[CCode (has_construct_function = false)]
|
||||
public Schema (string name, Secret.SchemaFlags flags, ...);
|
||||
[CCode (cname = "secret_schema_newv", has_construct_function = false)]
|
||||
public Schema.newv (string name, Secret.SchemaFlags flags, GLib.HashTable<string,Secret.SchemaAttributeType> attribute_names_and_types);
|
||||
public Secret.Schema @ref ();
|
||||
public void unref ();
|
||||
}
|
||||
[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_attribute_get_type ()")]
|
||||
[Compact]
|
||||
public class SchemaAttribute {
|
||||
public weak string name;
|
||||
public Secret.SchemaAttributeType type;
|
||||
}
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_ERROR_", has_type_id = false)]
|
||||
public enum Error {
|
||||
PROTOCOL,
|
||||
IS_LOCKED,
|
||||
NO_SUCH_OBJECT,
|
||||
ALREADY_EXISTS;
|
||||
public static GLib.Quark get_quark ();
|
||||
}
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_ATTRIBUTE_", has_type_id = false)]
|
||||
public enum SchemaAttributeType {
|
||||
STRING,
|
||||
INTEGER,
|
||||
BOOLEAN
|
||||
}
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_", has_type_id = false)]
|
||||
[Flags]
|
||||
public enum SchemaFlags {
|
||||
NONE,
|
||||
DONT_MATCH_NAME
|
||||
}
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_DEFAULT")]
|
||||
public const string COLLECTION_DEFAULT;
|
||||
[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_SESSION")]
|
||||
public const string COLLECTION_SESSION;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static GLib.HashTable<string,string> attributes_build (Secret.Schema schema, ...);
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static GLib.HashTable<string,string> attributes_buildv (Secret.Schema schema, va_list va);
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static async bool password_clear (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static bool password_clear_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_clear_finish")]
|
||||
public static async bool password_clearv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static bool password_clearv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static async string password_lookup (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static string password_lookup_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_lookup_finish")]
|
||||
public static async string password_lookupv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static string password_lookupv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static async bool password_store (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static bool password_store_sync (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_store_finish")]
|
||||
public static async bool password_storev (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static bool password_storev_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable = null) throws GLib.Error;
|
||||
[CCode (cheader_filename = "libsecret/secret.h")]
|
||||
public static void password_wipe (string? password);
|
||||
}
|
||||
5
debian/control
vendored
5
debian/control
vendored
|
|
@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 8),
|
|||
libunique-3.0-dev (>= 3.0.0),
|
||||
libnotify-dev (>=0.7.5),
|
||||
libcanberra-dev (>= 0.28),
|
||||
libwebkitgtk-3.0-dev (>= 1.8.0),
|
||||
libsecret-1-dev (>= 0.11),
|
||||
gir1.2-secret-1 (>= 0.11),
|
||||
libgmime-2.6-dev (>= 2.6.0),
|
||||
valac-0.18 (>= 0.17.4),
|
||||
cmake (>= 2.8.0),
|
||||
|
|
@ -34,7 +35,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
|||
libwebkitgtk-3.0-0 (>= 1.8.0),
|
||||
libxml2 (>= 2.6.32),
|
||||
libsqlite3-0 (>= 3.7.4),
|
||||
libgnome-keyring0 (>= 3.2.2),
|
||||
libsecret-1-0 (>= 0.11),
|
||||
libmessaging-menu0 (>= 12.10.2),
|
||||
libunity9 (>= 5.12.0)
|
||||
Description: Email client
|
||||
|
|
|
|||
|
|
@ -213,8 +213,8 @@ client/geary-application.vala
|
|||
client/geary-args.vala
|
||||
client/geary-config.vala
|
||||
client/geary-controller.vala
|
||||
client/gnome-keyring-mediator.vala
|
||||
client/main.vala
|
||||
client/secret-mediator.vala
|
||||
|
||||
client/accounts/account-dialog.vala
|
||||
client/accounts/account-dialog-account-list-pane.vala
|
||||
|
|
@ -353,7 +353,7 @@ pkg_check_modules(DEPS REQUIRED
|
|||
libcanberra>=0.28
|
||||
sqlite3>=3.7.4
|
||||
gmime-2.6>=2.6.0
|
||||
gnome-keyring-1>=3.2.2
|
||||
libsecret-1>=0.11
|
||||
webkitgtk-3.0>=1.8.0
|
||||
${EXTRA_CLIENT_PKG_CONFIG}
|
||||
)
|
||||
|
|
@ -363,7 +363,7 @@ set(ENGINE_PACKAGES
|
|||
)
|
||||
|
||||
set(CLIENT_PACKAGES
|
||||
gtk+-3.0 gnome-keyring-1 WebKit-3.0 libnotify libcanberra ${EXTRA_CLIENT_PACKAGES}
|
||||
gtk+-3.0 libsecret-1 WebKit-3.0 libnotify libcanberra ${EXTRA_CLIENT_PACKAGES}
|
||||
)
|
||||
|
||||
set(CONSOLE_PACKAGES
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ along with Geary; if not, write to the Free Software Foundation, Inc.,
|
|||
// Start Geary.
|
||||
try {
|
||||
yield Geary.Engine.instance.open_async(get_user_data_directory(), get_resource_directory(),
|
||||
new GnomeKeyringMediator());
|
||||
new SecretMediator());
|
||||
if (Geary.Engine.instance.get_accounts().size == 0)
|
||||
create_account();
|
||||
} catch (Error e) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
/* Copyright 2011-2012 Yorba Foundation
|
||||
/* Copyright 2011-2013 Yorba Foundation
|
||||
*
|
||||
* This software is licensed under the GNU Lesser General Public License
|
||||
* (version 2.1 or later). See the COPYING file in this distribution.
|
||||
*/
|
||||
|
||||
public class GnomeKeyringMediator : Geary.CredentialsMediator, Object {
|
||||
// LibSecret password adapter.
|
||||
public class SecretMediator : Geary.CredentialsMediator, Object {
|
||||
private const string OLD_GEARY_USERNAME_PREFIX = "org.yorba.geary username:";
|
||||
|
||||
private string get_key_name(Geary.CredentialsMediator.Service service, string user) {
|
||||
|
|
@ -21,40 +22,42 @@ public class GnomeKeyringMediator : Geary.CredentialsMediator, Object {
|
|||
}
|
||||
|
||||
public virtual async string? get_password_async(
|
||||
Geary.CredentialsMediator.Service service, string username) throws Error {
|
||||
string password;
|
||||
GnomeKeyring.Result result = GnomeKeyring.find_password_sync(GnomeKeyring.NETWORK_PASSWORD,
|
||||
out password, "user", get_key_name(service, username));
|
||||
Geary.CredentialsMediator.Service service, string username, Cancellable? cancellable = null)
|
||||
throws Error {
|
||||
string? password = yield Secret.password_lookup(Secret.SCHEMA_COMPAT_NETWORK, cancellable,
|
||||
"user", get_key_name(service, username));
|
||||
|
||||
if (result != GnomeKeyring.Result.OK) {
|
||||
if (password == null) {
|
||||
// fallback to the old keyring key string for upgrading users
|
||||
result = GnomeKeyring.find_password_sync(GnomeKeyring.NETWORK_PASSWORD, out password,
|
||||
password = yield Secret.password_lookup(Secret.SCHEMA_COMPAT_NETWORK, cancellable,
|
||||
"user", OLD_GEARY_USERNAME_PREFIX + username);
|
||||
}
|
||||
|
||||
if (result != GnomeKeyring.Result.OK)
|
||||
debug("Unable to fetch password in GNOME keyring: %s", result.to_string());
|
||||
if (password == null)
|
||||
debug("Unable to fetch password in libsecret keyring for user: %s", username);
|
||||
|
||||
return (result == GnomeKeyring.Result.OK) ? password : null;
|
||||
return password;
|
||||
}
|
||||
|
||||
public virtual async void set_password_async(
|
||||
Geary.CredentialsMediator.Service service, Geary.Credentials credentials) throws Error {
|
||||
Geary.CredentialsMediator.Service service, Geary.Credentials credentials,
|
||||
Cancellable? cancellable = null) throws Error {
|
||||
string key_name = get_key_name(service, credentials.user);
|
||||
|
||||
GnomeKeyring.Result result = GnomeKeyring.store_password_sync(GnomeKeyring.NETWORK_PASSWORD,
|
||||
null, key_name, credentials.pass, "user", key_name);
|
||||
bool result = yield Secret.password_store(Secret.SCHEMA_COMPAT_NETWORK,
|
||||
null, key_name, credentials.pass, cancellable, "user", key_name);
|
||||
|
||||
if (result != GnomeKeyring.Result.OK)
|
||||
debug("Unable to store password in GNOME keyring: %s", result.to_string());
|
||||
if (!result)
|
||||
debug("Unable to store password in libsecret keyring: %s", result.to_string());
|
||||
}
|
||||
|
||||
public virtual async void clear_password_async(
|
||||
Geary.CredentialsMediator.Service service, string username) throws Error {
|
||||
Geary.CredentialsMediator.Service service, string username, Cancellable? cancellable = null)
|
||||
throws Error {
|
||||
// delete new-style and old-style locations
|
||||
GnomeKeyring.delete_password_sync(GnomeKeyring.NETWORK_PASSWORD, "user",
|
||||
yield Secret.password_clear(Secret.SCHEMA_COMPAT_NETWORK, cancellable, "user",
|
||||
get_key_name(service, username));
|
||||
GnomeKeyring.delete_password_sync(GnomeKeyring.NETWORK_PASSWORD, "user",
|
||||
yield Secret.password_clear(Secret.SCHEMA_COMPAT_NETWORK, cancellable, "user",
|
||||
OLD_GEARY_USERNAME_PREFIX + username);
|
||||
}
|
||||
|
||||
|
|
@ -29,21 +29,23 @@ public interface Geary.CredentialsMediator : Object {
|
|||
* service. Return null if the password wasn't in the key store, or the
|
||||
* password if it was.
|
||||
*/
|
||||
public abstract async string? get_password_async(Service service, string username) throws Error;
|
||||
public abstract async string? get_password_async(Service service, string username,
|
||||
Cancellable? cancellable = null) throws Error;
|
||||
|
||||
/**
|
||||
* Add or update the key store's password entry for the given credentials
|
||||
* for the given service.
|
||||
*/
|
||||
public abstract async void set_password_async(Service service,
|
||||
Geary.Credentials credentials) throws Error;
|
||||
Geary.Credentials credentials, Cancellable? cancellable = null) throws Error;
|
||||
|
||||
/**
|
||||
* Deletes the key store's password entry for the given credentials for the
|
||||
* given service. Do nothing (and do *not* throw an error) if the
|
||||
* credentials weren't in the key store.
|
||||
*/
|
||||
public abstract async void clear_password_async(Service service, string username) throws Error;
|
||||
public abstract async void clear_password_async(Service service, string username,
|
||||
Cancellable? cancellable = null) throws Error;
|
||||
|
||||
/**
|
||||
* Prompt the user to enter passwords for the given services in the given
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue