diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-account-gui.c | 11 | ||||
| -rw-r--r-- | mail/mail-format.c | 3 |
3 files changed, 20 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7752542572..c06bf4077a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-08-03 Jeffrey Stedfast <fejj@ximian.com> + + * mail-account-gui.c (build_auth_menu): Try to restore the choice + the user had chosen before hitting the "Check Supported Types" + button. + + * mail-format.c (write_headers): Removed a no-longer-needed + g_warning. + 2001-08-03 Not Zed <NotZed@Ximian.com> * mail-session.c (get_password): return the source url for diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 19d7789742..05d2674699 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -222,9 +222,16 @@ build_auth_menu (MailAccountGuiService *service, GList *all_authtypes, GList *supported_authtypes, gboolean check_supported) { GtkWidget *menu, *item, *first = NULL; - CamelServiceAuthType *authtype, *sauthtype; + CamelServiceAuthType *preferred, *authtype, *sauthtype; GList *l, *s; + if (service->authitem) + preferred = gtk_object_get_data (GTK_OBJECT (service->authitem), "authtype"); + else + preferred = NULL; + + service->authitem = NULL; + menu = gtk_menu_new (); for (l = all_authtypes; l; l = l->next) { @@ -238,6 +245,8 @@ build_auth_menu (MailAccountGuiService *service, GList *all_authtypes, } if (check_supported && !s) gtk_widget_set_sensitive (item, FALSE); + else if (preferred == authtype) + first = item; else if (!first) first = item; diff --git a/mail/mail-format.c b/mail/mail-format.c index 391548601a..7522b1d674 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -916,7 +916,6 @@ write_headers (CamelMimeMessage *message, MailDisplay *md) b = 255 - (0.92 * (255 - b)); } - g_warning ("%d, %d, %d", r, g, b); sprintf (bgcolor, "%.2X%.2X%.2X", r, g, b); r = style->text[state].red; @@ -1397,7 +1396,7 @@ mail_write_authenticity (MailDisplay *md, CamelCipherValidity *valid) } if (valid && camel_cipher_validity_get_description (valid)) { - mail_error_write (md->html, md->stream, + mail_error_write (md->html, md->stream, "%s", camel_cipher_validity_get_description (valid)); mail_html_write (md->html, md->stream, "<br><br>"); } |