Remove unstable vapi

Just use the main vapi, and expect people to define the relevant
SECRET_WITH_UNSTABLE preprocessor macro.

https://bugzilla.gnome.org/show_bug.cgi?id=721429
This commit is contained in:
Stef Walter 2014-01-04 11:17:18 +01:00
parent 0257a68106
commit 66e8949b7b
7 changed files with 184 additions and 91 deletions

View File

@ -99,14 +99,13 @@ AM_VALAFLAGS = \
<para>
Some parts of the <application>libsecret</application> API are not yet stable.
To use them you need use the <literal>libsecret-unstable</literal> package.
The API contained in this package will change from time to time. Here's how
you would do it:
To use them you need to define the SECRET_WITH_UNSTABLE C preprocessor
macro to use them, or else the build will fail:
</para>
<informalexample><programlisting>
AM_VALAFLAGS = \
--pkg=libsecret-unstable
AM_CPPFLAGS = \
-DSECRET_WITH_UNSTABLE=1
</programlisting></informalexample>
</chapter>

View File

@ -37,7 +37,7 @@ BUILT_SOURCES = \
secret-enum-types.c secret-enum-types.h \
$(NULL)
STABLE_FILES = \
PUBLIC_FILES = \
secret-attributes.h secret-attributes.c \
secret-collection.h secret-collection.c \
secret-item.h secret-item.c \
@ -49,9 +49,6 @@ STABLE_FILES = \
secret-service.h secret-service.c \
secret-types.h \
secret-value.h secret-value.c \
$(NULL)
UNSTABLE_FILES = \
secret-paths.h secret-paths.c \
$(NULL)
@ -62,8 +59,7 @@ PRIVATE_FILES = \
$(NULL)
libsecret_@SECRET_MAJOR@_la_SOURCES = \
$(STABLE_FILES) \
$(UNSTABLE_FILES) \
$(PUBLIC_FILES) \
$(PRIVATE_FILES) \
$(BUILT_SOURCES) \
$(NULL)
@ -120,7 +116,7 @@ if HAVE_INTROSPECTION
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS = Secret-@SECRET_MAJOR@.gir SecretUnstable-0.gir
INTROSPECTION_GIRS = Secret-@SECRET_MAJOR@.gir
INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
@ -131,24 +127,12 @@ Secret_@SECRET_MAJOR@_gir_EXPORT_PACKAGES = libsecret-@SECRET_MAJOR@
Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0
Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la
Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION
Secret_@SECRET_MAJOR@_gir_FILES = $(STABLE_FILES)
Secret_@SECRET_MAJOR@_gir_FILES = $(PUBLIC_FILES)
Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
SecretUnstable-0.gir: Secret-@SECRET_MAJOR@.gir
SecretUnstable_0_gir_NAMESPACE = SecretUnstable
SecretUnstable_0_gir_EXPORT_PACKAGES = libsecret-unstable
SecretUnstable_0_gir_INCLUDES = GObject-2.0 Gio-2.0
SecretUnstable_0_gir_LIBS = libsecret-@SECRET_MAJOR@.la
SecretUnstable_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION -DSECRET_API_SUBJECT_TO_CHANGE
SecretUnstable_0_gir_FILES = $(UNSTABLE_FILES)
SecretUnstable_0_gir_SCANNERFLAGS = --c-include "libsecret/secret.h" --identifier-prefix=Secret --symbol-prefix=secret --include-uninstalled=$(builddir)/Secret-@SECRET_MAJOR@.gir
girdir = $(datadir)/gir-1.0
gir_DATA = Secret-@SECRET_MAJOR@.gir
noinst_DATA = SecretUnstable-0.gir
typelibsdir = $(libdir)/girepository-1.0
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
@ -157,30 +141,17 @@ include $(VAPIGEN_MAKEFILE)
libsecret-@SECRET_MAJOR@.vapi: Secret-@SECRET_MAJOR@.gir Secret-@SECRET_MAJOR@.metadata libsecret-@SECRET_MAJOR@.deps
libsecret-unstable.vapi: SecretUnstable-0.gir SecretUnstable-0.metadata libsecret-unstable.deps
VAPIGEN_VAPIS = \
libsecret-@SECRET_MAJOR@.vapi \
libsecret-unstable.vapi
libsecret-@SECRET_MAJOR@.vapi
libsecret_@SECRET_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0
libsecret_@SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)
libsecret_@SECRET_MAJOR@_vapi_FILES = Secret-@SECRET_MAJOR@.gir
libsecret_unstable_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
libsecret_unstable_vapi_METADATADIRS = $(srcdir)
libsecret_unstable_vapi_VAPIDIRS = $(builddir)
libsecret_unstable_vapi_GIRDIRS = $(builddir)
# ... because _GIRDIRS above is broken, yes, this is ugly
libsecret_unstable_vapi_FILES = --girdir=$(builddir)
libsecret_unstable_vapi_FILES += SecretUnstable-0.gir
VAPI_DEPS = $(VAPIGEN_VAPIS:.vapi=.deps)
libsecret-$(SECRET_MAJOR).deps: Makefile.am
$(AM_V_GEN) echo $(libsecret_@SECRET_MAJOR@_vapi_DEPS) | tr ' ' '\n' > $@
libsecret-unstable.deps: Makefile.am
$(AM_V_GEN) echo $(libsecret_unstable_vapi_DEPS) | tr ' ' '\n' > $@
vapidir = $(datadir)/vala/vapi
vapi_DATA = \
@ -213,7 +184,6 @@ EXTRA_DIST = \
secret-enum-types.c.template \
org.freedesktop.Secrets.xml \
Secret-@SECRET_MAJOR@.metadata \
SecretUnstable-0.metadata \
$(NULL)
CLEANFILES += \

View File

@ -1,9 +1,6 @@
// Metadata file for Vala API generation.
// See https://live.gnome.org/Vala/UpstreamGuide for more information
Schema
.new skip=false
attributes_build skip=false
attributes_buildv skip=false
password_lookup skip=false
@ -18,3 +15,54 @@ password_store skip=false
password_store_sync skip=false throws="GLib.Error"
.error skip
password_storev finish_name="secret_password_store_finish"
Schema
.new skip=false
Collection
.new_for_dbus_path skip=false
.new_for_dbus_path_finish skip=false
.new_for_dbus_path_sync skip=false
.search_for_dbus_paths skip=false
.search_for_dbus_paths_finish skip=false
.search_for_dbus_paths_sync skip=false
Item
.new_for_dbus_path skip=false
.new_for_dbus_path_finish skip=false
.new_for_dbus_path_sync skip=false
Service
.search_for_dbus_paths skip=false
.search_for_dbus_paths_finish skip=false
.search_for_dbus_paths_sync skip=false
.get_secret_for_dbus_path skip=false
.get_secret_for_dbus_path_finish skip=false
.get_secret_for_dbus_path_sync skip=false
.get_secrets_for_dbus_paths skip=false
.get_secrets_for_dbus_paths_finish skip=false
.get_secrets_for_dbus_paths_sync skip=false
.lock_dbus_paths_sync skip=false
.lock_dbus_paths skip=false
.lock_dbus_paths_finish skip=false
.unlock_dbus_paths_sync skip=false
.unlock_dbus_paths skip=false
.unlock_dbus_paths_finish skip=false
.delete_item_dbus_path skip=false
.delete_item_dbus_path_finish skip=false
.delete_item_dbus_path_sync skip=false
.create_collection_dbus_path skip=false
.create_collection_dbus_path_finish skip=false
.create_collection_dbus_path_sync skip=false
.create_item_dbus_path skip=false
.create_item_dbus_path_finish skip=false
.create_item_dbus_path_sync skip=false
.read_alias_dbus_path skip=false
.read_alias_dbus_path_finish skip=false
.read_alias_dbus_path_sync skip=false
.set_alias_to_dbus_path skip=false
.set_alias_to_dbus_path_finish skip=false
.set_alias_to_dbus_path_sync skip=false
.prompt_at_dbus_path_sync skip=false
.prompt_at_dbus_path skip=false
.prompt_at_dbus_path_finish skip=false

View File

@ -1,5 +0,0 @@
// Metadata file for Vala API generation.
// See https://live.gnome.org/Vala/UpstreamGuide for more information
// include in the same Secret namespace
* parent="Secret"

View File

@ -40,7 +40,7 @@
*/
/**
* secret_collection_new_for_dbus_path:
* secret_collection_new_for_dbus_path: (skip)
* @service: (allow-none): a secret service object
* @collection_path: the D-Bus path of the collection
* @flags: options for the collection initialization
@ -54,6 +54,8 @@
* the default #SecretService proxy.
*
* This method will return immediately and complete asynchronously.
*
* Stability: Unstable
*/
void
secret_collection_new_for_dbus_path (SecretService *service,
@ -85,7 +87,7 @@ secret_collection_new_for_dbus_path (SecretService *service,
}
/**
* secret_collection_new_for_dbus_path_finish:
* secret_collection_new_for_dbus_path_finish: (skip)
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
*
@ -117,7 +119,7 @@ secret_collection_new_for_dbus_path_finish (GAsyncResult *result,
}
/**
* secret_collection_new_for_dbus_path_sync:
* secret_collection_new_for_dbus_path_sync: (skip)
* @service: (allow-none): a secret service object
* @collection_path: the D-Bus path of the collection
* @flags: options for the collection initialization
@ -132,6 +134,8 @@ secret_collection_new_for_dbus_path_finish (GAsyncResult *result,
* This method may block indefinitely and should not be used in user interface
* threads.
*
* Stability: Unstable
*
* Returns: (transfer full): the new collection, which should be unreferenced
* with g_object_unref()
*/
@ -165,7 +169,7 @@ secret_collection_new_for_dbus_path_sync (SecretService *service,
}
/**
* secret_item_new_for_dbus_path:
* secret_item_new_for_dbus_path: (skip)
* @service: (allow-none): a secret service object
* @item_path: the D-Bus path of the collection
* @flags: initialization flags for the new item
@ -179,6 +183,8 @@ secret_collection_new_for_dbus_path_sync (SecretService *service,
* the default #SecretService proxy.
*
* This method will return immediately and complete asynchronously.
*
* Stability: Unstable
*/
void
secret_item_new_for_dbus_path (SecretService *service,
@ -210,13 +216,15 @@ secret_item_new_for_dbus_path (SecretService *service,
}
/**
* secret_item_new_for_dbus_path_finish:
* secret_item_new_for_dbus_path_finish: (skip)
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
*
* Finish asynchronous operation to get a new item proxy for an secret
* item in the secret service.
*
* Stability: Unstable
*
* Returns: (transfer full): the new item, which should be unreferenced
* with g_object_unref()
*/
@ -239,7 +247,7 @@ secret_item_new_for_dbus_path_finish (GAsyncResult *result,
}
/**
* secret_item_new_for_dbus_path_sync:
* secret_item_new_for_dbus_path_sync: (skip)
* @service: (allow-none): a secret service object
* @item_path: the D-Bus path of the item
* @flags: initialization flags for the new item
@ -254,6 +262,8 @@ secret_item_new_for_dbus_path_finish (GAsyncResult *result,
* This method may block indefinitely and should not be used in user interface
* threads.
*
* Stability: Unstable
*
* Returns: (transfer full): the new item, which should be unreferenced
* with g_object_unref()
*/
@ -308,7 +318,7 @@ on_search_items_complete (GObject *source,
}
/**
* secret_collection_search_for_dbus_paths:
* secret_collection_search_for_dbus_paths: (skip)
* @collection: the secret collection
* @schema: (allow-none): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
@ -326,6 +336,8 @@ on_search_items_complete (GObject *source,
* to get the results of this function. Only the DBus object paths of the
* items will be returned. If you would like #SecretItem objects to be returned
* instead, then use the secret_collection_search() function.
*
* Stability: Unstable
*/
void
secret_collection_search_for_dbus_paths (SecretCollection *collection,
@ -361,7 +373,7 @@ secret_collection_search_for_dbus_paths (SecretCollection *collection,
}
/**
* secret_collection_search_for_dbus_paths_finish:
* secret_collection_search_for_dbus_paths_finish: (skip)
* @collection: the secret collection
* @result: asynchronous result passed to callback
* @error: location to place error on failure
@ -372,6 +384,8 @@ secret_collection_search_for_dbus_paths (SecretCollection *collection,
* #SecretItem objects to be returned instead, then use the
* secret_collection_search() and secret_collection_search_finish() functions.
*
* Stability: Unstable
*
* Returns: (transfer full) (array zero-terminated=1): an array of DBus object
* paths for matching items.
*/
@ -398,7 +412,7 @@ secret_collection_search_for_dbus_paths_finish (SecretCollection *collection,
}
/**
* secret_collection_search_for_dbus_paths_sync:
* secret_collection_search_for_dbus_paths_sync: (skip)
* @collection: the secret collection
* @schema: (allow-none): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
@ -416,6 +430,8 @@ secret_collection_search_for_dbus_paths_finish (SecretCollection *collection,
* #SecretItem objects to be returned instead, then use the
* secret_collection_search_sync() function.
*
* Stability: Unstable
*
* Returns: (transfer full) (array zero-terminated=1): an array of DBus object
* paths for matching items.
*/
@ -451,7 +467,7 @@ secret_collection_search_for_dbus_paths_sync (SecretCollection *collection,
}
/**
* secret_service_search_for_dbus_paths:
* secret_service_search_for_dbus_paths: (skip)
* @self: the secret service
* @schema: (allow-none): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
@ -469,6 +485,8 @@ secret_collection_search_for_dbus_paths_sync (SecretCollection *collection,
* to get the results of this function. Only the D-Bus object paths of the
* items will be returned. If you would like #SecretItem objects to be returned
* instead, then use the secret_service_search() function.
*
* Stability: Unstable
*/
void
secret_service_search_for_dbus_paths (SecretService *self,
@ -520,7 +538,7 @@ _secret_service_search_for_paths_variant (SecretService *self,
}
/**
* secret_service_search_for_dbus_paths_finish:
* secret_service_search_for_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to callback
* @unlocked: (out) (transfer full) (array zero-terminated=1) (allow-none):
@ -542,6 +560,8 @@ _secret_service_search_for_paths_variant (SecretService *self,
* instead, then us the secret_service_search() and
* secret_service_search_finish() functions.
*
* Stability: Unstable
*
* Returns: whether the search was successful or not
*/
gboolean
@ -577,7 +597,7 @@ secret_service_search_for_dbus_paths_finish (SecretService *self,
}
/**
* secret_service_search_for_dbus_paths_sync:
* secret_service_search_for_dbus_paths_sync: (skip)
* @self: the secret service
* @schema: (allow-none): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
@ -604,6 +624,8 @@ secret_service_search_for_dbus_paths_finish (SecretService *self,
* @locked arrays. If you would to have #SecretItem objects to be returned
* instead, then use the secret_service_search_sync() function.
*
* Stability: Unstable
*
* Returns: whether the search was successful or not
*/
gboolean
@ -717,7 +739,7 @@ on_get_secrets_session (GObject *source,
}
/**
* secret_service_get_secret_for_dbus_path:
* secret_service_get_secret_for_dbus_path: (skip)
* @self: the secret service
* @item_path: the D-Bus path to item to retrieve secret for
* @cancellable: optional cancellation object
@ -731,6 +753,8 @@ on_get_secrets_session (GObject *source,
* get its secret value.
*
* This function returns immediately and completes asynchronously.
*
* Stability: Unstable
*/
void
secret_service_get_secret_for_dbus_path (SecretService *self,
@ -762,7 +786,7 @@ secret_service_get_secret_for_dbus_path (SecretService *self,
}
/**
* secret_service_get_secret_for_dbus_path_finish:
* secret_service_get_secret_for_dbus_path_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to callback
* @error: location to place an error on failure
@ -772,6 +796,8 @@ secret_service_get_secret_for_dbus_path (SecretService *self,
*
* Will return %NULL if the item is locked.
*
* Stability: Unstable
*
* Returns: (transfer full) (allow-none): the newly allocated secret value
* for the item, which should be released with secret_value_unref()
*/
@ -797,7 +823,7 @@ secret_service_get_secret_for_dbus_path_finish (SecretService *self,
}
/**
* secret_service_get_secret_for_dbus_path_sync:
* secret_service_get_secret_for_dbus_path_sync: (skip)
* @self: the secret service
* @item_path: the D-Bus path to item to retrieve secret for
* @cancellable: optional cancellation object
@ -814,6 +840,8 @@ secret_service_get_secret_for_dbus_path_finish (SecretService *self,
*
* Will return %NULL if the item is locked.
*
* Stability: Unstable
*
* Returns: (transfer full) (allow-none): the newly allocated secret value
* for the item, which should be released with secret_value_unref()
*/
@ -848,7 +876,7 @@ secret_service_get_secret_for_dbus_path_sync (SecretService *self,
}
/**
* secret_service_get_secrets_for_dbus_paths:
* secret_service_get_secrets_for_dbus_paths: (skip)
* @self: the secret service
* @item_paths: the D-Bus paths to items to retrieve secrets for
* @cancellable: optional cancellation object
@ -862,6 +890,8 @@ secret_service_get_secret_for_dbus_path_sync (SecretService *self,
* get their secret values.
*
* This function returns immediately and completes asynchronously.
*
* Stability: Unstable
*/
void
secret_service_get_secrets_for_dbus_paths (SecretService *self,
@ -893,7 +923,7 @@ secret_service_get_secrets_for_dbus_paths (SecretService *self,
}
/**
* secret_service_get_secrets_for_dbus_paths_finish:
* secret_service_get_secrets_for_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to callback
* @error: location to place an error on failure
@ -903,6 +933,8 @@ secret_service_get_secrets_for_dbus_paths (SecretService *self,
*
* Items that are locked will not be included the results.
*
* Stability: Unstable
*
* Returns: (transfer full) (element-type utf8 Secret.Value): a newly
* allocated hash table of item_path keys to #SecretValue
* values.
@ -929,7 +961,7 @@ secret_service_get_secrets_for_dbus_paths_finish (SecretService *self,
}
/**
* secret_service_get_secrets_for_dbus_paths_sync:
* secret_service_get_secrets_for_dbus_paths_sync: (skip)
* @self: the secret service
* @item_paths: the D-Bus paths to items to retrieve secrets for
* @cancellable: optional cancellation object
@ -946,6 +978,8 @@ secret_service_get_secrets_for_dbus_paths_finish (SecretService *self,
*
* Items that are locked will not be included the results.
*
* Stability: Unstable
*
* Returns: (transfer full) (element-type utf8 Secret.Value): a newly
* allocated hash table of item_path keys to #SecretValue
* values.
@ -1120,7 +1154,7 @@ _secret_service_xlock_paths_finish (SecretService *self,
}
/**
* secret_service_lock_dbus_paths_sync:
* secret_service_lock_dbus_paths_sync: (skip)
* @self: the secret service
* @paths: the D-Bus object paths of the items or collections to lock
* @cancellable: optional cancellation object
@ -1142,6 +1176,8 @@ _secret_service_xlock_paths_finish (SecretService *self,
* interface threads. The secret service may prompt the user.
* secret_service_prompt() will be used to handle any prompts that show up.
*
* Stability: Unstable
*
* Returns: the number of items or collections that were locked
*/
gint
@ -1177,7 +1213,7 @@ secret_service_lock_dbus_paths_sync (SecretService *self,
}
/**
* secret_service_lock_dbus_paths:
* secret_service_lock_dbus_paths: (skip)
* @self: the secret service
* @paths: the D-Bus paths for items or collections to lock
* @cancellable: optional cancellation object
@ -1196,6 +1232,8 @@ secret_service_lock_dbus_paths_sync (SecretService *self,
* This method returns immediately and completes asynchronously. The secret
* service may prompt the user. secret_service_prompt() will be used to handle
* any prompts that show up.
*
* Stability: Unstable
*/
void
secret_service_lock_dbus_paths (SecretService *self,
@ -1213,7 +1251,7 @@ secret_service_lock_dbus_paths (SecretService *self,
}
/**
* secret_service_lock_dbus_paths_finish:
* secret_service_lock_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to the callback
* @locked: (out) (array zero-terminated=1) (transfer full) (allow-none):
@ -1227,6 +1265,8 @@ secret_service_lock_dbus_paths (SecretService *self,
* The secret service may not be able to lock items individually, and may
* lock an entire collection instead.
*
* Stability: Unstable
*
* Returns: the number of items or collections that were locked
*/
gint
@ -1243,7 +1283,7 @@ secret_service_lock_dbus_paths_finish (SecretService *self,
}
/**
* secret_service_unlock_dbus_paths_sync:
* secret_service_unlock_dbus_paths_sync: (skip)
* @self: the secret service
* @paths: the D-Bus object paths of the items or collections to unlock
* @cancellable: optional cancellation object
@ -1265,6 +1305,8 @@ secret_service_lock_dbus_paths_finish (SecretService *self,
* interface threads. The secret service may prompt the user.
* secret_service_prompt() will be used to handle any prompts that show up.
*
* Stability: Unstable
*
* Returns: the number of items or collections that were unlocked
*/
gint
@ -1300,7 +1342,7 @@ secret_service_unlock_dbus_paths_sync (SecretService *self,
}
/**
* secret_service_unlock_dbus_paths:
* secret_service_unlock_dbus_paths: (skip)
* @self: the secret service
* @paths: the D-Bus paths for items or collections to unlock
* @cancellable: optional cancellation object
@ -1319,6 +1361,8 @@ secret_service_unlock_dbus_paths_sync (SecretService *self,
* This method returns immediately and completes asynchronously. The secret
* service may prompt the user. secret_service_prompt() will be used to handle
* any prompts that show up.
*
* Stability: Unstable
*/
void
secret_service_unlock_dbus_paths (SecretService *self,
@ -1337,7 +1381,7 @@ secret_service_unlock_dbus_paths (SecretService *self,
}
/**
* secret_service_unlock_dbus_paths_finish:
* secret_service_unlock_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to the callback
* @unlocked: (out) (array zero-terminated=1) (transfer full) (allow-none):
@ -1351,6 +1395,8 @@ secret_service_unlock_dbus_paths (SecretService *self,
* The secret service may not be able to unlock items individually, and may
* unlock an entire collection instead.
*
* Stability: Unstable
*
* Returns: the number of items or collections that were unlocked
*/
gint
@ -1497,7 +1543,7 @@ _secret_service_delete_path_finish (SecretService *self,
}
/**
* secret_service_delete_item_dbus_path:
* secret_service_delete_item_dbus_path: (skip)
* @self: the secret service
* @item_path: the D-Bus path of item to delete
* @cancellable: optional cancellation object
@ -1510,6 +1556,8 @@ _secret_service_delete_path_finish (SecretService *self,
* #SecretItem proxy objects, use use secret_item_delete() instead.
*
* This method will return immediately and complete asynchronously.
*
* Stability: Unstable
*/
void
secret_service_delete_item_dbus_path (SecretService *self,
@ -1526,7 +1574,7 @@ secret_service_delete_item_dbus_path (SecretService *self,
}
/**
* secret_service_delete_item_dbus_path_finish:
* secret_service_delete_item_dbus_path_finish: (skip)
* @self: the secret service
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
@ -1534,6 +1582,8 @@ secret_service_delete_item_dbus_path (SecretService *self,
* Complete an asynchronous operation to delete a secret item from the secret
* service.
*
* Stability: Unstable
*
* Returns: whether the deletion was successful or not
*/
gboolean
@ -1550,7 +1600,7 @@ secret_service_delete_item_dbus_path_finish (SecretService *self,
}
/**
* secret_service_delete_item_dbus_path_sync:
* secret_service_delete_item_dbus_path_sync: (skip)
* @self: the secret service
* @item_path: the D-Bus path of item to delete
* @cancellable: optional cancellation object
@ -1564,6 +1614,8 @@ secret_service_delete_item_dbus_path_finish (SecretService *self,
* This method may block indefinitely and should not be used in user interface
* threads.
*
* Stability: Unstable
*
* Returns: whether the deletion was successful or not
*/
gboolean
@ -1672,7 +1724,7 @@ on_create_collection_called (GObject *source,
}
/**
* secret_service_create_collection_dbus_path:
* secret_service_create_collection_dbus_path: (skip)
* @self: a secret service object
* @properties: (element-type utf8 GLib.Variant): hash table of properties for
* the new collection
@ -1706,6 +1758,8 @@ on_create_collection_called (GObject *source,
* This method will return immediately and complete asynchronously. The secret
* service may prompt the user. secret_service_prompt() will be used to handle
* any prompts that are required.
*
* Stability: Unstable
*/
void
secret_service_create_collection_dbus_path (SecretService *self,
@ -1754,7 +1808,7 @@ secret_service_create_collection_dbus_path (SecretService *self,
}
/**
* secret_service_create_collection_dbus_path_finish:
* secret_service_create_collection_dbus_path_finish: (skip)
* @self: a secret service object
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
@ -1762,6 +1816,8 @@ secret_service_create_collection_dbus_path (SecretService *self,
* Finish asynchronous operation to create a new collection in the secret
* service.
*
* Stability: Unstable
*
* Returns: (transfer full): a new string containing the D-Bus object path
* of the collection
*/
@ -1790,7 +1846,7 @@ secret_service_create_collection_dbus_path_finish (SecretService *self,
}
/**
* secret_service_create_collection_dbus_path_sync:
* secret_service_create_collection_dbus_path_sync: (skip)
* @self: a secret service object
* @properties: (element-type utf8 GLib.Variant): hash table of D-Bus properties
* for the new collection
@ -1822,6 +1878,8 @@ secret_service_create_collection_dbus_path_finish (SecretService *self,
* threads. The secret service may prompt the user. secret_service_prompt()
* will be used to handle any prompts that are required.
*
* Stability: Unstable
*
* Returns: (transfer full): a new string containing the D-Bus object path
* of the collection
*/
@ -1979,7 +2037,7 @@ on_create_item_session (GObject *source,
}
/**
* secret_service_create_item_dbus_path:
* secret_service_create_item_dbus_path: (skip)
* @self: a secret service object
* @collection_path: the D-Bus object path of the collection in which to create item
* @properties: (element-type utf8 GLib.Variant): hash table of D-Bus properties
@ -2009,6 +2067,8 @@ on_create_item_session (GObject *source,
* This method will return immediately and complete asynchronously. The secret
* service may prompt the user. secret_service_prompt() will be used to handle
* any prompts that are required.
*
* Stability: Unstable
*/
void
secret_service_create_item_dbus_path (SecretService *self,
@ -2048,7 +2108,7 @@ secret_service_create_item_dbus_path (SecretService *self,
}
/**
* secret_service_create_item_dbus_path_finish:
* secret_service_create_item_dbus_path_finish: (skip)
* @self: a secret service object
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
@ -2056,6 +2116,8 @@ secret_service_create_item_dbus_path (SecretService *self,
* Finish asynchronous operation to create a new item in the secret
* service.
*
* Stability: Unstable
*
* Returns: (transfer full): a new string containing the D-Bus object path
* of the item
*/
@ -2121,6 +2183,8 @@ _secret_service_create_item_dbus_path_finish_raw (GAsyncResult *result,
* threads. The secret service may prompt the user. secret_service_prompt()
* will be used to handle any prompts that are required.
*
* Stability: Unstable
*
* Returns: (transfer full): a new string containing the D-Bus object path
* of the item
*/
@ -2159,7 +2223,7 @@ secret_service_create_item_dbus_path_sync (SecretService *self,
}
/**
* secret_service_read_alias_dbus_path:
* secret_service_read_alias_dbus_path: (skip)
* @self: a secret service object
* @alias: the alias to lookup
* @cancellable: (allow-none): optional cancellation object
@ -2171,6 +2235,8 @@ secret_service_create_item_dbus_path_sync (SecretService *self,
* dbus object path of the well known collection.
*
* This method will return immediately and complete asynchronously.
*
* Stability: Unstable
*/
void
secret_service_read_alias_dbus_path (SecretService *self,
@ -2190,7 +2256,7 @@ secret_service_read_alias_dbus_path (SecretService *self,
}
/**
* secret_service_read_alias_dbus_path_finish:
* secret_service_read_alias_dbus_path_finish: (skip)
* @self: a secret service object
* @result: asynchronous result passed to callback
* @error: location to place error on failure
@ -2198,6 +2264,8 @@ secret_service_read_alias_dbus_path (SecretService *self,
* Finish an asynchronous operation to lookup which collection is assigned
* to an alias. This method returns the DBus object path of the collection
*
* Stability: Unstable
*
* Returns: (transfer full): the collection dbus object path, or %NULL if
* none assigned to the alias
*/
@ -2227,7 +2295,7 @@ secret_service_read_alias_dbus_path_finish (SecretService *self,
}
/**
* secret_service_read_alias_dbus_path_sync:
* secret_service_read_alias_dbus_path_sync: (skip)
* @self: a secret service object
* @alias: the alias to lookup
* @cancellable: (allow-none): optional cancellation object
@ -2239,6 +2307,8 @@ secret_service_read_alias_dbus_path_finish (SecretService *self,
*
* This method may block and should not be used in user interface threads.
*
* Stability: Unstable
*
* Returns: (transfer full): the collection dbus object path, or %NULL if
* none assigned to the alias
*/
@ -2272,7 +2342,7 @@ secret_service_read_alias_dbus_path_sync (SecretService *self,
}
/**
* secret_service_set_alias_to_dbus_path:
* secret_service_set_alias_to_dbus_path: (skip)
* @self: a secret service object
* @alias: the alias to assign the collection to
* @collection_path: (allow-none): the dbus object path of the collection to assign to the alias
@ -2285,6 +2355,8 @@ secret_service_read_alias_dbus_path_sync (SecretService *self,
* path of the collection to assign to the alias.
*
* This method will return immediately and complete asynchronously.
*
* Stability: Unstable
*/
void
secret_service_set_alias_to_dbus_path (SecretService *self,
@ -2310,13 +2382,15 @@ secret_service_set_alias_to_dbus_path (SecretService *self,
}
/**
* secret_service_set_alias_to_dbus_path_finish:
* secret_service_set_alias_to_dbus_path_finish: (skip)
* @self: a secret service object
* @result: asynchronous result passed to callback
* @error: location to place error on failure
*
* Finish an asynchronous operation to assign a collection to an alias.
*
* Stability: Unstable
*
* Returns: %TRUE if successful
*/
gboolean
@ -2340,7 +2414,7 @@ secret_service_set_alias_to_dbus_path_finish (SecretService *self,
}
/**
* secret_service_set_alias_to_dbus_path_sync:
* secret_service_set_alias_to_dbus_path_sync: (skip)
* @self: a secret service object
* @alias: the alias to assign the collection to
* @collection_path: (allow-none): the dbus object path of the collection to assign to the alias
@ -2353,6 +2427,8 @@ secret_service_set_alias_to_dbus_path_finish (SecretService *self,
*
* This method may block and should not be used in user interface threads.
*
* Stability: Unstable
*
* Returns: %TRUE if successful
*/
gboolean
@ -2392,7 +2468,7 @@ secret_service_set_alias_to_dbus_path_sync (SecretService *self,
}
/**
* secret_service_prompt_at_dbus_path_sync:
* secret_service_prompt_at_dbus_path_sync: (skip)
* @self: the secret service
* @prompt_path: the D-Bus object path of the prompt
* @cancellable: optional cancellation object
@ -2411,6 +2487,8 @@ secret_service_set_alias_to_dbus_path_sync (SecretService *self,
*
* This method may block and should not be used in user interface threads.
*
* Stability: Unstable
*
* Returns: (transfer full): %NULL if the prompt was dismissed or an error occurred,
* a variant result if the prompt was successful
*/
@ -2437,7 +2515,7 @@ secret_service_prompt_at_dbus_path_sync (SecretService *self,
}
/**
* secret_service_prompt_at_dbus_path:
* secret_service_prompt_at_dbus_path: (skip)
* @self: the secret service
* @prompt_path: the D-Bus object path of the prompt
* @return_type: (allow-none): the variant type of the prompt result
@ -2453,6 +2531,8 @@ secret_service_prompt_at_dbus_path_sync (SecretService *self,
* Override the #SecretServiceClass <literal>prompt_async</literal> virtual method
* to change the behavior of the propmting. The default behavior is to simply
* run secret_prompt_perform() on the prompt.
*
* Stability: Unstable
*/
void
secret_service_prompt_at_dbus_path (SecretService *self,
@ -2474,7 +2554,7 @@ secret_service_prompt_at_dbus_path (SecretService *self,
}
/**
* secret_service_prompt_at_dbus_path_finish:
* secret_service_prompt_at_dbus_path_finish: (skip)
* @self: the secret service
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
@ -2485,6 +2565,8 @@ secret_service_prompt_at_dbus_path (SecretService *self,
* type of result depends on the action the prompt is completing, and is defined
* in the Secret Service DBus API specification.
*
* Stability: Unstable
*
* Returns: (transfer full): %NULL if the prompt was dismissed or an error occurred,
* a variant result if the prompt was successful
*/

View File

@ -90,7 +90,6 @@ VALA_FLAGS = \
--pkg gio-2.0
VALA_TESTS_VAPIS = \
$(builddir)/../libsecret-unstable.vapi \
$(builddir)/../libsecret-@SECRET_MAJOR@.vapi \
$(builddir)/mock-service-0.vapi

View File

@ -12,7 +12,7 @@
private void test_read_alias () {
try {
var service = Secret.Service.get_sync(Secret.ServiceFlags.NONE);
var path = Secret.service_read_alias_dbus_path_sync(service, "default", null);
var path = service.read_alias_dbus_path_sync("default", null);
GLib.assert (path != null);
} catch ( GLib.Error e ) {
GLib.error (e.message);