summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefw@src.gnome.org>2009-03-14 19:01:34 +0000
committerStefan Walter <stefw@src.gnome.org>2009-03-14 19:01:34 +0000
commiteb7e03980071307617883d86b8e1e334b26e4295 (patch)
tree0df6bfc51754dc647aeabf9fc05ecab855f3277a
parentd51d767c66680169260268fdfa7a8ea005ce539d (diff)
downloadgnome-keyring-eb7e03980071307617883d86b8e1e334b26e4295.tar.gz
Release version 2.26.0GNOME_KEYRING_2_26_0
svn path=/trunk/; revision=1673
-rw-r--r--ChangeLog7
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--gp11/tests/unit-test-gp11-session.c8
-rw-r--r--po/ChangeLog9
-rw-r--r--po/POTFILES.in1
6 files changed, 29 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ca7c341..e2bbb163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+=== gnome-keyring 2.26.0 ===
+
+2009-03-14 Stef Walter <stef@memberwebs.com>
+
+ * configure.in:
+ * NEWS: Version 2.26.0
+
2009-03-10 Stef Walter <stef@memberwebs.com>
* configure.in:
diff --git a/NEWS b/NEWS
index 13107ea1..22e75960 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Changes in version 2.26.0 are:
+* Implement support for running gnome-keyring-daemon under valgrind.
+* Checks for asn1Parser tool when configuring. [Alberto Ruiz].
+* Only automatically expose PKCS#11 public key objects for private keys.
+* Have the SSH agent only log into the token when we have a private
+ key that we want to access.
+* Disable input method in password. [Takao Fujiwara]
+
Changes in version 2.25.92 are:
* Fix problems when multiple processes tried to initialize the
gnome-keyring-daemon at the same time, often resulting in a user
diff --git a/configure.in b/configure.in
index 2aa6c1c6..0942e56a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_INIT(library/gnome-keyring.h)
-AM_INIT_AUTOMAKE(gnome-keyring, 2.25.92)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.26.0)
AM_CONFIG_HEADER(config.h)
dnl ****************************************************************************
diff --git a/gp11/tests/unit-test-gp11-session.c b/gp11/tests/unit-test-gp11-session.c
index d7b17645..7a043f04 100644
--- a/gp11/tests/unit-test-gp11-session.c
+++ b/gp11/tests/unit-test-gp11-session.c
@@ -225,7 +225,7 @@ DEFINE_TEST(auto_login)
GError *err = NULL;
GP11Attributes *attrs;
gboolean ret;
- gboolean value;
+ gint value;
attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_DATA,
CKA_LABEL, GP11_STRING, "TEST OBJECT",
@@ -239,11 +239,11 @@ DEFINE_TEST(auto_login)
g_clear_error (&err);
/* Setup for auto login */
- g_assert (gp11_module_get_auto_authenticate (module) == FALSE);
+ g_assert (gp11_module_get_auto_authenticate (module) == 0);
gp11_module_set_auto_authenticate (module, TRUE);
- g_assert (gp11_module_get_auto_authenticate (module) == TRUE);
+ g_assert (gp11_module_get_auto_authenticate (module) == (GP11_AUTHENTICATE_TOKENS | GP11_AUTHENTICATE_OBJECTS));
g_object_get (module, "auto-authenticate", &value, NULL);
- g_assert (value == TRUE);
+ g_assert (value == (GP11_AUTHENTICATE_TOKENS | GP11_AUTHENTICATE_OBJECTS));
g_signal_connect (module, "authenticate-slot", G_CALLBACK (authenticate_token), GUINT_TO_POINTER (35));
diff --git a/po/ChangeLog b/po/ChangeLog
index ff86716e..5a636634 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,4 +1,11 @@
-2009-03-14 felix@redhat.com>
+=== gnome-keyring 2.26.0 ===
+
+2009-03-14 Stef Walter <stef@memberwebs.com>
+
+ * Add missing file due to distcheck:
+ daemon/org.gnome.keyring.service.in
+
+2009-03-14 felix <felix@redhat.com>
* ta.po: Tamil Translation updated
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96a7714b..74432746 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@ common/gkr-location.c
daemon/gkr-daemon-ops.c
daemon/data/gnome-keyring.schemas.in
daemon/gnome-keyring-daemon.desktop.in.in
+daemon/org.gnome.keyring.service.in
daemon/keyrings/gkr-keyring-login.c
daemon/keyrings/gkr-keyring.c
daemon/pkcs11/gkr-pkcs11-auth.c