Mercurial > pidgin
diff src/account.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 | f93ed7f6ecc7 |
children | 885377f484b7 |
line wrap: on
line diff
--- a/src/account.c Sat Apr 02 16:38:33 2005 +0000 +++ b/src/account.c Sat Apr 02 17:18:43 2005 +0000 @@ -775,22 +775,19 @@ request_password(GaimAccount *account) { gchar *primary; - gchar *escaped; const gchar *username; /* Close any previous password request windows */ gaim_request_close_with_handle(account); username = gaim_account_get_username(account); - escaped = g_markup_escape_text(username, strlen(username)); - primary = g_strdup_printf(_("Enter password for %s (%s)"), escaped, + primary = g_strdup_printf(_("Enter password for %s (%s)"), username, gaim_account_get_protocol_name(account)); gaim_request_input(account, _("Enter Password"), primary, NULL, NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(request_password_ok_cb), _("Cancel"), NULL, account); g_free(primary); - g_free(escaped); } void