[libsecret] Rename the library subdirectory to libsecret
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsecret] Rename the library subdirectory to libsecret
- Date: Fri, 13 Jul 2012 10:01:28 +0000 (UTC)
commit 5cc30b2b68f551506bd9bbbe1306a24009e14eca
Author: Stef Walter <stefw gnome org>
Date: Fri Jul 13 10:32:36 2012 +0200
Rename the library subdirectory to libsecret
* Death by a thousand paper cuts from gir and vapi not liking
the fact that the secret.h file was not usable uninstalled
and installed in the same way.
.gitignore | 18 +++++++++---------
Makefile.am | 2 +-
autogen.sh | 2 +-
configure.ac | 8 ++++----
docs/reference/libsecret/Makefile.am | 8 ++++----
docs/reference/libsecret/libsecret-sections.txt | 20 ++++++++++----------
{library => libsecret}/Makefile.am | 4 ++--
{library => libsecret}/Secret-0.metadata | 0
{library => libsecret}/libsecret.pc.in | 0
{library => libsecret}/org.freedesktop.Secrets.xml | 0
{library => libsecret}/secret-attributes.c | 0
{library => libsecret}/secret-attributes.h | 2 +-
{library => libsecret}/secret-collection.c | 0
{library => libsecret}/secret-collection.h | 2 +-
.../secret-enum-types.c.template | 0
.../secret-enum-types.h.template | 0
{library => libsecret}/secret-item.c | 0
{library => libsecret}/secret-item.h | 2 +-
{library => libsecret}/secret-methods.c | 0
{library => libsecret}/secret-password.c | 0
{library => libsecret}/secret-password.h | 2 +-
{library => libsecret}/secret-paths.c | 0
{library => libsecret}/secret-paths.h | 2 +-
{library => libsecret}/secret-private.h | 0
{library => libsecret}/secret-prompt.c | 0
{library => libsecret}/secret-prompt.h | 2 +-
{library => libsecret}/secret-schema.c | 0
{library => libsecret}/secret-schema.h | 2 +-
{library => libsecret}/secret-schemas.c | 0
{library => libsecret}/secret-schemas.h | 2 +-
{library => libsecret}/secret-service.c | 0
{library => libsecret}/secret-service.h | 2 +-
{library => libsecret}/secret-session.c | 0
{library => libsecret}/secret-types.h | 2 +-
{library => libsecret}/secret-unstable.h | 18 +++++++++---------
{library => libsecret}/secret-util.c | 0
{library => libsecret}/secret-value.c | 0
{library => libsecret}/secret-value.h | 2 +-
{library => libsecret}/secret.h | 8 ++++----
{library => libsecret}/tests/Makefile.am | 12 ++++++------
.../tests/mock-service-delete.py | 0
{library => libsecret}/tests/mock-service-lock.py | 0
.../tests/mock-service-normal.py | 0
.../tests/mock-service-only-plain.py | 0
.../tests/mock-service-prompt.py | 0
{library => libsecret}/tests/mock-service.c | 0
{library => libsecret}/tests/mock-service.h | 0
{library => libsecret}/tests/mock/__init__.py | 0
{library => libsecret}/tests/mock/aes.py | 0
{library => libsecret}/tests/mock/dh.py | 0
{library => libsecret}/tests/mock/hkdf.py | 0
{library => libsecret}/tests/mock/service.py | 0
{library => libsecret}/tests/test-collection.c | 0
{library => libsecret}/tests/test-item.c | 0
.../tests/test-lookup-password.js | 0
.../tests/test-lookup-password.py | 0
{library => libsecret}/tests/test-methods.c | 0
{library => libsecret}/tests/test-password.c | 0
{library => libsecret}/tests/test-paths.c | 0
{library => libsecret}/tests/test-prompt.c | 0
.../tests/test-remove-password.js | 0
.../tests/test-remove-password.py | 0
{library => libsecret}/tests/test-service.c | 0
{library => libsecret}/tests/test-session.c | 0
.../tests/test-store-password.js | 0
.../tests/test-store-password.py | 0
{library => libsecret}/tests/test-vala-lang.vala | 0
{library => libsecret}/tests/test-value.c | 0
po/POTFILES.in | 4 ++--
po/pl.po | 4 ++--
tool/Makefile.am | 4 ++--
71 files changed, 67 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 578fbda..43fbffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,14 +66,14 @@ stamp*
/egg/tests/test-*
!/egg/tests/test-*.c
-/library/secret-dbus-generated.[ch]
-/library/secret-enum-types.[ch]
-/library/tests/test-*
-/library/tests/*.metadata
-!/library/tests/test-*.c
-!/library/tests/test-*.js
-!/library/tests/test-*.py
-!/library/tests/test-*.vala
-/library/tests/test-vala-lang.c
+/libsecret/secret-dbus-generated.[ch]
+/libsecret/secret-enum-types.[ch]
+/libsecret/tests/test-*
+/libsecret/tests/*.metadata
+!/libsecret/tests/test-*.c
+!/libsecret/tests/test-*.js
+!/libsecret/tests/test-*.py
+!/libsecret/tests/test-*.vala
+/libsecret/tests/test-vala-lang.c
/tool/secret-tool
diff --git a/Makefile.am b/Makefile.am
index 118da59..3a64aaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
-SUBDIRS = build egg library tool po docs .
+SUBDIRS = build egg libsecret tool po docs .
DISTCHECK_CONFIGURE_FLAGS = \
--enable-debug=yes \
diff --git a/autogen.sh b/autogen.sh
index 7afd1b3..1826300 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ ORIGDIR=`pwd`
cd $srcdir
PROJECT=libsecret
TEST_TYPE=-f
-FILE=library/secret-value.c
+FILE=libsecret/secret-value.c
DIE=0
diff --git a/configure.ac b/configure.ac
index cd8c674..548e45d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([build/m4])
AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
AM_SANITY_CHECK
AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([library/secret-value.c])
+AC_CONFIG_SRCDIR([libsecret/secret-value.c])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable])
@@ -247,9 +247,9 @@ AC_CONFIG_FILES([
egg/tests/Makefile
po/Makefile.in
po/Makefile
- library/Makefile
- library/libsecret.pc
- library/tests/Makefile
+ libsecret/Makefile
+ libsecret/libsecret.pc
+ libsecret/tests/Makefile
tool/Makefile
])
AC_OUTPUT
diff --git a/docs/reference/libsecret/Makefile.am b/docs/reference/libsecret/Makefile.am
index eb2b19e..5f05319 100644
--- a/docs/reference/libsecret/Makefile.am
+++ b/docs/reference/libsecret/Makefile.am
@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/library
+DOC_SOURCE_DIR=$(top_srcdir)/libsecret
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
@@ -48,8 +48,8 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/library/*.h
-CFILE_GLOB=$(top_srcdir)/library/*.c
+HFILE_GLOB=$(top_srcdir)/libsecret/*.h
+CFILE_GLOB=$(top_srcdir)/libsecret/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -86,7 +86,7 @@ expand_content_files = \
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error
GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS) \
- $(top_builddir)/library/libsecret- SECRET_MAJOR@.la
+ $(top_builddir)/libsecret/libsecret- SECRET_MAJOR@.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/libsecret/libsecret-sections.txt b/docs/reference/libsecret/libsecret-sections.txt
index 04057fe..245f1b8 100644
--- a/docs/reference/libsecret/libsecret-sections.txt
+++ b/docs/reference/libsecret/libsecret-sections.txt
@@ -1,6 +1,6 @@
<SECTION>
<FILE>secret-collection</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretCollection
SecretCollectionClass
SecretCollectionFlags
@@ -48,7 +48,7 @@ secret_collection_create_flags_get_type
<SECTION>
<FILE>secret-item</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretItem
SecretItemClass
SecretItemFlags
@@ -100,7 +100,7 @@ secret_item_create_flags_get_type
<SECTION>
<FILE>secret-error</FILE>
-<INCLUDE>secret/secret.h</INCLUDE>
+<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_ERROR
SecretError
<SUBSECTION Standard>
@@ -111,7 +111,7 @@ secret_error_get_type
<SECTION>
<FILE>secret-password</FILE>
-<INCLUDE>secret/secret.h</INCLUDE>
+<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_COLLECTION_DEFAULT
SECRET_COLLECTION_SESSION
secret_password_store
@@ -138,7 +138,7 @@ secret_password_free
<SECTION>
<FILE>secret-schema</FILE>
-<INCLUDE>secret/secret.h</INCLUDE>
+<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_SCHEMA_NOTE
SECRET_SCHEMA_COMPAT_NETWORK
SecretSchema
@@ -160,7 +160,7 @@ SECRET_TYPE_SCHEMA_ATTRIBUTE_TYPE
<SECTION>
<FILE>secret-prompt</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretPrompt
SecretPromptClass
secret_prompt_perform
@@ -180,7 +180,7 @@ secret_prompt_get_type
<SECTION>
<FILE>secret-service</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretService
SecretServiceClass
SecretServiceFlags
@@ -242,7 +242,7 @@ secret_service_get_type
<SECTION>
<FILE>secret-paths</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
secret_collection_new_for_dbus_path
secret_collection_new_for_dbus_path_finish
secret_collection_new_for_dbus_path_sync
@@ -290,7 +290,7 @@ secret_service_set_alias_to_dbus_path_sync
<SECTION>
<FILE>secret-value</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretValue
secret_value_new
secret_value_new_full
@@ -305,7 +305,7 @@ secret_value_get_type
<SECTION>
<FILE>secret-attributes</FILE>
-<INCLUDE>secret/secret-unstable.h</INCLUDE>
+<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
secret_attributes_build
secret_attributes_buildv
</SECTION>
diff --git a/library/Makefile.am b/libsecret/Makefile.am
similarity index 97%
rename from library/Makefile.am
rename to libsecret/Makefile.am
index c45c10f..b071994 100644
--- a/library/Makefile.am
+++ b/libsecret/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
lib_LTLIBRARIES = libsecret- SECRET_MAJOR@.la
-incdir = $(includedir)/secret- SECRET_MAJOR@/secret
+incdir = $(includedir)/secret- SECRET_MAJOR@/libsecret
HEADER_FILES = \
secret.h \
@@ -119,7 +119,7 @@ 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 -DSECRET_API_SUBJECT_TO_CHANGE
Secret_ SECRET_MAJOR@_gir_FILES = $(PUBLIC_FILES)
-Secret_ SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "secret.h"
+Secret_ SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/library/Secret-0.metadata b/libsecret/Secret-0.metadata
similarity index 100%
rename from library/Secret-0.metadata
rename to libsecret/Secret-0.metadata
diff --git a/library/libsecret.pc.in b/libsecret/libsecret.pc.in
similarity index 100%
rename from library/libsecret.pc.in
rename to libsecret/libsecret.pc.in
diff --git a/library/org.freedesktop.Secrets.xml b/libsecret/org.freedesktop.Secrets.xml
similarity index 100%
rename from library/org.freedesktop.Secrets.xml
rename to libsecret/org.freedesktop.Secrets.xml
diff --git a/library/secret-attributes.c b/libsecret/secret-attributes.c
similarity index 100%
rename from library/secret-attributes.c
rename to libsecret/secret-attributes.c
diff --git a/library/secret-attributes.h b/libsecret/secret-attributes.h
similarity index 91%
rename from library/secret-attributes.h
rename to libsecret/secret-attributes.h
index 91c2735..b2591bd 100644
--- a/library/secret-attributes.h
+++ b/libsecret/secret-attributes.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_ATTRIBUTES_H__
diff --git a/library/secret-collection.c b/libsecret/secret-collection.c
similarity index 100%
rename from library/secret-collection.c
rename to libsecret/secret-collection.c
diff --git a/library/secret-collection.h b/libsecret/secret-collection.h
similarity index 98%
rename from library/secret-collection.h
rename to libsecret/secret-collection.h
index f367dbe..24fdf10 100644
--- a/library/secret-collection.h
+++ b/libsecret/secret-collection.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_COLLECTION_H__
diff --git a/library/secret-enum-types.c.template b/libsecret/secret-enum-types.c.template
similarity index 100%
rename from library/secret-enum-types.c.template
rename to libsecret/secret-enum-types.c.template
diff --git a/library/secret-enum-types.h.template b/libsecret/secret-enum-types.h.template
similarity index 100%
rename from library/secret-enum-types.h.template
rename to libsecret/secret-enum-types.h.template
diff --git a/library/secret-item.c b/libsecret/secret-item.c
similarity index 100%
rename from library/secret-item.c
rename to libsecret/secret-item.c
diff --git a/library/secret-item.h b/libsecret/secret-item.h
similarity index 99%
rename from library/secret-item.h
rename to libsecret/secret-item.h
index 05dbb1c..2c6dc54 100644
--- a/library/secret-item.h
+++ b/libsecret/secret-item.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_ITEM_H__
diff --git a/library/secret-methods.c b/libsecret/secret-methods.c
similarity index 100%
rename from library/secret-methods.c
rename to libsecret/secret-methods.c
diff --git a/library/secret-password.c b/libsecret/secret-password.c
similarity index 100%
rename from library/secret-password.c
rename to libsecret/secret-password.c
diff --git a/library/secret-password.h b/libsecret/secret-password.h
similarity index 98%
rename from library/secret-password.h
rename to libsecret/secret-password.h
index 58a42d6..a7bcbe3 100644
--- a/library/secret-password.h
+++ b/libsecret/secret-password.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_PASSWORD_H__
diff --git a/library/secret-paths.c b/libsecret/secret-paths.c
similarity index 100%
rename from library/secret-paths.c
rename to libsecret/secret-paths.c
diff --git a/library/secret-paths.h b/libsecret/secret-paths.h
similarity index 99%
rename from library/secret-paths.h
rename to libsecret/secret-paths.h
index 19cb501..11a0efa 100644
--- a/library/secret-paths.h
+++ b/libsecret/secret-paths.h
@@ -14,7 +14,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_PATHS_H__
diff --git a/library/secret-private.h b/libsecret/secret-private.h
similarity index 100%
rename from library/secret-private.h
rename to libsecret/secret-private.h
diff --git a/library/secret-prompt.c b/libsecret/secret-prompt.c
similarity index 100%
rename from library/secret-prompt.c
rename to libsecret/secret-prompt.c
diff --git a/library/secret-prompt.h b/libsecret/secret-prompt.h
similarity index 97%
rename from library/secret-prompt.h
rename to libsecret/secret-prompt.h
index 15b035e..56ec893 100644
--- a/library/secret-prompt.h
+++ b/libsecret/secret-prompt.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_PROMPT_H__
diff --git a/library/secret-schema.c b/libsecret/secret-schema.c
similarity index 100%
rename from library/secret-schema.c
rename to libsecret/secret-schema.c
diff --git a/library/secret-schema.h b/libsecret/secret-schema.h
similarity index 95%
rename from library/secret-schema.h
rename to libsecret/secret-schema.h
index ccbf5c9..481f73a 100644
--- a/library/secret-schema.h
+++ b/libsecret/secret-schema.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_SCHEMA_H__
diff --git a/library/secret-schemas.c b/libsecret/secret-schemas.c
similarity index 100%
rename from library/secret-schemas.c
rename to libsecret/secret-schemas.c
diff --git a/library/secret-schemas.h b/libsecret/secret-schemas.h
similarity index 91%
rename from library/secret-schemas.h
rename to libsecret/secret-schemas.h
index 82c5b28..3a0855a 100644
--- a/library/secret-schemas.h
+++ b/libsecret/secret-schemas.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_SCHEMAS_H__
diff --git a/library/secret-service.c b/libsecret/secret-service.c
similarity index 100%
rename from library/secret-service.c
rename to libsecret/secret-service.c
diff --git a/library/secret-service.h b/libsecret/secret-service.h
similarity index 99%
rename from library/secret-service.h
rename to libsecret/secret-service.h
index 69d3ce0..ea958e1 100644
--- a/library/secret-service.h
+++ b/libsecret/secret-service.h
@@ -14,7 +14,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_SERVICE_H__
diff --git a/library/secret-session.c b/libsecret/secret-session.c
similarity index 100%
rename from library/secret-session.c
rename to libsecret/secret-session.c
diff --git a/library/secret-types.h b/libsecret/secret-types.h
similarity index 93%
rename from library/secret-types.h
rename to libsecret/secret-types.h
index a7977df..a6c3ad9 100644
--- a/library/secret-types.h
+++ b/libsecret/secret-types.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_TYPES_H__
diff --git a/library/secret-unstable.h b/libsecret/secret-unstable.h
similarity index 69%
rename from library/secret-unstable.h
rename to libsecret/secret-unstable.h
index 0a781bd..c6fc0f4 100644
--- a/library/secret-unstable.h
+++ b/libsecret/secret-unstable.h
@@ -21,18 +21,18 @@
#include <glib.h>
-#include <secret/secret.h>
+#include <libsecret/secret.h>
#define __SECRET_INSIDE_HEADER__
-#include <secret/secret-attributes.h>
-#include <secret/secret-collection.h>
-#include <secret/secret-enum-types.h>
-#include <secret/secret-item.h>
-#include <secret/secret-paths.h>
-#include <secret/secret-prompt.h>
-#include <secret/secret-service.h>
-#include <secret/secret-value.h>
+#include <libsecret/secret-attributes.h>
+#include <libsecret/secret-collection.h>
+#include <libsecret/secret-enum-types.h>
+#include <libsecret/secret-item.h>
+#include <libsecret/secret-paths.h>
+#include <libsecret/secret-prompt.h>
+#include <libsecret/secret-service.h>
+#include <libsecret/secret-value.h>
#undef __SECRET_INSIDE_HEADER__
diff --git a/library/secret-util.c b/libsecret/secret-util.c
similarity index 100%
rename from library/secret-util.c
rename to libsecret/secret-util.c
diff --git a/library/secret-value.c b/libsecret/secret-value.c
similarity index 100%
rename from library/secret-value.c
rename to libsecret/secret-value.c
diff --git a/library/secret-value.h b/libsecret/secret-value.h
similarity index 94%
rename from library/secret-value.h
rename to libsecret/secret-value.h
index cdd7035..b3b53b0 100644
--- a/library/secret-value.h
+++ b/libsecret/secret-value.h
@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
-#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
+#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_VALUE_H__
diff --git a/library/secret.h b/libsecret/secret.h
similarity index 80%
rename from library/secret.h
rename to libsecret/secret.h
index a9306d7..0c03c30 100644
--- a/library/secret.h
+++ b/libsecret/secret.h
@@ -19,10 +19,10 @@
#define __SECRET_INSIDE_HEADER__
-#include <secret/secret-password.h>
-#include <secret/secret-schema.h>
-#include <secret/secret-schemas.h>
-#include <secret/secret-types.h>
+#include <libsecret/secret-password.h>
+#include <libsecret/secret-schema.h>
+#include <libsecret/secret-schemas.h>
+#include <libsecret/secret-types.h>
#undef __SECRET_INSIDE_HEADER__
diff --git a/library/tests/Makefile.am b/libsecret/tests/Makefile.am
similarity index 92%
rename from library/tests/Makefile.am
rename to libsecret/tests/Makefile.am
index 994c41e..d4456a1 100644
--- a/library/tests/Makefile.am
+++ b/libsecret/tests/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/library \
+ -I$(top_srcdir)/libsecret \
-DSRCDIR="\"@abs_srcdir \"" \
-DSECRET_COMPILATION \
$(NULL)
@@ -22,12 +22,12 @@ libmock_service_la_LDFLAGS = \
libmock_service_la_LIBADD = \
$(top_builddir)/egg/libegg.la \
- $(top_builddir)/library/libsecret- SECRET_MAJOR@.la \
+ $(top_builddir)/libsecret/libsecret- SECRET_MAJOR@.la \
$(LIBGCRYPT_LIBS)
LDADD = \
$(top_builddir)/egg/libegg.la \
- $(top_builddir)/library/libsecret- SECRET_MAJOR@.la \
+ $(top_builddir)/libsecret/libsecret- SECRET_MAJOR@.la \
libmock_service.la \
$(NULL)
@@ -159,15 +159,15 @@ vapi_DATA = mock-service-0.vapi
VAPIGEN_VAPIS += libsecret- SECRET_MAJOR@.vapi
-Secret- SECRET_MAJOR@.metadata: $(top_srcdir)/library/Secret- SECRET_MAJOR@.metadata
+Secret- SECRET_MAJOR@.metadata: $(top_srcdir)/libsecret/Secret- SECRET_MAJOR@.metadata
$(AM_V_GEN) echo "* cheader_filename=\"secret-collection.h,secret-item.h,secret-password.h,secret-prompt.h,secret-schema.h,secret-schemas.h,secret-service.h,secret-types.h,secret-value.h\"" > $@ && \
cat < $^ >> $@
-libsecret- SECRET_MAJOR@.vapi: Secret- SECRET_MAJOR@.metadata $(top_builddir)/library/Secret- SECRET_MAJOR@.gir
+libsecret- SECRET_MAJOR@.vapi: Secret- SECRET_MAJOR@.metadata $(top_builddir)/libsecret/Secret- SECRET_MAJOR@.gir
libsecret_ SECRET_MAJOR@_vapi_DEPS = gio-2.0
libsecret_ SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)
-libsecret_ SECRET_MAJOR@_vapi_FILES = $(top_builddir)/library/Secret- SECRET_MAJOR@.gir
+libsecret_ SECRET_MAJOR@_vapi_FILES = $(top_builddir)/libsecret/Secret- SECRET_MAJOR@.gir
noinst_DATA += $(VAPIGEN_VAPIS)
diff --git a/library/tests/mock-service-delete.py b/libsecret/tests/mock-service-delete.py
similarity index 100%
rename from library/tests/mock-service-delete.py
rename to libsecret/tests/mock-service-delete.py
diff --git a/library/tests/mock-service-lock.py b/libsecret/tests/mock-service-lock.py
similarity index 100%
rename from library/tests/mock-service-lock.py
rename to libsecret/tests/mock-service-lock.py
diff --git a/library/tests/mock-service-normal.py b/libsecret/tests/mock-service-normal.py
similarity index 100%
rename from library/tests/mock-service-normal.py
rename to libsecret/tests/mock-service-normal.py
diff --git a/library/tests/mock-service-only-plain.py b/libsecret/tests/mock-service-only-plain.py
similarity index 100%
rename from library/tests/mock-service-only-plain.py
rename to libsecret/tests/mock-service-only-plain.py
diff --git a/library/tests/mock-service-prompt.py b/libsecret/tests/mock-service-prompt.py
similarity index 100%
rename from library/tests/mock-service-prompt.py
rename to libsecret/tests/mock-service-prompt.py
diff --git a/library/tests/mock-service.c b/libsecret/tests/mock-service.c
similarity index 100%
rename from library/tests/mock-service.c
rename to libsecret/tests/mock-service.c
diff --git a/library/tests/mock-service.h b/libsecret/tests/mock-service.h
similarity index 100%
rename from library/tests/mock-service.h
rename to libsecret/tests/mock-service.h
diff --git a/library/tests/mock/__init__.py b/libsecret/tests/mock/__init__.py
similarity index 100%
rename from library/tests/mock/__init__.py
rename to libsecret/tests/mock/__init__.py
diff --git a/library/tests/mock/aes.py b/libsecret/tests/mock/aes.py
similarity index 100%
rename from library/tests/mock/aes.py
rename to libsecret/tests/mock/aes.py
diff --git a/library/tests/mock/dh.py b/libsecret/tests/mock/dh.py
similarity index 100%
rename from library/tests/mock/dh.py
rename to libsecret/tests/mock/dh.py
diff --git a/library/tests/mock/hkdf.py b/libsecret/tests/mock/hkdf.py
similarity index 100%
rename from library/tests/mock/hkdf.py
rename to libsecret/tests/mock/hkdf.py
diff --git a/library/tests/mock/service.py b/libsecret/tests/mock/service.py
similarity index 100%
rename from library/tests/mock/service.py
rename to libsecret/tests/mock/service.py
diff --git a/library/tests/test-collection.c b/libsecret/tests/test-collection.c
similarity index 100%
rename from library/tests/test-collection.c
rename to libsecret/tests/test-collection.c
diff --git a/library/tests/test-item.c b/libsecret/tests/test-item.c
similarity index 100%
rename from library/tests/test-item.c
rename to libsecret/tests/test-item.c
diff --git a/library/tests/test-lookup-password.js b/libsecret/tests/test-lookup-password.js
similarity index 100%
rename from library/tests/test-lookup-password.js
rename to libsecret/tests/test-lookup-password.js
diff --git a/library/tests/test-lookup-password.py b/libsecret/tests/test-lookup-password.py
similarity index 100%
rename from library/tests/test-lookup-password.py
rename to libsecret/tests/test-lookup-password.py
diff --git a/library/tests/test-methods.c b/libsecret/tests/test-methods.c
similarity index 100%
rename from library/tests/test-methods.c
rename to libsecret/tests/test-methods.c
diff --git a/library/tests/test-password.c b/libsecret/tests/test-password.c
similarity index 100%
rename from library/tests/test-password.c
rename to libsecret/tests/test-password.c
diff --git a/library/tests/test-paths.c b/libsecret/tests/test-paths.c
similarity index 100%
rename from library/tests/test-paths.c
rename to libsecret/tests/test-paths.c
diff --git a/library/tests/test-prompt.c b/libsecret/tests/test-prompt.c
similarity index 100%
rename from library/tests/test-prompt.c
rename to libsecret/tests/test-prompt.c
diff --git a/library/tests/test-remove-password.js b/libsecret/tests/test-remove-password.js
similarity index 100%
rename from library/tests/test-remove-password.js
rename to libsecret/tests/test-remove-password.js
diff --git a/library/tests/test-remove-password.py b/libsecret/tests/test-remove-password.py
similarity index 100%
rename from library/tests/test-remove-password.py
rename to libsecret/tests/test-remove-password.py
diff --git a/library/tests/test-service.c b/libsecret/tests/test-service.c
similarity index 100%
rename from library/tests/test-service.c
rename to libsecret/tests/test-service.c
diff --git a/library/tests/test-session.c b/libsecret/tests/test-session.c
similarity index 100%
rename from library/tests/test-session.c
rename to libsecret/tests/test-session.c
diff --git a/library/tests/test-store-password.js b/libsecret/tests/test-store-password.js
similarity index 100%
rename from library/tests/test-store-password.js
rename to libsecret/tests/test-store-password.js
diff --git a/library/tests/test-store-password.py b/libsecret/tests/test-store-password.py
similarity index 100%
rename from library/tests/test-store-password.py
rename to libsecret/tests/test-store-password.py
diff --git a/library/tests/test-vala-lang.vala b/libsecret/tests/test-vala-lang.vala
similarity index 100%
rename from library/tests/test-vala-lang.vala
rename to libsecret/tests/test-vala-lang.vala
diff --git a/library/tests/test-value.c b/libsecret/tests/test-value.c
similarity index 100%
rename from library/tests/test-value.c
rename to libsecret/tests/test-value.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cb0a9bd..11ac4ee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
-library/secret-item.c
-library/secret-session.c
+libsecret/secret-item.c
+libsecret/secret-session.c
tool/secret-tool.c
diff --git a/po/pl.po b/po/pl.po
index b2998cc..2a6bcd7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,12 +21,12 @@ msgstr ""
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
-#: ../library/secret-item.c:994
+#: ../libsecret/secret-item.c:994
#, c-format
msgid "Received invalid secret from the secret storage"
msgstr "Otrzymano nieprawidÅowy sekret z przechowalni"
-#: ../library/secret-session.c:244 ../library/secret-session.c:281
+#: ../libsecret/secret-session.c:244 ../libsecret/secret-session.c:281
msgid "Couldn't communicate with the secret storage"
msgstr "Nie moÅna komunikowaÄ siÄ z przechowalniÄ"
diff --git a/tool/Makefile.am b/tool/Makefile.am
index c461c73..691d27f 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/library \
+ -I$(top_srcdir)/libsecret \
-DSECRET_COMPILATION \
$(NULL)
@@ -12,4 +12,4 @@ secret_tool_SOURCES = \
secret-tool.c
secret_tool_LDADD = \
- $(top_builddir)/library/libsecret-0.la
+ $(top_builddir)/libsecret/libsecret-0.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]