[tracker] all: Iradicate all instances of deprecated GStaticMutex

[Martyn James Russell <mr src gnome org>]

commit 1e1d8b0cd8996702695eabf9073810e88257195e
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Mar 12 18:35:25 2013 +0000

    all: Iradicate all instances of deprecated GStaticMutex

 src/libtracker-common/tracker-locale-gconfdbus.c   |   14 +++++++-------
 src/libtracker-data/tracker-db-manager.c           |   16 ----------------
 .../tracker-network-provider-dummy.c               |    6 +++---
 .../tracker-network-provider-network-manager.c     |    6 +++---
 .../tracker-password-provider-gnome.c              |    6 +++---
 .../tracker-password-provider-keyfile.c            |    6 +++---
 src/libtracker-sparql-backend/tracker-backend.vala |    2 +-
 7 files changed, 20 insertions(+), 36 deletions(-)
---
diff --git a/src/libtracker-common/tracker-locale-gconfdbus.c 
b/src/libtracker-common/tracker-locale-gconfdbus.c
index 2ade289..0645678 100644
--- a/src/libtracker-common/tracker-locale-gconfdbus.c
+++ b/src/libtracker-common/tracker-locale-gconfdbus.c
@@ -49,7 +49,7 @@ static GDBusConnection *connection = NULL;
 static gboolean service_running = FALSE;
 static guint watch_name_id = 0;
 static guint registration_id = 0;
-static GStaticMutex subscribers_mutex = G_STATIC_MUTEX_INIT;
+static GMutex subscribers_mutex;
 GDBusNodeInfo *introspection_data = NULL;
 static gboolean meegotouch_mode = TRUE;
 static gboolean first_time = TRUE;
@@ -182,7 +182,7 @@ handle_method_call (GDBusConnection       *connection,
 
                        tracker_locale_set (i, value);
 
-                       g_static_mutex_lock (&subscribers_mutex);
+                       g_mutex_lock (&subscribers_mutex);
 
                        for (li = subscribers; li; li = g_slist_next (li)) {
                                TrackerLocaleNotification *data = li->data;
@@ -195,7 +195,7 @@ handle_method_call (GDBusConnection       *connection,
                                }
                        }
 
-                       g_static_mutex_unlock (&subscribers_mutex);
+                       g_mutex_unlock (&subscribers_mutex);
                }
        }
 }
@@ -515,9 +515,9 @@ tracker_locale_gconfdbus_notify_add (TrackerLocaleID         id,
        data->user_data = user_data;
        data->destroy_notify = destroy_notify;
 
-       g_static_mutex_lock (&subscribers_mutex);
+       g_mutex_lock (&subscribers_mutex);
        subscribers = g_slist_prepend (subscribers, data);
-       g_static_mutex_unlock (&subscribers_mutex);
+       g_mutex_unlock (&subscribers_mutex);
 
        return data;
 }
@@ -547,7 +547,7 @@ tracker_locale_gconfdbus_notify_remove (gpointer notification_id)
 
        /* Can be called from a thread */
 
-       g_static_mutex_lock (&subscribers_mutex);
+       g_mutex_lock (&subscribers_mutex);
 
        li = g_slist_find (subscribers, notification_id);
        if (li) {
@@ -559,5 +559,5 @@ tracker_locale_gconfdbus_notify_remove (gpointer notification_id)
                g_idle_add (destroy_locale_notify, data);
        }
 
-       g_static_mutex_unlock (&subscribers_mutex);
+       g_mutex_unlock (&subscribers_mutex);
 }
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 7ba7a21..10eaaa4 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -168,11 +168,7 @@ static GStaticPrivate        interface_data_key = G_STATIC_PRIVATE_INIT;
 #endif
 
 /* mutex used by singleton connection in libtracker-direct, not used by tracker-store */
-#if GLIB_CHECK_VERSION (2,31,0)
 static GMutex                global_mutex;
-#else
-static GStaticMutex          global_mutex = G_STATIC_MUTEX_INIT;
-#endif
 
 static TrackerDBInterface   *global_iface;
 
@@ -1807,29 +1803,17 @@ tracker_db_manager_set_need_mtime_check (gboolean needed)
 void
 tracker_db_manager_lock (void)
 {
-#if GLIB_CHECK_VERSION (2,31,0)
        g_mutex_lock (&global_mutex);
-#else
-       g_static_mutex_lock (&global_mutex);
-#endif
 }
 
 gboolean
 tracker_db_manager_trylock (void)
 {
-#if GLIB_CHECK_VERSION (2,31,0)
        return g_mutex_trylock (&global_mutex);
-#else
-       return g_static_mutex_trylock (&global_mutex);
-#endif
 }
 
 void
 tracker_db_manager_unlock (void)
 {
-#if GLIB_CHECK_VERSION (2,31,0)
        g_mutex_unlock (&global_mutex);
-#else
-       g_static_mutex_unlock (&global_mutex);
-#endif
 }
diff --git a/src/libtracker-miner/tracker-network-provider-dummy.c 
b/src/libtracker-miner/tracker-network-provider-dummy.c
index 7b26ba9..2dad469 100644
--- a/src/libtracker-miner/tracker-network-provider-dummy.c
+++ b/src/libtracker-miner/tracker-network-provider-dummy.c
@@ -152,9 +152,9 @@ TrackerNetworkProvider *
 tracker_network_provider_get (void)
 {
        static TrackerNetworkProvider *instance = NULL;
-       static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+       static GMutex mutex;
 
-       g_static_mutex_lock (&mutex);
+       g_mutex_lock (&mutex);
 
        if (!instance) {
                instance = g_object_new (TRACKER_TYPE_NETWORK_PROVIDER_DUMMY,
@@ -162,7 +162,7 @@ tracker_network_provider_get (void)
                                         NULL);
        }
 
-       g_static_mutex_unlock (&mutex);
+       g_mutex_unlock (&mutex);
 
        return instance;
 }
diff --git a/src/libtracker-miner/tracker-network-provider-network-manager.c 
b/src/libtracker-miner/tracker-network-provider-network-manager.c
index 35fa8c9..eb5e2e0 100644
--- a/src/libtracker-miner/tracker-network-provider-network-manager.c
+++ b/src/libtracker-miner/tracker-network-provider-network-manager.c
@@ -314,9 +314,9 @@ TrackerNetworkProvider *
 tracker_network_provider_get (void)
 {
        static TrackerNetworkProvider *instance = NULL;
-       static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+       static GMutex mutex;
 
-       g_static_mutex_lock (&mutex);
+       g_mutex_lock (&mutex);
 
        if (!instance) {
                instance = g_object_new (TRACKER_TYPE_NETWORK_PROVIDER_NETWORK_MANAGER,
@@ -324,7 +324,7 @@ tracker_network_provider_get (void)
                                         NULL);
        }
 
-       g_static_mutex_unlock (&mutex);
+       g_mutex_unlock (&mutex);
 
        return instance;
 }
diff --git a/src/libtracker-miner/tracker-password-provider-gnome.c 
b/src/libtracker-miner/tracker-password-provider-gnome.c
index 30e7bd9..5ef1767 100644
--- a/src/libtracker-miner/tracker-password-provider-gnome.c
+++ b/src/libtracker-miner/tracker-password-provider-gnome.c
@@ -290,9 +290,9 @@ TrackerPasswordProvider *
 tracker_password_provider_get (void)
 {
        static TrackerPasswordProvider *instance = NULL;
-       static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+       static GMutex mutex;
 
-       g_static_mutex_lock (&mutex);
+       g_mutex_lock (&mutex);
 
        if (!instance) {
                instance = g_object_new (TRACKER_TYPE_PASSWORD_PROVIDER_GNOME,
@@ -300,7 +300,7 @@ tracker_password_provider_get (void)
                                         NULL);
        }
 
-       g_static_mutex_unlock (&mutex);
+       g_mutex_unlock (&mutex);
 
        return instance;
 }
diff --git a/src/libtracker-miner/tracker-password-provider-keyfile.c 
b/src/libtracker-miner/tracker-password-provider-keyfile.c
index 95cb71a..5e0a0d8 100644
--- a/src/libtracker-miner/tracker-password-provider-keyfile.c
+++ b/src/libtracker-miner/tracker-password-provider-keyfile.c
@@ -295,9 +295,9 @@ TrackerPasswordProvider *
 tracker_password_provider_get (void)
 {
        static TrackerPasswordProvider *instance = NULL;
-       static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+       static GMutex mutex;
 
-       g_static_mutex_lock (&mutex);
+       g_mutex_lock (&mutex);
 
        if (instance == NULL) {
                instance = g_object_new (TRACKER_TYPE_PASSWORD_PROVIDER_KEYFILE,
@@ -305,7 +305,7 @@ tracker_password_provider_get (void)
                                         NULL);
        }
 
-       g_static_mutex_unlock (&mutex);
+       g_mutex_unlock (&mutex);
 
        return instance;
 }
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala 
b/src/libtracker-sparql-backend/tracker-backend.vala
index 3c74e80..61ab2eb 100644
--- a/src/libtracker-sparql-backend/tracker-backend.vala
+++ b/src/libtracker-sparql-backend/tracker-backend.vala
@@ -209,7 +209,7 @@ class Tracker.Sparql.Backend : Connection {
 
        static weak Connection? singleton;
        static bool log_initialized;
-       static StaticMutex door;
+       static Mutex door = Mutex ();
 
        static new Connection get (Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError, 
SpawnError {
                door.lock ();