diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2007-12-21 01:58:09 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-12-21 01:58:09 +0800 |
commit | 538be0680e04babfa4a42132e8c6188c4b23efa2 (patch) | |
tree | c73a9f317d0c392fd397f68908d0a49e2398ae37 /mail/importers/elm-importer.c | |
parent | c4edfbcd4477ae7e136537bf11d337da1c7ebfdb (diff) | |
download | gsoc2013-evolution-538be0680e04babfa4a42132e8c6188c4b23efa2.tar.gz gsoc2013-evolution-538be0680e04babfa4a42132e8c6188c4b23efa2.tar.zst gsoc2013-evolution-538be0680e04babfa4a42132e8c6188c4b23efa2.zip |
** Fixes bug #362638
2007-12-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #362638
* calendar/gui/alarm-notify/alarm-notify.c:
* calendar/gui/alarm-notify/alarm-notify.h:
* calendar/gui/alarm-notify/alarm-queue.c:
Rewrite message passing to use GThreadPool instead of EThread.
* mail/mail-mt.h:
Overhaul the message passing API:
- Define a MailMsg type as the base message struct.
- Define types for the various callback functions.
- Add a priority value to each message (not yet used).
- Add a reference count to each message.
- Define a MailMsgInfo type for the virtual function table.
- Record the size of message sub-types in MailMsgInfo.
- New/changed functions:
mail_msg_new() - Easier to use.
mail_msg_ref() - Increase reference count.
mail_msg_unref() - Decrease reference count.
mail_msg_main_loop_push() }
mail_msg_unordered_push() } Submit MailMsgs to various
mail_msg_fast_ordered_push() } message-processing threads.
mail_msg_slow_ordered_push() }
* mail/mail-mt.c (mail_msg_new):
Use GSlice for memory allocation.
* mail/mail-mt.c (mail_msg_ref), (mail_msg_unref):
New functions increment/decrement a MailMsg's reference count.
* mail/mail-mt.c (mail_cancel_hood_add), (mail_cancel_hook_remove):
Convert the 'cancel_hook_list' from an EDList to a GHookList and
modify the API accordingly.
* mail/mail-mt.c:
Use GThreadPools instead of EThreads.
Use GAsyncQueues instead of EMsgPorts.
* mail/em-composer-utils.c:
* mail/em-folder-browser.c:
* mail/em-folder-properties.c:
* mail/em-folder-tree.c:
* mail/em-folder-utils.c:
* mail/em-folder-view.c:
* mail/em-format-html-print.c:
* mail/em-format-html.c:
* mail/em-subscribe-editor.c:
* mail/em-sync-stream.c:
* mail/importers/elm-importer.c:
* mail/importers/mail-importer.c:
* mail/importers/pine-importer.c:
* mail/mail-component.c:
* mail/mail-folder-cache.c:
* mail/mail-mt.c:
* mail/mail-ops.c:
* mail/mail-ops.h:
* mail/mail-send-recv.c:
* mail/mail-session.c:
* mail/mail-vfolder.c:
* mail/message-list.c:
* plugins/folder-unsubscribe/folder-unsubscribe.c:
* plugins/groupwise-features/share-folder-common.c:
* plugins/exchange-operations/exchange-folder.c:
* plugins/mark-all-read/mark-all-read.c:
* plugins/mailing-list-actions/mailing-list-actions.c:
* plugins/itip-formatter/itip-formatter.c:
* plugins/save-attachments/save-attachments.c:
Use the new MailMsg API for messages.
svn path=/trunk/; revision=34730
Diffstat (limited to 'mail/importers/elm-importer.c')
-rw-r--r-- | mail/importers/elm-importer.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 1fafedc0a2..b65ffe420f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -51,7 +51,7 @@ #define d(x) x struct _elm_import_msg { - struct _mail_msg msg; + MailMsg base; EImport *import; EImportTargetHome *target; @@ -178,8 +178,8 @@ elm_supported(EImport *ei, EImportTarget *target, EImportImporter *im) return mailexists; } -static char * -elm_import_describe (struct _mail_msg *mm, int complete) +static gchar * +elm_import_desc (struct _elm_import_msg *m) { return g_strdup (_("Importing Elm data")); } @@ -190,9 +190,8 @@ static MailImporterSpecial elm_special_folders[] = { }; static void -elm_import_import(struct _mail_msg *mm) +elm_import_exec (struct _elm_import_msg *m) { - struct _elm_import_msg *m = (struct _elm_import_msg *) mm; const char *maildir; char *elmdir; @@ -210,13 +209,11 @@ elm_import_import(struct _mail_msg *mm) } static void -elm_import_imported(struct _mail_msg *mm) +elm_import_done(struct _elm_import_msg *m) { - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - printf("importing complete\n"); - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { GConfClient *gconf; gconf = gconf_client_get_default(); @@ -228,10 +225,8 @@ elm_import_imported(struct _mail_msg *mm) } static void -elm_import_free(struct _mail_msg *mm) +elm_import_free(struct _elm_import_msg *m) { - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - camel_operation_unref(m->status); g_free(m->status_what); @@ -280,11 +275,12 @@ elm_status_timeout(void *data) return TRUE; } -static struct _mail_msg_op elm_import_op = { - elm_import_describe, - elm_import_import, - elm_import_imported, - elm_import_free, +static MailMsgInfo elm_import_info = { + sizeof (struct _elm_import_msg), + (MailMsgDescFunc) elm_import_desc, + (MailMsgExecFunc) elm_import_exec, + (MailMsgDoneFunc) elm_import_done, + (MailMsgFreeFunc) elm_import_free }; static int @@ -293,7 +289,7 @@ mail_importer_elm_import(EImport *ei, EImportTarget *target) struct _elm_import_msg *m; int id; - m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); + m = mail_msg_new(&elm_import_info); g_datalist_set_data(&target->data, "elm-msg", m); m->import = ei; g_object_ref(m->import); @@ -302,9 +298,9 @@ mail_importer_elm_import(EImport *ei, EImportTarget *target) m->status_lock = g_mutex_new(); m->status = camel_operation_new(elm_status, m); - id = m->msg.seq; + id = m->base.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); return id; } |