Mercurial > pidgin.yaz
diff libpurple/protocols/msnp9/msn.c @ 22433:616a76954a97
Improve "Get Info" parsing on MSN - ignore all URLs in fields instead of
playing chase-the-search-url, and ignore some more search linkified fields
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 09 Mar 2008 13:42:54 +0000 |
| parents | 6e5d37105189 |
| children | 3225c99785b8 efaecb71baad |
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/msn.c Sat Mar 08 17:17:57 2008 +0000 +++ b/libpurple/protocols/msnp9/msn.c Sun Mar 09 13:42:54 2008 +0000 @@ -1482,8 +1482,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); } @@ -1630,15 +1629,15 @@ purple_notify_user_info_add_section_break(user_info); purple_notify_user_info_add_section_header(user_info, _("Social")); - MSN_GOT_INFO_GET_FIELD("Marital status", _("Marital Status")); - MSN_GOT_INFO_GET_FIELD("Interested in", _("Interests")); - MSN_GOT_INFO_GET_FIELD("Pets", _("Pets")); - MSN_GOT_INFO_GET_FIELD("Hometown", _("Hometown")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Marital status", _("Marital Status")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Interested in", _("Interests")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Pets", _("Pets")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Hometown", _("Hometown")); MSN_GOT_INFO_GET_FIELD("Places lived", _("Places Lived")); - MSN_GOT_INFO_GET_FIELD("Fashion", _("Fashion")); - MSN_GOT_INFO_GET_FIELD("Humor", _("Humor")); - MSN_GOT_INFO_GET_FIELD("Music", _("Music")); - MSN_GOT_INFO_GET_FIELD("Favorite quote", _("Favorite Quote")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Fashion", _("Fashion")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Humor", _("Humor")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Music", _("Music")); + MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Favorite quote", _("Favorite Quote")); if (sect_info) {