# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181495923 0
# Node ID 210fc36306e4ebcacc0572af54db3f350b6bbb13
# Parent  60bc2827d0e7f4d11f6ebf7e2c84df7a5b0a3566
Don't retrieve hotmail authorization info for non-hotmail accounts. Fixes #1580

diff -r 60bc2827d0e7 -r 210fc36306e4 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun Jun 10 15:59:10 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Jun 10 17:18:43 2007 +0000
@@ -591,12 +591,23 @@
 static void
 qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
+	MsnSession *session;
 	static int count = 0;
-	MsnSession *session = cmdproc->session;
+	const char *passport;
+	PurpleAccount *account;
+
+	session = cmdproc->session;
+	account = session->account;
 
 	if (session->passport_info.file == NULL)
 		return;
 
+	passport = purple_normalize(account, purple_account_get_username(account));
+
+	if ((strstr(passport, "@hotmail.") != NULL) ||
+		(strstr(passport, "@msn.com") != NULL))
+		return;
+
 	if (count++ < 26)
 		return;
 
diff -r 60bc2827d0e7 -r 210fc36306e4 libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Sun Jun 10 15:59:10 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sun Jun 10 17:18:43 2007 +0000
@@ -386,6 +386,7 @@
 	PurpleAccount *account;
 	PurpleConnection *gc;
 	PurpleStoredImage *img;
+	const char *passport;
 
 	if (session->logged_in)
 		return;
@@ -409,5 +410,12 @@
 	 * and @msn.com accounts don't automatically get the initial email
 	 * notification so we always request it on login
 	 */
-	msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
+
+	passport = purple_normalize(account, purple_account_get_username(account));
+
+	if ((strstr(passport, "@hotmail.") != NULL) ||
+		(strstr(passport, "@msn.com") != NULL))
+	{
+		msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
+	}
 }