# HG changeset patch
# User Jeffrey Connelly <jaconnel@calpoly.edu>
# Date 1188020485 0
# Node ID 4fced00fdc9f630f9d63cebb4e0d37d4bea490d9
# Parent  1096aea9821781ad2cb87336b273dfbd82d21895# Parent  93dfc16efbda6c3afc0139fb0b0525f6ebed08ea
merge of '3b5ffa9dc2dec5443f83a219ac14382a0e3ccf03'
     and '6f352e89294bdd1ce546d3a5db327e7fc965b095'

diff -r 1096aea98217 -r 4fced00fdc9f libpurple/blist.c
--- a/libpurple/blist.c	Sat Aug 25 01:14:56 2007 +0000
+++ b/libpurple/blist.c	Sat Aug 25 05:41:25 2007 +0000
@@ -1191,8 +1191,11 @@
 			purple_blist_add_group(group,
 					purple_blist_get_last_sibling(purplebuddylist->root));
 		} else {
-			/* Fail if tried to add buddy to a group that isn't on the blist. #2752. */
-			g_return_if_fail(purple_find_group(group->name));
+			/* Add group to blist if isn't already on it. Fixes #2752. */
+			if (!purple_find_group(group->name)) {
+				purple_blist_add_group(group,
+						purple_blist_get_last_sibling(purplebuddylist->root));
+			}
 		}
 	} else {
 		group = (PurpleGroup*)node->parent;
@@ -1287,9 +1290,11 @@
 		g = (PurpleGroup *)((PurpleBlistNode *)c)->parent;
 	} else {
 		if (group) {
-			/*  Fail if trying to add buddy to a group that is not on the buddy list. 
-			 *  Fix for #2752. */
-			g_return_if_fail(purple_find_group(group->name));
+			/* Add chat to blist if isn't already on it. Fixes #2752. */
+			if (!purple_find_group(group->name)) {
+				purple_blist_add_group(group,
+						purple_blist_get_last_sibling(purplebuddylist->root));
+			}
 
 			g = group;
 		} else {