changeset 17159:d92776c252b8

Support for @msn.com accounts when opening Inbox, and unconditioanlly request Inbox URL (and associated passport authentication details) on login. Fixes #1142.
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 20 May 2007 15:07:49 +0000
parents fdd52f7651c7
children e4179a27f5be
files libpurple/protocols/msn/msn.c libpurple/protocols/msn/session.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Sun May 20 14:57:09 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sun May 20 15:07:49 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"),
--- a/libpurple/protocols/msn/session.c	Sun May 20 14:57:09 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sun May 20 15:07:49 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");
 }