[anjuta/new-assistance] language-support-cpp-java: Don't show duplicate symbol entries (both prototype and function)

[Johannes Schmid <jhs src gnome org>]

commit ce9cfedc3bc8fa81b5570245e59308e3e91dea26
Author: Johannes Schmid <jhs gnome org>
Date:   Mon Nov 23 17:23:36 2009 +0100

    language-support-cpp-java: Don't show duplicate symbol entries (both prototype and function)
    
    At least not for non-local functions. Remove some debug messages

 .../language-support-cpp-java/cpp-java-assist.c    |   10 +++++++---
 plugins/sourceview/sourceview-provider.c           |    1 -
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 903e873..b0fa951 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -331,7 +331,7 @@ cpp_java_assist_update_autocomplete (CppJavaAssist *assist)
 
 	gboolean queries_active = (assist->priv->async_file || assist->priv->async_project || assist->priv->async_system);
 
-	DEBUG_PRINT ("Queries active: %d", queries_active);
+	// DEBUG_PRINT ("Queries active: %d", queries_active);
 	
 	if (assist->priv->completion_cache == NULL || !assist->priv->pre_word)
 	{
@@ -430,24 +430,28 @@ cpp_java_assist_create_word_completion_cache (CppJavaAssist *assist)
 		}
 	}
 	{
+		/* This will avoid duplicates of FUNCTION and PROTOTYPE */
+		IAnjutaSymbolType types = IANJUTA_SYMBOL_TYPE_MAX & ~IANJUTA_SYMBOL_TYPE_FUNCTION;
 		AnjutaAsyncNotify* notify = anjuta_async_notify_new();
 		g_signal_connect (notify, "finished", G_CALLBACK(project_finished), assist);
 		assist->priv->async_project = TRUE;
 		ianjuta_symbol_manager_search_project_async (assist->priv->isymbol_manager,
-											 IANJUTA_SYMBOL_TYPE_UNDEF,
+											 types,
 											 TRUE,
 											 IANJUTA_SYMBOL_FIELD_SIMPLE|IANJUTA_SYMBOL_FIELD_TYPE,
 											 pattern, IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PUBLIC, -1, -1, 
 											 NULL,
 											 notify, (IAnjutaSymbolManagerSearchCallback) on_query_data, assist,
 											 NULL);
+		
 	}
 	{
+		IAnjutaSymbolType types = IANJUTA_SYMBOL_TYPE_MAX & ~IANJUTA_SYMBOL_TYPE_FUNCTION;
 		AnjutaAsyncNotify* notify = anjuta_async_notify_new();
 		g_signal_connect (notify, "finished", G_CALLBACK(system_finished), assist);
 		assist->priv->async_system = TRUE;
 		ianjuta_symbol_manager_search_system_async (assist->priv->isymbol_manager,
-											 IANJUTA_SYMBOL_TYPE_UNDEF,
+											 types,
 											 TRUE,
 											 IANJUTA_SYMBOL_FIELD_SIMPLE|IANJUTA_SYMBOL_FIELD_TYPE,
 											 pattern, IANJUTA_SYMBOL_MANAGER_SEARCH_FS_PUBLIC, -1, -1,
diff --git a/plugins/sourceview/sourceview-provider.c b/plugins/sourceview/sourceview-provider.c
index e9fad9e..0178556 100644
--- a/plugins/sourceview/sourceview-provider.c
+++ b/plugins/sourceview/sourceview-provider.c
@@ -51,7 +51,6 @@ sourceview_provider_populate (GtkSourceCompletionProvider* provider, GtkSourceCo
 	prov->context = context;
 	prov->cancelled = FALSE;
 	g_signal_connect (context, "cancelled", G_CALLBACK(on_context_cancelled), prov);
-	g_message ("populating provider");
 	ianjuta_provider_populate(prov->iprov, IANJUTA_ITERABLE(cell), NULL);
 	g_object_unref (cell);
 }