Mercurial > pidgin.yaz
diff libpurple/protocols/msnp9/msn.c @ 25635:efaecb71baad
propagate from branch 'im.pidgin.pidgin' (head 8ca6a80e2cd7fbbc59983f8ba370f7276e062db9)
to branch 'im.pidgin.pidgin.vv' (head 3ed39e8792f4a2e92ef5a3c7f4fb14251c9dae11)
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 15 Mar 2008 07:39:15 +0000 |
| parents | f5bcb58bdf56 616a76954a97 |
| children | e4a4bc86c547 |
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/msn.c Sat Mar 15 07:37:03 2008 +0000 +++ b/libpurple/protocols/msnp9/msn.c Sat Mar 15 07:39:15 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) {