From 90c877576f3e8d9ba17327e667aadb60bf53012e Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Mon, 11 Feb 2013 11:45:48 +0100 Subject: Fix deprecated GStaticMutex --- libcaja-private/caja-debug-log.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libcaja-private/caja-debug-log.c b/libcaja-private/caja-debug-log.c index 4b18ca80..446df48e 100644 --- a/libcaja-private/caja-debug-log.c +++ b/libcaja-private/caja-debug-log.c @@ -40,7 +40,11 @@ #define MAX_URI_COUNT 20 +#if GLIB_CHECK_VERSION(2, 31, 0) +static GMutex log_mutex; +#else static GStaticMutex log_mutex = G_STATIC_MUTEX_INIT; +#endif static GHashTable *domains_hash; static char **ring_buffer; @@ -54,13 +58,21 @@ static GSList *milestones_tail; static void lock (void) { + #if GLIB_CHECK_VERSION(2, 31, 0) + g_mutex_lock (&log_mutex); + #else g_static_mutex_lock (&log_mutex); + #endif } static void unlock (void) { + #if GLIB_CHECK_VERSION(2, 31, 0) + g_mutex_unlock (&log_mutex); + #else g_static_mutex_unlock (&log_mutex); + #endif } void -- cgit v1.2.1