# HG changeset patch # User Richard Laager # Date 1179561063 0 # Node ID c8ed8e35154130894f3107725e1efdb22522649f # Parent fb35886b0d855ffa593fb2c149b044dc970cae54# Parent ec6a029c865de46ab041a7f97b6383640e35508f explicit merge of '751c46819c7edfd139753ceda847258389eee965' and 'e39b5117f8df79ccfe2f383c3b0bbe8f33566991' to branch 'im.pidgin.pidgin' diff -r fb35886b0d85 -r c8ed8e351541 libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Sat May 19 07:50:19 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat May 19 07:51:03 2007 +0000 @@ -619,7 +619,7 @@ account = purple_connection_get_account(gc); user = msn_normalize(account, purple_account_get_username(account)); - if (strstr(user, "@hotmail.com") != NULL) + if (strstr(user, "@hotmail.") != NULL) { m = g_list_append(m, NULL); act = purple_plugin_action_new(_("Open Hotmail Inbox"), diff -r fb35886b0d85 -r c8ed8e351541 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Sat May 19 07:50:19 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Sat May 19 07:51:03 2007 +0000 @@ -982,7 +982,8 @@ } else { - fputs("\n" + fputs("\n" + "\n" "\n" "