diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
| commit | cea054cd54d84479352a43bbabc19c9ce9af5efb (patch) | |
| tree | ba02763209ba0f22989024004f57689071603ec5 /mail/em-folder-tree-model.c | |
| parent | 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff) | |
| download | gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip | |
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'mail/em-folder-tree-model.c')
| -rw-r--r-- | mail/em-folder-tree-model.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index ce6e15a851..eb6191199e 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -448,6 +448,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite const char *name; guint32 flags; + /* make sure we don't already know about it? */ + if (g_hash_table_lookup (si->full_hash, fi->full_name)) + return; + if (!fully_loaded) load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS)); @@ -878,8 +882,9 @@ em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *st if (!(si = g_hash_table_lookup (model->store_hash, store))) return; - g_hash_table_remove (model->store_hash, si->store); g_hash_table_remove (model->account_hash, si->account); + /* store_hash owns and frees the si structure, thus free it after done with it */ + g_hash_table_remove (model->store_hash, si->store); } |