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 /daemon/gvfsdaemonutils.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 'daemon/gvfsdaemonutils.c')
| -rw-r--r-- | daemon/gvfsdaemonutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c index f03d4b2e..1efcf870 100644 --- a/daemon/gvfsdaemonutils.c +++ b/daemon/gvfsdaemonutils.c @@ -41,7 +41,7 @@ #include "gvfsdaemonprotocol.h" static gint32 extra_fd_slot = -1; -static GStaticMutex extra_lock = G_STATIC_MUTEX_INIT; +static GMutex extra_lock; typedef struct { int extra_fd; @@ -93,7 +93,7 @@ dbus_connection_send_fd (DBusConnection *connection, return FALSE; } - g_static_mutex_lock (&extra_lock); + g_mutex_lock (&extra_lock); if (_g_socket_send_fd (extra->extra_fd, fd) == -1) { @@ -103,13 +103,13 @@ dbus_connection_send_fd (DBusConnection *connection, g_io_error_from_errno (errsv), _("Error sending file descriptor: %s"), g_strerror (errsv)); - g_static_mutex_unlock (&extra_lock); + g_mutex_unlock (&extra_lock); return FALSE; } *fd_id = extra->fd_count++; - g_static_mutex_unlock (&extra_lock); + g_mutex_unlock (&extra_lock); return TRUE; } |