Mercurial > pidgin.yaz
comparison libpurple/prefs.c @ 16562:1f9cba8efdfb
merge of '2ec86531b43742d8242195bf529e7ba77be9d3dc'
and 'fb970fdd4f3e27ac176f55bee8baf7074a1a96ef'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 28 Apr 2007 02:42:26 +0000 |
| parents | 1b58a7fabb7e |
| children | 06ee8064b3d0 |
comparison
equal
deleted
inserted
replaced
| 16553:69e36b560549 | 16562:1f9cba8efdfb |
|---|---|
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 static void | 1102 static void |
| 1103 purple_prefs_rename_node(struct purple_pref *oldpref, struct purple_pref *newpref) | 1103 purple_prefs_rename_node(struct purple_pref *oldpref, struct purple_pref *newpref) |
| 1104 { | 1104 { |
| 1105 struct purple_pref *child; | 1105 struct purple_pref *child, *next; |
| 1106 char *oldname, *newname; | 1106 char *oldname, *newname; |
| 1107 | 1107 |
| 1108 /* if we're a parent, rename the kids first */ | 1108 /* if we're a parent, rename the kids first */ |
| 1109 for(child = oldpref->first_child; child != NULL; child = child->sibling) | 1109 for(child = oldpref->first_child; child != NULL; child = next) |
| 1110 { | 1110 { |
| 1111 struct purple_pref *newchild; | 1111 struct purple_pref *newchild; |
| 1112 next = child->sibling; | |
| 1112 for(newchild = newpref->first_child; newchild != NULL; newchild = newchild->sibling) | 1113 for(newchild = newpref->first_child; newchild != NULL; newchild = newchild->sibling) |
| 1113 { | 1114 { |
| 1114 if(!strcmp(child->name, newchild->name)) | 1115 if(!strcmp(child->name, newchild->name)) |
| 1115 { | 1116 { |
| 1116 purple_prefs_rename_node(child, newchild); | 1117 purple_prefs_rename_node(child, newchild); |