[anjuta/symbol-db-model] symbol-db: Fixed file path in query and order by occurance in file symbols view

[Naba Kumar <naba src gnome org>]

commit 004a2267e08cc14e68a557560731d5775267bc91
Author: Naba Kumar <naba gnome org>
Date:   Thu Mar 18 23:34:02 2010 +0200

    symbol-db: Fixed file path in query and order by occurance in file symbols view

 plugins/symbol-db/symbol-db-engine-queries.c |    7 ++++---
 plugins/symbol-db/symbol-db-model.c          |    1 -
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/symbol-db/symbol-db-engine-queries.c b/plugins/symbol-db/symbol-db-engine-queries.c
index 40c1e43..a5f6d96 100644
--- a/plugins/symbol-db/symbol-db-engine-queries.c
+++ b/plugins/symbol-db/symbol-db-engine-queries.c
@@ -1555,11 +1555,12 @@ symbol_db_engine_get_file_symbols (SymbolDBEngine *dbe,
 		query_str = g_strdup_printf ("SELECT symbol.symbol_id AS symbol_id, "
 			"symbol.name AS name, symbol.file_position AS file_position, "
 			"symbol.is_file_scope AS is_file_scope, symbol.signature AS signature, "
-		    "symbol.returntype AS returntype, '%s' AS db_file_path "
+		    "symbol.returntype AS returntype, file.file_path AS db_file_path "
 			"%s FROM symbol "
 				"JOIN file ON symbol.file_defined_id = file.file_id "
-			"%s WHERE file.file_path = ## /* name:'filepath' type:gchararray */ %s %s", 
-						relative_path, info_data->str, join_data->str, limit, offset);
+			"%s WHERE file.file_path = ## /* name:'filepath' type:gchararray */ "
+			"ORDER BY symbol.file_position %s %s", 
+						info_data->str, join_data->str, limit, offset);
 	
 		dyn_node = sdb_engine_insert_dyn_query_node_by_id (dbe, 
 						DYN_PREP_QUERY_GET_FILE_SYMBOLS,
diff --git a/plugins/symbol-db/symbol-db-model.c b/plugins/symbol-db/symbol-db-model.c
index 8e22df4..3ed9cae 100644
--- a/plugins/symbol-db/symbol-db-model.c
+++ b/plugins/symbol-db/symbol-db-model.c
@@ -505,7 +505,6 @@ symbol_db_model_get_iter (GtkTreeModel *tree_model,
 	}
 	if (i != depth)
 	{
-		/* g_warning ("Invalid path to iter conversion; no child found"); */
 		return FALSE;
 	}
 	iter->stamp = SYMBOL_DB_MODEL_STAMP;