[libgnome-keyring] Release 3.3.5

[Stefan Walter <stefw src gnome org>]

commit 946e1a349c4b496feaa6a1b0c9d50acedcac318e
Author: Stef Walter <stefw gnome org>
Date:   Sat Feb 4 09:06:38 2012 +0100

    Release 3.3.5

 NEWS                |    9 +++++++++
 configure.ac        |    2 +-
 egg/egg-libgcrypt.c |   10 ++++++++++
 3 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index b1d7c15..99a3f56 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Changes in version 3.3.5 are:
+ * GObject introspection for synchronous functions
+ * Fix issue where an operation could be completed twice, with
+   undefined results.
+ * Test against mock Secret Service rather than gnome-keyring-daemon
+ * More testing fixes
+ * Updated translations
+ * Build fixes
+
 Changes in version 3.3.4 are:
  * Fix gnome_keyring_item_info_copy()
  * Build fixes
diff --git a/configure.ac b/configure.ac
index 4923856..3d32a15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libgnome-keyring], [3.3.4])
+AC_INIT([libgnome-keyring], [3.3.5])
 AC_CONFIG_SRCDIR([library/gnome-keyring.h])
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_CONFIG_MACRO_DIR([build/m4])
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
index 7918e96..5e91779 100644
--- a/egg/egg-libgcrypt.c
+++ b/egg/egg-libgcrypt.c
@@ -54,14 +54,24 @@ fatal_handler (gpointer unused, int unknown, const gchar *msg)
 static int
 glib_thread_mutex_init (void **lock)
 {
+#if GLIB_CHECK_VERSION(2,31,0)
+	*lock = g_slice_new (GMutex);
+	g_mutex_init (*lock);
+#else
 	*lock = g_mutex_new ();
+#endif
 	return 0;
 }
 
 static int
 glib_thread_mutex_destroy (void **lock)
 {
+#if GLIB_CHECK_VERSION(2,31,0)
+	g_mutex_clear (*lock);
+	g_slice_free (GMutex, *lock);
+#else
 	g_mutex_free (*lock);
+#endif
 	return 0;
 }