cpw.darkrain42.buddy-add: fa0c982c: Fixing busted merge
paul at darkrain42.org
paul at darkrain42.org
Sat Mar 7 18:35:33 EST 2009
-----------------------------------------------------------------
Revision: fa0c982c0252e44f0310912b9dc35ca8d6334b51
Ancestor: ba460a8a6fd25fb6eb23ef2f6d3f0fb78a266c16
Author: paul at darkrain42.org
Date: 2009-03-07T22:40:30
Branch: im.pidgin.cpw.darkrain42.buddy-add
URL: http://d.pidgin.im/viewmtn/revision/info/fa0c982c0252e44f0310912b9dc35ca8d6334b51
Modified files:
pidgin/plugins/gevolution/gevo-util.c
ChangeLog:
Fixing busted merge
-------------- next part --------------
============================================================
--- pidgin/plugins/gevolution/gevo-util.c 775b1a91836f48576ab36c65e5920e51d0b400e3
+++ pidgin/plugins/gevolution/gevo-util.c 19d17bec2e9d47b2fbe2bea46535aeb79a15a0cc
@@ -41,7 +41,7 @@ gevo_add_buddy(PurpleAccount *account, c
purple_blist_add_group(group, NULL);
}
- if ((buddy = purple_find_buddy_in_group(account, buddy_name, group))) {
+ if ((buddy = purple_find_buddy_in_group(account, buddy_name, group)))
{
buddy = purple_buddy_new(account, buddy_name, alias);
purple_blist_add_buddy(buddy, NULL, group, NULL);
More information about the Commits
mailing list