# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1180059733 0
# Node ID 995f31f5432ad4cb1b8c3c3b3e699299fc6c593d
# Parent  38c26b0bbb6e199fe1741af804b5a3f2f35f94e1# Parent  f9838075117aa4b478637035f2b804f319f13ace
merge of '1c63ff450cd444f6f7b3d9caa86407fca3584491'
     and 'd1d3db7eb95dffd90aae4031e0574b4aee9fdca1'

diff -r 38c26b0bbb6e -r 995f31f5432a finch/gntblist.c
--- a/finch/gntblist.c	Fri May 25 01:19:12 2007 +0000
+++ b/finch/gntblist.c	Fri May 25 02:22:13 2007 +0000
@@ -1876,9 +1876,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:
@@ -1911,7 +1912,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:
@@ -1955,7 +1957,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:
diff -r 38c26b0bbb6e -r 995f31f5432a po/ChangeLog
--- a/po/ChangeLog	Fri May 25 01:19:12 2007 +0000
+++ b/po/ChangeLog	Fri May 25 02:22:13 2007 +0000
@@ -1,7 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.1
-	* Chinese (Hong Kong) translation added (Ambrose C. Li, Abelard)
+	* Chinese (Hong Kong) translation added (Ambrose C. Li, Abel Cheung)
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Chinese (Traditional) win32 translation updated (Ambrose C. Li)