aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-config.c6
2 files changed, 13 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a78eba3bd6..8a6d7036eb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-03 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #59717.
+
+ * mail-config.c (mail_config_check_service): Make the dialog
+ modal. Not ideal but a problem with the way the function works,
+ it should be fully async instead.
+
2004-09-03 Jeffrey Stedfast <fejj@novell.com>
* mail-config.glade: Revert the use of gtkfilechooser for Path
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 7e761e319a..c16113d4ab 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -970,8 +970,12 @@ mail_config_check_service (const char *url, CamelProviderType type, GList **auth
id = m->msg.seq;
e_thread_put(mail_thread_new, (EMsg *)m);
+ /* FIXME: make this use e-error.
+ * It has to be modal otherwise we can get nasty re-entrancy whilst waiting for the
+ * subthread to complete.
+ * FIXME: make this whole function async to deal with this issue */
dialog = gtk_dialog_new_with_buttons(_("Connecting to server..."), window,
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
label = gtk_label_new (_("Connecting to server..."));