diff options
Diffstat (limited to 'plugins/pst-import/pst-importer.c')
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 205bfff333..958b374ebc 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -109,7 +109,7 @@ struct _PstImporter { EImportTarget *target; gint waiting_open; - GMutex *status_lock; + GMutex status_lock; gchar *status_what; gint status_pc; gint status_timeout_id; @@ -2098,7 +2098,7 @@ pst_import_free (PstImporter *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; @@ -2125,11 +2125,11 @@ pst_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->target->import, (EImportTarget *) importer->target, what, pc); } @@ -2145,11 +2145,11 @@ pst_status (CamelOperation *op, { PstImporter *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 void @@ -2175,7 +2175,7 @@ pst_import (EImport *ei, m->status_timeout_id = g_timeout_add (100, pst_status_timeout, m); /*m->status_timeout_id = NULL;*/ - m->status_lock = g_mutex_new (); + g_mutex_init (&m->status_lock); m->cancellable = camel_operation_new (); g_signal_connect ( |