Adapt to GLib 2.31 deprecations and thread API changes

GStaticMutex and GStaticRWLock have been replaced by GMutex
and GRWLock, and g_thread_init() is no longer needed.

https://bugzilla.gnome.org/show_bug.cgi?id=661148

3 files changed, 11 insertions, 10 deletions

diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 0f021b9e..ae17c3c6 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -298,9 +298,8 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
 
   bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  
-  if (g_thread_supported ())
-    dbus_threads_init_default ();
+
+  dbus_threads_init_default ();
 
   vfs->async_bus = dbus_bus_get_private (DBUS_BUS_SESSION, NULL);
 
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c
index f32a6f82..2cfd2e63 100644
--- a/client/gvfsdaemondbus.c
+++ b/client/gvfsdaemondbus.c
@@ -53,7 +53,10 @@ typedef struct {
 static gint32 vfs_data_slot = -1;
 static GOnce once_init_dbus = G_ONCE_INIT;
 
-static GStaticPrivate local_connections = G_STATIC_PRIVATE_INIT;
+typedef struct _ThreadLocalConnections ThreadLocalConnections;
+static void free_local_connections (ThreadLocalConnections *local);
+
+static GPrivate local_connections = G_PRIVATE_INIT((GDestroyNotify)free_local_connections);
 
 /* dbus id -> async connection */
 static GHashTable *async_map = NULL;
@@ -862,10 +865,10 @@ _g_vfs_daemon_call_sync (DBusMessage *message,
  *               get per-thread synchronous dbus connections             *
  *************************************************************************/
 
-typedef struct {
+struct _ThreadLocalConnections {
   GHashTable *connections;
   DBusConnection *session_bus;
-} ThreadLocalConnections;
+};
 
 static void
 free_mount_connection (DBusConnection *conn)
@@ -891,7 +894,7 @@ invalidate_local_connection (const char *dbus_id,
   
   _g_daemon_vfs_invalidate_dbus_id (dbus_id);
 
-  local = g_static_private_get (&local_connections);
+  local = g_private_get (&local_connections);
   if (local)
     g_hash_table_remove (local->connections, dbus_id);
   
@@ -916,13 +919,13 @@ _g_dbus_connection_get_sync (const char *dbus_id,
 
   g_once (&once_init_dbus, vfs_dbus_init, NULL);
 
-  local = g_static_private_get (&local_connections);
+  local = g_private_get (&local_connections);
   if (local == NULL)
     {
       local = g_new0 (ThreadLocalConnections, 1);
       local->connections = g_hash_table_new_full (g_str_hash, g_str_equal,
 						  g_free, (GDestroyNotify)free_mount_connection);
-      g_static_private_set (&local_connections, local, (GDestroyNotify)free_local_connections);
+      g_private_set (&local_connections, local);
     }
 
   if (dbus_id == NULL)
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index a4ba32c7..7cfa81cc 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -2425,7 +2425,6 @@ gint
 main (gint argc, gchar *argv [])
 {
   g_type_init ();
-  g_thread_init (NULL);
 
   return fuse_main (argc, argv, &vfs_oper, NULL /* user data */);
 }