[anjuta/symbol-db-model] symbol-db: Fixed cols order and warnings

[Naba Kumar <naba src gnome org>]

commit 51a91744a94ba93d85832e83706a52bbd166a508
Author: Naba Kumar <naba gnome org>
Date:   Sun Mar 21 10:16:24 2010 +0200

    symbol-db: Fixed cols order and warnings

 plugins/symbol-db/symbol-db-model-project.c |   10 +++++-----
 plugins/symbol-db/symbol-db-model.c         |   11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/plugins/symbol-db/symbol-db-model-project.c b/plugins/symbol-db/symbol-db-model-project.c
index 1617a58..82a11e9 100644
--- a/plugins/symbol-db/symbol-db-model-project.c
+++ b/plugins/symbol-db/symbol-db-model-project.c
@@ -38,9 +38,9 @@ enum {
 	DATA_COL_SYMBOL_RETURNTYPE,
 	DATA_COL_SYMBOL_FILE_PATH,
 	DATA_COL_SYMBOL_ACCESS,
-	DATA_COL_SYMBOL_KIND_NAME,
 	DATA_COL_SYMBOL_TYPE,
 	DATA_COL_SYMBOL_TYPE_NAME,
+	DATA_COL_SYMBOL_KIND_NAME,
 	DATA_N_COLS
 };
 
@@ -153,12 +153,12 @@ symbol_db_model_project_get_query_value (SymbolDBModel *model,
 	switch (column)
 	{
 	case SYMBOL_DB_MODEL_PROJECT_COL_PIXBUF:
-		ret_value = gda_data_model_iter_get_value_for_field (iter,
-		                                                     "type_type");
+		ret_value = gda_data_model_iter_get_value_at (iter,
+		                                              DATA_COL_SYMBOL_TYPE);
 		if (ret_value && G_VALUE_HOLDS_STRING (ret_value))
 				type = g_value_get_string (ret_value);
-		ret_value = gda_data_model_iter_get_value_for_field (iter,
-		                                                     "access_name");
+		ret_value = gda_data_model_iter_get_value_at (iter,
+		                                              DATA_COL_SYMBOL_ACCESS);
 		if (ret_value && G_VALUE_HOLDS_STRING (ret_value))
 				access = g_value_get_string (ret_value);
 
diff --git a/plugins/symbol-db/symbol-db-model.c b/plugins/symbol-db/symbol-db-model.c
index dcd5064..8f3def5 100644
--- a/plugins/symbol-db/symbol-db-model.c
+++ b/plugins/symbol-db/symbol-db-model.c
@@ -650,11 +650,16 @@ symbol_db_model_iter_children (GtkTreeModel *tree_model,
 		parent_node = (SymbolDBModelNode*) parent->user_data;
 		offset = GPOINTER_TO_INT (parent->user_data2);
 		node = symbol_db_model_node_get_child (parent_node, offset);
+		if (!node)
+		{
+			symbol_db_model_page_fault (SYMBOL_DB_MODEL (tree_model),
+			                            parent_node, offset);
+			if (node)
+				symbol_db_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
+						                              node, FALSE);
+		}
 		g_return_val_if_fail (node != NULL, FALSE);
 	}
-	if (!node->children_ensured)
-		symbol_db_model_ensure_node_children (SYMBOL_DB_MODEL (tree_model),
-		                                      node, FALSE);
 	g_return_val_if_fail (node->n_children > 0, FALSE);
 	
 	iter->user_data = node;