[Commits] [SCM] claws branch, master, updated. 3.18.0-337-gea407c21b

[paul at claws-mail.org]

The branch, master has been updated
       via  ea407c21bbaa955c0c17a00c25847cbe49ca4640 (commit)
      from  5a9e9c5af59144c9ac54c992ea31e2ac3a827019 (commit)

Summary of changes:
 src/common/utils.h | 8 ++------
 src/compose.c      | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit ea407c21bbaa955c0c17a00c25847cbe49ca4640
Author: paul <paul at claws-mail.org>
Date:   Thu Feb 24 11:12:39 2022 +0000

    double the size of MAX_ALLOCA_MEM_SIZE and use standard sizing in alertpanel

diff --git a/src/common/utils.h b/src/common/utils.h
index 2e58f15a6..fb8eeefe8 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -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
+ * 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
@@ -95,11 +95,7 @@ typedef gint64 goffset;
 	} \
 }
 
-/*
-100k of utf-8 text is 51200 utf-8 characters and
-51200 utf-8 characters is at least 28 A4 pages
-*/
-#define MAX_ALLOCA_MEM_SIZE 51200
+#define MAX_ALLOCA_MEM_SIZE 102400
 
 #define Xalloca(ptr, size, iffail) \
 { \
diff --git a/src/compose.c b/src/compose.c
index f25aa7e36..f1f5c3e9e 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -10919,7 +10919,9 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
 
                 glong len = g_utf8_strlen(contents, -1);
                 if (len > MAX_ALLOCA_MEM_SIZE) {
-                        alertpanel_error(_("Number of pages '%ld' exceeds limit '%d' for paste.\nAttach as file instead."), (len / 1800), (MAX_ALLOCA_MEM_SIZE / 1800));
+                        alertpanel_error(_("Size of pasted text exceeds limit (%dKiB) for paste.\n"
+					   "Attach as file instead."),
+					 (MAX_ALLOCA_MEM_SIZE / 1024));
                         return;
                 }
 

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


hooks/post-receive
-- 
Claws Mail