# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1251512993 0
# Node ID 635b28b527a2bb5f816c5473752e907bcc7ba163
# Parent  6b018d1efc5ce4ce7159212271edc9e3bc03b301
Fix what looks like an incorrect merge that caused gevolution's add buddy dialog to segfault.

diff -r 6b018d1efc5c -r 635b28b527a2 pidgin/plugins/gevolution/gevo-util.c
--- a/pidgin/plugins/gevolution/gevo-util.c	Fri Aug 28 05:35:00 2009 +0000
+++ b/pidgin/plugins/gevolution/gevo-util.c	Sat Aug 29 02:29:53 2009 +0000
@@ -35,14 +35,16 @@
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy_name, account);
 
-	if ((group = purple_find_group(group_name)) == NULL)
+	group = purple_find_group(group_name);
+	if (group == NULL)
 	{
 		group = purple_group_new(group_name);
 		purple_blist_add_group(group, NULL);
 	}
 
-	if ((buddy = purple_find_buddy_in_group(account, buddy_name, group)))
-	{	
+	buddy = purple_find_buddy_in_group(account, buddy_name, group);
+	if (buddy == NULL)
+	{
 		buddy = purple_buddy_new(account, buddy_name, alias);
 		purple_blist_add_buddy(buddy, NULL, group, NULL);
 	}