Mercurial > pidgin
changeset 17242:f9838075117a
merge of '98adfa78dbac6ceee05caeb096498a3fecf7fd55'
and 'e518bdf67d58db1c0394e7e672235ced1b140184'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 25 May 2007 02:10:06 +0000 |
| parents | 29b3dc9cc8c5 (diff) f3e7c423232a (current diff) |
| children | 92a248815a96 995f31f5432a |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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: