aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-06-02 02:12:34 +0800
committerMilan Crha <mcrha@redhat.com>2009-06-02 02:12:34 +0800
commit8079db6e4695e37c2b7777e61d6e657e7eadc564 (patch)
tree05ebba3a5dee0c1bcd975ba4315810cf4dd98d36
parent700dad871baf9ff39e6e66511856486f75a777cf (diff)
downloadgsoc2013-evolution-8079db6e4695e37c2b7777e61d6e657e7eadc564.tar.gz
gsoc2013-evolution-8079db6e4695e37c2b7777e61d6e657e7eadc564.tar.zst
gsoc2013-evolution-8079db6e4695e37c2b7777e61d6e657e7eadc564.zip
Bug #337082 - Do not produce unnamed folders in a folder tree
-rw-r--r--mail/em-folder-tree.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 25c7809c54..182a40df36 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1775,9 +1775,12 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m)
gint fully_loaded = (m->flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) ? TRUE : FALSE;
do {
- em_folder_tree_model_set_folder_info (priv->model, &iter, si, fi, fully_loaded);
+ gboolean known = g_hash_table_lookup (si->full_hash, fi->full_name) != NULL;
- if ((fi = fi->next) != NULL)
+ if (!known)
+ em_folder_tree_model_set_folder_info (priv->model, &iter, si, fi, fully_loaded);
+
+ if ((fi = fi->next) != NULL && !known)
gtk_tree_store_append (model, &iter, &root);
} while (fi != NULL);
}
@@ -1863,8 +1866,7 @@ emft_tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *t
return;
}
- /* do not set LOAD_SUBDIRS to FALSE until we are really done with loading */
- /* gtk_tree_store_set ((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); */
+ gtk_tree_store_set ((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1);
m = mail_msg_new (&get_folder_info_info);
m->root = gtk_tree_row_reference_new (model, tree_path);