aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-06-23 05:39:57 +0800
committerChris Lahey <clahey@src.gnome.org>2000-06-23 05:39:57 +0800
commit8e54fc772c7e30ccb943ccdb57ffb02099bd29ae (patch)
treeb20dccbe01cdc23ed856eb7dda6e794e2f222eb3 /mail
parentced77ebe056db95f5e613bc7d9ce4a8d0d5f95dc (diff)
downloadgsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar.gz
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar.bz2
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar.lz
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar.xz
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.tar.zst
gsoc2013-evolution-8e54fc772c7e30ccb943ccdb57ffb02099bd29ae.zip
Changed ml_value_at to return "" instead of NULL in some cases.
2000-06-22 Christopher James Lahey <clahey@helixcode.com> * message-list.c: Changed ml_value_at to return "" instead of NULL in some cases. svn path=/trunk/; revision=3697
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/message-list.c28
2 files changed, 29 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4196976789..e8c0461cb0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-22 Christopher James Lahey <clahey@helixcode.com>
+
+ * message-list.c: Changed ml_value_at to return "" instead of NULL
+ in some cases.
+
2000-06-22 Peter Williams <peterw@curious-george.helixcode.com>
* Makefile.am: Add GNOME_EXTRA_LIBS so that we get libgthread
in our LIBS for evolution-mail.
diff --git a/mail/message-list.c b/mail/message-list.c
index 02fd55bce7..2cb8e1d363 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -279,7 +279,10 @@ ml_value_at (ETableModel *etm, int col, int row, void *data)
break;
case COL_TO:
- retval = msg_info->to;
+ if (msg_info->to)
+ retval = msg_info->to;
+ else
+ retval = "";
break;
case COL_SIZE:
@@ -307,10 +310,27 @@ ml_value_at (ETableModel *etm, int col, int row, void *data)
* in the case there is nothing to look at,
* notify the user.
*/
- if (col == COL_SUBJECT)
+ switch (col){
+ case COL_ONLINE_STATUS:
+ case COL_MESSAGE_STATUS:
+ case COL_PRIORITY:
+ case COL_ATTACHMENT:
+ case COL_DELETED:
+ case COL_UNREAD:
+ case COL_SENT:
+ case COL_RECEIVED:
+ return (void *) 0;
+
+ case COL_SUBJECT:
return "No item in this view";
- else
- return NULL;
+ case COL_FROM:
+ case COL_TO:
+ case COL_SIZE:
+ return "";
+ default:
+ g_assert_not_reached ();
+ return NULL;
+ }
}
static void