evolution r34772 - trunk/mail

[gdartigu svn gnome org]

Author: gdartigu
Date: Sun Jan  6 22:48:18 2008
New Revision: 34772
URL: http://svn.gnome.org/viewvc/evolution?rev=34772&view=rev

Log:
	** Fix bug #497914

	* em-mailer-prefs.c: (emmp_header_is_valid):
	backport changes from the copy/pasted code in imap-headers
	plugin.


Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-mailer-prefs.c

Modified: trunk/mail/ChangeLog
==============================================================================
--- trunk/mail/ChangeLog	(original)
+++ trunk/mail/ChangeLog	Sun Jan  6 22:48:18 2008
@@ -1,3 +1,11 @@
+2007-11-18  Gilles Dartiguelongue  <gdartigu svn gnome org>
+
+	** Fix bug #497914
+
+	* em-mailer-prefs.c: (emmp_header_is_valid):
+	backport changes from the copy/pasted code in imap-headers
+	plugin.
+
 2008-01-06  Michael Monreal  <michael monreal gmx net>
 
 	** Fix for bug #492188

Modified: trunk/mail/em-mailer-prefs.c
==============================================================================
--- trunk/mail/em-mailer-prefs.c	(original)
+++ trunk/mail/em-mailer-prefs.c	Sun Jan  6 22:48:18 2008
@@ -462,17 +462,13 @@
 static gboolean
 emmp_header_is_valid (const char *header)
 {
-	const char *p = header;
+	gint len = g_utf8_strlen (header, -1);
 
-	if (header[0] == 0)
+	if (header[0] == 0
+	    || g_utf8_strchr (header, len, ':') != NULL
+	    || g_utf8_strchr (header, len, ' ') != NULL)
 		return FALSE;
 
-	while (*p) {
-		if ((*p == ':') || (*p == ' '))
-			return FALSE;
-		p++;
-	}
-
 	return TRUE;
 }