[gnome-keyring] Release 3.3.91

[Stefan Walter <stefw src gnome org>]

commit a6812d0b3792d2fec8515ebb5b4c9f9c78921167
Author: Stef Walter <stefw gnome org>
Date:   Fri Mar 9 13:55:52 2012 +0100

    Release 3.3.91
    
     * Fix timer test

 NEWS                          |    7 +++++++
 configure.ac                  |    2 +-
 pkcs11/gkm/tests/test-timer.c |   14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/NEWS b/NEWS
index b5d64e7..cb752c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in version 3.3.91 are:
+ * Fix regression in changing a keyring master password
+ * Set better button labels for the prompts
+ * Fix assertion when cancelling a unlock prompt
+ * Use a single CA certificates file by default
+ * Updated translations
+
 Changes in version 3.3.5 are:
  * Updated translations
  * Fix introspection data for SearchItems()
diff --git a/configure.ac b/configure.ac
index fd734eb..40a18e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.3.5)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.3.91)
 
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/pkcs11/gkm/tests/test-timer.c b/pkcs11/gkm/tests/test-timer.c
index dca9971..3035786 100644
--- a/pkcs11/gkm/tests/test-timer.c
+++ b/pkcs11/gkm/tests/test-timer.c
@@ -85,7 +85,7 @@ test_cancel (Test* test, gconstpointer unused)
 	timer = gkm_timer_start (test->module, 2, timer_callback, &timer);
 
 	mock_module_leave ();
-	egg_test_wait_until (500);
+	egg_test_wait_until (50);
 	mock_module_enter ();
 
 	gkm_timer_cancel (timer);
@@ -164,12 +164,12 @@ main (int argc, char **argv)
 	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add ("/gkm/secret/extra_initialize", Test, NULL, setup, test_extra_initialize, teardown);
-	g_test_add ("/gkm/secret/simple", Test, NULL, setup, test_simple, teardown);
-	g_test_add ("/gkm/secret/cancel", Test, NULL, setup, test_cancel, teardown);
-	g_test_add ("/gkm/secret/immediate", Test, NULL, setup, test_immediate, teardown);
-	g_test_add ("/gkm/secret/multiple", Test, NULL, setup, test_multiple, teardown);
-	g_test_add ("/gkm/secret/outstanding", Test, NULL, setup, test_outstanding, teardown);
+	g_test_add ("/gkm/timer/extra_initialize", Test, NULL, setup, test_extra_initialize, teardown);
+	g_test_add ("/gkm/timer/simple", Test, NULL, setup, test_simple, teardown);
+	g_test_add ("/gkm/timer/cancel", Test, NULL, setup, test_cancel, teardown);
+	g_test_add ("/gkm/timer/immediate", Test, NULL, setup, test_immediate, teardown);
+	g_test_add ("/gkm/timer/multiple", Test, NULL, setup, test_multiple, teardown);
+	g_test_add ("/gkm/timer/outstanding", Test, NULL, setup, test_outstanding, teardown);
 
 	return egg_tests_run_in_thread_with_loop ();
 }