Mercurial > pidgin.yaz
diff libpurple/protocols/msn/msn.c @ 21100:29d8c86c14cd
propagate from branch 'im.pidgin.pidgin' (head cd2be742f6c45c200000003fc5a6341297bbe857)
to branch 'im.pidgin.cpw.khc.msnp14.soap' (head 1d7d51174ae87c7f03bb1290a8e447bf2a1704a5)
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Thu, 04 Oct 2007 06:13:01 +0000 |
| parents | 7e69275a4eef 39737dfe1cca |
| children | 741c3b5eac21 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Wed Oct 03 05:05:35 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Thu Oct 04 06:13:01 2007 +0000 @@ -598,9 +598,11 @@ g_free(tmp2); } else { - tmp = g_markup_escape_text(psm, -1); - purple_notify_user_info_add_pair(user_info, _("Status"), tmp); - g_free(tmp); + if (psm != NULL && *psm) { + tmp = g_markup_escape_text(psm, -1); + purple_notify_user_info_add_pair(user_info, _("Status"), tmp); + g_free(tmp); + } } if (currentmedia) { @@ -1570,8 +1572,7 @@ msn_info_strip_search_link(const char *field, size_t len) { const char *c; - if ((c = strstr(field, " (http://spaces.live.com/default.aspx?page=searchresults")) == NULL && - (c = strstr(field, " (http://spaces.msn.com/default.aspx?page=searchresults")) == NULL) + if ((c = strstr(field, " (http://")) == NULL) return g_strndup(field, len); return g_strndup(field, c - field); }