Mercurial > pidgin
diff libpurple/blist.c @ 27501:6d26258e9f1d
propagate from branch 'im.pidgin.pidgin' (head ac87c285c7056f86005dc157b9870745de471f74)
to branch 'im.pidgin.cpw.darkrain42.roster' (head 976d874853ac9745edb77d3cf107b92ebc037c10)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Mon, 06 Jul 2009 04:37:41 +0000 |
parents | e3c2c3e72d7a 75acd9ad14be |
children | 3bb1085235d0 |
line wrap: on
line diff
--- a/libpurple/blist.c Wed Jun 10 04:42:11 2009 +0000 +++ b/libpurple/blist.c Mon Jul 06 04:37:41 2009 +0000 @@ -1909,7 +1909,6 @@ void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node) { PurpleBlistNode *sourcenode = (PurpleBlistNode*)source; - PurpleBlistNode *targetnode; PurpleBlistNode *prev, *cur, *next; PurpleContact *target; @@ -1929,7 +1928,6 @@ if (source == target || !target) return; - targetnode = (PurpleBlistNode *)target; next = sourcenode->child; while (next) {