Replace deprecated GLib symbols (as of GLib 2.34.x)

1 files changed, 28 insertions, 28 deletions

diff --git a/libedataserver/e-source-mail-identity.c b/libedataserver/e-source-mail-identity.c
index f8729f68d..9af90d878 100644
--- a/libedataserver/e-source-mail-identity.c
+++ b/libedataserver/e-source-mail-identity.c
@@ -45,7 +45,7 @@
 	((obj), E_TYPE_SOURCE_MAIL_IDENTITY, ESourceMailIdentityPrivate))
 
 struct _ESourceMailIdentityPrivate {
-	GMutex *property_lock;
+	GMutex property_lock;
 	gchar *address;
 	gchar *name;
 	gchar *organization;
@@ -161,7 +161,7 @@ source_mail_identity_finalize (GObject *object)
 
 	priv = E_SOURCE_MAIL_IDENTITY_GET_PRIVATE (object);
 
-	g_mutex_free (priv->property_lock);
+	g_mutex_clear (&priv->property_lock);
 
 	g_free (priv->address);
 	g_free (priv->name);
@@ -259,7 +259,7 @@ static void
 e_source_mail_identity_init (ESourceMailIdentity *extension)
 {
 	extension->priv = E_SOURCE_MAIL_IDENTITY_GET_PRIVATE (extension);
-	extension->priv->property_lock = g_mutex_new ();
+	g_mutex_init (&extension->priv->property_lock);
 }
 
 /**
@@ -302,12 +302,12 @@ e_source_mail_identity_dup_address (ESourceMailIdentity *extension)
 
 	g_return_val_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension), NULL);
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	protected = e_source_mail_identity_get_address (extension);
 	duplicate = g_strdup (protected);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	return duplicate;
 }
@@ -331,17 +331,17 @@ e_source_mail_identity_set_address (ESourceMailIdentity *extension,
 {
 	g_return_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension));
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	if (g_strcmp0 (extension->priv->address, address) == 0) {
-		g_mutex_unlock (extension->priv->property_lock);
+		g_mutex_unlock (&extension->priv->property_lock);
 		return;
 	}
 
 	g_free (extension->priv->address);
 	extension->priv->address = e_util_strdup_strip (address);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	g_object_notify (G_OBJECT (extension), "address");
 }
@@ -385,12 +385,12 @@ e_source_mail_identity_dup_name (ESourceMailIdentity *extension)
 
 	g_return_val_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension), NULL);
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	protected = e_source_mail_identity_get_name (extension);
 	duplicate = g_strdup (protected);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	return duplicate;
 }
@@ -414,11 +414,11 @@ e_source_mail_identity_set_name (ESourceMailIdentity *extension,
 {
 	g_return_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension));
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	if (extension->priv->name != NULL &&
 	    g_strcmp0 (extension->priv->name, name) == 0) {
-		g_mutex_unlock (extension->priv->property_lock);
+		g_mutex_unlock (&extension->priv->property_lock);
 		return;
 	}
 
@@ -428,7 +428,7 @@ e_source_mail_identity_set_name (ESourceMailIdentity *extension,
 	if (extension->priv->name == NULL)
 		extension->priv->name = g_strdup (g_get_real_name ());
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	g_object_notify (G_OBJECT (extension), "name");
 }
@@ -472,12 +472,12 @@ e_source_mail_identity_dup_organization (ESourceMailIdentity *extension)
 
 	g_return_val_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension), NULL);
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	protected = e_source_mail_identity_get_organization (extension);
 	duplicate = g_strdup (protected);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	return duplicate;
 }
@@ -501,17 +501,17 @@ e_source_mail_identity_set_organization (ESourceMailIdentity *extension,
 {
 	g_return_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension));
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	if (g_strcmp0 (extension->priv->organization, organization) == 0) {
-		g_mutex_unlock (extension->priv->property_lock);
+		g_mutex_unlock (&extension->priv->property_lock);
 		return;
 	}
 
 	g_free (extension->priv->organization);
 	extension->priv->organization = e_util_strdup_strip (organization);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	g_object_notify (G_OBJECT (extension), "organization");
 }
@@ -556,12 +556,12 @@ e_source_mail_identity_dup_reply_to (ESourceMailIdentity *extension)
 
 	g_return_val_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension), NULL);
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	protected = e_source_mail_identity_get_reply_to (extension);
 	duplicate = g_strdup (protected);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	return duplicate;
 }
@@ -586,17 +586,17 @@ e_source_mail_identity_set_reply_to (ESourceMailIdentity *extension,
 {
 	g_return_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension));
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	if (g_strcmp0 (extension->priv->reply_to, reply_to) == 0) {
-		g_mutex_unlock (extension->priv->property_lock);
+		g_mutex_unlock (&extension->priv->property_lock);
 		return;
 	}
 
 	g_free (extension->priv->reply_to);
 	extension->priv->reply_to = e_util_strdup_strip (reply_to);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	g_object_notify (G_OBJECT (extension), "reply-to");
 }
@@ -644,12 +644,12 @@ e_source_mail_identity_dup_signature_uid (ESourceMailIdentity *extension)
 
 	g_return_val_if_fail (E_IS_SOURCE_MAIL_IDENTITY (extension), NULL);
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	protected = e_source_mail_identity_get_signature_uid (extension);
 	duplicate = g_strdup (protected);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	return duplicate;
 }
@@ -678,17 +678,17 @@ e_source_mail_identity_set_signature_uid (ESourceMailIdentity *extension,
 	if (signature_uid == NULL || *signature_uid == '\0')
 		signature_uid = "none";
 
-	g_mutex_lock (extension->priv->property_lock);
+	g_mutex_lock (&extension->priv->property_lock);
 
 	if (g_strcmp0 (extension->priv->signature_uid, signature_uid) == 0) {
-		g_mutex_unlock (extension->priv->property_lock);
+		g_mutex_unlock (&extension->priv->property_lock);
 		return;
 	}
 
 	g_free (extension->priv->signature_uid);
 	extension->priv->signature_uid = g_strdup (signature_uid);
 
-	g_mutex_unlock (extension->priv->property_lock);
+	g_mutex_unlock (&extension->priv->property_lock);
 
 	g_object_notify (G_OBJECT (extension), "signature-uid");
 }