From 0998e3317ac86e7544f2a5d669b46de85e14ec90 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 2 Apr 2002 21:26:39 +0000 Subject: If folder is NULL, return the correct type of data. 2002-04-02 Christopher James Lahey * e-storage-set-view.c (etree_value_at): If folder is NULL, return the correct type of data. svn path=/trunk/; revision=16325 --- shell/ChangeLog | 5 +++++ shell/e-storage-set-view.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 017a03ba4a..c6f1d93066 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2002-04-02 Christopher James Lahey + + * e-storage-set-view.c (etree_value_at): If folder is NULL, return + the correct type of data. + 2002-04-02 Christopher James Lahey * Makefile.am (etspec_DATA): Added diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 0cd18f0102..8ac770e983 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -1452,11 +1452,11 @@ etree_value_at (ETreeModel *etree, path = (char *) e_tree_memory_node_get_data (E_TREE_MEMORY(etree), tree_path); folder = e_storage_set_get_folder (storage_set, path); - if (folder == NULL) - return (void *) "?"; switch (col) { case 0: /* Title */ + if (folder == NULL) + return (void *) "?"; folder_name = e_folder_get_name (folder); unread_count = e_folder_get_unread_count (folder); @@ -1473,6 +1473,8 @@ etree_value_at (ETreeModel *etree, } else return (void *) folder_name; case 1: /* bold */ + if (folder == NULL) + return (void *) FALSE; return (void *) e_folder_get_highlighted (folder); case 2: /* checkbox */ return (void *) FALSE; /* FIXME: Yo danw, here's the whatnot, ya know. */ -- cgit v1.2.3