changeset 27242:763247959e00

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?
author Mark Doliner <mark@kingant.net>
date Tue, 23 Jun 2009 18:08:03 +0000
parents 8487bf2c306e
children 7054f810b0f9
files libpurple/protocols/oscar/oscar.c
diffstat 1 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c	Tue Jun 23 18:03:48 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Jun 23 18:08:03 2009 +0000
@@ -3913,20 +3913,9 @@
 			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;
 }