# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1180059006 0
# Node ID f9838075117aa4b478637035f2b804f319f13ace
# Parent  29b3dc9cc8c581961d5eba176dc8bcbb588967ee# Parent  f3e7c423232afb9cd2bcdcea17d212c9e9ef8caa
merge of '98adfa78dbac6ceee05caeb096498a3fecf7fd55'
     and 'e518bdf67d58db1c0394e7e672235ced1b140184'

diff -r f3e7c423232a -r f9838075117a finch/gntblist.c
--- a/finch/gntblist.c	Fri May 25 02:08:56 2007 +0000
+++ b/finch/gntblist.c	Fri May 25 02:10:06 2007 +0000
@@ -1873,9 +1873,10 @@
 	const char *s1, *s2;
 	char *us1, *us2;
 	int ret;
-	
-	g_return_val_if_fail(n1->type == n2->type, -1);
-	
+
+	if (n1->type != n2->type)
+		return blist_node_compare_position(n1, n2);
+
 	switch (n1->type)
 	{
 		case PURPLE_BLIST_CHAT_NODE:
@@ -1908,7 +1909,8 @@
 {
 	int ret;
 
-	g_return_val_if_fail(n1->type == n2->type, -1);
+	if (n1->type != n2->type)
+		return blist_node_compare_position(n1, n2);
 
 	switch (n1->type) {
 		case PURPLE_BLIST_CONTACT_NODE:
@@ -1952,7 +1954,8 @@
 	int ret;
 	PurpleBuddy *b1, *b2;
 
-	g_return_val_if_fail(n1->type == n2->type, -1);
+	if (n1->type != n2->type)
+		return blist_node_compare_position(n1, n2);
 
 	switch (n1->type) {
 		case PURPLE_BLIST_BUDDY_NODE: