# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1329105061 0
# Node ID b441fd23e5bb394abd51e6a4c07d25e11385148d
# Parent  a3283d6a19b23aa444c5f1550092038f02adb9b4
*** Plucked rev 13d6e924c9257b20e21050646cab88043bdb2e15 (markdoliner@pidgin.im):
Allow signing on with usernames containing periods and
underscores.  Allow adding buddies containing periods
and underscores.

Fixes #13500.

*** Plucked rev 9bc480e430c705484b95bc77407b0956800cdab4 (grim@pidgin.im):
Fix mark's commit and allow aim accounts to work again

diff -r a3283d6a19b2 -r b441fd23e5bb ChangeLog
--- a/ChangeLog	Mon Feb 13 03:32:29 2012 +0000
+++ b/ChangeLog	Mon Feb 13 03:51:01 2012 +0000
@@ -1,5 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.2 (02/22/2012):
+	AIM and ICQ:
+	* Allow signing on with usernames containing periods and
+	  underscores. (#13500)
+	* Allow adding buddies containing periods and underscores. (#13500)
+
 version 2.10.1 (12/06/2011):
 	Finch:
 	* Fix compilation on OpenBSD.
diff -r a3283d6a19b2 -r b441fd23e5bb libpurple/protocols/oscar/util.c
--- a/libpurple/protocols/oscar/util.c	Mon Feb 13 03:32:29 2012 +0000
+++ b/libpurple/protocols/oscar/util.c	Mon Feb 13 03:51:01 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]) == 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;
 	}