g_free(session);
}
+static gint pop3_get_port(Pop3Session *pop3_session)
+{
+#ifdef USE_GNUTLS
+ return pop3_session->ac_prefs->set_popport ?
+ pop3_session->ac_prefs->popport :
+ pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
+#else
+ return pop3_session->ac_prefs->set_popport ?
+ pop3_session->ac_prefs->popport : 110;
+#endif
+}
+
static gint inc_start(IncProgressDialog *inc_dialog)
{
IncSession *session;
session = qlist->data;
pop3_session = POP3_SESSION(session->session);
pop3_session->user = g_strdup(pop3_session->ac_prefs->userid);
+
if (password_get(pop3_session->user,
pop3_session->ac_prefs->recv_server,
- "pop3", SESSION(session)->port,
+ "pop3", pop3_get_port(pop3_session),
&(pop3_session->pass))) {
/* NOP */;
} else if (pop3_session->ac_prefs->passwd)
server = pop3_session->ac_prefs->recv_server;
account_name = pop3_session->ac_prefs->account_name;
+ port = pop3_get_port(pop3_session);
+
#ifdef USE_GNUTLS
- port = pop3_session->ac_prefs->set_popport ?
- pop3_session->ac_prefs->popport :
- pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
SESSION(pop3_session)->ssl_type = pop3_session->ac_prefs->ssl_pop;
if (pop3_session->ac_prefs->ssl_pop != SSL_NONE)
SESSION(pop3_session)->nonblocking =
G_ALERTDEFAULT) != G_ALERTALTERNATE)
return INC_CANCEL;
}
- port = pop3_session->ac_prefs->set_popport ?
- pop3_session->ac_prefs->popport : 110;
#endif
buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s:%d..."),