Mercurial > pidgin
changeset 17141:c8ed8e351541
explicit merge of '751c46819c7edfd139753ceda847258389eee965'
and 'e39b5117f8df79ccfe2f383c3b0bbe8f33566991'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 07:51:03 +0000 |
| parents | fb35886b0d85 (current diff) ec6a029c865d (diff) |
| children | 9fd39a035729 |
| files | |
| diffstat | 5 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"),
--- 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("<html>\n" + fputs("<!-- saved from url=(0013)about:internet -->\n" + "<html>\n" "<head>\n" "<noscript>\n" "<meta http-equiv=\"Refresh\" content=\"0; "
--- a/libpurple/protocols/msn/slp.c Sat May 19 07:50:19 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Sat May 19 07:51:03 2007 +0000 @@ -363,6 +363,8 @@ purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel); slpcall->xfer = xfer; + purple_xfer_ref(slpcall->xfer); + xfer->data = slpcall; purple_xfer_request(xfer);
--- a/libpurple/protocols/msn/slpcall.c Sat May 19 07:50:19 2007 +0000 +++ b/libpurple/protocols/msn/slpcall.c Sat May 19 07:51:03 2007 +0000 @@ -120,6 +120,9 @@ if (slpcall->end_cb != NULL) slpcall->end_cb(slpcall, session); + if (slpcall->xfer != NULL) + purple_xfer_unref(slpcall->xfer); + g_free(slpcall); }
--- a/libpurple/protocols/msn/slplink.c Sat May 19 07:50:19 2007 +0000 +++ b/libpurple/protocols/msn/slplink.c Sat May 19 07:51:03 2007 +0000 @@ -763,6 +763,7 @@ slpcall->progress_cb = msn_xfer_progress_cb; slpcall->cb = msn_xfer_completed_cb; slpcall->xfer = xfer; + purple_xfer_ref(slpcall->xfer); slpcall->pending = TRUE;