[Commits] [SCM] claws branch, master, updated. 3.14.1-206-g0b164a3

[mones at claws-mail.org]

The branch, master has been updated
       via  0b164a349d5f66c2e3e749f036ef3a3628962928 (commit)
      from  68274612f4e59a221a2564b27a0fae3efbbb0823 (commit)

Summary of changes:
 src/compose.c      |    2 +-
 src/prefs_common.c |    4 +---
 src/prefs_common.h |    1 -
 3 files changed, 2 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 0b164a349d5f66c2e3e749f036ef3a3628962928
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Feb 27 23:59:19 2017 +0100

    Simplify hidden prefs for too many recipients

diff --git a/src/compose.c b/src/compose.c
index 2a2a438..77d9f05 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5152,7 +5152,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
 		}
 	}
 
-	if (!compose->batch && prefs_common.warn_sending_many_recipients == TRUE
+	if (!compose->batch && prefs_common.warn_sending_many_recipients_num > 0
 			&& check_everything == TRUE) {
 		GSList *list;
 		gint cnt = 0;
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 2d8f5bd..da80d2c 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -213,9 +213,7 @@ static PrefParam param[] = {
 	  P_BOOL, NULL, NULL, NULL},
 	{"warn_empty_subj", "TRUE", &prefs_common.warn_empty_subj,
 	 P_BOOL, NULL, NULL, NULL},
-	{"warn_sending_many_recipients", "FALSE", &prefs_common.warn_sending_many_recipients,
-	 P_BOOL, NULL, NULL, NULL},
-	{"warn_sending_many_recipients_num", "1", &prefs_common.warn_sending_many_recipients_num, P_INT,
+	{"warn_sending_many_recipients_num", "0", &prefs_common.warn_sending_many_recipients_num, P_INT,
 	 NULL, NULL, NULL},
 	{"hide_timezone", "FALSE", &prefs_common.hide_timezone,
 	 P_BOOL, NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 179e163..f4b6e1d 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -144,7 +144,6 @@ struct _PrefsCommon
 	gboolean outgoing_fallback_to_ascii;
 	gboolean rewrite_first_from;
 	gboolean warn_empty_subj;
-	gboolean warn_sending_many_recipients;
 	gint warn_sending_many_recipients_num;
 	gboolean hide_timezone;
 	gboolean allow_jisx0201_kana;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail