Mercurial > pidgin.yaz
diff src/protocols/jabber/jabber.c @ 7095:c8bf2da398e3
[gaim-migrate @ 7660]
html.[ch] is gone. Everything inside was namespaced and put in util.[ch].
One less ugly part of gaim in the tree.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Wed, 01 Oct 2003 03:43:18 +0000 |
| parents | 1350352f5818 |
| children | 6c8706109f92 |
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c Wed Oct 01 03:01:25 2003 +0000 +++ b/src/protocols/jabber/jabber.c Wed Oct 01 03:43:18 2003 +0000 @@ -34,13 +34,13 @@ #include "account.h" #include "accountopt.h" #include "debug.h" -#include "html.h" #include "message.h" #include "multi.h" #include "notify.h" #include "prpl.h" #include "request.h" #include "server.h" +#include "util.h" #include "auth.h" #include "buddy.h" @@ -777,7 +777,9 @@ } else if(jb && !GAIM_BUDDY_IS_ONLINE(b) && jb->error_msg) { ret = g_strdup(jb->error_msg); } else { - char *stripped = strip_html(jabber_buddy_get_status_msg(jb)); + char *stripped; + + stripped = gaim_markup_strip_html(jabber_buddy_get_status_msg(jb)); if(!stripped && b->uc & UC_UNAVAILABLE) stripped = g_strdup(jabber_get_state_string(b->uc)); @@ -802,7 +804,7 @@ char *text = NULL; if(jbr->status) { char *stripped; - stripped = strip_html(jbr->status); + stripped = gaim_markup_strip_html(jbr->status); text = g_markup_escape_text(stripped, -1); g_free(stripped); }