Mercurial > pidgin

changeset 28115:635b28b527a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix what looks like an incorrect merge that caused gevolution's add buddy dialog to segfault.
author Paul Aurich <paul@darkrain42.org>
date Sat, 29 Aug 2009 02:29:53 +0000
parents 6b018d1efc5c
children caa94dfa37f1
files pidgin/plugins/gevolution/gevo-util.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
 	}