changeset 15753:0efc23706de2

merge of '0bbdd897525969f1b481b593dad32050b57f9033' and '8dee64564b04f629410f93246dc03044efc8a7c6'
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 01 Mar 2007 01:45:53 +0000
parents 6d4c5218b90b (diff) e11859350489 (current diff)
children dc6081d167cf
files gaim-installer.nsi pidgin/pixmaps/gaim-install.ico pidgin/win32/nsis/gaim-header.bmp pidgin/win32/nsis/gaim-intro.bmp pidgin/win32/nsis/gaim-plugin.nsh
diffstat 1 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/console/libgnt/gnttree.c	Wed Feb 28 17:27:30 2007 +0000
+++ b/console/libgnt/gnttree.c	Thu Mar 01 01:45:53 2007 +0000
@@ -1275,16 +1275,20 @@
 	g_return_val_if_fail(!r || !r->choice, NULL);
 
 	if (bigbro == NULL) {
-		r = g_hash_table_lookup(tree->hash, parent);
-		if (!r)
-			r = tree->root;
-		else
-			r = r->child;
-		if (r) {
-			while (r->next)
-				r = r->next;
-			bigbro = r->key;
-		} 
+		if (tree->compare)
+			bigbro = find_position(tree, key, parent);
+		else {
+			r = g_hash_table_lookup(tree->hash, parent);
+			if (!r)
+				r = tree->root;
+			else
+				r = r->child;
+			if (r) {
+				while (r->next)
+					r = r->next;
+				bigbro = r->key;
+			} 
+		}
 	}
 	row = gnt_tree_add_row_after(tree, key, row, parent, bigbro);
 	row->choice = TRUE;