[evolution-patches] 68794, mail account setup smtp auth forgotten

[Not Zed <notzed ximian com>]

hmm, missed the attach button last time.

--

Michael Zucchi <notzed ximian com> "I'm stuck in a reality I can't imagine could be real." Novell's Evolution and Free Software Developer

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.25
diff -u -p -r1.3444.2.25 ChangeLog
--- mail/ChangeLog	3 Nov 2004 02:29:55 -0000	1.3444.2.25
+++ mail/ChangeLog	10 Nov 2004 06:10:33 -0000
@@ -1,3 +1,15 @@
+2004-11-10  Not Zed  <NotZed Ximian com>
+
+	** See bug #68794.
+
+	* mail-account-gui.h: moved the needs_auth checkbox to the service
+	structure so it can be checked in save_service.  removed the
+	transport_needs_auth field.  the 'source' one is always NULL.
+
+	* mail-account-gui.c (save_service): check the needs-auth checkbox
+	rather than the round-a-bout and functionless sensitivity check on
+	the widget.
+
 2004-11-03  Not Zed  <NotZed Ximian com>
 
 	* em-format-html.c (efh_format_timeout): removed the fixme i
Index: mail/mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.171.14.7
diff -u -p -r1.171.14.7 mail-account-gui.c
--- mail/mail-account-gui.c	19 Oct 2004 03:31:08 -0000	1.171.14.7
+++ mail/mail-account-gui.c	10 Nov 2004 06:10:34 -0000
@@ -528,7 +528,7 @@ mail_account_gui_transport_complete (Mai
 		return FALSE;
 	
 	/* FIXME? */
-	if (gtk_toggle_button_get_active (gui->transport_needs_auth) &&
+	if (gtk_toggle_button_get_active (gui->transport.needs_auth) &&
 	    CAMEL_PROVIDER_ALLOWS (gui->transport.provider, CAMEL_URL_PART_USER)) {
 		const char *text = gtk_entry_get_text (gui->transport.username);
 		
@@ -844,9 +844,9 @@ transport_type_changed (GtkWidget *widge
 		/* auth */
 		if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH) &&
 		    !CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_AUTH))
-			gtk_widget_show (GTK_WIDGET (gui->transport_needs_auth));
+			gtk_widget_show (GTK_WIDGET (gui->transport.needs_auth));
 		else
-			gtk_widget_hide (GTK_WIDGET (gui->transport_needs_auth));
+			gtk_widget_hide (GTK_WIDGET (gui->transport.needs_auth));
 	} else
 		gtk_widget_hide (frame);
 	
@@ -865,7 +865,7 @@ transport_type_changed (GtkWidget *widge
 		}
 		
 		build_auth_menu (&gui->transport, provider->authtypes, NULL, FALSE);
-		transport_needs_auth_toggled (gui->transport_needs_auth, gui);
+		transport_needs_auth_toggled (gui->transport.needs_auth, gui);
 	} else
 		gtk_widget_hide (frame);
 	
@@ -1948,8 +1948,8 @@ mail_account_gui_new (EAccount *account,
 	gui->transport.use_ssl = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_use_ssl"));
 	construct_ssl_menu (&gui->transport);
 	gui->transport.no_ssl = glade_xml_get_widget (gui->xml, "transport_ssl_disabled");
-	gui->transport_needs_auth = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "transport_needs_auth"));
-	g_signal_connect (gui->transport_needs_auth, "toggled",
+	gui->transport.needs_auth = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "transport_needs_auth"));
+	g_signal_connect (gui->transport.needs_auth, "toggled",
 			  G_CALLBACK (transport_needs_auth_toggled), gui);
 	gui->transport.authtype = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_auth_omenu"));
 	gui->transport.remember = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "transport_remember_password"));
@@ -2229,7 +2229,7 @@ mail_account_gui_setup (MailAccountGui *
 	
 	if (transport_proto) {
 		if (setup_service (gui, &gui->transport, gui->account->transport))
-			gtk_toggle_button_set_active (gui->transport_needs_auth, TRUE);
+			gtk_toggle_button_set_active (gui->transport.needs_auth, TRUE);
 		gui->transport.provider_type = CAMEL_PROVIDER_TRANSPORT;
 		g_free (transport_proto);
 	}
@@ -2305,8 +2305,8 @@ save_service (MailAccountGuiService *gsv
 			url->user = g_strstrip (g_strdup (str));
 	}
 	
-	if (CAMEL_PROVIDER_ALLOWS (gsvc->provider, CAMEL_URL_PART_AUTH) &&
-	    GTK_WIDGET_IS_SENSITIVE (gsvc->authtype) && gsvc->authitem && url->user) {
+	if (CAMEL_PROVIDER_ALLOWS (gsvc->provider, CAMEL_URL_PART_AUTH)
+	    && url->user && gsvc->needs_auth && gtk_toggle_button_get_active(gsvc->needs_auth)) {
 		CamelServiceAuthType *authtype;
 		
 		authtype = g_object_get_data(G_OBJECT(gsvc->authitem), "authtype");
Index: mail/mail-account-gui.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.h,v
retrieving revision 1.31
diff -u -p -r1.31 mail-account-gui.h
--- mail/mail-account-gui.h	1 Apr 2004 19:47:06 -0000	1.31
+++ mail/mail-account-gui.h	10 Nov 2004 06:10:34 -0000
@@ -52,6 +52,8 @@ typedef struct _MailAccountGuiService {
 	struct _GtkWidget *authitem;
 	struct _GtkToggleButton *remember;
 	struct _GtkButton *check_supported;
+
+	struct _GtkToggleButton *needs_auth;
 	
 	CamelProvider *provider;
 	CamelProviderType provider_type;
@@ -85,7 +87,6 @@ typedef struct _MailAccountGui {
 	
 	/* outgoing mail */
 	MailAccountGuiService transport;
-	struct _GtkToggleButton *transport_needs_auth;
 	
 	/* account management */
 	struct _GtkEntry *account_name;
Index: mail/mail-config-druid.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config-druid.c,v
retrieving revision 1.108
diff -u -p -r1.108 mail-config-druid.c
--- mail/mail-config-druid.c	3 May 2004 10:30:59 -0000	1.108
+++ mail/mail-config-druid.c	10 Nov 2004 06:10:34 -0000
@@ -503,7 +503,7 @@ config_wizard_new (void)
 			  G_CALLBACK (transport_changed), mcw);
 	g_signal_connect (mcw->gui->transport.username, "changed",
 			  G_CALLBACK (transport_changed), mcw);
-	g_signal_connect (mcw->gui->transport_needs_auth, "toggled",
+	g_signal_connect (mcw->gui->transport.needs_auth, "toggled",
 			  G_CALLBACK (transport_changed), mcw);
 	
 	g_signal_connect (mcw->gui->account_name, "activate",