comparison src/blist.c @ 7246:cb6bf374c7ee

[gaim-migrate @ 7823] 1. fix 822297 (add/remove button in conv window not changing) 2. make dragging a contact into an expanded contact put the dragged one where you wanted it committer: Tailor Script <[e-mail]>

7245:747b9e00ef60

	if (save)
		gaim_blist_save();
}

void gaim_blist_merge_contact(GaimContact *source, GaimContact *target)
{
	GaimBlistNode *sourcenode = (GaimBlistNode*)source;
	GaimBlistNode *targetnode = (GaimBlistNode*)target;
	GaimBlistNode *child, *child2;

	if(source == target)
		return;

	child = sourcenode->child;

	while(child) {
		child2 = child;
		child = child->next;
		if(GAIM_BLIST_NODE_IS_BUDDY(child2))
			gaim_blist_add_buddy((GaimBuddy*)child2, target, NULL,
					gaim_blist_get_last_child(targetnode));
	}
}

void  gaim_blist_add_group (GaimGroup *group, GaimBlistNode *node)
{

7246:cb6bf374c7ee

	if (save)
		gaim_blist_save();
}

void gaim_blist_merge_contact(GaimContact *source, GaimBlistNode *node)
{
	GaimBlistNode *sourcenode = (GaimBlistNode*)source;
	GaimBlistNode *targetnode;
	GaimBlistNode *prev, *cur, *next;
	GaimContact *target;

	if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
		target = (GaimContact*)node;
		prev = gaim_blist_get_last_child(node);
	} else if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
		target = (GaimContact*)node->parent;
		prev = node;
	} else {
		return;
	}

	if(source == target || !target)
		return;

	targetnode = (GaimBlistNode*)target;
	next = sourcenode->child;

	while(next) {
		cur = next;
		next = cur->next;
		if(GAIM_BLIST_NODE_IS_BUDDY(cur)) {
			gaim_blist_add_buddy((GaimBuddy*)cur, target, NULL, prev);
			prev = cur;
		}
	}
}

void  gaim_blist_add_group (GaimGroup *group, GaimBlistNode *node)
{