Mercurial > pidgin.yaz
diff src/protocols/msn/userlist.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 | a4c6f8deac96 |
children | 34d2aac7b34f |
line wrap: on
line diff
--- a/src/protocols/msn/userlist.c Sat Apr 02 16:38:33 2005 +0000 +++ b/src/protocols/msn/userlist.c Sat Apr 02 17:18:43 2005 +0000 @@ -73,7 +73,7 @@ got_new_entry(GaimConnection *gc, const char *passport, const char *friendly) { MsnPermitAdd *pa; - char *msg, *escaped; + char *msg; pa = g_new0(MsnPermitAdd, 1); pa->who = g_strdup(passport); @@ -81,13 +81,11 @@ if (friendly != NULL) { - escaped = g_markup_escape_text(friendly, -1); msg = g_strdup_printf( _("The user %s (%s) wants to add %s to his or her " "buddy list."), - passport, escaped, + passport, friendly, gaim_account_get_username(gc->account)); - g_free(escaped); } else {