Mercurial > pidgin.yaz
comparison finch/gntblist.c @ 26479:f5f08111da52
propagate from branch 'im.pidgin.pidgin' (head a609160715ae18beed98b084aac19bc0f6551362)
to branch 'im.pidgin.pidgin.vv' (head 6e683319559d829234bc548e0795ed03403af478)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 01 Apr 2009 04:25:37 +0000 |
| parents | 9ea3474065dc |
| children | 8df78c06d10e |
comparison
equal
deleted
inserted
replaced
| 26477:e1523f30bdb5 | 26479:f5f08111da52 |
|---|---|
| 641 { | 641 { |
| 642 grp = purple_group_new(group); | 642 grp = purple_group_new(group); |
| 643 purple_blist_add_group(grp, NULL); | 643 purple_blist_add_group(grp, NULL); |
| 644 } | 644 } |
| 645 | 645 |
| 646 /* XXX: Ask if there's already the same buddy in the same group (#4553) */ | 646 /* XXX: Ask to merge if there's already a buddy with the same alias in the same group (#4553) */ |
| 647 | 647 |
| 648 buddy = purple_buddy_new(account, username, alias); | 648 if ((buddy = purple_find_buddy_in_group(account, username, grp)) == NULL) |
| 649 purple_blist_add_buddy(buddy, NULL, grp, NULL); | 649 { |
| 650 buddy = purple_buddy_new(account, username, alias); | |
| 651 purple_blist_add_buddy(buddy, NULL, grp, NULL); | |
| 652 } | |
| 653 | |
| 650 purple_account_add_buddy(account, buddy); | 654 purple_account_add_buddy(account, buddy); |
| 651 } | 655 } |
| 652 | 656 |
| 653 static void | 657 static void |
| 654 finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias) | 658 finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias) |