[evolution-patches] fixes for both bug #42118 and #42120

[Jeffrey Stedfast <fejj ximian com>]

http://bugzilla.ximian.com/show_bug.cgi?id=42118
http://bugzilla.ximian.com/show_bug.cgi?id=42120

Eh... read the changelog :-)

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 42118-42120.patch
? accounts.xml
? crash.txt
? evolution-mail-account.schemas
? filter-importer.patch
? mail-account-list.h
? mail-account.c
? mail-account.h
? mail-composer-prefs.patch
? mail-config-hig.patch
? ml-load-save-state.c
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2710
diff -u -r1.2710 ChangeLog
--- ChangeLog	29 Apr 2003 20:23:55 -0000	1.2710
+++ ChangeLog	30 Apr 2003 18:18:38 -0000
@@ -1,3 +1,17 @@
+2003-04-30  Jeffrey Stedfast  <fejj ximian com>
+
+	* message-list.c (ml_tree_value_at): Fixed to return the correct
+	values (swapped) in order to fix bug #42120.
+
+	Make flagging a message only act upon that one flag (ie, don't
+	undelete a msg just because we've changed some other flag).
+
+	* mail-callbacks.c (mark_as_important): Don't undelete the
+	msg. See bug #42118 for details.
+
+	* message-list.c (on_click): Don't undelete a msg when changing
+	other flags. (See pasted irc log in bug #42118 for details).
+
 2003-04-29  Jeffrey Stedfast  <fejj ximian com>
 
 	* importers/netscape-importer.c
Index: mail-callbacks.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-callbacks.c,v
retrieving revision 1.439
diff -u -r1.439 mail-callbacks.c
--- mail-callbacks.c	23 Apr 2003 18:10:45 -0000	1.439
+++ mail-callbacks.c	30 Apr 2003 18:18:40 -0000
@@ -2079,7 +2079,7 @@
 void
 mark_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
 {
-	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_FLAGGED);
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED);
 }
 
 void
Index: message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.338
diff -u -r1.338 message-list.c
--- message-list.c	29 Apr 2003 18:18:36 -0000	1.338
+++ message-list.c	30 Apr 2003 18:18:41 -0000
@@ -902,9 +902,9 @@
 		child = e_tree_model_node_get_first_child(etm, path);
 		if (child && !e_tree_node_is_expanded(message_list->tree, path)) {
 			if (subtree_unread(message_list, child))
-				return (void *)3;
+				return GINT_TO_POINTER (4);
 			else
-				return (void *)4;
+				return GINT_TO_POINTER (3);
 		}
 		
 		if (msg_info->flags & CAMEL_MESSAGE_ANSWERED)
@@ -2275,17 +2275,6 @@
 	info = get_message_info (list, path);
 	if (info == NULL) {
 		return FALSE;
-	}
-	
-	/* If a message was marked as deleted and the user flags it as
-	   important, marks it as needing a reply, marks it as unread,
-	   then undelete the message. */
-	if (info->flags & CAMEL_MESSAGE_DELETED) {		
-		if (col == COL_FLAGGED && !(info->flags & CAMEL_MESSAGE_FLAGGED))
-			flag |= CAMEL_MESSAGE_DELETED;
-		
-		if (col == COL_MESSAGE_STATUS && (info->flags & CAMEL_MESSAGE_SEEN))
-			flag |= CAMEL_MESSAGE_DELETED;
 	}
 	
 	camel_folder_set_message_flags (list->folder, camel_message_info_uid (info), flag, ~info->flags);