Mercurial > pidgin.yaz
comparison libpurple/protocols/novell/novell.c @ 25013:7bfaa0b61a83
propagate from branch 'im.pidgin.pidgin' (head 42f77b0e8b8ebf5ff3c30d8f8022ac5d289631e8)
to branch 'im.pidgin.cpw.darkrain42.buddy-add' (head c29b3b2fa5d4e173fd9e476cfbb5a34cfc537b99)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 17 Jan 2009 22:42:28 +0000 |
parents | 568b786c36f9 9b1310f1cc7c |
children | c02da09b567f |
comparison
equal
deleted
inserted
replaced
24964:8a5c0c5c71f9 | 25013:7bfaa0b61a83 |
---|---|
2549 | 2549 |
2550 /* If we haven't synched the contact list yet, ignore | 2550 /* If we haven't synched the contact list yet, ignore |
2551 * the add_buddy calls. Server side list is the master. | 2551 * the add_buddy calls. Server side list is the master. |
2552 */ | 2552 */ |
2553 if (!user->clist_synched) | 2553 if (!user->clist_synched) |
2554 return; | |
2555 | |
2556 /* Don't re-add a buddy that is already on our contact list */ | |
2557 if (nm_find_user_record(user, buddy->name) != NULL) | |
2554 return; | 2558 return; |
2555 | 2559 |
2556 contact = nm_create_contact(); | 2560 contact = nm_create_contact(); |
2557 nm_contact_set_dn(contact, buddy->name); | 2561 nm_contact_set_dn(contact, buddy->name); |
2558 | 2562 |