use the "new" tigert pixmaps rather than the older ones. Includes a

	* message-list.c: use the "new" tigert pixmaps rather than the
	older ones. Includes a "replied to" icon (which is used now), but
	no "deleted" icon (although we have the strikeout renderer for
	that now).

svn path=/trunk/; revision=3295

2 files changed, 27 insertions, 27 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6435cd4861..774883dc31 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -9,6 +9,11 @@
 	(ml_value_at): Use the MESSAGE_STATUS column for read/unread as
 	well as deleted.
 
+	* message-list.c: use the "new" tigert pixmaps rather than the
+	older ones. Includes a "replied to" icon (which is used now), but
+	no "deleted" icon (although we have the strikeout renderer for
+	that now).
+
 2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
 
 	* message-list.c, message-list.h: Added bold for unread messages.
diff --git a/mail/message-list.c b/mail/message-list.c
index 89b5fb7cd4..32e1a8dfc3 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -20,7 +20,11 @@
 #include "widgets/e-table/e-table-header-item.h"
 #include "widgets/e-table/e-table-item.h"
 
-#include "pixmaps.h"
+#include "art/mail-new.xpm"
+#include "art/mail-read.xpm"
+#include "art/mail-replied.xpm"
+#include "art/attachment.xpm"
+#include "art/empty.xpm"
 
 /*
  * Default sizes for the ETable display
@@ -96,7 +100,7 @@ mark_msg_seen (gpointer data)
 	CamelMimeMessage *msg = data;
 	guint32 flags;
 
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (msg), FALSE);
 
 	flags = camel_mime_message_get_flags (msg);
 	camel_mime_message_set_flags (msg, CAMEL_MESSAGE_SEEN,
@@ -208,7 +212,7 @@ ml_value_at (ETableModel *etm, int col, int row, void *data)
 		break;
 		
 	case COL_MESSAGE_STATUS:
-		if (msg_info->flags & CAMEL_MESSAGE_DELETED)
+		if (msg_info->flags & CAMEL_MESSAGE_ANSWERED)
 			retval = GINT_TO_POINTER (2);
 		else if (msg_info->flags & CAMEL_MESSAGE_SEEN)
 			retval = GINT_TO_POINTER (0);
@@ -403,15 +407,12 @@ static struct {
 	char **image_base;
 	GdkPixbuf  *pixbuf;
 } states_pixmaps [] = {
-	{ envelope_opened_xpm,   NULL },
-	{ envelope_closed_xpm,   NULL },
-	{ empty_xpm,             NULL },
-	{ attachment_xpm,        NULL },
-	{ attachment_header_xpm, NULL },
-	{ online_status_xpm,     NULL },
-	{ message_status_xpm,    NULL },
-	{ envelope_deleted_xpm,  NULL },
-	{ NULL,                  NULL },
+	{ mail_new_xpm,		NULL },
+	{ mail_read_xpm,	NULL },
+	{ mail_replied_xpm,	NULL },
+	{ empty_xpm,		NULL },
+	{ attachment_xpm,	NULL },
+	{ NULL,			NULL }
 };
 
 static void
@@ -434,6 +435,8 @@ message_list_init_images (void)
 static void
 message_list_init_renderers (MessageList *message_list)
 {
+	GdkPixbuf *images [3];
+
 	g_assert (message_list);
 	g_assert (message_list->table_model);
 
@@ -453,27 +456,19 @@ message_list_init_renderers (MessageList *message_list)
 	/*
 	 * Message status
 	 */
-	{
-		GdkPixbuf *images [3];
+	images [0] = states_pixmaps [0].pixbuf;
+	images [1] = states_pixmaps [1].pixbuf;
+	images [2] = states_pixmaps [2].pixbuf;
 
-		images [0] = states_pixmaps [0].pixbuf;
-		images [1] = states_pixmaps [1].pixbuf;
-		images [2] = states_pixmaps [7].pixbuf;
-		
-		message_list->render_message_status = e_cell_toggle_new (0, 3, images);
-	}
+	message_list->render_message_status = e_cell_toggle_new (0, 3, images);
 
 	/*
 	 * Attachment
 	 */
-	{
-		GdkPixbuf *images [2];
+	images [0] = states_pixmaps [3].pixbuf;
+	images [1] = states_pixmaps [4].pixbuf;
 
-		images [0] = states_pixmaps [2].pixbuf;
-		images [1] = states_pixmaps [3].pixbuf;
-		
-		message_list->render_attachment = e_cell_toggle_new (0, 2, images);
-	}
+	message_list->render_attachment = e_cell_toggle_new (0, 2, images);
 	
 	/*
 	 * FIXME: We need a real renderer here