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

3 files changed, 21 insertions, 21 deletions

diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 5b555cb1c7..02d29f5394 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -51,7 +51,7 @@ struct _elm_import_msg {
 	EImport *import;
 	EImportTargetHome *target;
 
-	GMutex *status_lock;
+	GMutex status_lock;
 	gchar *status_what;
 	gint status_pc;
 	gint status_timeout_id;
@@ -228,7 +228,7 @@ elm_import_free (struct _elm_import_msg *m)
 	g_object_unref (m->status);
 
 	g_free (m->status_what);
-	g_mutex_free (m->status_lock);
+	g_mutex_clear (&m->status_lock);
 
 	g_source_remove (m->status_timeout_id);
 	m->status_timeout_id = 0;
@@ -244,11 +244,11 @@ elm_status (CamelOperation *op,
 {
 	struct _elm_import_msg *importer = data;
 
-	g_mutex_lock (importer->status_lock);
+	g_mutex_lock (&importer->status_lock);
 	g_free (importer->status_what);
 	importer->status_what = g_strdup (what);
 	importer->status_pc = pc;
-	g_mutex_unlock (importer->status_lock);
+	g_mutex_unlock (&importer->status_lock);
 }
 
 static gboolean
@@ -259,11 +259,11 @@ elm_status_timeout (gpointer data)
 	gchar *what;
 
 	if (importer->status_what) {
-		g_mutex_lock (importer->status_lock);
+		g_mutex_lock (&importer->status_lock);
 		what = importer->status_what;
 		importer->status_what = NULL;
 		pc = importer->status_pc;
-		g_mutex_unlock (importer->status_lock);
+		g_mutex_unlock (&importer->status_lock);
 
 		e_import_status (
 			importer->import, (EImportTarget *)
@@ -294,7 +294,7 @@ mail_importer_elm_import (EImport *ei,
 	g_object_ref (m->import);
 	m->target = (EImportTargetHome *) target;
 	m->status_timeout_id = g_timeout_add (100, elm_status_timeout, m);
-	m->status_lock = g_mutex_new ();
+	g_mutex_init (&m->status_lock);
 	m->status = camel_operation_new ();
 
 	g_signal_connect (
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index a024729bc2..0f1e507f2c 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -59,7 +59,7 @@ typedef struct {
 	EImport *import;
 	EImportTarget *target;
 
-	GMutex *status_lock;
+	GMutex status_lock;
 	gchar *status_what;
 	gint status_pc;
 	gint status_timeout_id;
@@ -207,11 +207,11 @@ mbox_status (CamelOperation *op,
 {
 	MboxImporter *importer = data;
 
-	g_mutex_lock (importer->status_lock);
+	g_mutex_lock (&importer->status_lock);
 	g_free (importer->status_what);
 	importer->status_what = g_strdup (what);
 	importer->status_pc = pc;
-	g_mutex_unlock (importer->status_lock);
+	g_mutex_unlock (&importer->status_lock);
 }
 
 static gboolean
@@ -222,11 +222,11 @@ mbox_status_timeout (gpointer data)
 	gchar *what;
 
 	if (importer->status_what) {
-		g_mutex_lock (importer->status_lock);
+		g_mutex_lock (&importer->status_lock);
 		what = importer->status_what;
 		importer->status_what = NULL;
 		pc = importer->status_pc;
-		g_mutex_unlock (importer->status_lock);
+		g_mutex_unlock (&importer->status_lock);
 
 		e_import_status (
 			importer->import, (EImportTarget *)
@@ -244,7 +244,7 @@ mbox_import_done (gpointer data,
 
 	g_source_remove (importer->status_timeout_id);
 	g_free (importer->status_what);
-	g_mutex_free (importer->status_lock);
+	g_mutex_clear (&importer->status_lock);
 	g_object_unref (importer->cancellable);
 
 	e_import_complete (importer->import, importer->target);
@@ -275,7 +275,7 @@ mbox_import (EImport *ei,
 	g_datalist_set_data (&target->data, "mbox-data", importer);
 	importer->import = ei;
 	importer->target = target;
-	importer->status_lock = g_mutex_new ();
+	g_mutex_init (&importer->status_lock);
 	importer->status_timeout_id = g_timeout_add (100, mbox_status_timeout, importer);
 	importer->cancellable = camel_operation_new ();
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 664a77bcba..c8904c4e0b 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -53,7 +53,7 @@ struct _pine_import_msg {
 	EImport *import;
 	EImportTarget *target;
 
-	GMutex *status_lock;
+	GMutex status_lock;
 	gchar *status_what;
 	gint status_pc;
 	gint status_timeout_id;
@@ -298,7 +298,7 @@ pine_import_free (struct _pine_import_msg *m)
 	g_object_unref (m->cancellable);
 
 	g_free (m->status_what);
-	g_mutex_free (m->status_lock);
+	g_mutex_clear (&m->status_lock);
 
 	g_source_remove (m->status_timeout_id);
 	m->status_timeout_id = 0;
@@ -314,11 +314,11 @@ pine_status (CamelOperation *op,
 {
 	struct _pine_import_msg *importer = data;
 
-	g_mutex_lock (importer->status_lock);
+	g_mutex_lock (&importer->status_lock);
 	g_free (importer->status_what);
 	importer->status_what = g_strdup (what);
 	importer->status_pc = pc;
-	g_mutex_unlock (importer->status_lock);
+	g_mutex_unlock (&importer->status_lock);
 }
 
 static gboolean
@@ -328,11 +328,11 @@ pine_status_timeout (struct _pine_import_msg *importer)
 	gchar *what;
 
 	if (importer->status_what) {
-		g_mutex_lock (importer->status_lock);
+		g_mutex_lock (&importer->status_lock);
 		what = importer->status_what;
 		importer->status_what = NULL;
 		pc = importer->status_pc;
-		g_mutex_unlock (importer->status_lock);
+		g_mutex_unlock (&importer->status_lock);
 
 		e_import_status (
 			importer->import, (EImportTarget *)
@@ -364,7 +364,7 @@ mail_importer_pine_import (EImport *ei,
 	m->target = target;
 	m->status_timeout_id = g_timeout_add (
 		100, (GSourceFunc) pine_status_timeout, m);
-	m->status_lock = g_mutex_new ();
+	g_mutex_init (&m->status_lock);
 	m->cancellable = camel_operation_new ();
 
 	g_signal_connect (