[Commits] [SCM] claws branch, gtk2, updated. 3.19.0-53-g72097400a
paul at claws-mail.org
paul at claws-mail.org
Sat Jul 23 14:05:40 UTC 2022
The branch, gtk2 has been updated
via 72097400ab167b2c3fb007c41ba3d7b1753a8cf2 (commit)
from 435f1d27ed82a6cc33d3ee5dedb5274dd7cd785c (commit)
Summary of changes:
src/common/smtp.c | 17 ++++++++++---
src/etpan/imap-thread.c | 10 +++++---
src/imap.c | 18 +++++++++++---
src/inc.c | 7 ++++--
src/oauth2.c | 4 +++
src/oauth2.h | 8 ++++--
src/pop.c | 14 ++++++++---
src/prefs_account.c | 66 +++++++++++++++++++++++++++++++++++++++++++++----
src/prefs_account.h | 4 +--
src/send_message.c | 8 +++---
10 files changed, 126 insertions(+), 30 deletions(-)
- Log -----------------------------------------------------------------
commit 72097400ab167b2c3fb007c41ba3d7b1753a8cf2
Author: Paul <paul at claws-mail.org>
Date: Sat Jul 23 13:39:31 2022 +0100
fix bug 4615, 'Compilation fails with --disable-gnutls'
diff --git a/src/common/smtp.c b/src/common/smtp.c
index b0d91c0cc..b01898653 100644
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -42,11 +42,11 @@ static void smtp_session_destroy(Session *session);
static gint smtp_auth(SMTPSession *session);
#ifdef USE_GNUTLS
static gint smtp_starttls(SMTPSession *session);
+static gint smtp_auth_oauth2(SMTPSession *session);
#endif
static gint smtp_auth_cram_md5(SMTPSession *session);
static gint smtp_auth_login(SMTPSession *session);
static gint smtp_auth_plain(SMTPSession *session);
-static gint smtp_auth_oauth2(SMTPSession *session);
static gint smtp_ehlo(SMTPSession *session);
static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg);
@@ -176,11 +176,13 @@ static gint smtp_auth(SMTPSession *session)
&&
(session->avail_auth_type & SMTPAUTH_PLAIN) != 0)
smtp_auth_plain(session);
+#ifdef USE_GNUTLS
else if ((session->forced_auth_type == SMTPAUTH_OAUTH2
|| session->forced_auth_type == 0)
&&
(session->avail_auth_type & SMTPAUTH_OAUTH2) != 0)
smtp_auth_oauth2(session);
+#endif
else if (session->forced_auth_type == 0) {
log_warning(LOG_PROTOCOL, _("No SMTP AUTH method available\n"));
return SM_AUTHFAIL;
@@ -323,8 +325,10 @@ static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg)
session->avail_auth_type |= SMTPAUTH_CRAM_MD5;
if (strcasestr(p, "DIGEST-MD5"))
session->avail_auth_type |= SMTPAUTH_DIGEST_MD5;
+#ifdef USE_GNUTLS
if (strcasestr(p, "XOAUTH2"))
session->avail_auth_type |= SMTPAUTH_OAUTH2;
+#endif
}
if (g_ascii_strncasecmp(p, "SIZE", 4) == 0) {
p += 5;
@@ -399,7 +403,7 @@ static gint smtp_auth_plain(SMTPSession *session)
return SM_OK;
}
-
+#ifdef USE_GNUTLS
static gint smtp_auth_oauth2(SMTPSession *session)
{
gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
@@ -428,6 +432,7 @@ static gint smtp_auth_oauth2(SMTPSession *session)
return SM_OK;
}
+#endif
static gint smtp_auth_login(SMTPSession *session)
{
@@ -547,7 +552,9 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
case SMTP_AUTH_PLAIN:
case SMTP_AUTH_LOGIN_USER:
case SMTP_AUTH_LOGIN_PASS:
+#ifdef USE_GNUTLS
case SMTP_AUTH_OAUTH2:
+#endif
case SMTP_AUTH_CRAM_MD5:
log_print(LOG_PROTOCOL, "ESMTP< %s\n", msg);
break;
@@ -670,7 +677,9 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
break;
case SMTP_AUTH_PLAIN:
case SMTP_AUTH_LOGIN_PASS:
+#ifdef USE_GNUTLS
case SMTP_AUTH_OAUTH2:
+#endif
case SMTP_AUTH_CRAM_MD5:
ret = smtp_from(smtp_session);
break;
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index c573f21b3..a043f2c78 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2022 the Claws Mail team and DINH Viet Hoa
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1001,9 +1001,11 @@ static void login_run(struct etpan_thread_op * op)
param->type, NULL, NULL, NULL,
NULL, param->login,
param->password, NULL);
- else if (!strcmp(param->type, "XOAUTH2")) {
+#ifdef USE_GNUTLS
+ else if (!strcmp(param->type, "XOAUTH2"))
r = mailimap_oauth2_authenticate(param->imap, param->login, param->password);
- } else
+#endif
+ else
r = mailimap_authenticate(param->imap,
param->type, NULL, NULL, NULL,
param->login, param->login,
diff --git a/src/imap.c b/src/imap.c
index 1ad6cc5ca..ce2ed4a70 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -72,7 +72,9 @@
#include "main.h"
#include "passwordstore.h"
#include "file-utils.h"
+#ifdef USE_GNUTLS
#include "oauth2.h"
+#endif
typedef struct _IMAPFolder IMAPFolder;
typedef struct _IMAPSession IMAPSession;
@@ -913,9 +915,11 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
case IMAP_AUTH_PLAIN:
ok = imap_cmd_login(session, user, pass, "PLAIN");
break;
+#ifdef USE_GNUTLS
case IMAP_AUTH_OAUTH2:
ok = imap_cmd_login(session, user, pass, "XOAUTH2");
break;
+#endif
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
@@ -932,7 +936,9 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
"\t DIGEST-MD5 %d\n"
"\t SCRAM-SHA-1 %d\n"
"\t PLAIN %d\n"
+#ifdef USE_GNUTLS
"\t OAUTH2 %d\n"
+#endif
"\t LOGIN %d\n"
"\t GSSAPI %d\n",
imap_has_capability(session, "ANONYMOUS"),
@@ -940,7 +946,9 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
imap_has_capability(session, "DIGEST-MD5"),
imap_has_capability(session, "SCRAM-SHA-1"),
imap_has_capability(session, "PLAIN"),
+#ifdef USE_GNUTLS
imap_has_capability(session, "XOAUTH2"),
+#endif
imap_has_capability(session, "LOGIN"),
imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-MD5"))
@@ -957,8 +965,10 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
ok = imap_cmd_login(session, user, pass, "GSSAPI");
if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
ok = imap_cmd_login(session, user, pass, "plaintext");
+#ifdef USE_GNUTLS
if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2"))
ok = imap_cmd_login(session, user, pass, "XOAUTH2");
+#endif
}
if (ok == MAILIMAP_NO_ERROR)
@@ -993,12 +1003,12 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
"compiled with SASL support and the "
"LOGIN SASL plugin is installed.");
}
-
+#ifdef USE_GNUTLS
if (type == IMAP_AUTH_OAUTH2) {
ext_info = _("\n\nOAuth2 error. Check and correct your OAuth2 "
"account preferences.");
}
-
+#endif
if (time(NULL) - last_login_err > 10) {
if (!prefs_common.no_recv_err_panel) {
alertpanel_error_log(_("Connection to %s failed: "
@@ -1320,10 +1330,10 @@ static gint imap_session_authenticate(IMAPSession *session,
gboolean failed = FALSE;
gint ok = MAILIMAP_NO_ERROR;
g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
-
+#ifdef USE_GNUTLS
if(account->imap_auth_type == IMAP_AUTH_OAUTH2)
oauth2_check_passwds (account);
-
+#endif
if (!password_get(account->userid, account->recv_server, "imap",
SESSION(session)->port, &acc_pass)) {
acc_pass = passwd_store_get_account(account->account_id,
diff --git a/src/inc.c b/src/inc.c
index 7e69caa1b..9ede6c5a1 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -61,7 +61,9 @@
#include "hooks.h"
#include "logwindow.h"
#include "passwordstore.h"
+#ifdef USE_GNUTLS
#include "oauth2.h"
+#endif
extern SessionStats session_stats;
@@ -633,11 +635,12 @@ static gint inc_start(IncProgressDialog *inc_dialog)
manage_window_focus_in
(inc_dialog->dialog->window,
NULL, NULL);
-
+#ifdef USE_GNUTLS
if(pop3_session->ac_prefs->use_pop_auth &&
pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
oauth2_check_passwds (pop3_session->ac_prefs);
-
+#endif
+
if (password_get(pop3_session->user,
pop3_session->ac_prefs->recv_server,
"pop3", pop3_get_port(pop3_session),
diff --git a/src/oauth2.c b/src/oauth2.c
index f37284b7a..26491db31 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -22,6 +22,8 @@
#include "claws-features.h"
#endif
+#ifdef USE_GNUTLS
+
#include <glib.h>
#ifdef ENABLE_NLS
#include <glib/gi18n.h>
@@ -703,3 +705,5 @@ gint oauth2_init (OAUTH2Data *OAUTH2Data)
return (0);
}
+
+#endif /* USE_GNUTLS */
diff --git a/src/oauth2.h b/src/oauth2.h
index ef910d0e9..ccef56770 100644
--- a/src/oauth2.h
+++ b/src/oauth2.h
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2020 the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2020-2022 the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
#include "claws-features.h"
#endif
+#ifdef USE_GNUTLS
+
#include <glib.h>
#include "socket.h"
@@ -79,3 +81,5 @@ gint oauth2_authorisation_url (Oauth2Service provider, gchar **url, const gchar
gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data);
guchar* oauth2_decode(const gchar *in);
void oauth2_encode(const gchar *in);
+
+#endif /* USE_GNUTLS */
diff --git a/src/pop.c b/src/pop.c
index 0954df85c..1117084bb 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -178,6 +178,7 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
return PS_SUCCESS;
}
+#ifdef USE_GNUTLS
static gint pop3_getauth_oauth2_send(Pop3Session *session)
{
gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
@@ -202,6 +203,7 @@ static gint pop3_getauth_oauth2_send(Pop3Session *session)
g_free(out);
return PS_SUCCESS;
}
+#endif
static gint pop3_getrange_stat_send(Pop3Session *session)
{
@@ -533,8 +535,10 @@ static void pop3_gen_send(Pop3Session *session, const gchar *format, ...)
if (!g_ascii_strncasecmp(buf, "PASS ", 5))
log_print(LOG_PROTOCOL, "POP> PASS ********\n");
+#ifdef USE_GNUTLS
else if (!g_ascii_strncasecmp(buf, "AUTH XOAUTH2 ", 13))
log_print(LOG_PROTOCOL, "POP> AUTH XOAUTH2 ********\n");
+#endif
else
log_print(LOG_PROTOCOL, "POP> %s\n", buf);
@@ -989,12 +993,12 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
#ifdef USE_GNUTLS
if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
val = pop3_stls_send(pop3_session);
+ else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
+ val = pop3_getauth_oauth2_send(pop3_session);
else
#endif
if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_APOP)
val = pop3_getauth_apop_send(pop3_session);
- else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
- val = pop3_getauth_oauth2_send(pop3_session);
else
val = pop3_getauth_user_send(pop3_session);
break;
@@ -1015,7 +1019,9 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
break;
case POP3_GETAUTH_PASS:
case POP3_GETAUTH_APOP:
+#ifdef USE_GNUTLS
case POP3_GETAUTH_OAUTH2:
+#endif
if (!pop3_session->pop_before_smtp)
val = pop3_getrange_stat_send(pop3_session);
else
diff --git a/src/prefs_account.c b/src/prefs_account.c
index f0073f2e3..ec9f8c099 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -62,7 +62,9 @@
#include "smtp.h"
#include "imap.h"
#include "pop.h"
+#ifdef USE_GNUTLS
#include "oauth2.h"
+#endif
#include "remotefolder.h"
#include "combobox.h"
#include "setup.h"
@@ -103,9 +105,11 @@ struct AutocheckWidgets {
static GSList *prefs_pages = NULL;
+#ifdef USE_GNUTLS
static GTask *oauth2_listener_task;
static int oauth2_listener_cancel = 0;
static int oauth2_listener_closed = 0;
+#endif
typedef struct BasicPage
{
@@ -212,6 +216,7 @@ typedef struct SendPage
GtkWidget *pop_auth_minutes_lbl;
} SendPage;
+#ifdef USE_GNUTLS
typedef struct Oauth2Page
{
PrefsPage page;
@@ -229,6 +234,7 @@ typedef struct Oauth2Page
GtkWidget *oauth2_client_id_entry;
GtkWidget *oauth2_client_secret_entry;
} Oauth2Page;
+#endif
typedef struct
{
@@ -384,7 +390,9 @@ typedef struct AdvancedPage
static BasicPage basic_page;
static ReceivePage receive_page;
static SendPage send_page;
+#ifdef USE_GNUTLS
static Oauth2Page oauth2_page;
+#endif
static ComposePage compose_page;
static TemplatesPage templates_page;
static PrivacyPage privacy_page;
@@ -410,12 +418,14 @@ static char *protocol_names[] = {
N_("None (SMTP only)")
};
+#ifdef USE_GNUTLS
struct Oauth2Listener {
int success;
Oauth2Service service;
OAUTH2Data *OAUTH2Data;
gchar *trim_text;
};
+#endif
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam);
static void prefs_account_protocol_set_optmenu (PrefParam *pparam);
@@ -430,6 +440,7 @@ static void prefs_account_smtp_auth_type_set_data_from_optmenu (PrefParam *ppara
static void prefs_account_smtp_auth_type_set_optmenu (PrefParam *pparam);
static void prefs_account_pop_auth_type_set_data_from_optmenu (PrefParam *pparam);
static void prefs_account_pop_auth_type_set_optmenu (PrefParam *pparam);
+#ifdef USE_GNUTLS
static void prefs_account_oauth2_provider_set_data_from_optmenu (PrefParam *pparam);
static void prefs_account_oauth2_provider_set_optmenu (PrefParam *pparam);
static void prefs_account_oauth2_copy_url (GtkButton *button, gpointer data);
@@ -439,6 +450,7 @@ static int prefs_account_oauth2_get_line(int sock, char *buf, int size);
static void prefs_account_oauth2_set_sensitivity(void);
static void prefs_account_oauth2_set_auth_sensitivity(void);
static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data);
+#endif
static void prefs_account_set_autochk_interval_from_widgets(PrefParam *pparam);
static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam);
@@ -659,6 +671,7 @@ static PrefParam send_param[] = {
};
static PrefParam oauth2_param[] = {
+#ifdef USE_GNUTLS
{"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
&oauth2_page.oauth2_auth_optmenu,
prefs_account_oauth2_provider_set_data_from_optmenu,
@@ -675,6 +688,23 @@ static PrefParam oauth2_param[] = {
{"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
&oauth2_page.oauth2_client_secret_entry, prefs_set_data_from_entry, prefs_set_entry},
+#else
+ {"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
+ NULL, NULL, NULL},
+
+ {"oauth2_date", 0, &tmp_ac_prefs.oauth2_date, P_INT,
+ NULL, NULL, NULL},
+
+ {"oauth2_authcode", NULL, &tmp_ac_prefs.oauth2_authcode, P_PASSWORD,
+ NULL, NULL, NULL},
+
+ {"oauth2_client_id", NULL, &tmp_ac_prefs.oauth2_client_id, P_STRING,
+ NULL, NULL, NULL},
+
+ {"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
+ NULL, NULL, NULL},
+
+#endif
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
@@ -1654,8 +1684,9 @@ static void receive_create_widget_func(PrefsPage * _page,
COMBOBOX_ADD (menu2, _("Select"), 0);
COMBOBOX_ADD (menu2, NULL, 0);
COMBOBOX_ADD (menu2, "APOP", POPAUTH_APOP);
+#ifdef USE_GNUTLS
COMBOBOX_ADD (menu2, "OAuth2", POPAUTH_OAUTH2);
-
+#endif
SET_TOGGLE_SENSITIVITY (pop_auth_checkbtn, vbox5);
PACK_CHECK_BUTTON (vbox2, rmmail_checkbtn,
@@ -1793,7 +1824,9 @@ static void receive_create_widget_func(PrefsPage * _page,
COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+#ifdef USE_GNUTLS
COMBOBOX_ADD (menu, "OAUTH2", IMAP_AUTH_OAUTH2);
+#endif
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
@@ -2050,7 +2083,9 @@ static void send_create_widget_func(PrefsPage * _page,
COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
+#ifdef USE_GNUTLS
COMBOBOX_ADD (menu, "OAUTH2", SMTPAUTH_OAUTH2);
+#endif
COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1);
@@ -2195,7 +2230,8 @@ static void send_create_widget_func(PrefsPage * _page,
page->page.widget = vbox1;
}
-
+
+#ifdef USE_GNUTLS
static void oauth2_create_widget_func(PrefsPage * _page,
GtkWindow * window,
gpointer data)
@@ -2409,6 +2445,7 @@ static void oauth2_create_widget_func(PrefsPage * _page,
/* oauth2_encode(OAUTH2info[0][OA2_CLIENT_ID]); */
}
+#endif
static void compose_create_widget_func(PrefsPage * _page,
@@ -3658,8 +3695,10 @@ static gint prefs_basic_apply(void)
gtk_entry_get_text(GTK_ENTRY(basic_page.pass_entry)),
FALSE);
+#ifdef USE_GNUTLS
/* Manual password change - reset expiry on OAUTH2 tokens*/
passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
+#endif
if (protocol == A_IMAP4 || protocol == A_NNTP) {
new_id = g_strdup_printf("#%s/%s",
@@ -3702,13 +3741,15 @@ static gint prefs_send_apply(void)
PWS_ACCOUNT_SEND,
gtk_entry_get_text(GTK_ENTRY(send_page.smtp_pass_entry)),
FALSE);
-
+#ifdef USE_GNUTLS
/* Manual password change - reset expiry on OAUTH2 tokens*/
passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
+#endif
return 0;
}
+#ifdef USE_GNUTLS
static gint prefs_oauth2_apply(void)
{
prefs_set_data_from_dialog(oauth2_param);
@@ -3721,6 +3762,7 @@ static gint prefs_oauth2_apply(void)
return 0;
}
+#endif
static gint prefs_compose_apply(void)
{
@@ -3819,6 +3861,7 @@ static void send_destroy_widget_func(PrefsPage *_page)
/* SendPage *page = (SendPage *) _page; */
}
+#ifdef USE_GNUTLS
static void oauth2_destroy_widget_func(PrefsPage *_page)
{
/* Oauth2Page *page = (Oauth2Page *) _page; */
@@ -3828,6 +3871,7 @@ static void oauth2_destroy_widget_func(PrefsPage *_page)
oauth2_listener_cancel = 1;
}
}
+#endif
static void compose_destroy_widget_func(PrefsPage *_page)
{
@@ -3891,6 +3935,7 @@ static gboolean send_can_close_func(PrefsPage *_page)
return prefs_send_apply() >= 0;
}
+#ifdef USE_GNUTLS
static gboolean oauth2_can_close_func(PrefsPage *_page)
{
Oauth2Page *page = (Oauth2Page *) _page;
@@ -3900,6 +3945,7 @@ static gboolean oauth2_can_close_func(PrefsPage *_page)
return prefs_oauth2_apply() >= 0;
}
+#endif
static gboolean compose_can_close_func(PrefsPage *_page)
{
@@ -3996,6 +4042,7 @@ static void send_save_func(PrefsPage *_page)
cancelled = FALSE;
}
+#ifdef USE_GNUTLS
static void oauth2_save_func(PrefsPage *_page)
{
Oauth2Page *page = (Oauth2Page *) _page;
@@ -4006,6 +4053,7 @@ static void oauth2_save_func(PrefsPage *_page)
if (prefs_oauth2_apply() >= 0)
cancelled = FALSE;
}
+#endif
static void compose_save_func(PrefsPage *_page)
{
@@ -4141,6 +4189,7 @@ static void register_send_page(void)
prefs_account_register_page((PrefsPage *) &send_page);
}
+#ifdef USE_GNUTLS
static void register_oauth2_page(void)
{
static gchar *path[3];
@@ -4158,6 +4207,7 @@ static void register_oauth2_page(void)
prefs_account_register_page((PrefsPage *) &oauth2_page);
}
+#endif
static void register_compose_page(void)
{
@@ -4347,7 +4397,9 @@ void prefs_account_init()
hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
#endif
register_proxy_page();
+#ifdef USE_GNUTLS
register_oauth2_page();
+#endif
register_advanced_page();
}
@@ -5087,6 +5139,7 @@ static void prefs_account_pop_auth_type_set_optmenu(PrefParam *pparam)
combobox_select_by_data(optmenu, type);
}
+#ifdef USE_GNUTLS
static void prefs_account_oauth2_provider_set_data_from_optmenu(PrefParam *pparam)
{
*((Oauth2Service *)pparam->data) =
@@ -5240,6 +5293,7 @@ static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data)
g_free(trim_text);
g_free(OAUTH2Data);
}
+#endif
static void prefs_account_set_autochk_interval_from_widgets(PrefParam *pparam)
{
@@ -6138,6 +6192,7 @@ static void prefs_account_receive_itv_spinbutton_value_changed_cb(GtkWidget *w,
}
}
+#ifdef USE_GNUTLS
//Automation of the oauth2 authorisation process to receive loopback callback generated by redirect in browser
static void prefs_account_oauth2_listener(GTask *task, gpointer source, gpointer task_data, GCancellable *cancellable)
{
@@ -6324,3 +6379,4 @@ static int prefs_account_oauth2_get_line(int sock, char *buf, int size)
return (i);
}
+#endif
diff --git a/src/prefs_account.h b/src/prefs_account.h
index 539dfd9e5..5c3c21611 100644
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/send_message.c b/src/send_message.c
index a9ff5ccfe..cdd265601 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -57,7 +57,9 @@
#include "log.h"
#include "passwordstore.h"
#include "file-utils.h"
+#ifdef USE_GNUTLS
#include "oauth2.h"
+#endif
typedef struct _SendProgressDialog SendProgressDialog;
@@ -282,6 +284,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
strlen(ac_prefs->gnutls_priority))
session->gnutls_priority = g_strdup(ac_prefs->gnutls_priority);
session->use_tls_sni = ac_prefs->use_tls_sni;
+
+ if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
+ oauth2_check_passwds (ac_prefs);
#else
if (ac_prefs->ssl_smtp != SSL_NONE) {
if (alertpanel_full(_("Insecure connection"),
@@ -299,9 +304,6 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
}
port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
#endif
-
- if(ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
- oauth2_check_passwds (ac_prefs);
if (ac_prefs->use_smtp_auth) {
smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list