Mercurial > pidgin
comparison src/blist.c @ 7261:1930e3d00ecd
[gaim-migrate @ 7838]
prpl-specific normalize is back, after my crusade to kill it.
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Tue, 14 Oct 2003 05:07:39 +0000 |
parents | cb6bf374c7ee |
children | b8ce6e194cff |
comparison
equal
deleted
inserted
replaced
7260:49839c4cbb1c | 7261:1930e3d00ecd |
---|---|
679 | 679 |
680 save = TRUE; | 680 save = TRUE; |
681 | 681 |
682 if(bnode->parent->parent != (GaimBlistNode*)g) { | 682 if(bnode->parent->parent != (GaimBlistNode*)g) { |
683 hb = g_new(struct _gaim_hbuddy, 1); | 683 hb = g_new(struct _gaim_hbuddy, 1); |
684 hb->name = g_strdup(gaim_normalize(buddy->name)); | 684 hb->name = g_strdup(gaim_normalize(buddy->account, buddy->name)); |
685 hb->account = buddy->account; | 685 hb->account = buddy->account; |
686 hb->group = bnode->parent->parent; | 686 hb->group = bnode->parent->parent; |
687 g_hash_table_remove(gaimbuddylist->buddies, hb); | 687 g_hash_table_remove(gaimbuddylist->buddies, hb); |
688 g_free(hb->name); | 688 g_free(hb->name); |
689 g_free(hb); | 689 g_free(hb); |
725 } | 725 } |
726 ((GaimContact*)bnode->parent)->totalsize++; | 726 ((GaimContact*)bnode->parent)->totalsize++; |
727 | 727 |
728 | 728 |
729 hb = g_new(struct _gaim_hbuddy, 1); | 729 hb = g_new(struct _gaim_hbuddy, 1); |
730 hb->name = g_strdup(gaim_normalize(buddy->name)); | 730 hb->name = g_strdup(gaim_normalize(buddy->account, buddy->name)); |
731 hb->account = buddy->account; | 731 hb->account = buddy->account; |
732 hb->group = ((GaimBlistNode*)buddy)->parent->parent; | 732 hb->group = ((GaimBlistNode*)buddy)->parent->parent; |
733 | 733 |
734 g_hash_table_replace(gaimbuddylist->buddies, hb, buddy); | 734 g_hash_table_replace(gaimbuddylist->buddies, hb, buddy); |
735 | 735 |
851 if(cnode->parent != gnode) { | 851 if(cnode->parent != gnode) { |
852 for(bnode = cnode->child; bnode; bnode = bnode->next) { | 852 for(bnode = cnode->child; bnode; bnode = bnode->next) { |
853 GaimBuddy *b = (GaimBuddy*)bnode; | 853 GaimBuddy *b = (GaimBuddy*)bnode; |
854 | 854 |
855 struct _gaim_hbuddy *hb = g_new(struct _gaim_hbuddy, 1); | 855 struct _gaim_hbuddy *hb = g_new(struct _gaim_hbuddy, 1); |
856 hb->name = g_strdup(gaim_normalize(b->name)); | 856 hb->name = g_strdup(gaim_normalize(b->account, b->name)); |
857 hb->account = b->account; | 857 hb->account = b->account; |
858 hb->group = cnode->parent; | 858 hb->group = cnode->parent; |
859 | 859 |
860 g_hash_table_remove(gaimbuddylist->buddies, hb); | 860 g_hash_table_remove(gaimbuddylist->buddies, hb); |
861 | 861 |
1053 if(cnode->child == node) { | 1053 if(cnode->child == node) { |
1054 cnode->child = node->next; | 1054 cnode->child = node->next; |
1055 } | 1055 } |
1056 | 1056 |
1057 | 1057 |
1058 hb.name = g_strdup(gaim_normalize(buddy->name)); | 1058 hb.name = g_strdup(gaim_normalize(buddy->account, buddy->name)); |
1059 hb.account = buddy->account; | 1059 hb.account = buddy->account; |
1060 hb.group = ((GaimBlistNode*)buddy)->parent->parent; | 1060 hb.group = ((GaimBlistNode*)buddy)->parent->parent; |
1061 g_hash_table_remove(gaimbuddylist->buddies, &hb); | 1061 g_hash_table_remove(gaimbuddylist->buddies, &hb); |
1062 g_free(hb.name); | 1062 g_free(hb.name); |
1063 | 1063 |
1217 return NULL; | 1217 return NULL; |
1218 | 1218 |
1219 if (!name) | 1219 if (!name) |
1220 return NULL; | 1220 return NULL; |
1221 | 1221 |
1222 hb.name = g_strdup(gaim_normalize(name)); | 1222 hb.name = g_strdup(gaim_normalize(account, name)); |
1223 hb.account = account; | 1223 hb.account = account; |
1224 | 1224 |
1225 for(group = gaimbuddylist->root; group; group = group->next) { | 1225 for(group = gaimbuddylist->root; group; group = group->next) { |
1226 hb.group = group; | 1226 hb.group = group; |
1227 if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb))) { | 1227 if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb))) { |
1244 return NULL; | 1244 return NULL; |
1245 | 1245 |
1246 if (!name) | 1246 if (!name) |
1247 return NULL; | 1247 return NULL; |
1248 | 1248 |
1249 hb.name = g_strdup(gaim_normalize(name)); | 1249 hb.name = g_strdup(gaim_normalize(account, name)); |
1250 hb.account = account; | 1250 hb.account = account; |
1251 hb.group = (GaimBlistNode*)group; | 1251 hb.group = (GaimBlistNode*)group; |
1252 | 1252 |
1253 ret = g_hash_table_lookup(gaimbuddylist->buddies, &hb); | 1253 ret = g_hash_table_lookup(gaimbuddylist->buddies, &hb); |
1254 g_free(hb.name); | 1254 g_free(hb.name); |
1266 return NULL; | 1266 return NULL; |
1267 | 1267 |
1268 if (!name) | 1268 if (!name) |
1269 return NULL; | 1269 return NULL; |
1270 | 1270 |
1271 hb.name = g_strdup(gaim_normalize(name)); | 1271 hb.name = g_strdup(gaim_normalize(account, name)); |
1272 hb.account = account; | 1272 hb.account = account; |
1273 | 1273 |
1274 for(group = gaimbuddylist->root; group; group = group->next) { | 1274 for(group = gaimbuddylist->root; group; group = group->next) { |
1275 hb.group = group; | 1275 hb.group = group; |
1276 if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) != NULL) | 1276 if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) != NULL) |