Mercurial > pidgin.yaz
changeset 9224:3e0cd1c6ddc7
[gaim-migrate @ 10020]
This fixes a weird bug i ran into where Gaim was crashing apparently
because on of my buddy's status messages started with a <
I wonder if this wasn't really a bug with gaim_markup_strip_html
Either way, Yahoo status messages aren't html, so lets not strip them.
Besides we escape the markup anyway.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Sun, 06 Jun 2004 20:31:20 +0000 |
| parents | f46154d6de2b |
| children | 554ef91db2dd |
| files | src/protocols/yahoo/yahoo.c |
| diffstat | 1 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c Sun Jun 06 20:09:45 2004 +0000 +++ b/src/protocols/yahoo/yahoo.c Sun Jun 06 20:31:20 2004 +0000 @@ -2451,7 +2451,6 @@ { struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data; struct yahoo_friend *f = NULL; - char *stripped = NULL; f = g_hash_table_lookup(yd->friends, b->name); if (!f) @@ -2467,13 +2466,8 @@ case YAHOO_STATUS_CUSTOM: if (!f->msg) return NULL; - stripped = gaim_markup_strip_html(f->msg); - if (stripped) { - char *ret = g_markup_escape_text(stripped, strlen(stripped)); - g_free(stripped); - return ret; - } - return NULL; + return g_markup_escape_text(f->msg, strlen(f->msg)); + default: return g_strdup(yahoo_get_status_string(f->status)); } @@ -2499,7 +2493,7 @@ case YAHOO_STATUS_CUSTOM: if (!f->msg) return NULL; - status = gaim_markup_strip_html(f->msg); + status = g_strdup(f->msg); break; default: status = g_strdup(yahoo_get_status_string(f->status));