GDBusProxy *pacrunner;
- GMutex *lock;
+ GMutex lock;
};
static void g_proxy_resolver_gnome_iface_init (GProxyResolverInterface *iface);
{
GProxyResolverGnome *resolver = user_data;
- g_mutex_lock (resolver->lock);
+ g_mutex_lock (&resolver->lock);
resolver->need_update = TRUE;
- g_mutex_unlock (resolver->lock);
+ g_mutex_unlock (&resolver->lock);
}
static void
if (resolver->pacrunner)
g_object_unref (resolver->pacrunner);
- g_mutex_free (resolver->lock);
+ g_mutex_clear (&resolver->lock);
G_OBJECT_CLASS (g_proxy_resolver_gnome_parent_class)->finalize (object);
}
static void
g_proxy_resolver_gnome_init (GProxyResolverGnome *resolver)
{
- resolver->lock = g_mutex_new ();
+ g_mutex_init (&resolver->lock);
resolver->proxy_settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
g_signal_connect (resolver->proxy_settings, "changed",
gchar **proxies = NULL;
gushort port;
- g_mutex_lock (resolver->lock);
+ g_mutex_lock (&resolver->lock);
if (resolver->need_update)
update_settings (resolver);
- g_mutex_unlock (resolver->lock);
+ g_mutex_unlock (&resolver->lock);
if (resolver->mode == G_DESKTOP_PROXY_MODE_NONE)
goto done;
struct _GTlsBackendGnutlsPrivate
{
- GMutex *mutex;
+ GMutex mutex;
GTlsDatabase *default_database;
};
g_once (&gnutls_inited, gtls_gnutls_init, NULL);
backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, G_TYPE_TLS_BACKEND_GNUTLS, GTlsBackendGnutlsPrivate);
- backend->priv->mutex = g_mutex_new ();
+ g_mutex_init (&backend->priv->mutex);
}
static void
if (backend->priv->default_database)
g_object_unref (backend->priv->default_database);
- g_mutex_free (backend->priv->mutex);
+ g_mutex_clear (&backend->priv->mutex);
G_OBJECT_CLASS (g_tls_backend_gnutls_parent_class)->finalize (object);
}
GTlsDatabase *result;
GError *error = NULL;
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
if (self->priv->default_database)
{
}
}
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
return result;
}
gchar *anchor_filename;
/* protected by mutex */
- GMutex *mutex;
+ GMutex mutex;
/*
* These are hash tables of GByteArray -> GPtrArray<GByteArray>. The values of
g_free (self->priv->anchor_filename);
self->priv->anchor_filename = NULL;
- g_mutex_free (self->priv->mutex);
+ g_mutex_clear (&self->priv->mutex);
G_OBJECT_CLASS (g_tls_file_database_gnutls_parent_class)->finalize (object);
}
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
G_TYPE_TLS_FILE_DATABASE_GNUTLS,
GTlsFileDatabaseGnutlsPrivate);
- self->priv->mutex = g_mutex_new ();
+ g_mutex_init (&self->priv->mutex);
}
static gchar*
g_object_get (certificate, "certificate", &der, NULL);
g_return_val_if_fail (der, FALSE);
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
/* At the same time look up whether this certificate is in list */
contains = g_hash_table_lookup (self->priv->complete, der) ? TRUE : FALSE;
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
/* Certificate is in the database */
if (contains)
if (!handle)
return NULL;
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
/* Create the handles table if not already done */
if (!self->priv->handles)
der = g_hash_table_lookup (self->priv->handles, handle);
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
if (der == NULL)
return NULL;
g_object_get (certificate, "certificate", &der, NULL);
g_return_val_if_fail (der, FALSE);
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
contains = g_hash_table_lookup (self->priv->complete, der) ? TRUE : FALSE;
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
g_byte_array_unref (der);
gnutls_free (dn.data);
/* Find the full DER value of the certificate */
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
der = multi_byte_array_hash_lookup_one (self->priv->subjects, subject);
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
g_byte_array_unref (subject);
return NULL;
/* Find the full DER value of the certificate */
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
ders = multi_byte_array_hash_lookup_all (self->priv->issuers, issuer_raw_dn);
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
for (i = 0; ders && i < ders->len; i++)
{
if (result)
{
- g_mutex_lock (self->priv->mutex);
+ g_mutex_lock (&self->priv->mutex);
if (!self->priv->subjects)
{
self->priv->subjects = subjects;
self->priv->complete = complete;
complete = NULL;
}
- g_mutex_unlock (self->priv->mutex);
+ g_mutex_unlock (&self->priv->mutex);
}
if (subjects != NULL)