gnome-keyring r1673 - in trunk: . daemon/pk gp11/tests po

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Mar 14 19:01:34 2009
New Revision: 1673
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1673&view=rev

Log:
Release version 2.26.0


Removed:
   trunk/daemon/pk/
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/gp11/tests/unit-test-gp11-session.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar 14 19:01:34 2009
@@ -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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 14 19:01:34 2009
@@ -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 ****************************************************************************

Modified: trunk/gp11/tests/unit-test-gp11-session.c
==============================================================================
--- trunk/gp11/tests/unit-test-gp11-session.c	(original)
+++ trunk/gp11/tests/unit-test-gp11-session.c	Sat Mar 14 19:01:34 2009
@@ -225,7 +225,7 @@
 	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 @@
 	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));
 	

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sat Mar 14 19:01:34 2009
@@ -4,6 +4,7 @@
 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