aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2002-04-03 05:26:39 +0800
committerChris Lahey <clahey@src.gnome.org>2002-04-03 05:26:39 +0800
commit0998e3317ac86e7544f2a5d669b46de85e14ec90 (patch)
treeb3e0d90f6bdc8c0edb92872890af83e34b97a558 /shell
parent4431711f558959af523b5b8c0e3a127f56a43688 (diff)
downloadgsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar.gz
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar.bz2
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar.lz
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar.xz
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.tar.zst
gsoc2013-evolution-0998e3317ac86e7544f2a5d669b46de85e14ec90.zip
If folder is NULL, return the correct type of data.
2002-04-02 Christopher James Lahey <clahey@ximian.com> * e-storage-set-view.c (etree_value_at): If folder is NULL, return the correct type of data. svn path=/trunk/; revision=16325
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-storage-set-view.c6
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,5 +1,10 @@
2002-04-02 Christopher James Lahey <clahey@ximian.com>
+ * e-storage-set-view.c (etree_value_at): If folder is NULL, return
+ the correct type of data.
+
+2002-04-02 Christopher James Lahey <clahey@ximian.com>
+
* Makefile.am (etspec_DATA): Added
e-storage-set-view-checkboxes.etstate and
e-storage-set-view-no-checkboxes.etstate here.
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. */