aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-threads.c11
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 06a4521008..587f9305c8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2000-08-14 Peter Williams <peterw@helixcode.com>
+ * mail-threads.c (show_error): Fix the error dialogs.
+ (read_msg): Re-enable them.
+
* mail-ops.c (do_scan_subfolders): Silence a compile warning.
2000-08-13 Jeffrey Stedfast <fejj@helixcode.com>
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index 8df6d3f5e0..5d1b56975c 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -716,7 +716,7 @@ read_msg (GIOChannel * source, GIOCondition condition, gpointer userdata)
case ERROR:
DEBUG (("*** Message -- ERROR\n"));
- /* show_error (msg); */
+ show_error (msg);
break;
/* Don't fall through; dispatch_func does the FINISHED
@@ -806,9 +806,14 @@ show_error (com_msg_t * msg)
/* Show the dialog. */
- GDK_THREADS_ENTER ();
+ /* Do not GDK_THREADS_ENTER; we're inside the read_msg
+ * handler which takes care of this for us. Oh, if
+ * only GDK_THREADS_ENTER were recursive...
+ */
+
+ /*GDK_THREADS_ENTER ();*/
gnome_dialog_run_and_close (GNOME_DIALOG (err_dialog));
- GDK_THREADS_LEAVE ();
+ /*GDK_THREADS_LEAVE ();*/
/* Allow the other thread to proceed */