[anjuta/sdb-core-trans: 8/14] language-support-cpp-java: Added missing field and fixed a warning.

[Massimo Cora' <mcora src gnome org>]

commit aa0fdacb85de224bcef41ee71fc2c1c4449b9c9c
Author: Naba Kumar <naba gnome org>
Date:   Sun Jun 20 00:01:52 2010 +0300

    language-support-cpp-java: Added missing field and fixed a warning.

 .../cxxparser/engine-parser.cpp                    |    8 ++++++++
 plugins/symbol-db/symbol-db-query-result.c         |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp b/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
index 84294e6..66ca9c1 100644
--- a/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
+++ b/plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
@@ -129,6 +129,11 @@ EngineParser::setSymbolManager (IAnjutaSymbolManager *manager)
 		IANJUTA_SYMBOL_FIELD_ID, IANJUTA_SYMBOL_FIELD_NAME,
 		IANJUTA_SYMBOL_FIELD_KIND
 	};
+	static IAnjutaSymbolField query_scope_fields[] =
+	{
+		IANJUTA_SYMBOL_FIELD_ID, IANJUTA_SYMBOL_FIELD_NAME,
+		IANJUTA_SYMBOL_FIELD_SIGNATURE
+	};
 	static IAnjutaSymbolField query_search_in_scope_fields[] =
 	{
 		IANJUTA_SYMBOL_FIELD_ID, IANJUTA_SYMBOL_FIELD_NAME,
@@ -150,6 +155,9 @@ EngineParser::setSymbolManager (IAnjutaSymbolManager *manager)
 		ianjuta_symbol_manager_create_query (manager,
 		                                     IANJUTA_SYMBOL_QUERY_SEARCH_SCOPE,
 		                                     IANJUTA_SYMBOL_QUERY_DB_PROJECT, NULL);
+	ianjuta_symbol_query_set_fields (_query_scope,
+	                                 G_N_ELEMENTS (query_scope_fields),
+	                                 query_scope_fields, NULL);
 	_query_search_in_scope =
 		ianjuta_symbol_manager_create_query (manager,
 		                                     IANJUTA_SYMBOL_QUERY_SEARCH_IN_SCOPE,
diff --git a/plugins/symbol-db/symbol-db-query-result.c b/plugins/symbol-db/symbol-db-query-result.c
index 82b8ec4..b0ead25 100644
--- a/plugins/symbol-db/symbol-db-query-result.c
+++ b/plugins/symbol-db/symbol-db-query-result.c
@@ -97,10 +97,10 @@ sdb_query_result_validate_field (SymbolDBQueryResult *result,
 	{
 		g_set_error (err, SYMBOL_DB_QUERY_RESULT_ERROR,
 		             SYMBOL_DB_QUERY_RESULT_ERROR_FIELD_NOT_PRESENT,
-		             "Symbol field '%d' is present in the query. Make sure to "
-		             "include the during query creation.", field);
-		g_warning ("Symbol field '%d' is present in the query. Make sure to "
-		             "include the during query creation.", field);
+		             "Symbol field '%d' is not present in the query. Make sure to "
+		             "include it during query creation.", field);
+		g_warning ("Symbol field '%d' is not present in the query. Make sure to "
+		             "include it during query creation.", field);
 		return FALSE;
 	}
 	return TRUE;