diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-folder-tree-model.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 710208c5b4..4edbcfafe5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2004-06-29 Not Zed <NotZed@Ximian.com> + * em-folder-tree-model.c (folder_created_cb): call + folder_subscribed directly from the async function not + foldre_subscribed_cb, otherwise we run out of order. Part of + #60775. + * em-vfolder-rule.c (source_add): setup exclusion for vfolder sources, noselect folders. Bug #60794. diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 70a058970f..1c94f2c8c3 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -634,7 +634,7 @@ folder_created_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model camel_object_ref (store); fi = camel_folder_info_clone (event_data); - mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) folder_subscribed_cb, store, fi, model); + mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) folder_subscribed, store, fi, model); } static void @@ -659,7 +659,7 @@ folder_renamed (CamelStore *store, CamelRenameInfo *info, EMFolderTreeModel *mod GtkTreeIter root, iter; GtkTreePath *path; char *parent, *p; - + if (!(si = g_hash_table_lookup (model->store_hash, store))) goto done; |