[Gaim-commits] SF.net SVN: gaim: [17862] trunk/libgaim/protocols/oscar/oscar.c

[<the...@us...>]

Revision: 17862
          http://svn.sourceforge.net/gaim/?rev=17862&view=rev
Author:   thekingant
Date:     2006-11-30 20:27:36 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
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).

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/oscar.c

Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c	2006-12-01 04:17:15 UTC (rev 17861)
+++ trunk/libgaim/protocols/oscar/oscar.c	2006-12-01 04:27:36 UTC (rev 17862)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.