? current.diff
? everything.diff
? addressbook/backend/ebook/evolution-gnomecard-importer
? doc/devel/calendar/cal-client/evolution-cal-client-scan.c
? doc/devel/calendar/cal-util/evolution-cal-util-scan.c
? doc/devel/calendar/cal-util/evolution-cal-util-unused.txt
? tools/temp-30608-libs-verifier
Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.200
diff -u -r1.200 message-list.c
--- mail/message-list.c	2001/01/12 22:48:31	1.200
+++ mail/message-list.c	2001/01/13 01:21:30
@@ -127,6 +127,9 @@
 	{ mail_new_xpm,		NULL },
 	{ mail_read_xpm,	NULL },
 	{ mail_replied_xpm,	NULL },
+/* FIXME: Replace these with pixmaps for multiple_read and multiple_unread */
+    	{ mail_new_xpm,		NULL },
+    	{ mail_read_xpm,	NULL },
 	{ empty_xpm,		NULL },
 	{ attachment_xpm,	NULL },
 	{ priority_high_xpm,	NULL },
@@ -599,6 +602,12 @@
 		case 2:
 			return g_strdup (_("Answered"));
 			break;
+		case 3:
+			return g_strdup (_("Multiple Unseen Messages"));
+			break;
+		case 4:
+			return g_strdup (_("Multiple Messages"));
+			break;
 		default:
 			return g_strdup ("");
 			break;
@@ -868,6 +877,9 @@
 		return (void *)subtree_unread(message_list, e_tree_model_node_get_first_child(etm, path));
 
 	case COL_MESSAGE_STATUS:
+		/* The same applies as for COL_UNREAD just above */
+		return GINT_TO_POINTER(subtree_unread(message_list, e_tree_model_node_get_first_child(etm,path))?3:4);
+
 	case COL_FLAGGED:
 	case COL_SCORE:
 	case COL_ATTACHMENT:
@@ -1028,28 +1040,28 @@
 
 	extras = e_table_extras_new();
 	e_table_extras_add_pixbuf(extras, "status", states_pixmaps [0].pixbuf);
-	e_table_extras_add_pixbuf(extras, "score", states_pixmaps [11].pixbuf);
-	e_table_extras_add_pixbuf(extras, "attachment", states_pixmaps [4].pixbuf);
-	e_table_extras_add_pixbuf(extras, "flagged", states_pixmaps [5].pixbuf);
+	e_table_extras_add_pixbuf(extras, "score", states_pixmaps [13].pixbuf);
+	e_table_extras_add_pixbuf(extras, "attachment", states_pixmaps [6].pixbuf);
+	e_table_extras_add_pixbuf(extras, "flagged", states_pixmaps [7].pixbuf);
 	
 	e_table_extras_add_compare(extras, "address_compare", address_compare);
 	e_table_extras_add_compare(extras, "subject_compare", subject_compare);
 	
-	for (i = 0; i < 3; i++)
+	for (i = 0; i < 5; i++)
 		images [i] = states_pixmaps [i].pixbuf;
-	
-	e_table_extras_add_cell(extras, "render_message_status", e_cell_toggle_new (0, 3, images));
+
+	e_table_extras_add_cell(extras, "render_message_status", e_cell_toggle_new (0, 5, images));
 
 	for (i = 0; i < 2; i++)
-		images [i] = states_pixmaps [i + 3].pixbuf;
+		images [i] = states_pixmaps [i + 5].pixbuf;
 	
 	e_table_extras_add_cell(extras, "render_attachment", e_cell_toggle_new (0, 2, images));
 	
-	images [1] = states_pixmaps [5].pixbuf;
+	images [1] = states_pixmaps [7].pixbuf;
 	e_table_extras_add_cell(extras, "render_flagged", e_cell_toggle_new (0, 2, images));
 
 	for (i = 0; i < 7; i++)
-		images[i] = states_pixmaps [i + 5].pixbuf;
+		images[i] = states_pixmaps [i + 7].pixbuf;
 	
 	e_table_extras_add_cell(extras, "render_score", e_cell_toggle_new (0, 7, images));