aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-06 02:18:38 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:07 +0800
commitf904b972f1b4540a55d2045c122f252f16092c9a (patch)
tree896c51fc206a95d2843c258fd6005e25a656816e
parent13559de0838d5bf42e534ca528ae8befe1b0fe80 (diff)
downloadgsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar.gz
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar.bz2
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar.lz
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar.xz
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.tar.zst
gsoc2013-evolution-f904b972f1b4540a55d2045c122f252f16092c9a.zip
EMFolderTreeModel: Always populate the CamelStore column.
Even in 'Loading...' rows. This way we know the CamelStore is present in all rows, and don't have to test for NULL.
-rw-r--r--mail/em-folder-tree-model.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index c9a020e761..25d3d993e4 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -783,7 +783,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, &sub,
COL_STRING_DISPLAY_NAME, _("Loading..."),
- COL_POINTER_CAMEL_STORE, NULL,
+ COL_POINTER_CAMEL_STORE, si->store,
COL_STRING_FULL_NAME, NULL,
COL_STRING_ICON_NAME, NULL,
COL_BOOL_LOAD_SUBDIRS, FALSE,
@@ -1038,8 +1038,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
si = g_new (EMFolderTreeModelStoreInfo, 1);
si->display_name = g_strdup (display_name);
- g_object_ref (store);
- si->store = store;
+ si->store = g_object_ref (store);
si->account = account;
si->row = gtk_tree_row_reference_copy (reference);
si->full_hash = g_hash_table_new_full (
@@ -1059,7 +1058,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
gtk_tree_store_set (
tree_store, &iter,
COL_STRING_DISPLAY_NAME, _("Loading..."),
- COL_POINTER_CAMEL_STORE, NULL,
+ COL_POINTER_CAMEL_STORE, store,
COL_STRING_FULL_NAME, NULL,
COL_BOOL_LOAD_SUBDIRS, FALSE,
COL_BOOL_IS_STORE, FALSE,