Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/oscar.c @ 22415:a491ebed7f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I realized that I don't like initializing variables when I declare them if I can avoid it
author Mark Doliner <mark@kingant.net>
date Thu, 06 Mar 2008 07:29:39 +0000
parents 791c9545846b
children 5762dcb1909c
comparison
equal deleted inserted replaced
22414:35c4a9b4a699 22415:a491ebed7f3a
4978 for (curitem=od->ssi.local; curitem; curitem=curitem->next) { 4978 for (curitem=od->ssi.local; curitem; curitem=curitem->next) {
4979 if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL))) 4979 if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
4980 switch (curitem->type) { 4980 switch (curitem->type) {
4981 case 0x0000: { /* Buddy */ 4981 case 0x0000: { /* Buddy */
4982 if (curitem->name) { 4982 if (curitem->name) {
4983 struct aim_ssi_item *groupitem = aim_ssi_itemlist_find(od->ssi.local, curitem->gid, 0x0000); 4983 struct aim_ssi_item *groupitem;
4984 char *gname = groupitem ? groupitem->name : NULL; 4984 char *gname, *gname_utf8, *alias, *alias_utf8;
4985 char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL; 4985
4986 char *alias = aim_ssi_getalias(od->ssi.local, gname, curitem->name); 4986 groupitem = aim_ssi_itemlist_find(od->ssi.local, curitem->gid, 0x0000);
4987 char *alias_utf8; 4987 gname = groupitem ? groupitem->name : NULL;
4988 gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL;
4989 alias = aim_ssi_getalias(od->ssi.local, gname, curitem->name);
4988 4990
4989 g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans")); 4991 g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans"));
4990 if (g == NULL) { 4992 if (g == NULL) {
4991 g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans")); 4993 g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
4992 purple_blist_add_group(g, NULL); 4994 purple_blist_add_group(g, NULL);
5037 g_free(alias_utf8); 5039 g_free(alias_utf8);
5038 } 5040 }
5039 } break; 5041 } break;
5040 5042
5041 case 0x0001: { /* Group */ 5043 case 0x0001: { /* Group */
5042 char *gname = curitem->name; 5044 char *gname;
5043 char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL; 5045 char *gname_utf8;
5046
5047 gname = curitem->name;
5048 gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL;
5044 if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) { 5049 if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) {
5045 g = purple_group_new(gname_utf8); 5050 g = purple_group_new(gname_utf8);
5046 purple_blist_add_group(g, NULL); 5051 purple_blist_add_group(g, NULL);
5047 } 5052 }
5048 g_free(gname_utf8); 5053 g_free(gname_utf8);