# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1326106717 0
# Node ID 307d487f21ee5577b344afa264cc447bde9e26a6
# Parent  1874e96cf51343ce1f395abd7273f38833461218
Allow signing on with usernames containing periods and
underscores.  Allow adding buddies containing periods
and underscores.

Fixes #13500.

diff -r 1874e96cf513 -r 307d487f21ee ChangeLog
--- a/ChangeLog	Fri Jan 06 02:37:42 2012 +0000
+++ b/ChangeLog	Mon Jan 09 10:58:37 2012 +0000
@@ -6,9 +6,12 @@
 	  (Dan Williams) (#13859)
 
 	AIM and ICQ:
-	* Make buddy list management code more efficient. (Oliver) (#4816)
+	* Allow signing on with usernames containing periods and
+	  underscores. (#13500)
+	* Allow adding buddies containing periods and underscores. (#13500)
 	* Don't try to format ICQ usernames entered as email addresses.
 	  Gets rid of an "Unable to format username" error at login. (#13883)
+	* Make buddy list management code more efficient. (Oliver) (#4816)
 
 	Bonjour:
 	* Support file transfers up to ~9 EiB.
diff -r 1874e96cf513 -r 307d487f21ee libpurple/protocols/oscar/util.c
--- a/libpurple/protocols/oscar/util.c	Fri Jan 06 02:37:42 2012 +0000
+++ b/libpurple/protocols/oscar/util.c	Mon Jan 09 10:58:37 2012 +0000
@@ -141,12 +141,12 @@
 	if (purple_email_is_valid(name))
 		return TRUE;
 
-	/* Normal AIM usernames can't start with a number */
-	if (isdigit(name[0]))
+	/* Normal AIM usernames can't start with a number, period or underscore */
+	if (isalnum(name[0]))
 		return FALSE;
 
 	for (i = 0; name[i] != '\0'; i++) {
-		if (!isalnum(name[i]) && (name[i] != ' '))
+		if (!isalnum(name[i]) && name[i] != ' ' && name[i] != '.' && name[i] != '_')
 			return FALSE;
 	}