# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1164947256 0
# Node ID e02355d52752b53edb49c0b554971603f396fd01
# Parent  7ca4a6820154cef3dd68d813c088140da8ad4fed
[gaim-migrate @ 17862]
Don't attempt to check for new mail for screen names in the form
of email addresses.  This fixes sf bug #1595188.  It mail
checking currently works for @mac.com screen names then this
will break it (unfortunate side-effect).

committer: Tailor Script <tailor@pidgin.im>

diff -r 7ca4a6820154 -r e02355d52752 libgaim/protocols/oscar/oscar.c
--- a/libgaim/protocols/oscar/oscar.c	Fri Dec 01 04:16:34 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Fri Dec 01 04:27:36 2006 +0000
@@ -3527,7 +3527,17 @@
 	}
 
 	aim_reqservice(od, SNAC_FAMILY_CHATNAV);
-	if (od->authinfo->email != NULL)
+
+	/*
+	 * The "if" statement here is a pathetic attempt to not attempt to
+	 * connect to the alerts servce (aka email notification) if this
+	 * screen name 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(gc->account->username, '@') == NULL)))
 		aim_reqservice(od, SNAC_FAMILY_ALERT);
 
 	return 1;