changeset
merge of 'e766b82c97cc999c749743df8266dfc186dab510'
Fri, 25 May 2007 02:22:13 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Fri, 25 May 2007 02:22:13 +0000
- changeset 17366
- 7324924bb4ae
- parent 17365
- e766b82c97cc (current diff)
- parent 17334
- 5d22e54fdfba (diff)
- child 17367
- ea7999b6ef1d
merge of 'e766b82c97cc999c749743df8266dfc186dab510'
and '5d22e54fdfbaec69e11f58567cc961251c412fb5'
| finch/gntblist.c | file | annotate | diff | comparison | revisions |
--- 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:
--- 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)
