From 3fcb3979d1301935a5c3c189aaa5f60ec9b8ab1e Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Fri, 25 Jan 2013 19:06:11 +0100
Subject: [PATCH] Fix for GStaticMutex deprecations in glib

---
 configure.ac            | 4 ++--
 egg/egg-secure-memory.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index d64b2b8..9ec34d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,8 +60,8 @@ AC_CHECK_FUNCS(mlock)
 # GLib
 
 PKG_CHECK_MODULES(GLIB,
-	glib-2.0 >= 2.31.0
-	gio-2.0 >= 2.31.0
+	glib-2.0 >= 2.32.0
+	gio-2.0 >= 2.32.0
 	gio-unix-2.0)
 LIBS="$LIBS $GLIB_LIBS"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
diff --git a/egg/egg-secure-memory.h b/egg/egg-secure-memory.h
index 969dbd7..fde9dfb 100644
--- a/egg/egg-secure-memory.h
+++ b/egg/egg-secure-memory.h
@@ -57,11 +57,11 @@ typedef struct {
 		lock, unlock, fallback, NULL, EGG_SECURE_POOL_VER_STR };
 
 #define EGG_SECURE_DEFINE_GLIB_GLOBALS() \
-	static GStaticMutex memory_mutex = G_STATIC_MUTEX_INIT; \
+	static GMutex memory_mutex = { NULL, }; \
 	static void egg_memory_lock (void) \
-		{ g_static_mutex_lock (&memory_mutex); } \
+		{ g_mutex_lock (&memory_mutex); } \
 	static void egg_memory_unlock (void) \
-		{ g_static_mutex_unlock (&memory_mutex); } \
+		{ g_mutex_unlock (&memory_mutex); } \
 	EGG_SECURE_DEFINE_GLOBALS (egg_memory_lock, egg_memory_unlock, g_realloc);
 
 extern egg_secure_glob EGG_SECURE_GLOBALS;