Mercurial > pidgin
diff src/protocols/jabber/message.c @ 10774:d83f745c997b
[gaim-migrate @ 12383]
Some escaping stuff, all over the place.
Various escaping fixes in the IRC prpl.
The core and plugins only need to escape text if it's going to be shown in
a gtkimhtml or equivalent - such as writing to a conversation window, or
gaim_notify_{formatted,userinfo}
The primary and secondary text for all notify and request API functions
do NOT need to be escaped by the core or plugins, because whether html-like
markup is required for these is UI dependent. Now we always escape these
in the Gtk UI request & notify ops.
Should I backport any of the above to oldstatus?
I also removed gaim_chat_get_display_name() - it was almost a duplicate of
gaim_chat_get_name(), and it leaked.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 02 Apr 2005 17:18:43 +0000 |
| parents | c4cb90065e1d |
| children | 11b43807d6a6 |
line wrap: on
line diff
--- a/src/protocols/jabber/message.c Sat Apr 02 16:38:33 2005 +0000 +++ b/src/protocols/jabber/message.c Sat Apr 02 17:18:43 2005 +0000 @@ -203,7 +203,6 @@ { GHashTable *components; JabberID *jid = jabber_id_new(jm->to); - char *stripped; if(!jid) return; @@ -218,9 +217,7 @@ g_strdup(jm->password)); jabber_id_free(jid); - stripped = gaim_markup_strip_html(jm->body); - serv_got_chat_invite(jm->js->gc, jm->to, jm->from, stripped, components); - g_free(stripped); + serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components); } static void handle_error(JabberMessage *jm)