Mercurial > pidgin.yaz
changeset 17199:ddf759c28d0b
merge of '004942f80429de395663b172b5d6c6e7d834050a'
and 'ff732da54be1455c1077c12232b125b47357a9a7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 20 May 2007 18:32:40 +0000 |
| parents | 569fa7a11a99 (diff) 1f0657cd89d3 (current diff) |
| children | c6c9f8a6dd9c 0598803f9b64 1e674c0886b1 |
| files | ChangeLog |
| diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 20 16:54:17 2007 +0000 +++ b/ChangeLog Sun May 20 18:32:40 2007 +0000 @@ -32,6 +32,7 @@ conversation tabs (Ma Xuan) * Fix IRC connection bug with dircproxy (xjoe) * Ctrl+[shift]+tab focuses the next most active tab (William Thompson) + * Fix Open Hotmail Inbox for MSN to work more reliably * Add a Google Talk item to the protocol list, to help users who think we don't support Google Talk. The item acts just like "XMPP". * Remember if the X server supports XScreenSaver, to avoid waking it
--- a/libpurple/protocols/msn/msn.c Sun May 20 16:54:17 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sun May 20 18:32:40 2007 +0000 @@ -342,10 +342,8 @@ if (session->passport_info.file == NULL) { - 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 +619,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 16:54:17 2007 +0000 +++ b/libpurple/protocols/msn/session.c Sun May 20 18:32:40 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"); }