aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-06-29 18:05:54 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-06-29 18:05:54 +0800
commit0535daf02ac298b224e43c3584051f21053cb05f (patch)
treeab0b1ccef1cdac94009ead4f7339789ad604c3d1
parentbe9d78b480acdc44a88c9c00f021fe96bf4db442 (diff)
downloadgsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar.gz
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar.bz2
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar.lz
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar.xz
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.tar.zst
gsoc2013-evolution-0535daf02ac298b224e43c3584051f21053cb05f.zip
call folder_subscribed directly from the async function not
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. svn path=/trunk/; revision=26547
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-tree-model.c4
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;