# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1185092062 0
# Node ID c46515956e2e93ee7efaa6716388d99d340ab33c
# Parent  5610c2ea0d948d96bd7d0a2d6dc3e9f78851f508# Parent  ac9f19a3105170d0e46940fee6b62ec21c2b0ae8
merge of '504a8cb6756b655e5d3fa457826b95b2c177ce61'
     and '8db13002b7de5128438d3b3daaf6cfe364b6e0da'

diff -r 5610c2ea0d94 -r c46515956e2e libpurple/util.c
--- a/libpurple/util.c	Sun Jul 22 08:14:16 2007 +0000
+++ b/libpurple/util.c	Sun Jul 22 08:14:22 2007 +0000
@@ -3994,6 +3994,10 @@
 		if (*c <= ' ' || *c >= 127) return FALSE;
 		if (strchr(rfc822_specials, *c)) return FALSE;
 	}
+
+	/* It's obviously not an email address if we didn't find an '@' above */
+	if (*c == '\0') return FALSE;
+
 	/* strictly we should return false if (*(c - 1) == '.') too, but I think
 	 * we should permit user.@domain type addresses - they do work :) */
 	if (c == address) return FALSE;
diff -r 5610c2ea0d94 -r c46515956e2e pidgin/gtkconv.c