[evolution-patches] select thread not updating menu's

[Not Zed <notzed ximian com>]

changelog entry says it all - boy that one routine is a mess



Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3611
diff -u -p -r1.3611 ChangeLog
--- mail/ChangeLog	30 Mar 2005 07:57:45 -0000	1.3611
+++ mail/ChangeLog	31 Mar 2005 08:54:32 -0000
@@ -1,3 +1,9 @@
+2005-03-31  Not Zed  <NotZed Ximian com>
+
+	* message-list.c (on_selection_changed_cmd): only noop if we only
+	have 1 message selected, otherwise we don't update the menu's.
+	Fixes a problem introduced by 64987's fix.
+
 2005-03-30  Li Yuan  <li yuan sun com>
 
 	* em-account-prefs.c: (em_account_prefs_treeview_new):
Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.413
diff -u -p -r1.413 message-list.c
--- mail/message-list.c	11 Mar 2005 01:27:27 -0000	1.413
+++ mail/message-list.c	31 Mar 2005 08:54:35 -0000
@@ -2881,7 +2881,7 @@ on_cursor_activated_idle (gpointer data)
 	MessageList *message_list = data;
 	ESelectionModel *esm = e_tree_get_selection_model (message_list->tree);
 	int selected = e_selection_model_selected_count (esm);
-	
+
 	if (selected == 1 && message_list->cursor_uid) {
 		d(printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid));
 		g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, message_list->cursor_uid);
@@ -2940,7 +2940,7 @@ on_selection_changed_cmd(ETree *tree, Me
 	   is also used for other updating.  If it is empty, it might just be a setup event
 	   from etree which we do need to ignore */
 	if ((newuid == NULL && ml->cursor_uid == NULL && uids->len == 0)
-	    || (newuid != NULL && ml->cursor_uid != NULL && !strcmp(ml->cursor_uid, newuid))) {
+	    || (uids->len == 1 && newuid != NULL && ml->cursor_uid != NULL && !strcmp(ml->cursor_uid, newuid))) {
 		/* noop */
 	} else {
 		g_free(ml->cursor_uid);