[libgnome-keyring] Deprecate libgnome-keyring. Use libsecret instead
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgnome-keyring] Deprecate libgnome-keyring. Use libsecret instead
- Date: Mon, 6 Jan 2014 15:30:50 +0000 (UTC)
commit 6a5adea4aec931708d2b16decff7405fb0ae67c3
Author: Stef Walter <stefw gnome org>
Date: Mon Jan 6 16:16:55 2014 +0100
Deprecate libgnome-keyring. Use libsecret instead
This has been years in coming, but now that the libsecret
API is stable, deprecate the libgnome-keyring API.
configure.ac | 8 +-
.../gnome-keyring/gnome-keyring-docs.sgml | 5 +
.../gnome-keyring/gnome-keyring-sections.txt | 2 +
library/Makefile.am | 3 +-
library/gnome-keyring-memory.c | 18 +++
library/gnome-keyring-memory.h | 21 +++
library/gnome-keyring-result.h | 4 +
library/gnome-keyring-utils.c | 136 +++++++++++++++++
library/gnome-keyring.c | 152 +++++++++++++++++++-
library/gnome-keyring.h | 138 +++++++++++++++++--
library/tests/Makefile.am | 3 +-
11 files changed, 471 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f607fdf..0c3b1da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,15 +208,11 @@ AC_ARG_ENABLE(strict, [
AC_MSG_CHECKING([build strict])
if test "$enable_strict" = "yes"; then
- CFLAGS="$CFLAGS -Werror \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED"
+ CFLAGS="$CFLAGS -Werror"
TEST_MODE="thorough"
INTROSPECTION_FLAGS="--warn-error"
AC_DEFINE_UNQUOTED(WITH_STRICT, 1, [More strict checks])
- strict_status="yes (-Werror, thorough tests, fatals, no deprecations)"
+ strict_status="yes (-Werror, thorough tests, fatals)"
else
TEST_MODE="quick"
INTROSPECTION_FLAGS=""
diff --git a/docs/reference/gnome-keyring/gnome-keyring-docs.sgml
b/docs/reference/gnome-keyring/gnome-keyring-docs.sgml
index fac1144..3c89f2b 100644
--- a/docs/reference/gnome-keyring/gnome-keyring-docs.sgml
+++ b/docs/reference/gnome-keyring/gnome-keyring-docs.sgml
@@ -4,6 +4,11 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
<bookinfo>
<title>gnome-keyring Reference Manual</title>
+ <releaseinfo>
+ <warning>libgnome-keyring is deprecated. Use
+ <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ instead.</warning>
+ </releaseinfo>
</bookinfo>
<chapter>
diff --git a/docs/reference/gnome-keyring/gnome-keyring-sections.txt
b/docs/reference/gnome-keyring/gnome-keyring-sections.txt
index 749d632..d741d1b 100644
--- a/docs/reference/gnome-keyring/gnome-keyring-sections.txt
+++ b/docs/reference/gnome-keyring/gnome-keyring-sections.txt
@@ -188,6 +188,8 @@ gnome_keyring_set_network_password_sync
gnome_keyring_is_available
gnome_keyring_cancel_request
gnome_keyring_string_list_free
+GNOME_KEYRING_DEPRECATED
+GNOME_KEYRING_DEPRECATED_FOR
</SECTION>
<SECTION>
<FILE>gnome-keyring-daemon</FILE>
diff --git a/library/Makefile.am b/library/Makefile.am
index 273844a..fc64828 100644
--- a/library/Makefile.am
+++ b/library/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES= \
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBRARY_CFLAGS) \
- $(LIBGCRYPT_CFLAGS)
+ $(LIBGCRYPT_CFLAGS) \
+ -DGNOME_KEYRING_COMPILATION
PUBLIC_SOURCES = \
gnome-keyring.c \
diff --git a/library/gnome-keyring-memory.c b/library/gnome-keyring-memory.c
index 3ba85cb..9bff187 100644
--- a/library/gnome-keyring-memory.c
+++ b/library/gnome-keyring-memory.c
@@ -37,6 +37,10 @@
* @title: Non-pageable Memory
* @short_description: Secure Non-pageable Memory
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* Normal allocated memory can be paged to disk at the whim of the operating system.
* This can be a serious problem for sensitive information like passwords, keys and secrets.
*
@@ -126,6 +130,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_memory);
*
* Return value: (transfer full): The new memory block which should be freed
* with gnome_keyring_memory_free()
+ *
+ * Deprecated: Use gcr_secure_memory_alloc() instead.
**/
gpointer
gnome_keyring_memory_alloc (gulong sz)
@@ -151,6 +157,8 @@ gnome_keyring_memory_alloc (gulong sz)
*
* Return value: (transfer full): The new block, or %NULL if memory cannot be
* allocated. The memory block should be freed with gnome_keyring_memory_free()
+ *
+ * Deprecated: Use gcr_secure_memory_try_alloc() instead.
*/
gpointer
gnome_keyring_memory_try_alloc (gulong sz)
@@ -175,6 +183,8 @@ gnome_keyring_memory_try_alloc (gulong sz)
*
* Return value: (transfer full): The new block, or %NULL if the block was
* freed. The memory block should be freed with gnome_keyring_memory_free()
+ *
+ * Deprecated: Use gcr_secure_memory_realloc() instead.
*/
gpointer
gnome_keyring_memory_realloc (gpointer p, gulong sz)
@@ -214,6 +224,8 @@ gnome_keyring_memory_realloc (gpointer p, gulong sz)
*
* Return value: (transfer full): The new block, or %NULL if memory cannot be
* allocated. The memory block should be freed with gnome_keyring_memory_free()
+ *
+ * Deprecated: Use gcr_secure_memory_try_realloc() instead.
*/
gpointer
gnome_keyring_memory_try_realloc (gpointer p, gulong sz)
@@ -245,6 +257,8 @@ gnome_keyring_memory_try_realloc (gpointer p, gulong sz)
*
* Glib memory is also freed correctly when passed to this function. If called
* with a null pointer then no action is taken.
+ *
+ * Deprecated: Use gcr_secure_memory_free() instead.
*/
void
gnome_keyring_memory_free (gpointer p)
@@ -261,6 +275,8 @@ gnome_keyring_memory_free (gpointer p)
* Check if a pointer is in non-pageable memory allocated by gnome-keyring.
*
* Return value: Whether the memory is non-pageable or not
+ *
+ * Deprecated: Use gcr_secure_memory_is_secure() instead.
*/
gboolean
gnome_keyring_memory_is_secure (gpointer p)
@@ -276,6 +292,8 @@ gnome_keyring_memory_is_secure (gpointer p)
* %NULL will be returned.
*
* Return value: The copied string, should be freed with gnome_keyring_memory_free()
+ *
+ * Deprecated: Use gcr_secure_memory_strdup() instead.
*/
gchar*
gnome_keyring_memory_strdup (const gchar* str)
diff --git a/library/gnome-keyring-memory.h b/library/gnome-keyring-memory.h
index 5077d8d..c0ba15d 100644
--- a/library/gnome-keyring-memory.h
+++ b/library/gnome-keyring-memory.h
@@ -26,8 +26,18 @@
#include <glib.h>
+#if !defined(GNOME_KEYRING_COMPILATION) && defined(G_DEPRECATED)
+#define GNOME_KEYRING_DEPRECATED GNOME_KEYRING_DEPRECATED
+#define GNOME_KEYRING_DEPRECATED_FOR(x) GNOME_KEYRING_DEPRECATED(x)
+#else
+#define GNOME_KEYRING_DEPRECATED
+#define GNOME_KEYRING_DEPRECATED_FOR(x)
+#endif
+
G_BEGIN_DECLS
+#ifndef GNOME_KEYRING_DISABLE_DEPRECATED
+
/**
* gnome_keyring_memory_new:
* @type: The C type of the objects to allocate
@@ -36,24 +46,35 @@ G_BEGIN_DECLS
* Allocate objects in non-pageable gnome-keyring memory.
*
* Return value: The new block of memory.
+ *
+ * Deprecated: Use gcr_secure_memory_alloc() instead.
**/
#define gnome_keyring_memory_new(type, n_objects) \
((type*)(gnome_keyring_memory_alloc (sizeof (type) * (n_objects))))
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_alloc)
gpointer gnome_keyring_memory_alloc (gulong sz);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_try_alloc)
gpointer gnome_keyring_memory_try_alloc (gulong sz);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_realloc)
gpointer gnome_keyring_memory_realloc (gpointer p, gulong sz);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_try_realloc)
gpointer gnome_keyring_memory_try_realloc (gpointer p, gulong sz);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_free)
void gnome_keyring_memory_free (gpointer p);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_is_secure)
gboolean gnome_keyring_memory_is_secure (gpointer p);
+GNOME_KEYRING_DEPRECATED_FOR(gcr_secure_memory_strdup)
gchar* gnome_keyring_memory_strdup (const gchar* str);
+#endif /* GNOME_KEYRING_DISABLE_DEPRECATED */
+
G_END_DECLS
#endif /* GNOME_KEYRING_MEMORY_H */
diff --git a/library/gnome-keyring-result.h b/library/gnome-keyring-result.h
index f3d8faa..33ca38e 100644
--- a/library/gnome-keyring-result.h
+++ b/library/gnome-keyring-result.h
@@ -24,6 +24,8 @@
#ifndef GNOME_KEYRING_RESULT_H
#define GNOME_KEYRING_RESULT_H
+#ifndef GNOME_KEYRING_DISABLE_DEPRECATED
+
typedef enum {
GNOME_KEYRING_RESULT_OK,
GNOME_KEYRING_RESULT_DENIED,
@@ -40,4 +42,6 @@ typedef enum {
#define GNOME_KEYRING_RESULT_ALREADY_EXISTS \
GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS
+#endif /* GNOME_KEYRING_DISABLE_DEPRECATED */
+
#endif /* GNOME_KEYRING_RESULT_H */
diff --git a/library/gnome-keyring-utils.c b/library/gnome-keyring-utils.c
index 1febcbc..0ee3a22 100644
--- a/library/gnome-keyring-utils.c
+++ b/library/gnome-keyring-utils.c
@@ -39,6 +39,10 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @title: Result Codes
* @short_description: Gnome Keyring Result Codes
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* <para>
* Result codes used through out GNOME Keyring. Additional result codes may be
* added from time to time and these should be handled gracefully.
@@ -52,6 +56,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* Clears the memory used by password by filling with '\0' and frees the memory
* after doing this. You should use this function instead of g_free() for
* secret information.
+ *
+ * Deprecated: Use secret_password_free() instead.
**/
/**
@@ -71,6 +77,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @GNOME_KEYRING_ITEM_LAST_TYPE: Not used
*
* The types of items.
+ *
+ * Deprecated: Use #SecretSchema instead.
*/
/**
@@ -87,6 +95,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @GNOME_KEYRING_RESULT_NO_MATCH: No such match found.
*
* Various result codes returned by functions.
+ *
+ * Deprecated: Errors are returned from libsecret functions as #GError.
*/
/**
@@ -97,6 +107,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* An item attribute. Set <code>string</code> if data type is
* %GNOME_KEYRING_ATTRIBUTE_TYPE_STRING or <code>integer</code> if data type is
* %GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32
+ *
+ * Deprecated: libsecret only supports string attributes.
*/
/**
@@ -106,6 +118,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @GNOME_KEYRING_ACCESS_REMOVE: Delete access
*
* Type of access.
+ *
+ * Deprecated: libsecret only supports string attributes.
*/
/**
@@ -115,6 +129,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @GNOME_KEYRING_ACCESS_ALLOW: Give permission.
*
* Type of access restriction.
+ *
+ * Deprecated: No permission prompts are supported.
*/
/**
@@ -131,6 +147,8 @@ EGG_SECURE_DECLARE (libgnome_keyring_utils);
* @password: The password.
*
* Network password info.
+ *
+ * Deprecated: Use #SECRET_SCHEMA_COMPAT_NETWORK instead.
*/
void
@@ -144,6 +162,8 @@ gnome_keyring_free_password (gchar *password)
* @strings: (element-type utf8): A %GList of string pointers.
*
* Free a list of string pointers.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
void
gnome_keyring_string_list_free (GList *strings)
@@ -166,6 +186,9 @@ gnome_keyring_string_list_free (GList *strings)
* Return value: a string suitable for display to the user for a given
* #GnomeKeyringResult, or an empty string if the message wouldn't make
* sense to a user.
+ *
+ * Deprecated: libsecret returns errors as #GError directly. Use the
+ * error message field for a description.
**/
const gchar*
gnome_keyring_result_to_message (GnomeKeyringResult res)
@@ -213,6 +236,8 @@ gnome_keyring_result_to_message (GnomeKeyringResult res)
*
* You usually want to use gnome_keyring_found_list_free() on the list of
* results.
+ *
+ * Deprecated: Deprecated: Not needed when using libsecret.
*/
void
gnome_keyring_found_free (GnomeKeyringFound *found)
@@ -232,6 +257,8 @@ gnome_keyring_found_free (GnomeKeyringFound *found)
* Copy a #GnomeKeyringFound item.
*
* Return value: (transfer full): The new #GnomeKeyringFound
+ *
+ * Deprecated: Not needed when using libsecret.
*/
GnomeKeyringFound*
gnome_keyring_found_copy (GnomeKeyringFound *found)
@@ -260,6 +287,8 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringFound,
* @found_list: (element-type GnomeKeyringFound): a #GList of #GnomeKeyringFound
*
* Free the memory used by the #GnomeKeyringFound items in @found_list.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
void
gnome_keyring_found_list_free (GList *found_list)
@@ -273,6 +302,10 @@ gnome_keyring_found_list_free (GList *found_list)
* @title: Item Attributes
* @short_description: Attributes of individual keyring items.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* Attributes allow various other pieces of information to be associated with an item.
* These can also be used to search for relevant items. Use gnome_keyring_item_get_attributes()
* or gnome_keyring_item_set_attributes().
@@ -294,6 +327,8 @@ gnome_keyring_found_list_free (GList *found_list)
*
* Returns: (transfer none): The value.string pointer of @attribute. This is
* not a copy, do not free.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
const gchar*
gnome_keyring_attribute_get_string (GnomeKeyringAttribute *attribute)
@@ -312,6 +347,8 @@ gnome_keyring_attribute_get_string (GnomeKeyringAttribute *attribute)
* you should just use attribute->value.integer.
*
* Returns: The value.integer of @attribute.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
guint32
gnome_keyring_attribute_get_uint32 (GnomeKeyringAttribute *attribute)
@@ -325,6 +362,8 @@ gnome_keyring_attribute_get_uint32 (GnomeKeyringAttribute *attribute)
* @attribute: a #GnomeKeyringAttribute.
*
* Free the memory used by the #GnomeKeyringAttribute @attribute.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
static void
gnome_keyring_attribute_free (GnomeKeyringAttribute *attribute)
@@ -346,6 +385,8 @@ gnome_keyring_attribute_free (GnomeKeyringAttribute *attribute)
* Copy a #GnomeKeyringAttribute.
*
* Return value: (transfer full): The new #GnomeKeyringAttribute
+ *
+ * Deprecated: Not needed when using libsecret.
**/
static GnomeKeyringAttribute*
gnome_keyring_attribute_copy (GnomeKeyringAttribute *attribute)
@@ -380,6 +421,9 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringAttribute,
* @value: The value to store in @attributes
*
* Store a key-value-pair with a string value in @attributes.
+ *
+ * Deprecated: libsecret stores attributes as a #GHashTable containing
+ * string keys and values, use g_hash_table_replace() instead.
**/
void
gnome_keyring_attribute_list_append_string (GnomeKeyringAttributeList *attributes,
@@ -404,6 +448,8 @@ gnome_keyring_attribute_list_append_string (GnomeKeyringAttributeList *attribute
* @value: The value to store in @attributes
*
* Store a key-value-pair with an unsigned 32bit number value in @attributes.
+ *
+ * Deprecated: libsecret does not support number attributes.
**/
void
gnome_keyring_attribute_list_append_uint32 (GnomeKeyringAttributeList *attributes,
@@ -426,6 +472,9 @@ gnome_keyring_attribute_list_append_uint32 (GnomeKeyringAttributeList *attribute
* Create a new #GnomeKeyringAttributeList.
*
* Return value: (transfer full): The new #GnomeKeyringAttributeList
+ *
+ * Deprecated: libsecret stores attributes as a #GHashTable containing
+ * string keys and values; use g_hash_table_new() instead.
**/
GnomeKeyringAttributeList *
gnome_keyring_attribute_list_new (void)
@@ -440,6 +489,9 @@ gnome_keyring_attribute_list_new (void)
* Free the memory used by @attributes.
*
* If a %NULL pointer is passed, it is ignored.
+ *
+ * Deprecated: libsecret stores attributes as a #GHashTable containing
+ * string keys and values, use g_hash_table_unref() instead.
**/
void
gnome_keyring_attribute_list_free (GnomeKeyringAttributeList *attributes)
@@ -468,6 +520,8 @@ gnome_keyring_attribute_list_free (GnomeKeyringAttributeList *attributes)
* Copy a list of item attributes.
*
* Return value: (transfer full): The new #GnomeKeyringAttributeList
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GnomeKeyringAttributeList *
gnome_keyring_attribute_list_copy (GnomeKeyringAttributeList *attributes)
@@ -505,6 +559,8 @@ gnome_keyring_attribute_list_copy (GnomeKeyringAttributeList *attributes)
* of #GnomeKeyringAttribute.
*
* Since: 3.4
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GList*
gnome_keyring_attribute_list_to_glist (GnomeKeyringAttributeList *attributes)
@@ -534,6 +590,10 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringAttributeList,
* @title: Keyring Info
* @short_description: Keyring Information
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* Use gnome_keyring_get_info() or gnome_keyring_get_info_sync() to get a #GnomeKeyringInfo
* pointer to use with these functions.
**/
@@ -544,6 +604,8 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringAttributeList,
*
* Free a #GnomeKeyringInfo object. If a %NULL pointer is passed
* nothing occurs.
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
void
gnome_keyring_info_free (GnomeKeyringInfo *keyring_info)
@@ -556,6 +618,10 @@ gnome_keyring_info_free (GnomeKeyringInfo *keyring_info)
* @title: Item Information
* @short_description: Keyring Item Info
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* #GnomeKeyringItemInfo represents the basic information about a keyring item.
* Use gnome_keyring_item_get_info() or gnome_keyring_item_set_info().
**/
@@ -568,6 +634,8 @@ gnome_keyring_info_free (GnomeKeyringInfo *keyring_info)
*
* Return value: The newly allocated #GnomeKeyringInfo. This must be freed with
* gnome_keyring_info_free()
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
GnomeKeyringInfo *
gnome_keyring_info_copy (GnomeKeyringInfo *keyring_info)
@@ -595,6 +663,8 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringInfo,
* Free the #GnomeKeyringItemInfo object.
*
* A %NULL pointer may be passed, in which case it will be ignored.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
void
gnome_keyring_item_info_free (GnomeKeyringItemInfo *item_info)
@@ -613,6 +683,8 @@ gnome_keyring_item_info_free (GnomeKeyringItemInfo *item_info)
* Free the #GnomeKeyringItemInfo object.
*
* Return value: A keyring item info pointer.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
GnomeKeyringItemInfo *
gnome_keyring_item_info_new (void)
@@ -633,6 +705,8 @@ gnome_keyring_item_info_new (void)
* Copy a #GnomeKeyringItemInfo object.
*
* Return value: A keyring item info pointer.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
GnomeKeyringItemInfo *
gnome_keyring_item_info_copy (GnomeKeyringItemInfo *item_info)
@@ -675,6 +749,8 @@ gnome_keyring_item_info_get_gtype (void)
* Create a new application reference.
*
* Return value: A new #GnomeKeyringApplicationRef pointer.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GnomeKeyringApplicationRef *
gnome_keyring_application_ref_new (void)
@@ -691,6 +767,8 @@ gnome_keyring_application_ref_new (void)
* @app: A #GnomeKeyringApplicationRef pointer
*
* Free an application reference.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
void
gnome_keyring_application_ref_free (GnomeKeyringApplicationRef *app)
@@ -709,6 +787,8 @@ gnome_keyring_application_ref_free (GnomeKeyringApplicationRef *app)
* Copy an application reference.
*
* Return value: A new #GnomeKeyringApplicationRef pointer.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GnomeKeyringApplicationRef *
gnome_keyring_application_ref_copy (const GnomeKeyringApplicationRef *app)
@@ -740,6 +820,8 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringApplicationRef,
*
* Return value: The new #GnomeKeyringAccessControl pointer. Use
* gnome_keyring_access_control_free() to free the memory.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GnomeKeyringAccessControl *
gnome_keyring_access_control_new (const GnomeKeyringApplicationRef *application,
@@ -759,6 +841,8 @@ gnome_keyring_access_control_new (const GnomeKeyringApplicationRef *application,
* @ac: A #GnomeKeyringAccessControl pointer
*
* Free an access control for an item.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
void
gnome_keyring_access_control_free (GnomeKeyringAccessControl *ac)
@@ -777,6 +861,8 @@ gnome_keyring_access_control_free (GnomeKeyringAccessControl *ac)
*
* Return value: The new #GnomeKeyringAccessControl pointer. Use
* gnome_keyring_access_control_free() to free the memory.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GnomeKeyringAccessControl *
gnome_keyring_access_control_copy (GnomeKeyringAccessControl *ac)
@@ -806,6 +892,8 @@ G_DEFINE_BOXED_TYPE (GnomeKeyringAccessControl,
* Return value: (transfer full) (element-type GnomeKeyringAccessControl):
* A new list of #GnomeKeyringAccessControl items. Use gnome_keyring_acl_free()
* to free the memory.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
GList *
gnome_keyring_acl_copy (GList *list)
@@ -826,6 +914,8 @@ gnome_keyring_acl_copy (GList *list)
* #GnomeKeyringAccessControl pointers.
*
* Free an access control list.
+ *
+ * Deprecated: Not needed when using libsecret.
**/
void
gnome_keyring_acl_free (GList *acl)
@@ -842,6 +932,8 @@ gnome_keyring_acl_free (GList *acl)
* Set whether or not to lock a keyring after a certain amount of idle time.
*
* See also gnome_keyring_info_set_lock_timeout().
+ *
+ * Deprecated: Not supported when using libsecret.
**/
void
gnome_keyring_info_set_lock_on_idle (GnomeKeyringInfo *keyring_info,
@@ -860,6 +952,8 @@ gnome_keyring_info_set_lock_on_idle (GnomeKeyringInfo *keyring_info,
* See also gnome_keyring_info_get_lock_timeout().
*
* Return value: Whether to lock or not.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
gboolean
gnome_keyring_info_get_lock_on_idle (GnomeKeyringInfo *keyring_info)
@@ -876,6 +970,8 @@ gnome_keyring_info_get_lock_on_idle (GnomeKeyringInfo *keyring_info)
* Set the idle timeout, in seconds, after which to lock the keyring.
*
* See also gnome_keyring_info_set_lock_on_idle().
+ *
+ * Deprecated: Not supported when using libsecret.
**/
void
gnome_keyring_info_set_lock_timeout (GnomeKeyringInfo *keyring_info,
@@ -894,6 +990,8 @@ gnome_keyring_info_set_lock_timeout (GnomeKeyringInfo *keyring_info,
* See also gnome_keyring_info_get_lock_on_idle().
*
* Return value: The idle timeout, in seconds.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
guint32
gnome_keyring_info_get_lock_timeout (GnomeKeyringInfo *keyring_info)
@@ -909,6 +1007,8 @@ gnome_keyring_info_get_lock_timeout (GnomeKeyringInfo *keyring_info)
* Get the time at which the keyring was last modified.
*
* Return value: The last modified time.
+ *
+ * Deprecated: Use secret_collection_get_modified() instead.
**/
time_t
gnome_keyring_info_get_mtime (GnomeKeyringInfo *keyring_info)
@@ -924,6 +1024,8 @@ gnome_keyring_info_get_mtime (GnomeKeyringInfo *keyring_info)
* Get the time at which the keyring was created.
*
* Return value: The created time.
+ *
+ * Deprecated: Use secret_collection_get_created() instead.
**/
time_t
gnome_keyring_info_get_ctime (GnomeKeyringInfo *keyring_info)
@@ -939,6 +1041,8 @@ gnome_keyring_info_get_ctime (GnomeKeyringInfo *keyring_info)
* Get whether the keyring is locked or not.
*
* Return value: Whether the keyring is locked or not.
+ *
+ * Deprecated: Use secret_collection_get_locked() instead.
**/
gboolean
gnome_keyring_info_get_is_locked (GnomeKeyringInfo *keyring_info)
@@ -954,6 +1058,8 @@ gnome_keyring_info_get_is_locked (GnomeKeyringInfo *keyring_info)
* Get the item type.
*
* Return value: The item type
+ *
+ * Deprecated: Use secret_item_get_schema_name() instead.
**/
GnomeKeyringItemType
gnome_keyring_item_info_get_type (GnomeKeyringItemInfo *item_info)
@@ -968,6 +1074,8 @@ gnome_keyring_item_info_get_type (GnomeKeyringItemInfo *item_info)
* @type: The new item type
*
* Set the type on an item info.
+ *
+ * Deprecated: Use secret_item_set_attributes() instead.
**/
void
gnome_keyring_item_info_set_type (GnomeKeyringItemInfo *item_info,
@@ -984,6 +1092,8 @@ gnome_keyring_item_info_set_type (GnomeKeyringItemInfo *item_info,
* Get the item secret.
*
* Return value: The newly allocated string containing the item secret.
+ *
+ * Deprecated: Use secret_item_get_secret() instead.
**/
char *
gnome_keyring_item_info_get_secret (GnomeKeyringItemInfo *item_info)
@@ -999,6 +1109,8 @@ gnome_keyring_item_info_get_secret (GnomeKeyringItemInfo *item_info)
* @value: The new item secret
*
* Set the secret on an item info.
+ *
+ * Deprecated: Use secret_item_set_secret() instead.
**/
void
gnome_keyring_item_info_set_secret (GnomeKeyringItemInfo *item_info,
@@ -1016,6 +1128,8 @@ gnome_keyring_item_info_set_secret (GnomeKeyringItemInfo *item_info,
* Get the item display name.
*
* Return value: The newly allocated string containing the item display name.
+ *
+ * Deprecated: Use secret_item_get_label() instead.
**/
char *
gnome_keyring_item_info_get_display_name (GnomeKeyringItemInfo *item_info)
@@ -1030,6 +1144,8 @@ gnome_keyring_item_info_get_display_name (GnomeKeyringItemInfo *item_info)
* @value: The new display name.
*
* Set the display name on an item info.
+ *
+ * Deprecated: Use secret_item_set_label() instead.
**/
void
gnome_keyring_item_info_set_display_name (GnomeKeyringItemInfo *item_info,
@@ -1047,6 +1163,8 @@ gnome_keyring_item_info_set_display_name (GnomeKeyringItemInfo *item_info,
* Get the item last modified time.
*
* Return value: The item last modified time.
+ *
+ * Deprecated: Use secret_item_get_modified() instead.
**/
time_t
gnome_keyring_item_info_get_mtime (GnomeKeyringItemInfo *item_info)
@@ -1062,6 +1180,8 @@ gnome_keyring_item_info_get_mtime (GnomeKeyringItemInfo *item_info)
* Get the item created time.
*
* Return value: The item created time.
+ *
+ * Deprecated: Use secret_item_get_created() instead.
**/
time_t
gnome_keyring_item_info_get_ctime (GnomeKeyringItemInfo *item_info)
@@ -1075,6 +1195,10 @@ gnome_keyring_item_info_get_ctime (GnomeKeyringItemInfo *item_info)
* @title: Item ACLs
* @short_description: Access control lists for keyring items.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* Each item has an access control list, which specifies the applications that
* can read, write or delete an item. The read access applies only to reading the secret.
* All applications can read other parts of the item. ACLs are accessed and changed
@@ -1088,6 +1212,8 @@ gnome_keyring_item_info_get_ctime (GnomeKeyringItemInfo *item_info)
* Get the access control application's display name.
*
* Return value: A newly allocated string containing the display name.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
char *
gnome_keyring_item_ac_get_display_name (GnomeKeyringAccessControl *ac)
@@ -1102,6 +1228,8 @@ gnome_keyring_item_ac_get_display_name (GnomeKeyringAccessControl *ac)
* @value: The new application display name.
*
* Set the access control application's display name.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
void
gnome_keyring_item_ac_set_display_name (GnomeKeyringAccessControl *ac,
@@ -1119,6 +1247,8 @@ gnome_keyring_item_ac_set_display_name (GnomeKeyringAccessControl *ac,
* Get the access control application's full path name.
*
* Return value: A newly allocated string containing the display name.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
char *
gnome_keyring_item_ac_get_path_name (GnomeKeyringAccessControl *ac)
@@ -1133,6 +1263,8 @@ gnome_keyring_item_ac_get_path_name (GnomeKeyringAccessControl *ac)
* @value: The new application full path.
*
* Set the access control application's full path name.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
void
gnome_keyring_item_ac_set_path_name (GnomeKeyringAccessControl *ac,
@@ -1150,6 +1282,8 @@ gnome_keyring_item_ac_set_path_name (GnomeKeyringAccessControl *ac,
* Get the application access rights for the access control.
*
* Return value: The access rights.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
GnomeKeyringAccessType
gnome_keyring_item_ac_get_access_type (GnomeKeyringAccessControl *ac)
@@ -1164,6 +1298,8 @@ gnome_keyring_item_ac_get_access_type (GnomeKeyringAccessControl *ac)
* @value: The new access rights.
*
* Set the application access rights for the access control.
+ *
+ * Deprecated: Not supported when using libsecret.
**/
void
gnome_keyring_item_ac_set_access_type (GnomeKeyringAccessControl *ac,
diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
index 3dd2ec8..ace9aab 100644
--- a/library/gnome-keyring.c
+++ b/library/gnome-keyring.c
@@ -63,6 +63,10 @@ typedef gboolean (*DecodePathCallback) (const char *, gpointer);
* SECTION:gnome-keyring-generic-callbacks
* @title: Callbacks
* @short_description: Different callbacks for retrieving async results
+ *
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
*/
static DBusMessage*
@@ -478,6 +482,10 @@ encode_attribute_list (DBusMessageIter *iter, GnomeKeyringAttributeList *attrs)
* SECTION:gnome-keyring-misc
* @title: Miscellaneous Functions
* @short_description: Miscellaneous functions.
+ *
+ * All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.
**/
/**
@@ -487,6 +495,9 @@ encode_attribute_list (DBusMessageIter *iter, GnomeKeyringAttributeList *attrs)
*
* Return value: %FALSE if you can't communicate with the daemon (so you
* can't load and save passwords).
+ *
+ * Deprecated: Not needed when using libsecret. The gnome-keyring daemon is
+ * automatically started as needed.
**/
gboolean
gnome_keyring_is_available (void)
@@ -513,6 +524,9 @@ gnome_keyring_is_available (void)
*
* If a callback was registered when making the asynchronous request, that callback
* function will be called with a result of %GNOME_KEYRING_RESULT_CANCELLED
+ *
+ * Deprecated: When using libsecret, use #GCancellable to cancel asynchronous
+ * requests.
**/
void
gnome_keyring_cancel_request (gpointer request)
@@ -530,6 +544,10 @@ gnome_keyring_cancel_request (gpointer request)
* @title: Keyrings
* @short_description: Listing and managing keyrings
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* <code>gnome-keyring-daemon</code> manages multiple keyrings. Each keyring can
* store one or more items containing secrets.
*
@@ -584,6 +602,8 @@ set_default_keyring_start (const gchar *keyring, GnomeKeyringOperationDoneCallba
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_service_set_alias() instead.
**/
gpointer
gnome_keyring_set_default_keyring (const gchar *keyring,
@@ -609,6 +629,8 @@ gnome_keyring_set_default_keyring (const gchar *keyr
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_service_set_alias_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_set_default_keyring_sync (const char *keyring)
@@ -701,6 +723,8 @@ get_default_keyring_start (GnomeKeyringOperationGetStringCallback callback,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_collection_for_alias() instead.
**/
gpointer
gnome_keyring_get_default_keyring (GnomeKeyringOperationGetStringCallback callback,
@@ -727,6 +751,8 @@ gnome_keyring_get_default_keyring (GnomeKeyringOperationGetStringCallback callb
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_collection_for_alias_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_get_default_keyring_sync (char **keyring)
@@ -826,6 +852,8 @@ list_keyring_names_start (GnomeKeyringOperationGetListCallback callback,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_service_get_collections() instead.
**/
gpointer
gnome_keyring_list_keyring_names (GnomeKeyringOperationGetListCallback callback,
@@ -853,6 +881,8 @@ gnome_keyring_list_keyring_names (GnomeKeyringOperationGetListCallback callba
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_service_get_collections() instead.
**/
GnomeKeyringResult
gnome_keyring_list_keyring_names_sync (GList **keyrings)
@@ -902,6 +932,8 @@ lock_all_start (GnomeKeyringOperationDoneCallback callback,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use libsecret instead.
**/
gpointer
gnome_keyring_lock_all (GnomeKeyringOperationDoneCallback callback,
@@ -926,6 +958,8 @@ gnome_keyring_lock_all (GnomeKeyringOperationDoneCallback callback,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use libsecret instead.
**/
GnomeKeyringResult
gnome_keyring_lock_all_sync (void)
@@ -1108,6 +1142,8 @@ create_keyring_start (const char *keyring_name, const char *password,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_collection_create() instead.
**/
gpointer
gnome_keyring_create (const char *keyring_name,
@@ -1138,6 +1174,8 @@ gnome_keyring_create (const char *keyring_name,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_collection_create_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_create_sync (const char *keyring_name,
@@ -1339,6 +1377,8 @@ unlock_keyring_start (const char *keyring, const char *password,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_service_unlock() instead.
**/
gpointer
gnome_keyring_unlock (const char *keyring,
@@ -1373,6 +1413,8 @@ gnome_keyring_unlock (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_service_unlock_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_unlock_sync (const char *keyring,
@@ -1413,6 +1455,8 @@ lock_keyring_start (const char *keyring, GnomeKeyringOperationDoneCallback callb
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_service_lock() instead.
**/
gpointer
gnome_keyring_lock (const char *keyring,
@@ -1443,6 +1487,8 @@ gnome_keyring_lock (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_service_lock_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_lock_sync (const char *keyring)
@@ -1492,6 +1538,8 @@ delete_keyring_start (const char *keyring, GnomeKeyringOperationDoneCallback cal
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_collection_delete() instead.
**/
gpointer
gnome_keyring_delete (const char *keyring,
@@ -1518,6 +1566,8 @@ gnome_keyring_delete (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_collection_delete_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_delete_sync (const char *keyring)
@@ -1680,6 +1730,8 @@ change_password_start (const char *keyring, const char *original, const char *pa
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Not used with libsecret.
**/
gpointer
gnome_keyring_change_password (const char *keyring,
@@ -1714,6 +1766,8 @@ gnome_keyring_change_password (const char *keyr
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Not used with libsecret.
**/
GnomeKeyringResult
gnome_keyring_change_password_sync (const char *keyring_name,
@@ -1848,6 +1902,8 @@ get_keyring_info_start (const char *keyring, GnomeKeyringOperationGetKeyringInfo
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
gpointer
gnome_keyring_get_info (const char *keyring,
@@ -1878,6 +1934,8 @@ gnome_keyring_get_info (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
GnomeKeyringResult
gnome_keyring_get_info_sync (const char *keyring,
@@ -1936,6 +1994,8 @@ set_keyring_info_start (const char *keyring, GnomeKeyringInfo *info,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
gpointer
gnome_keyring_set_info (const char *keyring,
@@ -1965,6 +2025,8 @@ gnome_keyring_set_info (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use #SecretCollection objects instead.
**/
GnomeKeyringResult
gnome_keyring_set_info_sync (const char *keyring,
@@ -2082,6 +2144,8 @@ list_item_ids_start (const char *keyring, GnomeKeyringOperationGetListCallback c
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_collection_get_items() instead.
**/
gpointer
gnome_keyring_list_item_ids (const char *keyring,
@@ -2113,6 +2177,8 @@ gnome_keyring_list_item_ids (const char *keyrin
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_collection_get_items() instead.
**/
GnomeKeyringResult
gnome_keyring_list_item_ids_sync (const char *keyring,
@@ -2133,6 +2199,10 @@ gnome_keyring_list_item_ids_sync (const char *keyring,
* @title: Daemon Management Functions
* @short_description: Functions used by session to run the Gnome Keyring Daemon.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* These functions are not used by most applications using Gnome Keyring.
**/
@@ -2140,7 +2210,7 @@ gnome_keyring_list_item_ids_sync (const char *keyring,
* gnome_keyring_daemon_set_display_sync:
* @display: Deprecated
*
- * Deprecated. No longer supported, always fails.
+ * Deprecated: No longer supported, always fails.
*
* Return value: GNOME_KEYRING_RESULT_DENIED
**/
@@ -2154,7 +2224,7 @@ gnome_keyring_daemon_set_display_sync (const char *display)
/**
* gnome_keyring_daemon_prepare_environment_sync:
*
- * Deprecated. No longer supported, call is ignored.
+ * Deprecated: No longer supported, call is ignored.
*
* Return value: GNOME_KEYRING_RESULT_OK
**/
@@ -2169,6 +2239,10 @@ gnome_keyring_daemon_prepare_environment_sync (void)
* @title: Search Functionality
* @short_description: Find Keyring Items
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* A find operation searches through all keyrings for items that match the
* attributes. The user may have been prompted to unlock necessary keyrings, and
* user will have been prompted for access to the items if needed.
@@ -2535,6 +2609,8 @@ find_items_start (GnomeKeyringItemType type, GnomeKeyringAttributeList *attribut
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_lookup() or secret_service_search() instead.
**/
gpointer
gnome_keyring_find_items (GnomeKeyringItemType type,
@@ -2611,6 +2687,8 @@ make_attribute_list_va (va_list args)
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_lookup() or secret_service_search() instead.
**/
gpointer
gnome_keyring_find_itemsv (GnomeKeyringItemType type,
@@ -2655,6 +2733,8 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_lookup_sync() or secret_service_search_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_find_items_sync (GnomeKeyringItemType type,
@@ -2696,6 +2776,8 @@ gnome_keyring_find_items_sync (GnomeKeyringItemType type,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_lookup_sync() or secret_service_search_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
@@ -2724,6 +2806,10 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
* @title: Keyring Items
* @short_description: Keyring items each hold a secret and a number of attributes.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* A keyring contains multiple items. Each item has a secret, attributes and access
* information associated with it.
*
@@ -3133,6 +3219,8 @@ item_create_start (const char *keyring, GnomeKeyringItemType type, const char *d
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_store() or secret_item_create() instead.
**/
gpointer
gnome_keyring_item_create (const char *keyring,
@@ -3182,6 +3270,8 @@ gnome_keyring_item_create (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_store_sync() or secret_item_create_sync() instead.
*/
GnomeKeyringResult
gnome_keyring_item_create_sync (const char *keyring,
@@ -3238,6 +3328,8 @@ item_delete_start (const char *keyring, guint32 id, GnomeKeyringOperationDoneCal
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_clear() or secret_item_delete() instead.
**/
gpointer
gnome_keyring_item_delete (const char *keyring,
@@ -3269,6 +3361,8 @@ gnome_keyring_item_delete (const char *keyring,
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_clear_sync() or secret_item_delete_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_item_delete_sync (const char *keyring,
@@ -3303,6 +3397,8 @@ gnome_keyring_item_delete_sync (const char *keyring,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
gpointer
gnome_keyring_item_get_info (const char *keyring,
@@ -3336,6 +3432,8 @@ gnome_keyring_item_get_info (const char *keyring
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
GnomeKeyringResult
gnome_keyring_item_get_info_sync (const char *keyring,
@@ -3547,6 +3645,8 @@ item_get_info_start (const char *keyring, guint32 id, guint32 flags,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
gpointer
gnome_keyring_item_get_info_full (const char *keyring,
@@ -3586,6 +3686,8 @@ gnome_keyring_item_get_info_full (const char *ke
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
GnomeKeyringResult
gnome_keyring_item_get_info_full_sync (const char *keyring,
@@ -3752,6 +3854,8 @@ item_set_info_start (const char *keyring, guint32 id, GnomeKeyringItemInfo *info
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
gpointer
gnome_keyring_item_set_info (const char *keyring,
@@ -3785,6 +3889,8 @@ gnome_keyring_item_set_info (const char *keyring
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use #SecretItem objects instead.
**/
GnomeKeyringResult
gnome_keyring_item_set_info_sync (const char *keyring,
@@ -3870,6 +3976,8 @@ item_get_attributes_start (const char *keyring, guint32 id,
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_item_get_attributes() instead.
**/
gpointer
gnome_keyring_item_get_attributes (const char *keyring,
@@ -3904,6 +4012,8 @@ gnome_keyring_item_get_attributes (const char *k
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_item_get_attributes() instead.
**/
GnomeKeyringResult
gnome_keyring_item_get_attributes_sync (const char *keyring,
@@ -3988,6 +4098,8 @@ item_set_attributes_start (const char *keyring, guint32 id, GnomeKeyringAttribut
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_item_set_attributes() instead.
**/
gpointer
gnome_keyring_item_set_attributes (const char *keyring,
@@ -4019,6 +4131,8 @@ gnome_keyring_item_set_attributes (const char *k
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_item_set_attributes_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_item_set_attributes_sync (const char *keyring,
@@ -4222,6 +4336,10 @@ gnome_keyring_item_grant_access_rights_sync (const char *keyri
* @title: Network Passwords
* @short_description: Saving of network passwords.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* Networks passwords are a simple way of saving passwords associated with a
* certain user/server/protocol and other fields.
*
@@ -4235,6 +4353,8 @@ gnome_keyring_item_grant_access_rights_sync (const char *keyri
*
* Free a network password data pointer. If %NULL is passed in,
* nothing happens.
+ *
+ * Deprecated: Not used with libsecret.
**/
void
gnome_keyring_network_password_free (GnomeKeyringNetworkPasswordData *data)
@@ -4260,6 +4380,8 @@ gnome_keyring_network_password_free (GnomeKeyringNetworkPasswordData *data)
* #GnomeKeyringNetworkPasswordData pointers.
*
* Free a list of network password data.
+ *
+ * Deprecated: Not used with libsecret.
**/
void
gnome_keyring_network_password_list_free (GList *list)
@@ -4411,6 +4533,8 @@ find_network_password_start (const char *user, const char *domain, const char *s
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_lookup() with %SECRET_SCHEMA_COMPAT_NETWORK.
**/
gpointer
gnome_keyring_find_network_password (const char *user,
@@ -4457,6 +4581,8 @@ gnome_keyring_find_network_password (const char
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_lookup_sync() with %SECRET_SCHEMA_COMPAT_NETWORK.
**/
GnomeKeyringResult
gnome_keyring_find_network_password_sync (const char *user,
@@ -4563,6 +4689,8 @@ set_network_password_start (const char *keyring, const char *user, const char *d
*
* Return value: (transfer none): The asynchronous request, which can be passed
* to gnome_keyring_cancel_request().
+ *
+ * Deprecated: Use secret_password_store() with %SECRET_SCHEMA_COMPAT_NETWORK.
**/
gpointer
gnome_keyring_set_network_password (const char *keyring,
@@ -4612,6 +4740,8 @@ gnome_keyring_set_network_password (const char *
*
* Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or
* an error result otherwise.
+ *
+ * Deprecated: Use secret_password_store_sync() with %SECRET_SCHEMA_COMPAT_NETWORK.
**/
GnomeKeyringResult
gnome_keyring_set_network_password_sync (const char *keyring,
@@ -4643,6 +4773,10 @@ gnome_keyring_set_network_password_sync (const char *
* @title: Simple Password Storage
* @short_description: Store and lookup passwords with a set of attributes.
*
+ * <warning>All of these APIs are deprecated. Use
+ * <ulink href="http://developer.gnome.org/libsecret/stable/";>libsecret</ulink>
+ * instead.</warning>
+ *
* This is a simple API for storing passwords and retrieving passwords in the keyring.
*
* Each password is associated with a set of attributes. Attribute values can be either
@@ -4839,6 +4973,8 @@ store_password_filter (GnomeKeyringResult res, guint32 item_id, gpointer user_da
* to gnome_keyring_cancel_request().
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_store() instead.
**/
gpointer
gnome_keyring_store_password (const GnomeKeyringPasswordSchema* schema, const gchar *keyring,
@@ -4896,6 +5032,8 @@ gnome_keyring_store_password (const GnomeKeyringPasswordSchema* schema, const gc
* an error result otherwise.
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_store_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_store_password_sync (const GnomeKeyringPasswordSchema* schema, const gchar *keyring,
@@ -5150,6 +5288,8 @@ find_password_va_start (const GnomeKeyringPasswordSchema* schema, va_list va,
* to gnome_keyring_cancel_request().
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_lookup() instead.
**/
gpointer
gnome_keyring_find_password (const GnomeKeyringPasswordSchema* schema,
@@ -5180,6 +5320,8 @@ gnome_keyring_find_password (const GnomeKeyringPasswordSchema* schema,
*
* A found structure returned by a found operation. Use gnome_keyring_found_list_free()
* to free a list of these structures.
+ *
+ * Deprecated: Not used with libsecret.
*/
/**
@@ -5207,6 +5349,8 @@ gnome_keyring_find_password (const GnomeKeyringPasswordSchema* schema,
* an error result otherwise.
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_lookup_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_find_password_sync (const GnomeKeyringPasswordSchema* schema,
@@ -5292,6 +5436,8 @@ delete_password_va_start (const GnomeKeyringPasswordSchema* schema, va_list va,
* to gnome_keyring_cancel_request().
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_clear() instead.
**/
gpointer
gnome_keyring_delete_password (const GnomeKeyringPasswordSchema* schema,
@@ -5336,6 +5482,8 @@ gnome_keyring_delete_password (const GnomeKeyringPasswordSchema* schema,
* an error result otherwise.
*
* Since: 2.22
+ *
+ * Deprecated: Use secret_password_clear_sync() instead.
**/
GnomeKeyringResult
gnome_keyring_delete_password_sync (const GnomeKeyringPasswordSchema* schema, ...)
diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
index eaa4150..7b54d7d 100644
--- a/library/gnome-keyring.h
+++ b/library/gnome-keyring.h
@@ -28,10 +28,20 @@
#include <glib-object.h>
#include <time.h>
+#if !defined(GNOME_KEYRING_COMPILATION) && defined(G_DEPRECATED)
+#define GNOME_KEYRING_DEPRECATED G_DEPRECATED
+#define GNOME_KEYRING_DEPRECATED_FOR(x) G_DEPRECATED_FOR(x)
+#else
+#define GNOME_KEYRING_DEPRECATED
+#define GNOME_KEYRING_DEPRECATED_FOR(x)
+#endif
+
#include "gnome-keyring-result.h"
G_BEGIN_DECLS
+#ifndef GNOME_KEYRING_DISABLE_DEPRECATED
+
#define GNOME_KEYRING_SESSION "session"
#define GNOME_KEYRING_DEFAULT NULL
@@ -89,6 +99,7 @@ typedef struct {
char *secret;
} GnomeKeyringFound;
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_string_list_free (GList *strings);
typedef void (*GnomeKeyringOperationDoneCallback) (GnomeKeyringResult result,
@@ -118,147 +129,202 @@ typedef void (*GnomeKeyringOperationGetAttributesCallback) (GnomeKeyringResult
GnomeKeyringAttributeList *attributes,
gpointer user_data);
-
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_attribute_get_type (void) G_GNUC_CONST;
+GNOME_KEYRING_DEPRECATED
const gchar* gnome_keyring_attribute_get_string (GnomeKeyringAttribute *attribute);
+GNOME_KEYRING_DEPRECATED
guint32 gnome_keyring_attribute_get_uint32 (GnomeKeyringAttribute *attribute);
#define GNOME_KEYRING_TYPE_ATTRIBUTE (gnome_keyring_attribute_get_type ())
#define gnome_keyring_attribute_list_index(a, i) g_array_index ((a), GnomeKeyringAttribute, (i))
+GNOME_KEYRING_DEPRECATED_FOR(g_hash_table_replace)
void gnome_keyring_attribute_list_append_string (GnomeKeyringAttributeList *attributes,
const char *name,
const char *value);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_attribute_list_append_uint32 (GnomeKeyringAttributeList *attributes,
const char *name,
guint32 value);
+GNOME_KEYRING_DEPRECATED_FOR(g_hash_table_new)
GnomeKeyringAttributeList *gnome_keyring_attribute_list_new (void);
+GNOME_KEYRING_DEPRECATED_FOR(g_hash_table_unref)
void gnome_keyring_attribute_list_free (GnomeKeyringAttributeList
*attributes);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringAttributeList *gnome_keyring_attribute_list_copy (GnomeKeyringAttributeList
*attributes);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_attribute_list_get_type (void) G_GNUC_CONST;
+GNOME_KEYRING_DEPRECATED
GList *gnome_keyring_attribute_list_to_glist (GnomeKeyringAttributeList
*attributes);
#define GNOME_KEYRING_TYPE_ATTRIBUTE_LIST (gnome_keyring_attribute_list_get_type ())
+GNOME_KEYRING_DEPRECATED
const gchar* gnome_keyring_result_to_message (GnomeKeyringResult res);
+GNOME_KEYRING_DEPRECATED
gboolean gnome_keyring_is_available (void);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_found_free (GnomeKeyringFound *found);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_found_list_free (GList *found_list);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringFound* gnome_keyring_found_copy (GnomeKeyringFound *found);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_found_get_type (void) G_GNUC_CONST;
#define GNOME_KEYRING_TYPE_FOUND (gnome_keyring_found_get_type ())
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_cancel_request (gpointer request);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_set_alias)
gpointer gnome_keyring_set_default_keyring (const char *keyring,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_set_alias_sync)
GnomeKeyringResult gnome_keyring_set_default_keyring_sync (const char *keyring);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_for_alias)
gpointer gnome_keyring_get_default_keyring (GnomeKeyringOperationGetStringCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_for_alias_sync)
GnomeKeyringResult gnome_keyring_get_default_keyring_sync (char **keyring);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_get_collections)
gpointer gnome_keyring_list_keyring_names (GnomeKeyringOperationGetListCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_get_collections)
GnomeKeyringResult gnome_keyring_list_keyring_names_sync (GList
**keyrings);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_lock_all (GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_lock_all_sync (void);
/* NULL password means ask user */
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_create)
gpointer gnome_keyring_create (const char
*keyring_name,
const char *password,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_create_sync)
GnomeKeyringResult gnome_keyring_create_sync (const char
*keyring_name,
const char *password);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_unlock)
gpointer gnome_keyring_unlock (const char *keyring,
const char *password,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_unlock_sync)
GnomeKeyringResult gnome_keyring_unlock_sync (const char *keyring,
const char *password);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_lock)
gpointer gnome_keyring_lock (const char *keyring,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_lock_sync)
GnomeKeyringResult gnome_keyring_lock_sync (const char *keyring);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_delete)
gpointer gnome_keyring_delete (const char *keyring,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_delete_sync)
GnomeKeyringResult gnome_keyring_delete_sync (const char *keyring);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_change_password (const char
*keyring,
const char *original,
const char *password,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_change_password_sync (const char
*keyring,
const char
*original,
const char *password);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_get_info (const char *keyring,
GnomeKeyringOperationGetKeyringInfoCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_get_info_sync (const char *keyring,
GnomeKeyringInfo **info);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_set_info (const char *keyring,
GnomeKeyringInfo *info,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_set_info_sync (const char *keyring,
GnomeKeyringInfo *info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_get_items)
gpointer gnome_keyring_list_item_ids (const char *keyring,
GnomeKeyringOperationGetListCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_get_items)
GnomeKeyringResult gnome_keyring_list_item_ids_sync (const char *keyring,
GList **ids);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_info_free (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringInfo *gnome_keyring_info_copy (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_info_get_type (void) G_GNUC_CONST;
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_info_set_lock_on_idle (GnomeKeyringInfo *keyring_info,
gboolean value);
+GNOME_KEYRING_DEPRECATED
gboolean gnome_keyring_info_get_lock_on_idle (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_info_set_lock_timeout (GnomeKeyringInfo *keyring_info,
guint32 value);
+GNOME_KEYRING_DEPRECATED
guint32 gnome_keyring_info_get_lock_timeout (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_get_modified)
time_t gnome_keyring_info_get_mtime (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_get_created)
time_t gnome_keyring_info_get_ctime (GnomeKeyringInfo *keyring_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_collection_get_locked)
gboolean gnome_keyring_info_get_is_locked (GnomeKeyringInfo *keyring_info);
#define GNOME_KEYRING_TYPE_INFO (gnome_keyring_info_get_type ())
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_search)
gpointer gnome_keyring_find_items (GnomeKeyringItemType type,
GnomeKeyringAttributeList *attributes,
GnomeKeyringOperationGetListCallback callback,
gpointer data,
GDestroyNotify destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_search)
gpointer gnome_keyring_find_itemsv (GnomeKeyringItemType type,
GnomeKeyringOperationGetListCallback callback,
gpointer data,
GDestroyNotify destroy_data,
...);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_search_sync)
GnomeKeyringResult gnome_keyring_find_items_sync (GnomeKeyringItemType type,
GnomeKeyringAttributeList *attributes,
GList **found);
+GNOME_KEYRING_DEPRECATED_FOR(secret_service_search_sync)
GnomeKeyringResult gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
GList **found,
...);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_create)
gpointer gnome_keyring_item_create (const char
*keyring,
GnomeKeyringItemType type,
const char
*display_name,
@@ -268,6 +334,7 @@ gpointer gnome_keyring_item_create (const char
GnomeKeyringOperationGetIntCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_create_sync)
GnomeKeyringResult gnome_keyring_item_create_sync (const char
*keyring,
GnomeKeyringItemType type,
const char
*display_name,
@@ -275,72 +342,96 @@ GnomeKeyringResult gnome_keyring_item_create_sync (const char
const char
*secret,
gboolean
update_if_exists,
guint32
*item_id);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_delete)
gpointer gnome_keyring_item_delete (const char
*keyring,
guint32 id,
GnomeKeyringOperationDoneCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_delete_sync)
GnomeKeyringResult gnome_keyring_item_delete_sync (const char
*keyring,
guint32 id);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_get_info (const char
*keyring,
guint32 id,
GnomeKeyringOperationGetItemInfoCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_get_info_sync (const char
*keyring,
guint32 id,
GnomeKeyringItemInfo **info);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_get_info_full (const char
*keyring,
guint32 id,
guint32 flags,
GnomeKeyringOperationGetItemInfoCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_get_info_full_sync (const char
*keyring,
guint32 id,
guint32 flags,
GnomeKeyringItemInfo
**info);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_set_info (const char
*keyring,
guint32 id,
GnomeKeyringItemInfo *info,
GnomeKeyringOperationDoneCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_set_info_sync (const char
*keyring,
guint32 id,
GnomeKeyringItemInfo *info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_attributes)
gpointer gnome_keyring_item_get_attributes (const char
*keyring,
guint32 id,
GnomeKeyringOperationGetAttributesCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_attributes)
GnomeKeyringResult gnome_keyring_item_get_attributes_sync (const char
*keyring,
guint32 id,
GnomeKeyringAttributeList
**attributes);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_set_attributes)
gpointer gnome_keyring_item_set_attributes (const char
*keyring,
guint32 id,
GnomeKeyringAttributeList
*attributes,
GnomeKeyringOperationDoneCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_set_attributes_sync)
GnomeKeyringResult gnome_keyring_item_set_attributes_sync (const char
*keyring,
guint32 id,
GnomeKeyringAttributeList
*attributes);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_item_info_free (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringItemInfo *gnome_keyring_item_info_new (void);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringItemInfo *gnome_keyring_item_info_copy (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_item_info_get_gtype (void) G_GNUC_CONST;
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_schema_name)
GnomeKeyringItemType gnome_keyring_item_info_get_type (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_item_info_set_type (GnomeKeyringItemInfo *item_info,
GnomeKeyringItemType type);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_secret)
char * gnome_keyring_item_info_get_secret (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_set_secret)
void gnome_keyring_item_info_set_secret (GnomeKeyringItemInfo *item_info,
const char *value);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_label)
char * gnome_keyring_item_info_get_display_name (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_set_label)
void gnome_keyring_item_info_set_display_name (GnomeKeyringItemInfo *item_info,
const char *value);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_get_modified)
time_t gnome_keyring_item_info_get_mtime (GnomeKeyringItemInfo *item_info);
+GNOME_KEYRING_DEPRECATED_FOR(secret_item_set_modified)
time_t gnome_keyring_item_info_get_ctime (GnomeKeyringItemInfo *item_info);
#define GNOME_KEYRING_TYPE_ITEM_INFO (gnome_keyring_item_info_get_gtype ())
@@ -376,6 +467,7 @@ typedef struct {
extern const GnomeKeyringPasswordSchema* GNOME_KEYRING_NETWORK_PASSWORD;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_store)
gpointer gnome_keyring_store_password (const GnomeKeyringPasswordSchema* schema,
const gchar *keyring,
const gchar *display_name,
@@ -385,31 +477,37 @@ gpointer gnome_keyring_store_password (const GnomeKeyrin
GDestroyNotify destroy_data,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_store_sync)
GnomeKeyringResult gnome_keyring_store_password_sync (const GnomeKeyringPasswordSchema* schema,
const gchar *keyring,
const gchar *display_name,
const gchar *password,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_lookup)
gpointer gnome_keyring_find_password (const GnomeKeyringPasswordSchema* schema,
GnomeKeyringOperationGetStringCallback
callback,
gpointer data,
GDestroyNotify destroy_data,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_lookup_sync)
GnomeKeyringResult gnome_keyring_find_password_sync (const GnomeKeyringPasswordSchema* schema,
gchar **password,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_clear)
gpointer gnome_keyring_delete_password (const GnomeKeyringPasswordSchema* schema,
GnomeKeyringOperationDoneCallback callback,
gpointer data,
GDestroyNotify destroy_data,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_clear_sync)
GnomeKeyringResult gnome_keyring_delete_password_sync (const GnomeKeyringPasswordSchema* schema,
...) G_GNUC_NULL_TERMINATED;
+GNOME_KEYRING_DEPRECATED_FOR(secret_password_free)
void gnome_keyring_free_password (gchar *password);
/* ------------------------------------------------------------------------------
@@ -431,9 +529,12 @@ typedef struct {
char *password;
} GnomeKeyringNetworkPasswordData;
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_network_password_free (GnomeKeyringNetworkPasswordData *data);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_network_password_list_free (GList *list);
+GNOME_KEYRING_DEPRECATED_FOR(SECRET_SCHEMA_COMPAT_NETWORK)
gpointer gnome_keyring_find_network_password (const char *user,
const char *domain,
const char *server,
@@ -444,6 +545,7 @@ gpointer gnome_keyring_find_network_password (const char
GnomeKeyringOperationGetListCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(SECRET_SCHEMA_COMPAT_NETWORK)
GnomeKeyringResult gnome_keyring_find_network_password_sync (const char *user,
const char *domain,
const char *server,
@@ -452,6 +554,7 @@ GnomeKeyringResult gnome_keyring_find_network_password_sync (const char
const char *authtype,
guint32 port,
GList **results);
+GNOME_KEYRING_DEPRECATED_FOR(SECRET_SCHEMA_COMPAT_NETWORK)
gpointer gnome_keyring_set_network_password (const char *keyring,
const char *user,
const char *domain,
@@ -464,6 +567,7 @@ gpointer gnome_keyring_set_network_password (const char
GnomeKeyringOperationGetIntCallback callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED_FOR(SECRET_SCHEMA_COMPAT_NETWORK)
GnomeKeyringResult gnome_keyring_set_network_password_sync (const char *keyring,
const char *user,
const char *domain,
@@ -475,12 +579,6 @@ GnomeKeyringResult gnome_keyring_set_network_password_sync (const char
const char *password,
guint32 *item_id);
-/* -----------------------------------------------------------------------------
- * DEPRECATED STUFF
- */
-
-#ifndef GNOME_KEYRING_DISABLE_DEPRECATED
-
typedef enum {
GNOME_KEYRING_ACCESS_ASK,
GNOME_KEYRING_ACCESS_DENY,
@@ -496,10 +594,13 @@ typedef enum {
GNOME_KEYRING_ACCESS_REMOVE = 1<<2
} GnomeKeyringAccessType;
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_daemon_set_display_sync (const char *display);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_daemon_prepare_environment_sync (void);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_grant_access_rights (const gchar *keyring,
const gchar
*display_name,
const gchar *full_path,
@@ -509,6 +610,7 @@ gpointer gnome_keyring_item_grant_access_rights (const gchar
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_grant_access_rights_sync (const char *keyring,
const char *display_name,
const char *full_path,
@@ -516,52 +618,70 @@ GnomeKeyringResult gnome_keyring_item_grant_access_rights_sync (const char
const GnomeKeyringAccessType rights);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringApplicationRef * gnome_keyring_application_ref_new (void);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringApplicationRef * gnome_keyring_application_ref_copy (const GnomeKeyringApplicationRef
*app);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_application_ref_free (GnomeKeyringApplicationRef
*app);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_application_ref_get_type (void) G_GNUC_CONST;
#define GNOME_KEYRING_TYPE_APPLICATION_REF (gnome_keyring_application_ref_get_type ())
+GNOME_KEYRING_DEPRECATED
GnomeKeyringAccessControl * gnome_keyring_access_control_new (const GnomeKeyringApplicationRef
*application,
GnomeKeyringAccessType
types_allowed);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringAccessControl * gnome_keyring_access_control_copy (GnomeKeyringAccessControl *ac);
+GNOME_KEYRING_DEPRECATED
GType gnome_keyring_access_control_get_type (void) G_GNUC_CONST;
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_access_control_free (GnomeKeyringAccessControl *ac);
#define GNOME_KEYRING_TYPE_ACCESS_CONTROL (gnome_keyring_access_control_get_type ())
+GNOME_KEYRING_DEPRECATED
GList * gnome_keyring_acl_copy (GList *list);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_acl_free (GList *acl);
-
+GNOME_KEYRING_DEPRECATED
char * gnome_keyring_item_ac_get_display_name (GnomeKeyringAccessControl *ac);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_item_ac_set_display_name (GnomeKeyringAccessControl *ac,
const char *value);
+GNOME_KEYRING_DEPRECATED
char * gnome_keyring_item_ac_get_path_name (GnomeKeyringAccessControl *ac);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_item_ac_set_path_name (GnomeKeyringAccessControl *ac,
const char *value);
-
+GNOME_KEYRING_DEPRECATED
GnomeKeyringAccessType gnome_keyring_item_ac_get_access_type (GnomeKeyringAccessControl *ac);
+GNOME_KEYRING_DEPRECATED
void gnome_keyring_item_ac_set_access_type (GnomeKeyringAccessControl *ac,
const GnomeKeyringAccessType value);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_get_acl (const char
*keyring,
guint32 id,
GnomeKeyringOperationGetListCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_get_acl_sync (const char
*keyring,
guint32 id,
GList **acl);
+GNOME_KEYRING_DEPRECATED
gpointer gnome_keyring_item_set_acl (const char
*keyring,
guint32 id,
GList *acl,
GnomeKeyringOperationDoneCallback
callback,
gpointer data,
GDestroyNotify
destroy_data);
+GNOME_KEYRING_DEPRECATED
GnomeKeyringResult gnome_keyring_item_set_acl_sync (const char
*keyring,
guint32 id,
GList *acl);
diff --git a/library/tests/Makefile.am b/library/tests/Makefile.am
index 3b299c3..92aef62 100644
--- a/library/tests/Makefile.am
+++ b/library/tests/Makefile.am
@@ -3,7 +3,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/library \
-DSRCDIR="\"@abs_srcdir \"" \
- $(LIBRARY_CFLAGS)
+ $(LIBRARY_CFLAGS) \
+ -DGNOME_KEYRING_COMPILATION
noinst_LTLIBRARIES = libmock-service.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
