diff options
author | Matthias Clasen <mclasen@redhat.com> | 2011-10-21 14:15:09 +0200 |
---|---|---|
committer | Tomas Bzatek <tbzatek@redhat.com> | 2011-10-21 14:15:09 +0200 |
commit | bd014bd8a442cae12aace7deb6e6a4d21ac3dd0e (patch) | |
tree | 4b95475577042b744ff00d8ebffd8de9a5300e5a /client/gvfsdaemondbus.c | |
parent | 90372ae6344398beaca9ef8c37ba2704014a5c39 (diff) | |
download | gvfs-bd014bd8a442cae12aace7deb6e6a4d21ac3dd0e.tar.gz |
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
Diffstat (limited to 'client/gvfsdaemondbus.c')
-rw-r--r-- | client/gvfsdaemondbus.c | 15 |
1 files changed, 9 insertions, 6 deletions
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) |