[evolution-patches] 40522, double passphrase request, 1.3 and 1.2

[Not Zed <notzed ximian com>]

patch is against 1.3, i think it should apply to 1.2.

see the bug for more info.

 Z


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2669
diff -u -3 -r1.2669 ChangeLog
--- ChangeLog	31 Mar 2003 02:57:41 -0000	1.2669
+++ ChangeLog	1 Apr 2003 05:42:27 -0000
@@ -1,3 +1,9 @@
+2003-04-01  Not Zed  <NotZed Ximian com>
+
+	* mail-display.c (mail_display_redisplay): if we're called and the
+	idle handler is set, remove it, so we dont go and redisplay it
+	again.  Fixes #40522.
+
 2003-03-31  Not Zed  <NotZed Ximian com>
 
 	* mail-session.c (pass_response): need to check for config_service
Index: mail-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-display.c,v
retrieving revision 1.272
diff -u -3 -r1.272 mail-display.c
--- mail-display.c	26 Mar 2003 03:38:30 -0000	1.272
+++ mail-display.c	1 Apr 2003 05:42:28 -0000
@@ -1925,6 +1925,12 @@
 {
 	if (md->destroyed)
 		return;
+
+	/* we're in effect stealing the queued redisplay */
+	if (md->idle_id) {
+		g_source_remove(md->idle_id);
+		md->idle_id = 0;
+	}
 	
 	fetch_cancel(md);