From: Ricardo Mones <ricardo@mones.org>
Date: Sat, 10 Dec 2016 12:32:41 +0000 (+0100)
Subject: Fix bug #3574: Template addressing
X-Git-Tag: 3.15.0~210
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9123296406a1f61f21464ca8fd439d315b4c8367;hp=d21adbda39220af55d316f864b4aa4c7631d09eb

Fix bug #3574: Template addressing

Remove artificial limitations to values of email addresses on templates:
these strings are already parsed and split when the template is applied
in compose window.
---

diff --git a/src/prefs_template.c b/src/prefs_template.c
index c095ec45e..9e2f28e71 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -716,16 +716,6 @@ gboolean prefs_template_string_is_valid(gchar *string, gint *line, gboolean esca
 				*line = quote_fmt_get_line();
 			return FALSE;
 		}
-		if (email) {
-			const gchar *start = strrchr(parsed_buf, '<');
-			const gchar *end = strrchr(parsed_buf, '>');
-			const gchar *at = strrchr(parsed_buf, '@');
-			const gchar *space = strrchr(parsed_buf, ' ');
-			if (!at)
-				result = FALSE;
-			if (at && space && (!start || !end || end < start || start < space))
-				result = FALSE;
-		}
 		quote_fmt_reset_vartable();
 	}
 	return result;