Mercurial > pidgin
changeset 31244:3fe2bd895946
There is code above these lines, just before the start of the switch(),
that validates that curitem->name is utf8. So we don't need to bother
with oscar_utf8_try_convert() here.
I know there has been some concern in the past about some people having
non-utf8 names in their server list and wanting Pidgin to deal with that
intelligently... all I can say is this commit shouldn't change the current
functionality. It looks like we currently ignore groups from the server
list if they're non-utf8, and it looks like it's been that way since at
least 2.7.3, and more likely before then.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Feb 2011 09:28:03 +0000 |
| parents | e5cd15ee3e5d |
| children | 6b2b8cc8e7ae |
| files | libpurple/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Feb 21 09:08:08 2011 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Feb 21 09:28:03 2011 +0000 @@ -4051,17 +4051,10 @@ } break; case AIM_SSI_TYPE_GROUP: { /* Group */ - char *gname; - char *gname_utf8; - - gname = curitem->name; - gname_utf8 = oscar_utf8_try_convert(account, od, gname); - - if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) { - g = purple_group_new(gname_utf8); + if (curitem->name != NULL && purple_find_group(curitem->name) == NULL) { + g = purple_group_new(curitem->name); purple_blist_add_group(g, NULL); } - g_free(gname_utf8); } break; case AIM_SSI_TYPE_PERMIT: { /* Permit buddy (unless we're on ICQ) */