diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-11-06 23:20:46 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-11-06 23:21:37 +0800 |
| commit | 704b78d23bf8d707707411608a3453250f2637a1 (patch) | |
| tree | 6bea89936534973c9b467503d198245f5035bc77 /plugins/dbx-import | |
| parent | b6fddaaa0efb8013c526f00926830b9cdcbe0d60 (diff) | |
| download | gsoc2013-evolution-704b78d23bf8d707707411608a3453250f2637a1.tar.gz gsoc2013-evolution-704b78d23bf8d707707411608a3453250f2637a1.tar.zst gsoc2013-evolution-704b78d23bf8d707707411608a3453250f2637a1.zip | |
Replace deprecated GLib symbols (as of GLib 2.34.x)
Diffstat (limited to 'plugins/dbx-import')
| -rw-r--r-- | plugins/dbx-import/dbx-importer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 14799fb583..7f850ae631 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -105,7 +105,7 @@ typedef struct { EImport *import; EImportTarget *target; - GMutex *status_lock; + GMutex status_lock; gchar *status_what; gint status_pc; gint status_timeout_id; @@ -736,7 +736,7 @@ static void dbx_import_free (DbxImporter *m) { 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; @@ -764,11 +764,11 @@ dbx_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, @@ -786,11 +786,11 @@ dbx_status (CamelOperation *op, { DbxImporter *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); } /* Start the main import operation */ @@ -813,7 +813,7 @@ org_gnome_evolution_readdbx_import (EImport *ei, m->status_timeout_id = g_timeout_add (100, dbx_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 ( |