pidgin.next.major: 950eb2e6: Change the heuristic we use for setting ...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 950eb2e674f6da789c0132765c4f2d68ccd0d617
Parent:   a21db4a60a730f13d6dfbeb144dde8eb113f8d05
Author:   markdoliner at pidgin.im
Date:     05/09/11 00:42:52
Branch:   im.pidgin.pidgin.next.major
URL: http://d.pidgin.im/viewmtn/revision/info/950eb2e674f6da789c0132765c4f2d68ccd0d617

Changelog: 

Change the heuristic we use for setting od->icq.  We used to set it to
true any time the username contained only digits.  Now we set it to try
if account->protocol_id is prpl-icq.  This means we're now relying on the
user to tell us whether their account is AIM or ICQ... and I think that's
fine.

The reason for this change is that we/AOL apparently allow the user to
login to ICQ accounts by entering their email address.  This means we're
no longer able to look at the username to determine whether it's an AIM
name or an ICQ name.

This was a problem because we were trying to format the spacing/capitalization
in the username if the name was an icq email address, which resulted in
an annoying popup error at login.  Fixes #13883.

It's probably safe for this to go into im.pidgin.pidgin (maybe after the
pending release), but I really don't want to keep changing the 2.x.y branch.
I think we need to move on to 3.x.y.

Changes against parent a21db4a60a730f13d6dfbeb144dde8eb113f8d05

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

-------------- next part --------------
============================================================
--- ChangeLog	1774138a17e3f5338fa0ab16bae2fa81431ef590
+++ ChangeLog	19f3ed7de824d1d45c61c768727c7450066d253c
@@ -3,6 +3,8 @@ version 3.0.0 (??/??/????):
 version 3.0.0 (??/??/????):
 	AIM and ICQ:
 	* Make buddy list management code more efficient. (Oliver) (#4816)
+	* Don't try to format ICQ usernames entered as email addresses.
+	  Gets rid of an "Unable to format username" error at login. (#13883)
 
 version 2.8.0 (??/??/????):
 	General:
============================================================
--- libpurple/protocols/oscar/oscar.c	3f0821f8398c92e9fe000d7ad7b7571942cecb6d
+++ libpurple/protocols/oscar/oscar.c	d93027012388ebf0dd511d9ef3aa6ed8955b739b
@@ -741,7 +741,7 @@ oscar_login(PurpleAccount *account)
 	}
 
 	gc->flags |= PURPLE_CONNECTION_HTML;
-	if (oscar_util_valid_name_icq((purple_account_get_username(account)))) {
+	if (g_str_equal(purple_account_get_protocol_id(account), "prpl-icq")) {
 		od->icq = TRUE;
 		gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS;
 	} else {
@@ -4581,32 +4581,18 @@ const char *oscar_list_icon_icq(PurpleAc
 const char *oscar_list_icon_icq(PurpleAccount *a, PurpleBuddy *b)
 {
 	const char *name = b ? purple_buddy_get_name(b) : NULL;
-	if ((b == NULL) || (name == NULL) || oscar_util_valid_name_sms(name))
-	{
-		if (a == NULL || oscar_util_valid_name_icq(purple_account_get_username(a)))
-			return "icq";
-		else
-			return "aim";
-	}
+	if (name && !oscar_util_valid_name_sms(name) && oscar_util_valid_name_icq(name))
+		return "icq";
 
-	if (oscar_util_valid_name_icq(name))
-		return "icq";
-	return "aim";
+	return "icq";
 }
 
 const char *oscar_list_icon_aim(PurpleAccount *a, PurpleBuddy *b)
 {
 	const char *name = b ? purple_buddy_get_name(b) : NULL;
-	if ((b == NULL) || (name == NULL) || oscar_util_valid_name_sms(name))
-	{
-		if (a != NULL && oscar_util_valid_name_icq(purple_account_get_username(a)))
-			return "icq";
-		else
-			return "aim";
-	}
+	if (name && !oscar_util_valid_name_sms(name) && oscar_util_valid_name_icq(name))
+		return "icq";
 
-	if (oscar_util_valid_name_icq(name))
-		return "icq";
 	return "aim";
 }