Disable the optionmenu because it is empty. (service_page_item_auth_fill):

 2000-10-17  Iain Holmes  <iain@helixcode.com>

        * mail-config-gui.c (service_page_item_new): Disable the optionmenu
        because it is empty.
        (service_page_item_auth_fill): Enable the optionmenu as there's stuff
        in it now.

        * mail-callbacks.c (reply_to_sender): Call check_send_configuration
        when we have the FolderBrowser because if it is done in mail_reply
        (with passing NULL) it will only be able to continue if the mailer
        has already been configured.
        (reply_to_all): Same.

svn path=/trunk/; revision=5984

3 files changed, 27 insertions, 3 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 331502cc90..151b058e6f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,16 @@
+2000-10-17  Iain Holmes  <iain@helixcode.com>
+
+	* mail-config-gui.c (service_page_item_new): Disable the optionmenu
+	because it is empty.
+	(service_page_item_auth_fill): Enable the optionmenu as there's stuff
+	in it now.
+
+	* mail-callbacks.c (reply_to_sender): Call check_send_configuration
+	when we have the FolderBrowser because if it is done in mail_reply
+	(with passing NULL) it will only be able to continue if the mailer
+	has already been configured.
+	(reply_to_all): Same.
+
 2000-10-18  Not Zed  <NotZed@HelixCode.com>
 
 	* folder-browser.c (folder_browser_gui_init): No, we REALLY dont
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 91afe99a93..f9d625a22e 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -406,10 +406,12 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, gboolea
 	
 	/* FIXME: I just don't feel like implementing the folder-browser-passing
 	 * garbage. */
+	/* FIXME: We really need some way to get the folder_browser into this
+	   function */
 	if (!check_send_configuration (NULL) || !folder ||
 	    !msg || !uid)
 		return;
-	
+
 	psd = g_new (struct post_send_data, 1);
 	psd->folder = folder;
 	camel_object_ref (CAMEL_OBJECT (psd->folder));
@@ -435,6 +437,9 @@ reply_to_sender (GtkWidget *widget, gpointer user_data)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	
+	if (!check_send_configuration (fb))
+		return;
+
 	mail_reply (fb->folder, fb->mail_display->current_message, 
 	       fb->message_list->cursor_uid, FALSE);
 }
@@ -443,7 +448,10 @@ void
 reply_to_all (GtkWidget *widget, gpointer user_data)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
+
+	if (!check_send_configuration (fb))
+		return;
+
 	mail_reply (fb->folder, fb->mail_display->current_message, 
 	       fb->message_list->cursor_uid, TRUE);
 }
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 34560647ac..e096339d15 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -755,7 +755,8 @@ service_page_item_auth_fill (MailDialogServicePage *page,
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (spitem->auth_optionmenu), 
 				  menu);
 	gtk_option_menu_set_history (GTK_OPTION_MENU (spitem->auth_optionmenu), 0);
-	if (firstitem)
+	gtk_widget_set_sensitive (spitem->auth_optionmenu, TRUE);
+	if (firstitem) 
 		service_page_item_auth_activate (firstitem, spitem);
 }
 
@@ -929,6 +930,8 @@ service_page_item_new (MailDialogServicePage *page, MailService *mcs)
 		gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
 
 		item->auth_optionmenu = gtk_option_menu_new ();
+		gtk_widget_set_sensitive (item->auth_optionmenu, FALSE);
+
 		gtk_table_attach (GTK_TABLE (table), 
 				  item->auth_optionmenu, 
 				  1, 2, row, row + 1,