pidgin: 604715e5: It's ok to always request this connectio...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 604715e55f19c8aff99f932d67f3d7ada7dc2afc
Ancestor: a40ad4118790ff992c17b471494164a0dcd7192b
Author: markdoliner at pidgin.im
Date: 2009-06-23T18:08:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/604715e55f19c8aff99f932d67f3d7ada7dc2afc

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

It's ok to always request this connection now.  It probably still doesn't
work for @example.com accounts, but it doesn't show an error anymore.  Maybe
we just stopped showing that error to users?

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	d2cf46b2e0a30636e59d8f28eb65d7d876f10717
+++ libpurple/protocols/oscar/oscar.c	1969a065d9f898a6cd4fba6260de33c5899a77f7
@@ -3913,20 +3913,9 @@ static int purple_bosrights(OscarData *o
 			purple_account_get_bool(account, "web_aware", OSCAR_DEFAULT_WEB_AWARE));
 	}
 
+	aim_srv_requestnew(od, SNAC_FAMILY_ALERT);
 	aim_srv_requestnew(od, SNAC_FAMILY_CHATNAV);
 
-	/*
-	 * The "if" statement here is a pathetic attempt to not attempt to
-	 * connect to the alerts servce (aka email notification) if this
-	 * username does not support it.  I think mail notification
-	 * works for @mac.com accounts but does not work for the newer
-	 * @anythingelse.com accounts.  If that's true then this change
-	 * breaks mail notification for @mac.com accounts, but it gets rid
-	 * of an annoying error at signon for @anythingelse.com accounts.
-	 */
-	if (od->authinfo->email != NULL && strchr(username, '@') == NULL)
-		aim_srv_requestnew(od, SNAC_FAMILY_ALERT);
-
 	return 1;
 }