Mercurial > pidgin
diff src/protocols/silc/ops.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 | bf5e48215158 |
| children | 2d3a935462aa |
line wrap: on
line diff
--- a/src/protocols/silc/ops.c Sat Apr 02 16:38:33 2005 +0000 +++ b/src/protocols/silc/ops.c Sat Apr 02 17:18:43 2005 +0000 @@ -1294,7 +1294,7 @@ SilcServerEntry server_entry; char *server_name; char *server_info; - char tmp[256], *msg; + char tmp[256]; if (!success) { gaim_notify_error(gc, _("Server Information"), @@ -1310,9 +1310,7 @@ if (server_name && server_info) { g_snprintf(tmp, sizeof(tmp), "Server: %s\n%s", server_name, server_info); - msg = g_markup_escape_text(tmp, strlen(tmp)); - gaim_notify_info(gc, NULL, _("Server Information"), msg); - g_free(msg); + gaim_notify_info(gc, NULL, _("Server Information"), tmp); } } break;