pidgin.2.x.y: fdd2e607: *** Plucked rev 13d6e924c9257b20e2105064...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: fdd2e607e8dbe0cbd6584455a9e71b0659f2c29f
Parent:   14d1bcdec5d90bcadbee7130f55ec007b7b01d14
Author:   markdoliner at pidgin.im
Date:     02/12/12 22:51:01
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/fdd2e607e8dbe0cbd6584455a9e71b0659f2c29f

Changelog: 

*** Plucked rev 13d6e924c9257b20e21050646cab88043bdb2e15 (markdoliner at pidgin.im):
Allow signing on with usernames containing periods and
underscores.  Allow adding buddies containing periods
and underscores.

Fixes #13500.

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

Changes against parent 14d1bcdec5d90bcadbee7130f55ec007b7b01d14

  patched  ChangeLog
  patched  libpurple/protocols/oscar/util.c

-------------- next part --------------
============================================================
--- ChangeLog	f31efa280712cae1d2a8e16708eda5785f53bbe2
+++ ChangeLog	dc7611f40e28578ee2c9d947ae1de9c5fe635ce7
@@ -1,5 +1,11 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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.
============================================================
--- libpurple/protocols/oscar/util.c	bb5244ce02caef6b30aea77b1e274b72f42f9d01
+++ libpurple/protocols/oscar/util.c	98d19884e1a7622e75c2df88586921142024ff79
@@ -141,12 +141,12 @@ oscar_util_valid_name_aim(const char *na
 	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;
 	}