[evolution-kolab] CamelKolabIMAPXSettings: GLib 2.32 GMutex fixups
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] CamelKolabIMAPXSettings: GLib 2.32 GMutex fixups
- Date: Mon, 30 Jul 2012 14:48:45 +0000 (UTC)
commit 5390aaf9056f1e9b604c85c0f79bf21bc395ecc5
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Mon Jul 30 16:28:13 2012 +0200
CamelKolabIMAPXSettings: GLib 2.32 GMutex fixups
* g_mutex_new() / g_mutex_free() have been deprecated
in GLib 2.32 in favor of g_mutex_init() / g_mutex_clear()
src/libekolab/camel-kolab-imapx-settings.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/libekolab/camel-kolab-imapx-settings.c b/src/libekolab/camel-kolab-imapx-settings.c
index 2f5e203..e1545cd 100644
--- a/src/libekolab/camel-kolab-imapx-settings.c
+++ b/src/libekolab/camel-kolab-imapx-settings.c
@@ -38,7 +38,7 @@
/*----------------------------------------------------------------------------*/
struct _CamelKolabIMAPXSettingsPrivate {
- GMutex *property_lock;
+ GMutex property_lock;
gchar *pkcs11_pin;
};
@@ -100,7 +100,7 @@ camel_kolab_imapx_settings_finalize (GObject *object)
priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (object);
- g_mutex_free (priv->property_lock);
+ g_mutex_clear (&(priv->property_lock));
g_free (priv->pkcs11_pin);
@@ -136,7 +136,7 @@ static void
camel_kolab_imapx_settings_init (CamelKolabIMAPXSettings *self)
{
self->priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
- self->priv->property_lock = g_mutex_new ();
+ g_mutex_init (&(self->priv->property_lock));
}
/*----------------------------------------------------------------------------*/
@@ -196,12 +196,12 @@ camel_kolab_imapx_settings_dup_pkcs11_pin (CamelKolabIMAPXSettings *settings)
g_return_val_if_fail (CAMEL_IS_KOLAB_IMAPX_SETTINGS (settings), NULL);
- g_mutex_lock (settings->priv->property_lock);
+ g_mutex_lock (&(settings->priv->property_lock));
protected = camel_kolab_imapx_settings_get_pkcs11_pin (settings);
duplicate = g_strdup (protected);
- g_mutex_unlock (settings->priv->property_lock);
+ g_mutex_unlock (&(settings->priv->property_lock));
return duplicate;
}
@@ -212,12 +212,12 @@ camel_kolab_imapx_settings_set_pkcs11_pin (CamelKolabIMAPXSettings *settings,
{
g_return_if_fail (CAMEL_IS_KOLAB_IMAPX_SETTINGS (settings));
- g_mutex_lock (settings->priv->property_lock);
+ g_mutex_lock (&(settings->priv->property_lock));
g_free (settings->priv->pkcs11_pin);
settings->priv->pkcs11_pin = e_util_strdup_strip (pkcs11_pin);
- g_mutex_unlock (settings->priv->property_lock);
+ g_mutex_unlock (&(settings->priv->property_lock));
g_object_notify (G_OBJECT (settings), "pkcs11-pin");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]