commit 90c8ce1452e33d4c1c14371e6301a61f22b4ff4a
parent 2a9e748623a8f12f0a515877faf2aa05fa9fa19b
Author: Paul <paul@claws-mail.org>
Date: Tue, 11 Jun 2024 08:34:11 +0100
use the migrated preference from 4dc29628f8545a4dd7ea8ce1e724220b06db0131
Diffstat:
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/imap.c b/src/imap.c
@@ -1060,7 +1060,7 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
}
#endif
if (time(NULL) - last_login_err > 10) {
- if (!prefs_common.no_recv_err_panel) {
+ if (prefs_common.show_recv_err_dialog) {
alertpanel_error_log(_("Connection to %s failed: "
"login refused.%s"),
server, ext_info);
@@ -1314,7 +1314,7 @@ static IMAPSession *imap_session_new(Folder * folder,
#endif
imap_handle_error(NULL, account->recv_server, r);
- if(!prefs_common.no_recv_err_panel) {
+ if(prefs_common.show_recv_err_dialog) {
alertpanel_error_log(_("Can't connect to IMAP server: %s:%d"),
account->recv_server, port);
} else {
@@ -1421,7 +1421,7 @@ try_again:
}
goto try_again;
} else {
- if (prefs_common.no_recv_err_panel) {
+ if (!prefs_common.show_recv_err_dialog) {
log_error(LOG_PROTOCOL, _("Couldn't login to IMAP server %s.\n"), account->recv_server);
mainwindow_show_error();
} else
diff --git a/src/inc.c b/src/inc.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 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
@@ -746,7 +746,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
}
if (pop3_session->error_val == PS_AUTHFAIL) {
- if(!prefs_common.no_recv_err_panel) {
+ if(prefs_common.show_recv_err_dialog) {
if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window))
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
@@ -925,7 +925,7 @@ static IncState inc_pop3_session_do(IncSession *session)
prefs_common.io_timeout_secs * 1000);
if (session_connect(SESSION(pop3_session), server, port) < 0) {
- if(!prefs_common.no_recv_err_panel) {
+ if(prefs_common.show_recv_err_dialog) {
if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
@@ -1232,7 +1232,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
switch (istate) {
case INC_CONNECT_ERROR:
fatal_error = TRUE;
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
err_msg = g_strdup_printf(_("Connection to %s:%d failed."),
SESSION(session)->server,
@@ -1241,7 +1241,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
case INC_ERROR:
log_msg = _("Error occurred while processing mail.");
fatal_error = TRUE;
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
if (session->error_msg)
err_msg = g_strdup_printf
@@ -1262,7 +1262,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
break;
case INC_SOCKET_ERROR:
log_msg = _("Socket error.");
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
err_msg = g_strdup_printf(_("Socket error on connection to %s:%d."),
SESSION(session)->server,
@@ -1270,7 +1270,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
break;
case INC_EOF:
log_msg = _("Connection closed by the remote host.");
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
err_msg = g_strdup_printf(_("Connection to %s:%d closed by the remote host."),
SESSION(session)->server,
@@ -1278,7 +1278,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
break;
case INC_LOCKED:
log_msg = _("Mailbox is locked.");
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
if (session->error_msg)
err_msg = g_strdup_printf(_("Mailbox is locked:\n%s"),
@@ -1289,7 +1289,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
case INC_AUTH_FAILED:
log_msg = _("Authentication failed.");
fatal_error = TRUE;
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
if (session->error_msg)
err_msg = g_strdup_printf
@@ -1301,7 +1301,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
log_msg = _("Session timed out. You may be able to "
"recover by increasing the timeout value in "
"Preferences/Other/Miscellaneous.");
- if (prefs_common.no_recv_err_panel)
+ if (!prefs_common.show_recv_err_dialog)
break;
err_msg = g_strdup_printf(_("Connection to %s:%d timed out."),
SESSION(session)->server,
@@ -1317,7 +1317,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
else
log_warning(LOG_PROTOCOL, "%s\n", log_msg);
}
- if (prefs_common.no_recv_err_panel && fatal_error)
+ if (!prefs_common.show_recv_err_dialog && fatal_error)
mainwindow_show_error();
if (err_msg) {
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Colin Leroy
+ * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy
*
* 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
@@ -595,7 +595,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
msg = g_strdup_printf(_("The Bogofilter plugin couldn't filter "
"a message. The command `%s %s %s` couldn't be run."),
bogo_args[0], bogo_args[1], bogo_args[2]);
- if (!prefs_common_get_prefs()->no_recv_err_panel) {
+ if (prefs_common_get_prefs()->show_recv_err_dialog) {
if (!warned_error) {
alertpanel_error("%s", msg);
}
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
@@ -376,7 +376,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
msg = g_strdup_printf(_("The Bsfilter plugin couldn't filter "
"a message. The command `%s` couldn't be run."),
bs_exec);
- if (!prefs_common_get_prefs()->no_recv_err_panel) {
+ if (prefs_common_get_prefs()->show_recv_err_dialog) {
if (!warned_error) {
alertpanel_error("%s", msg);
}
diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 2003-2024 Michael Rasmussen and 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
@@ -121,8 +121,8 @@ static gboolean scan_func(GNode *node, gpointer data)
name, NULL);
g_free(name);
g_warning("%s", msg);
- debug_print("no_recv: %d\n", prefs_common_get_prefs()->no_recv_err_panel);
- if (prefs_common_get_prefs()->no_recv_err_panel) {
+ debug_print("show_recv_err: %d\n", prefs_common_get_prefs()->show_recv_err_dialog);
+ if (!prefs_common_get_prefs()->show_recv_err_dialog) {
statusbar_print_all("%s", msg);
}
else {
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail Team
+ * Copyright (C) 1999-2024 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
@@ -363,7 +363,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
"a message. The probable cause of the error "
"is an unreachable spamd daemon. Please make "
"sure spamd is running and accessible.");
- if (!prefs_common_get_prefs()->no_recv_err_panel) {
+ if (prefs_common_get_prefs()->show_recv_err_dialog) {
if (!warned_error) {
alertpanel_error("%s", msg);
}
