diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-local.c | 4 | ||||
| -rw-r--r-- | mail/message-list.c | 11 |
3 files changed, 9 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 286e3aa1e9..629a6be489 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-08-15 Not Zed <NotZed@Ximian.com> + + * mail-local.c (register_folder_register): Remove operation + registration/etc. Handled by mail-mt.c + + * message-list.c (regen_list_regen): Remove camel operation + registration/etc. + 2001-08-14 Jeffrey Stedfast <fejj@ximian.com> * mail-accounts.c (load_accounts): Convert the UTF-8 account name diff --git a/mail/mail-local.c b/mail/mail-local.c index c3a5e5723f..c32ae707bd 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -480,14 +480,12 @@ register_folder_register(struct _mail_msg *mm) meta = load_metainfo (name); g_free (name); - camel_operation_register (mm->cancel); name = g_strdup_printf ("%s:%s", meta->format, path); store = camel_session_get_store (session, name, &mm->ex); g_free (name); if (!store) { free_metainfo (meta); - camel_operation_unregister (mm->cancel); return; } @@ -498,8 +496,6 @@ register_folder_register(struct _mail_msg *mm) camel_object_unref (CAMEL_OBJECT (store)); free_metainfo (meta); - - camel_operation_unregister(mm->cancel); } static void diff --git a/mail/message-list.c b/mail/message-list.c index 646bfb9246..7f7930c362 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2326,19 +2326,13 @@ regen_list_regen (struct _mail_msg *mm) CamelMessageInfo *info; int i; - camel_operation_register(mm->cancel); - camel_operation_start(mm->cancel, _("Updating message list")); - if (m->search) uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); else uids = camel_folder_get_uids (m->folder); - if (camel_exception_is_set (&mm->ex)) { - camel_operation_end(mm->cancel); - camel_operation_unregister(mm->cancel); + if (camel_exception_is_set (&mm->ex)) return; - } /* perform hiding */ if (m->hideexpr) { @@ -2441,9 +2435,6 @@ regen_list_regen (struct _mail_msg *mm) m->tree = camel_folder_thread_messages_new_summary (m->summary); else m->tree = NULL; - - camel_operation_end(mm->cancel); - camel_operation_unregister(mm->cancel); } static void |