# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181495930 0
# Node ID 42a6171a3b2522a08e341fb26317f920c0a20bd1
# Parent  2c425e60fb1dc28c77b1213c0b00710efbabbc68# Parent  210fc36306e4ebcacc0572af54db3f350b6bbb13
merge of '8076670c76ed171ce5bc373a596dfd98c5458d91'
     and 'dcb937559830ec1750888127573b88946b88c52f'

diff -r 2c425e60fb1d -r 42a6171a3b25 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun Jun 10 17:12:00 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Jun 10 17:18:50 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 2c425e60fb1d -r 42a6171a3b25 libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Sun Jun 10 17:12:00 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sun Jun 10 17:18:50 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");
+	}
 }