# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1179673742 0
# Node ID e4179a27f5be986dc5b4edb7493fdab144f32487
# Parent  d92776c252b81680c7d1def7d85cbd5154ccf13f# Parent  251ed95cc52ca5fe2d4b8162e028ff3b20122a9b
merge of '1b31a3a29b0aa69839b75bcf2fbc27ff3f36f3ed'
     and '70ef97577e36bac904647f87d4dbf571f6163a3f'

diff -r 251ed95cc52c -r e4179a27f5be libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Sun May 20 15:02:03 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sun May 20 15:09:02 2007 +0000
@@ -345,7 +345,6 @@
 		MsnCmdProc *cmdproc = session->notification->cmdproc;
 		purple_notify_error(gc, NULL,
 						  _("This Hotmail account may not be active."), NULL);
-		msn_cmdproc_send(cmdproc, "URL", "%s", "INBOX");
 		return;
 	}
 
@@ -621,7 +620,8 @@
 	account = purple_connection_get_account(gc);
 	user = msn_normalize(account, purple_account_get_username(account));
 
-	if (strstr(user, "@hotmail.") != NULL)
+	if ((strstr(user, "@hotmail.") != NULL) ||
+		(strstr(user, "@msn.com") != NULL))
 	{
 		m = g_list_append(m, NULL);
 		act = purple_plugin_action_new(_("Open Hotmail Inbox"),
diff -r 251ed95cc52c -r e4179a27f5be libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Sun May 20 15:02:03 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sun May 20 15:09:02 2007 +0000
@@ -404,4 +404,9 @@
 
 	/* Sync users */
 	msn_session_sync_users(session);
+	/* It seems that some accounts that haven't accessed hotmail for a while
+	 * 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");
 }