diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 11:16:38 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 11:48:02 +0800 |
commit | 5310e4a0b10ded4c77ce9dfaff49d3e99e327462 (patch) | |
tree | b29d85e7bb2e7b3e772859fa7e0e2ff9ab33846e /mail/importers | |
parent | 47d25995c5ca78ff530ce6a23faebf6547898e8e (diff) | |
download | gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.gz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.bz2 gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.lz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.xz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.zst gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.zip |
Adapt to CamelOperation API changes.
Diffstat (limited to 'mail/importers')
-rw-r--r-- | mail/importers/elm-importer.c | 13 | ||||
-rw-r--r-- | mail/importers/evolution-mbox-importer.c | 13 | ||||
-rw-r--r-- | mail/importers/mail-importer.c | 14 | ||||
-rw-r--r-- | mail/importers/pine-importer.c | 13 |
4 files changed, 23 insertions, 30 deletions
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 80d4c474bc..e6afc2bbac 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -219,7 +219,7 @@ elm_import_done (struct _elm_import_msg *m) static void elm_import_free (struct _elm_import_msg *m) { - camel_operation_unref (m->status); + g_object_unref (m->status); g_free (m->status_what); g_mutex_free (m->status_lock); @@ -235,11 +235,6 @@ elm_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _elm_import_msg *importer = data; - if (pc == CAMEL_OPERATION_START) - pc = 0; - else if (pc == CAMEL_OPERATION_END) - pc = 100; - g_mutex_lock (importer->status_lock); g_free (importer->status_what); importer->status_what = g_strdup (what); @@ -288,7 +283,11 @@ mail_importer_elm_import (EImport *ei, EImportTarget *target) m->target = (EImportTargetHome *)target; m->status_timeout_id = g_timeout_add (100, elm_status_timeout, m); m->status_lock = g_mutex_new (); - m->status = camel_operation_new (elm_status, m); + m->status = camel_operation_new (); + + g_signal_connect ( + m->status, "status", + G_CALLBACK (elm_status), m); id = m->base.seq; diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index affebd74b6..51d8796648 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -171,11 +171,6 @@ mbox_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) { MboxImporter *importer = data; - if (pc == CAMEL_OPERATION_START) - pc = 0; - else if (pc == CAMEL_OPERATION_END) - pc = 100; - g_mutex_lock (importer->status_lock); g_free (importer->status_what); importer->status_what = g_strdup (what); @@ -211,7 +206,7 @@ mbox_import_done (gpointer data, GError **error) g_source_remove (importer->status_timeout_id); g_free (importer->status_what); g_mutex_free (importer->status_lock); - camel_operation_unref (importer->cancel); + g_object_unref (importer->cancel); e_import_complete (importer->import, importer->target); g_free (importer); @@ -231,7 +226,11 @@ mbox_import (EImport *ei, EImportTarget *target, EImportImporter *im) importer->target = target; importer->status_lock = g_mutex_new (); importer->status_timeout_id = g_timeout_add (100, mbox_status_timeout, importer); - importer->cancel = camel_operation_new (mbox_status, importer); + importer->cancel = camel_operation_new (); + + g_signal_connect ( + importer->cancel, "status", + G_CALLBACK (mbox_status), importer); filename = g_filename_from_uri (((EImportTargetURI *)target)->uri_src, NULL, NULL); mail_importer_import_mbox ( diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index d00725533a..ddc9f66300 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -215,7 +215,7 @@ static void import_mbox_free (struct _import_mbox_msg *m) { if (m->cancel) - camel_operation_unref (m->cancel); + g_object_unref (m->cancel); g_free (m->uri); g_free (m->path); } @@ -239,10 +239,8 @@ mail_importer_import_mbox (const gchar *path, const gchar *folderuri, CamelOpera m->uri = g_strdup (folderuri); m->done = done; m->done_data = data; - if (cancel) { - m->cancel = cancel; - camel_operation_ref (cancel); - } + if (cancel) + m->cancel = g_object_ref (cancel); id = m->base.seq; mail_msg_fast_ordered_push (m); @@ -258,10 +256,8 @@ mail_importer_import_mbox_sync (const gchar *path, const gchar *folderuri, Camel m = mail_msg_new (&import_mbox_info); m->path = g_strdup (path); m->uri = g_strdup (folderuri); - if (cancel) { - m->cancel = cancel; - camel_operation_ref (cancel); - } + if (cancel) + m->cancel = g_object_ref (cancel); import_mbox_exec (m); import_mbox_done (m); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index c2c0ec22d7..4a7397c953 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -264,7 +264,7 @@ pine_import_done (struct _pine_import_msg *m) static void pine_import_free (struct _pine_import_msg *m) { - camel_operation_unref (m->status); + g_object_unref (m->status); g_free (m->status_what); g_mutex_free (m->status_lock); @@ -283,11 +283,6 @@ pine_status (CamelOperation *op, { struct _pine_import_msg *importer = data; - if (pc == CAMEL_OPERATION_START) - pc = 0; - else if (pc == CAMEL_OPERATION_END) - pc = 100; - g_mutex_lock (importer->status_lock); g_free (importer->status_what); importer->status_what = g_strdup (what); @@ -339,7 +334,11 @@ mail_importer_pine_import (EImport *ei, m->status_timeout_id = g_timeout_add ( 100, (GSourceFunc) pine_status_timeout, m); m->status_lock = g_mutex_new (); - m->status = camel_operation_new (pine_status, m); + m->status = camel_operation_new (); + + g_signal_connect ( + m->status, "status", + G_CALLBACK (pine_status), m); id = m->base.seq; |