Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 20943:e0d7429cfd8a
merge of '4d5bbc54236419e777e3df044678b798605409bf'
and 'cca81a1b623d3a31f3a7d03158eddb36ecf4bfbc'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 15 Oct 2007 02:11:13 +0000 |
| parents | df06520dbb4d |
| children | ac36f4a43fec |
comparison
equal
deleted
inserted
replaced
| 20940:d1695d02c498 | 20943:e0d7429cfd8a |
|---|---|
| 5004 char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL; | 5004 char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL; |
| 5005 if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) { | 5005 if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) { |
| 5006 g = purple_group_new(gname_utf8); | 5006 g = purple_group_new(gname_utf8); |
| 5007 purple_blist_add_group(g, NULL); | 5007 purple_blist_add_group(g, NULL); |
| 5008 } | 5008 } |
| 5009 g_free(gname_utf8); | |
| 5009 } break; | 5010 } break; |
| 5010 | 5011 |
| 5011 case 0x0002: { /* Permit buddy */ | 5012 case 0x0002: { /* Permit buddy */ |
| 5012 if (curitem->name) { | 5013 if (curitem->name) { |
| 5013 /* if (!find_permdeny_by_name(gc->permit, curitem->name)) { AAA */ | 5014 /* if (!find_permdeny_by_name(gc->permit, curitem->name)) { AAA */ |