Mercurial > pidgin
changeset 8461:16485e87b7bb
[gaim-migrate @ 9191]
Fix a problem displaying AIM tooltips with the dude or chick has an
away message containing an unmatched <
This breaks the string freeze horrendously. I'm afraid every string
for every language will have to be retranslated. Sorry.
Just kidding.
Really.
Don't hate me because I'm beautiful.
This commit brought to you by the follow quote:
"Chewie, take the professor in the back and plug him into the hyperdrive."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 17 Mar 2004 02:25:03 +0000 |
| parents | 03b9ce930f0d |
| children | 5a39fce812f4 |
| files | src/protocols/oscar/oscar.c src/util.h |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Tue Mar 16 20:48:21 2004 +0000 +++ b/src/protocols/oscar/oscar.c Wed Mar 17 02:25:03 2004 +0000 @@ -5754,8 +5754,10 @@ g_free(away_utf8); tmp2 = gaim_markup_strip_html(tmp1); g_free(tmp1); - tmp3 = gaim_str_sub_away_formatters(tmp2, gaim_account_get_username(gaim_connection_get_account(gc))); + tmp1 = gaim_strreplace(tmp2, "<", "<"); g_free(tmp2); + tmp3 = gaim_str_sub_away_formatters(tmp1, gaim_account_get_username(gaim_connection_get_account(gc))); + g_free(tmp1); tmp = ret; ret = g_strconcat(tmp, _("<b>Away Message:</b> "), tmp3, "\n", NULL); g_free(tmp);
--- a/src/util.h Tue Mar 16 20:48:21 2004 +0000 +++ b/src/util.h Wed Mar 17 02:25:03 2004 +0000 @@ -454,6 +454,9 @@ * @param delimiter The substring you want replaced. * @param replacement The substring you want inserted in place * of the delimiting substring. + * + * @return A new string, after performing the substitution. + * free this with g_free(). */ gchar *gaim_strreplace(const char *string, const char *delimiter, const char *replacement); @@ -466,6 +469,9 @@ * @param delimiter The substring you want replaced. * @param replacement The substring you want inserted in place * of the delimiting substring. + * + * @return A new string, after performing the substitution. + * free this with g_free(). */ gchar *gaim_strcasereplace(const char *string, const char *delimiter, const char *replacement);