Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
10773:888d4c328be5 | 10774:d83f745c997b |
---|---|
201 | 201 |
202 static void handle_groupchat_invite(JabberMessage *jm) | 202 static void handle_groupchat_invite(JabberMessage *jm) |
203 { | 203 { |
204 GHashTable *components; | 204 GHashTable *components; |
205 JabberID *jid = jabber_id_new(jm->to); | 205 JabberID *jid = jabber_id_new(jm->to); |
206 char *stripped; | |
207 | 206 |
208 if(!jid) | 207 if(!jid) |
209 return; | 208 return; |
210 | 209 |
211 components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); | 210 components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); |
216 g_strdup(jm->js->user->node)); | 215 g_strdup(jm->js->user->node)); |
217 g_hash_table_replace(components, g_strdup("password"), | 216 g_hash_table_replace(components, g_strdup("password"), |
218 g_strdup(jm->password)); | 217 g_strdup(jm->password)); |
219 | 218 |
220 jabber_id_free(jid); | 219 jabber_id_free(jid); |
221 stripped = gaim_markup_strip_html(jm->body); | 220 serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components); |
222 serv_got_chat_invite(jm->js->gc, jm->to, jm->from, stripped, components); | |
223 g_free(stripped); | |
224 } | 221 } |
225 | 222 |
226 static void handle_error(JabberMessage *jm) | 223 static void handle_error(JabberMessage *jm) |
227 { | 224 { |
228 char *buf; | 225 char *buf; |