Fix outdated uses of alertpanel() in code paths for --disable-gnutls.

This commit is contained in:
Andrej Kacian 2018-12-21 10:44:34 +01:00
parent fd6f84d6b3
commit 6d0b5371aa
4 changed files with 8 additions and 12 deletions

View file

@ -1154,9 +1154,8 @@ static IMAPSession *imap_session_new(Folder * folder,
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
GTK_STOCK_CANCEL, _("Con_tinue connecting"),
NULL, FALSE, NULL, ALERT_WARNING,
G_ALERTDEFAULT) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return NULL;
}
port = account->set_imapport ? account->imapport

View file

@ -877,9 +877,8 @@ static IncState inc_pop3_session_do(IncSession *session)
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
GTK_STOCK_CANCEL, _("Con_tinue connecting"),
NULL, FALSE, NULL, ALERT_WARNING,
G_ALERTDEFAULT) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return INC_CANCEL;
}
#endif

View file

@ -406,9 +406,8 @@ static Session *news_session_new_for_folder(Folder *folder)
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
GTK_STOCK_CANCEL, _("Con_tinue connecting"),
NULL, FALSE, NULL, ALERT_WARNING,
G_ALERTDEFAULT) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
return NULL;
}
port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;

View file

@ -290,9 +290,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
GTK_STOCK_CANCEL, _("Con_tinue connecting"),
NULL, FALSE, NULL, ALERT_WARNING,
G_ALERTDEFAULT) != G_ALERTALTERNATE) {
GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) {
session_destroy(session);
return -1;
}