[gnome-keyring: 14/15] Merge branch 'gck-work' into ui-widgets
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring: 14/15] Merge branch 'gck-work' into ui-widgets
- Date: Tue, 5 Oct 2010 22:05:41 +0000 (UTC)
commit dc0799ac1efecfb002df7c4c4f898df9e112505d
Merge: 8349031 c7f954a
Author: Stef Walter <stef memberwebs com>
Date: Mon Sep 13 08:33:14 2010 +0000
Merge branch 'gck-work' into ui-widgets
.gitignore | 1 +
Makefile.am | 8 +-
NEWS | 32 +
autogen.sh | 9 +-
configure.in | 94 ++-
daemon/data/Makefile.am | 2 +-
daemon/dbus/gkd-secret-unlock.c | 6 +-
daemon/gpg-agent/gkd-gpg-agent-ops.c | 78 ++-
daemon/gpg-agent/gkd-gpg-agent-private.h | 2 +
daemon/gpg-agent/gkd-gpg-agent.c | 57 +-
daemon/ssh-agent/gkd-ssh-agent-ops.c | 3 +-
docs/reference/gcr/Makefile.am | 5 +-
egg/egg-secure-memory.c | 7 +-
egg/tests/test-data/echo-script.sh | 1 +
gck/gck-attributes.c | 4 +-
gcr/.gitignore | 1 +
gcr/Makefile.am | 38 +-
gcr/gcr-certificate-basics-widget.ui | 504 -----------
gcr/gcr-unlock-options-widget.c | 259 ++++--
gcr/gcr-unlock-options-widget.h | 26 +
gcr/gcr-unlock-options-widget.ui | 36 +-
gcr/gcr-unlock-options.h | 32 +
gcr/gcr.pc.in | 8 +-
gcr/tests/.gitignore | 4 +-
gcr/tests/Makefile.am | 15 +-
gcr/tests/ui-test-unlock-options.c | 83 ++
gp11/gp11-attributes.c | 12 +-
gp11/gp11-misc.c | 2 +-
gp11/gp11-module.c | 6 +
gp11/gp11-object.c | 6 +
gp11/gp11-session.c | 6 +
gp11/gp11-slot.c | 8 +-
gp11/gp11.h | 18 +-
pam/gkr-pam-client.c | 31 +-
pkcs11/gkm/gkm-certificate.c | 9 +-
pkcs11/secret-store/gkm-secret-collection.c | 2 +-
pkcs11/wrap-layer/gkm-wrap-layer.c | 4 +-
pkcs11/wrap-layer/gkm-wrap-login.c | 2 +-
pkcs11/wrap-layer/gkm-wrap-prompt.c | 114 ++-
po/POTFILES.in | 7 +-
po/ar.po | 589 +++++++------
po/de.po | 381 ++++----
po/el.po | 1084 ++++++-----------------
po/en_GB.po | 610 +++++++------
po/es.po | 129 ++--
po/et.po | 313 +------
po/fr.po | 599 +++++++-------
po/gl.po | 122 ++--
po/he.po | 118 ++--
po/hu.po | 575 ++++++------
po/id.po | 1281 ++++++++++++++++++++-------
po/nb.po | 76 +--
po/nl.po | 619 +++++++------
po/pa.po | 124 ++--
po/pt.po | 625 +++++++------
po/sl.po | 89 ++-
po/sr.po | 648 +++++++-------
po/sr latin po | 646 +++++++-------
po/sv.po | 90 ++-
po/ta.po | 112 ++--
po/zh_CN.po | 284 +++---
po/zh_HK.po | 131 ++--
po/zh_TW.po | 140 ++--
schema/Makefile.am | 17 +
schema/org.gnome.crypto.cache.convert | 3 +
schema/org.gnome.crypto.cache.gschema.xml | 19 +
schema/org.gnome.crypto.pgp.convert | 6 +
schema/org.gnome.crypto.pgp.gschema.xml | 29 +
tool/.gitignore | 1 +
tool/Makefile.am | 16 +-
ui/.gitignore | 1 +
ui/Makefile.am | 18 +-
ui/gku-prompt-tool.c | 361 +++++++-
ui/gku-prompt.c | 85 ++-
ui/gku-prompt.h | 23 +-
ui/gku-prompt.ui | 49 +-
ui/tests/test-data/prompt-empty | 2 +
ui/tests/test-data/prompt-full | 4 +-
ui/tests/test-data/prompt-test | 1 +
79 files changed, 6099 insertions(+), 5463 deletions(-)
---
diff --cc gcr/Makefile.am
index 86b0891,b1dcc9f..4ff99c9
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -2,10 -2,10 +2,9 @@@
# UI BUILDER
#
- uidir = $(datadir)/gcr/ui/
+ uidir = $(datadir)/gcr GCR_VERSION_SUFFIX@/ui/
ui_DATA = \
-- gcr-certificate-basics-widget.ui \
gcr-import-dialog.ui \
gcr-unlock-options-widget.ui
@@@ -17,25 -17,23 +16,27 @@@ incdir = $(includedir)/gcr GCR_VERSION_
inc_HEADERS = \
gcr.h \
gcr-certificate.h \
- gcr-certificate-basics-widget.h \
- gcr-certificate-details-widget.h \
+ gcr-certificate-renderer.h \
+ gcr-certificate-widget.h \
+ gcr-key-renderer.h \
+ gcr-key-widget.h \
gcr-importer.h \
gcr-parser.h \
+ gcr-renderer.h \
+ gcr-simple-certificate.h \
gcr-types.h \
+ gcr-unlock-options.h \
- gcr-unlock-options-widget.h
+ gcr-unlock-options-widget.h \
+ gcr-viewer.h
# ------------------------------------------------------------------
# LIBRARY
INCLUDES = \
-I$(top_builddir) \
-- -I$(top_srcdir) \
-- $(GTK_CFLAGS) \
-- $(GOBJECT_CFLAGS) \
++ -I$(top_srcdir) \
++ $(GTK_CFLAGS) \
++ $(GOBJECT_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBGCRYPT_CFLAGS) \
$(LIBTASN1_CFLAGS)
@@@ -43,38 -41,33 +44,39 @@@
BUILT_SOURCES = \
gcr-marshal.c gcr-marshal.h
- lib_LTLIBRARIES = libgcr.la
+ lib_LTLIBRARIES = libgcr GCR_VERSION_SUFFIX@.la
- libgcr_la_SOURCES = \
+ libgcr GCR_VERSION_SUFFIX@_la_SOURCES = \
gcr-certificate.c gcr-certificate.h \
- gcr-certificate-basics-widget.c gcr-certificate-basics-widget.h \
- gcr-certificate-details-widget.c gcr-certificate-details-widget.h \
+ gcr-certificate-renderer.c gcr-certificate-renderer.h \
+ gcr-certificate-widget.c gcr-certificate-widget.h \
+ gcr-display-view.c gcr-display-view.h \
+ gcr-icons.c gcr-icons.h \
gcr-import-dialog.c gcr-import-dialog.h \
gcr-importer.c gcr-importer.h \
gcr-internal.h \
+ gcr-key-renderer.c gcr-key-renderer.h \
+ gcr-key-widget.c gcr-key-widget.h \
gcr-library.c \
gcr-parser.c gcr-parser.h \
+ gcr-renderer.c gcr-renderer.h \
gcr-simple-certificate.c gcr-simple-certificate.h \
gcr-types.h \
+ gcr-unlock-options.h \
gcr-unlock-options-widget.c gcr-unlock-options-widget.h \
+ gcr-viewer.c gcr-viewer.h \
$(BUILT_SOURCES)
- libgcr_la_CFLAGS = \
+ libgcr GCR_VERSION_SUFFIX@_la_CFLAGS = \
-DPKCS11_MODULE_PATH=\""$(libdir)/gnome-keyring/gnome-keyring-pkcs11.so"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
-DUIDIR=\""$(uidir)"\"
--
- libgcr_la_LDFLAGS = \
- -version-info $(GCR_LT_RELEASE) \
++
+ libgcr GCR_VERSION_SUFFIX@_la_LDFLAGS = \
- -version-info $(GCR_LT_RELEASE) \
++ -version-info $(GCR_LT_RELEASE) \
-no-undefined -export-symbols-regex 'gcr_*'
--
- libgcr_la_LIBADD = \
++
+ libgcr GCR_VERSION_SUFFIX@_la_LIBADD = \
$(top_builddir)/egg/libegg.la \
$(top_builddir)/egg/libegg-entry-buffer.la \
$(top_builddir)/gck/libgck.la \
@@@ -102,14 -95,14 +104,14 @@@ EXTRA_DIST =
gcr.pc.in \
gcr-marshal.list \
$(ui_DATA)
--
++
CLEANFILES = \
$(BUILT_SOURCES) \
-- $(pkgconfig_DATA)
--
++ $(pkgconfig_DATA)
++
DISTCLEANFILES = \
$(pkgconfig_DATA)
--
++
if WITH_TESTS
TESTS_DIR = tests
else
diff --cc gcr/tests/.gitignore
index 48d49ed,2fa0037..652f4c0
--- a/gcr/tests/.gitignore
+++ b/gcr/tests/.gitignore
@@@ -1,2 -1,2 +1,4 @@@
- /ui-test-key
+/ui-test-certificate
+ /ui-test-details
++/ui-test-key
+ /ui-test-unlock-options
diff --cc gcr/tests/Makefile.am
index 77e039e,22295ad..17ad9d0
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@@ -21,13 -18,13 +21,14 @@@ EXTRA_DIST =
# ------------------------------------------------------------------
noinst_PROGRAMS += \
- ui-test-details \
+ ui-test-certificate \
- ui-test-key
++ ui-test-key \
+ ui-test-unlock-options
-ui_test_details_SOURCES = \
- ui-test-details.c
+ui_test_certificate_SOURCES = \
+ ui-test-certificate.c
-ui_test_details_CFLAGS = \
+ui_test_certificate_CFLAGS = \
-DGCR_API_SUBJECT_TO_CHANGE \
$(GTK_CFLAGS)
@@@ -36,14 -33,17 +37,26 @@@ ui_test_certificate_LDADD =
$(GTK_LIBS) \
$(LIBGCRYPT_LIBS)
+ ui_test_unlock_options_SOURCES = \
+ ui-test-unlock-options.c
+
+ ui_test_unlock_options_CFLAGS = \
+ -DGCR_API_SUBJECT_TO_CHANGE \
+ $(GTK_CFLAGS)
+
+ ui_test_unlock_options_LDADD = \
+ $(top_builddir)/gcr/libgcr GCR_VERSION_SUFFIX@.la \
+ $(GTK_LIBS) \
+ $(LIBGCRYPT_LIBS)
+
-EXTRA_DIST = \
- test-data
+ui_test_key_SOURCES = \
+ ui-test-key.c
+
+ui_test_key_CFLAGS = \
+ -DGCR_API_SUBJECT_TO_CHANGE \
+ $(GTK_CFLAGS)
+
+ui_test_key_LDADD = \
+ $(top_builddir)/gcr/libgcr.la \
+ $(GTK_LIBS) \
+ $(LIBGCRYPT_LIBS)
diff --cc po/POTFILES.in
index ad4e044,5fbcfda..695aede
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -13,9 -12,9 +12,7 @@@ daemon/login/gkd-login.
daemon/org.gnome.keyring.service.in
egg/egg-oid.c
egg/egg-spawn.c
--gcr/gcr-certificate-basics-widget.c
--[type: gettext/glade]gcr/gcr-certificate-basics-widget.ui
--gcr/gcr-certificate-details-widget.c
++gcr/gcr-certificate-widget.c
[type: gettext/glade]gcr/gcr-import-dialog.ui
[type: gettext/glade]gcr/gcr-unlock-options-widget.ui
gcr/gcr-importer.c
diff --cc po/sl.po
index ba1b412,57d53c5..d0806a6
--- a/po/sl.po
+++ b/po/sl.po
@@@ -1055,3 -1043,41 +1043,40 @@@ msgstr "_Staro geslo:
#: ../ui/gku-prompt.ui.h:8
msgid "_Password:"
msgstr "_Geslo:"
+
+ #~ msgid ""
+ #~ "This option enables the PKCS#11 component in the gnome-keyring daemon. It "
+ #~ "only takes effect during startup with gnome-session, (ie: when the user "
+ #~ "logs in). This setting may be overridden when certain command line "
+ #~ "arguments are passed to the daemon."
+ #~ msgstr ""
+ #~ "Možnost omogoÄ?a zagon PKCS#11 enote v gnome-keyring ozadnjem programu. "
+ #~ "Uporablja se le med zagonom programa gnome-session, (primer: ko se "
+ #~ "uporabnik prijavi). Možnost je mogoÄ?e s posebnimi argumenti med zagonom "
+ #~ "preklicati."
+ #~ msgid ""
+ #~ "This option enables the SSH agent in the gnome-keyring daemon. It only "
+ #~ "takes effect as gnome-keyring-daemon starts, (ie: when the user logs in). "
+ #~ "This setting may be overridden when certain command line arguments are "
+ #~ "passed to the daemon."
+ #~ msgstr ""
+ #~ "Možnost omogoÄ?a podporo SSH agenta v ozadnjem programu gnome-keyring. "
+ #~ "Uporablja se le ob zagonu ozadnjega programa gnome-keyring-daemon, "
+ #~ "(primer: ko se uporabnik prijavi). Možnost je mogoÄ?e s posebnimi "
+ #~ "argumenti med zagonom preklicati."
+ #~ msgid ""
+ #~ "This option enables the secret service component in the gnome-keyring "
+ #~ "daemon. It only takes effect during startup with gnome-session, (ie: when "
+ #~ "the user logs in). This setting may be overridden when certain command "
+ #~ "line arguments are passed to the daemon."
+ #~ msgstr ""
+ #~ "Možnost omogoÄ?a zagon skritih storitev v gnome-keyring ozadnjem programu. "
+ #~ "Uporablja se le med zagonom programa gnome-session, (primer: ko se "
+ #~ "uporabnik prijavi). Možnost je mogoÄ?e s posebnimi argumenti med zagonom "
+ #~ "preklicati."
+ #~ msgid "Whether the gnome-keyring PKCS#11 component is enabled."
+ #~ msgstr "Ali je gnome-keyring PKCS#11 enota omogoÄ?ena."
+ #~ msgid "Whether the gnome-keyring SSH agent is enabled."
+ #~ msgstr "Ali je gnome-keyring SSH agent omogoÄ?en."
+ #~ msgid "Whether the gnome-keyring secret service is enabled."
+ #~ msgstr "Ali je skrita storitev gnome-keyring omogoÄ?ena."
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
