Mercurial > pidgin
diff src/gtkpounce.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 | 896efbdc74e2 |
| children | 5cda52915a1f |
line wrap: on
line diff
--- a/src/gtkpounce.c Sat Apr 02 16:38:33 2005 +0000 +++ b/src/gtkpounce.c Sat Apr 02 17:18:43 2005 +0000 @@ -954,9 +954,6 @@ { char tmp[1024]; const char *name_shown; - char *escaped; - - escaped = g_markup_escape_text(alias, -1); /* * Here we place the protocol name in the pounce dialog to lessen @@ -980,9 +977,7 @@ (events & GAIM_POUNCE_AWAY) ? _("%s has gone away. (%s)") : _("Unknown pounce event. Please report this!"), - escaped, gaim_account_get_protocol_name(account)); - - g_free(escaped); + alias, gaim_account_get_protocol_name(account)); /* * Ok here is where I change the second argument, title, from