diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2011-10-21 13:59:29 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2011-10-21 13:59:29 +0200 |
| commit | 90372ae6344398beaca9ef8c37ba2704014a5c39 (patch) | |
| tree | bda058bd5bed51f2b6c96cb04f9b46a285eff0ca | |
| parent | 94489e37b70992961c7afddbb2b875a907a4f35f (diff) | |
Use g_atomic_int_add instead of deprecated g_atomic_int_exchange_and_add.
https://bugzilla.gnome.org/show_bug.cgi?id=659815
| -rw-r--r-- | client/gdaemonfileenumerator.c | 2 | ||||
| -rw-r--r-- | client/gdaemonfilemonitor.c | 2 | ||||
| -rw-r--r-- | daemon/gvfsftpconnection.c | 2 | ||||
| -rw-r--r-- | daemon/gvfsmonitor.c | 2 | ||||
| -rw-r--r-- | metadata/metatree.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c index 46df64a7..d8ca8ab6 100644 --- a/client/gdaemonfileenumerator.c +++ b/client/gdaemonfileenumerator.c @@ -144,7 +144,7 @@ g_daemon_file_enumerator_init (GDaemonFileEnumerator *daemon) { char *path; - daemon->id = g_atomic_int_exchange_and_add (&path_counter, 1); + daemon->id = g_atomic_int_add (&path_counter, 1); path = g_daemon_file_enumerator_get_object_path (daemon); _g_dbus_register_vfs_filter (path, g_daemon_file_enumerator_dbus_filter, diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c index 20c10f92..dea5152f 100644 --- a/client/gdaemonfilemonitor.c +++ b/client/gdaemonfilemonitor.c @@ -86,7 +86,7 @@ g_daemon_file_monitor_init (GDaemonFileMonitor* daemon_monitor) { gint id; - id = g_atomic_int_exchange_and_add (&path_counter, 1); + id = g_atomic_int_add (&path_counter, 1); daemon_monitor->object_path = g_strdup_printf (OBJ_PATH_PREFIX"%d", id); diff --git a/daemon/gvfsftpconnection.c b/daemon/gvfsftpconnection.c index 3df27fe7..fc4047d7 100644 --- a/daemon/gvfsftpconnection.c +++ b/daemon/gvfsftpconnection.c @@ -73,7 +73,7 @@ g_vfs_ftp_connection_new (GSocketConnectable *addr, conn = g_slice_new0 (GVfsFtpConnection); conn->client = g_socket_client_new (); - conn->debug_id = g_atomic_int_exchange_and_add (&debug_id, 1); + conn->debug_id = g_atomic_int_add (&debug_id, 1); conn->commands = G_IO_STREAM (g_socket_client_connect (conn->client, addr, cancellable, diff --git a/daemon/gvfsmonitor.c b/daemon/gvfsmonitor.c index 8947099f..8c9b38f4 100644 --- a/daemon/gvfsmonitor.c +++ b/daemon/gvfsmonitor.c @@ -129,7 +129,7 @@ g_vfs_monitor_init (GVfsMonitor *monitor) G_TYPE_VFS_MONITOR, GVfsMonitorPrivate); - id = g_atomic_int_exchange_and_add (&path_counter, 1); + id = g_atomic_int_add (&path_counter, 1); monitor->priv->object_path = g_strdup_printf (OBJ_PATH_PREFIX"%d", id); } diff --git a/metadata/metatree.c b/metadata/metatree.c index d274882d..3420ad0e 100644 --- a/metadata/metatree.c +++ b/metadata/metatree.c @@ -591,7 +591,7 @@ meta_tree_lookup_by_name (const char *name, MetaTree * meta_tree_ref (MetaTree *tree) { - g_atomic_int_exchange_and_add ((int *)&tree->ref_count, 1); + g_atomic_int_add ((int *)&tree->ref_count, 1); return tree; } |