[Commits] [SCM] claws branch, master, updated. 4.3.0-3-g4dc29628f
paul at claws-mail.org
paul at claws-mail.org
Tue Jun 11 06:51:44 UTC 2024
The branch, master has been updated
via 4dc29628f8545a4dd7ea8ce1e724220b06db0131 (commit)
from a890cdbde84467af7d74cc8656c11ccd749c1281 (commit)
Summary of changes:
src/prefs_common.c | 2 ++
src/prefs_common.h | 3 ++-
src/prefs_migration.c | 7 ++++++-
src/prefs_receive.c | 20 ++++++++++----------
4 files changed, 20 insertions(+), 12 deletions(-)
- Log -----------------------------------------------------------------
commit 4dc29628f8545a4dd7ea8ce1e724220b06db0131
Author: Paul <paul at claws-mail.org>
Date: Tue Jun 11 07:51:39 2024 +0100
eliminate the negative preference oddity
diff --git a/src/prefs_common.c b/src/prefs_common.c
index f0a359d36..47bc3f93b 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -183,6 +183,8 @@ static PrefParam param[] = {
{"receivewin_height", "-1", &prefs_common.receivewin_height, P_INT,
NULL, NULL, NULL},
{"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
+ P_BOOL, NULL, NULL, NULL}, /* deprecated */
+ {"show_receive_error_dialog", "TRUE", &prefs_common.show_recv_err_dialog,
P_BOOL, NULL, NULL, NULL},
{"close_receive_dialog", "TRUE", &prefs_common.close_recv_dialog,
P_BOOL, NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index ad0cfce4c..6c81f1c4a 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -34,7 +34,7 @@
#include "prefs_msg_colors.h"
#include "prefs_summary_open.h"
-#define CLAWS_CONFIG_VERSION 4
+#define CLAWS_CONFIG_VERSION 5
typedef struct _PrefsCommon PrefsCommon;
@@ -163,6 +163,7 @@ struct _PrefsCommon
gint receivewin_height;
gboolean close_recv_dialog;
gboolean no_recv_err_panel;
+ gboolean show_recv_err_dialog;
/* Send */
gboolean savemsg;
diff --git a/src/prefs_migration.c b/src/prefs_migration.c
index 51cb439b0..3b9b6b99c 100644
--- a/src/prefs_migration.c
+++ b/src/prefs_migration.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2016-2022 the Claws Mail team
+ * Copyright (C) 2016-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
@@ -84,6 +84,11 @@ static void _update_config_common(gint version)
prefs_common.autochk_itv *= 60;
break;
+ case 5:
+ if (prefs_common.no_recv_err_panel)
+ prefs_common.show_recv_err_dialog = FALSE;
+ else
+ prefs_common.show_recv_err_dialog = TRUE;
default:
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index 84881e9fe..bdc0751e7 100644
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2016 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2005-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
@@ -63,7 +63,7 @@ typedef struct _ReceivePage
GtkWidget *entry_newmail_notify_cmd;
GtkWidget *hbox_newmail_notify;
GtkWidget *optmenu_recvdialog;
- GtkWidget *checkbtn_no_recv_err_panel;
+ GtkWidget *checkbtn_show_recv_err_dialog;
GtkWidget *checkbtn_close_recv_dialog;
} ReceivePage;
@@ -134,7 +134,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
GtkListStore *menu;
GtkTreeIter iter;
GtkWidget *optmenu_recvdialog;
- GtkWidget *checkbtn_no_recv_err_panel;
+ GtkWidget *checkbtn_show_recv_err_dialog;
GtkWidget *checkbtn_close_recv_dialog;
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
@@ -240,8 +240,8 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
_("Close receive dialog when finished"));
- PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
- _("Don't popup error dialog on receive error"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_show_recv_err_dialog,
+ _("Show error dialog on receive error"));
vbox2 = gtkut_get_options_frame(vbox1, &frame,
_("After receiving new mail"));
@@ -297,8 +297,8 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.autochk_newmail);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_incext),
prefs_common.use_extinc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_no_recv_err_panel),
- prefs_common.no_recv_err_panel);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_recv_err_dialog),
+ prefs_common.show_recv_err_dialog);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_close_recv_dialog),
prefs_common.close_recv_dialog);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_chkonstartup),
@@ -335,7 +335,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_receive->hbox_newmail_notify = hbox_newmail_notify;
prefs_receive->optmenu_recvdialog = optmenu_recvdialog;
- prefs_receive->checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel;
+ prefs_receive->checkbtn_show_recv_err_dialog = checkbtn_show_recv_err_dialog;
prefs_receive->checkbtn_close_recv_dialog = checkbtn_close_recv_dialog;
prefs_receive->page.widget = vbox1;
@@ -363,8 +363,8 @@ static void prefs_receive_save(PrefsPage *_page)
prefs_common.use_extinc = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_incext));
- prefs_common.no_recv_err_panel = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_no_recv_err_panel));
+ prefs_common.show_recv_err_dialog = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_recv_err_dialog));
prefs_common.close_recv_dialog = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_close_recv_dialog));
prefs_common.chk_on_startup = gtk_toggle_button_get_active(
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list