diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-06-02 02:12:34 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-02 22:37:30 +0800 |
| commit | c0a53378bac8827c19cb0dc345c9d939279f64b7 (patch) | |
| tree | fe0c6776f18f8b180bca92dc4f1695d76d34e9a4 | |
| parent | 433eac7844481b8ceda0bae8bf08f6bb623185b0 (diff) | |
| download | gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar.gz gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar.bz2 gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar.lz gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar.xz gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.tar.zst gsoc2013-evolution-c0a53378bac8827c19cb0dc345c9d939279f64b7.zip | |
Bug #337082 - Do not produce unnamed folders in a folder tree
| -rw-r--r-- | mail/em-folder-tree.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 65fdf8f726..e6abb53c9a 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1831,9 +1831,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); } @@ -1919,8 +1922,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); |