aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-12-11 03:24:30 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-12-11 03:24:30 +0800
commitefc4798ec9777af1d5ebd49434bae27093b2e158 (patch)
tree55b820d30482ac842a1b15c5a1084240499675a1 /mail
parentac71e9d8f34c61804a3e37c57b5c9dfc56e62029 (diff)
downloadgsoc2013-evolution-efc4798ec9777af1d5ebd49434bae27093b2e158.tar.gz
gsoc2013-evolution-efc4798ec9777af1d5ebd49434bae27093b2e158.tar.zst
gsoc2013-evolution-efc4798ec9777af1d5ebd49434bae27093b2e158.zip
Add INFO_FAST here as we don't need it to get unread counts.
2003-12-10 Jeffrey Stedfast <fejj@ximian.com> * em-folder-tree.c (em_folder_tree_set_selected): Add INFO_FAST here as we don't need it to get unread counts. (tree_row_expanded): Here too. * em-folder-tree-model.c (em_folder_tree_model_set_folder_info): Check CAMEL_FOLDER_NOCHILDREN. svn path=/trunk/; revision=23912
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-folder-tree-model.c3
-rw-r--r--mail/em-folder-tree.c4
3 files changed, 14 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 81780aa030..c64f413bf8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,16 @@
2003-12-10 Jeffrey Stedfast <fejj@ximian.com>
+ * em-folder-tree.c (em_folder_tree_set_selected): Add INFO_FAST
+ here as we don't need it to get unread counts.
+ (tree_row_expanded): Here too.
+
+ * em-folder-tree-model.c (em_folder_tree_model_set_folder_info):
+ Check CAMEL_FOLDER_NOCHILDREN.
+
+2003-12-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ Fixes bug #51045
+
* mail-folder-cache.c (real_flush_updates): Update the unread
count in the model if the folder got new mail.
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e7a766cc61..fdbf7ab93b 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -734,8 +734,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite
GtkTreeIter sub;
gboolean load;
- /* Note CAMEL_FOLDER_CHILDREN is only advisory, so we don't check it */
- load = fi->child == NULL && !(fi->flags & CAMEL_FOLDER_NOINFERIORS);
+ load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
path = gtk_tree_model_get_path ((GtkTreeModel *) model, iter);
uri_row = gtk_tree_row_reference_new ((GtkTreeModel *) model, path);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index db3f8219f9..e3b6aaa5f2 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -732,7 +732,7 @@ tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *tree_p
m->store = store;
m->emft = emft;
m->top = g_strdup (top);
- m->flags = 0;
+ m->flags = CAMEL_STORE_FOLDER_INFO_FAST;
m->select_uri = NULL;
e_thread_put (mail_thread_new, (EMsg *) m);
@@ -1648,7 +1648,7 @@ em_folder_tree_set_selected (EMFolderTree *emft, const char *uri)
m->store = store;
m->emft = emft;
m->top = top ? g_strdup (top) : NULL;
- m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
+ m->flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE;
m->select_uri = g_strdup (uri);
g_free (path);