[anjuta] libanjuta, language-support-*: Introspection from bgo#680466

[Johannes Schmid <jhs src gnome org>]

commit 9451c235939a1980110ad766ff3c591bbc89276c
Author: Johannes Schmid <jhs gnome org>
Date:   Fri Jul 27 12:15:12 2012 +0200

    libanjuta, language-support-*: Introspection from bgo#680466
    
    * Set (type GObject) to avoid cross dependencies in the GIR
    * Rename populate_language to populate_proposals

 libanjuta/anjuta-language-provider.c            |   34 +++++++++++-----------
 libanjuta/interfaces/libanjuta.idl              |    6 ++--
 plugins/language-support-js/plugin.c            |    2 +-
 plugins/language-support-python/python-assist.c |    8 +++---
 plugins/parser-cxx/parser-cxx-assist.c          |    8 +++---
 5 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/libanjuta/anjuta-language-provider.c b/libanjuta/anjuta-language-provider.c
index 40b3262..3d06b60 100644
--- a/libanjuta/anjuta-language-provider.c
+++ b/libanjuta/anjuta-language-provider.c
@@ -47,7 +47,7 @@ struct _AnjutaLanguageProviderPriv {
 /**
  * anjuta_language_provider_install:
  * @lang_prov: Self
- * @ieditor: IAnjutaEditor object
+ * @ieditor: (type GObject): IAnjutaEditor object
  * @settings: the settings
  *
  * Install the settings for AnjutaLanguageProvider
@@ -108,9 +108,9 @@ anjuta_language_provider_class_init (AnjutaLanguageProviderClass *klass)
 
 /**
  * anjuta_language_provider_find_next_brace:
- * @iter: Iter to start searching at
+ * @iter: (type GObject): Iter to start searching at
  *
- * Returns: The position of the brace, if the next non-whitespace character is a
+ * Returns: (type GObject): The position of the brace, if the next non-whitespace character is a
  * opening brace, NULL otherwise
  */
 static IAnjutaIterable*
@@ -133,7 +133,7 @@ anjuta_language_provider_find_next_brace (IAnjutaIterable* iter)
 
 /**
  * anjuta_language_provider_find_whitespace:
- * @iter: Iter to start searching at
+ * @iter: (type GObject): Iter to start searching at
  *
  * Returns: TRUE if the next character is a whitespace character,
  * FALSE otherwise
@@ -180,7 +180,7 @@ anjuta_language_provider_is_character (gchar ch, const gchar* characters)
 
 /**
  * anjuta_language_provider_get_scope_context
- * @editor: current editor
+ * @editor: (type GObject): current editor
  * @iter: Current cursor position
  * @scope_context_ch: language-specific context characters
  *                    the end is marked with a '0' character
@@ -239,8 +239,8 @@ anjuta_language_provider_get_scope_context (IAnjutaEditor* editor,
 
 /**
  * anjuta_language_provider_get_calltip_context:
- * @itip: whether a tooltip is crrently shown
- * @iter: current cursor position
+ * @itip: (type GObject): whether a tooltip is crrently shown
+ * @iter: (type GObject): current cursor position
  * @scope_context_ch: language-specific context characters
  *                    the end is marked with a '0' character
  *
@@ -289,9 +289,9 @@ anjuta_language_provider_get_calltip_context (AnjutaLanguageProvider* lang_prov,
 /**
  * anjuta_language_provider_get_pre_word:
  * @lang_prov: Self
- * @editor: IAnjutaEditor object
- * @iter: current cursor position
- * @start_iter: return location for the start_iter (if a preword was found)
+ * @editor: (type GObject): IAnjutaEditor object
+ * @iter: (type GObject): current cursor position
+ * @start_iter: (type GObject): return location for the start_iter (if a preword was found)
  *
  * Search for the current typed word
  *
@@ -346,7 +346,7 @@ anjuta_language_provider_get_pre_word (AnjutaLanguageProvider* lang_prov,
 /**
  * anjuta_language_provider_calltip:
  * @lang_prov: Self
- * @provider: IAnjutaLanguageProvider object
+ * @provider: (type GObject): IAnjutaLanguageProvider object
  * 
  * Creates a calltip if there is something to show a tip for
  * Calltips are queried async
@@ -405,7 +405,7 @@ anjuta_language_provider_calltip (AnjutaLanguageProvider* lang_prov,
 /**
  * anjuta_language_provider_none:
  * @lang_prov: Self
- * @provider: IAnjutaLanguageProvider object
+ * @provider: (type GObject): IAnjutaLanguageProvider object
  *
  * Indicate that there is nothing to autocomplete
  */
@@ -420,8 +420,8 @@ anjuta_language_provider_none (AnjutaLanguageProvider* lang_prov,
 /**
  * anjuta_language_provider_activate:
  * @lang_prov: Self
- * @iprov: IAnjutaProvider object
- * @iter: the cursor
+ * @iprov: (type GObject): IAnjutaProvider object
+ * @iter: (type GObject): the cursor
  * @data: the ProposalData
  *
  * Complete the function name
@@ -527,8 +527,8 @@ anjuta_language_provider_activate (AnjutaLanguageProvider* lang_prov,
 /**
  * anjuta_language_provider_populate:
  * @lang_prov: Self
- * @iprov: IAnjutaProvider object
- * @cursor: the text iter where the provider should be populated
+ * @iprov: (type GObject): IAnjutaProvider object
+ * @cursor: (type GObject): the text iter where the provider should be populated
  *
  * Show completion for the context at position @iter. The provider should
  * call ianjuta_editor_assist_proposals here to add proposals to the list.
@@ -566,7 +566,7 @@ anjuta_language_provider_populate (AnjutaLanguageProvider* lang_prov,
 	}
 	
 	/* Execute language-specific part */
-	start_iter = ianjuta_language_provider_populate_language (
+	start_iter = ianjuta_language_provider_populate_completions (
 	                     IANJUTA_LANGUAGE_PROVIDER (iprov), cursor, NULL);
 	if (start_iter)
 	{
diff --git a/libanjuta/interfaces/libanjuta.idl b/libanjuta/interfaces/libanjuta.idl
index 444bc2a..78ef3ec 100644
--- a/libanjuta/interfaces/libanjuta.idl
+++ b/libanjuta/interfaces/libanjuta.idl
@@ -2757,7 +2757,7 @@ interface IAnjutaProvider
 		void new_calltip (gchar* call_context, IAnjutaIterable* iter);
 		 
 		/**
-		 * ianjuta_language_provider_populate_language:
+		 * ianjuta_language_provider_populate_completions:
 		 * @obj: Self
 		 * @iter: the text iter where the provider should be populated
 		 * @err: Error propagation and reporting.
@@ -2768,9 +2768,9 @@ interface IAnjutaProvider
 		 * Note that this is called after every character typed and the list of proposals
 		 * has to be completely renewed.
 		 *
-		 * Returns: (transfer full): the iter where the provider populated, NULL otherwise
+		 * Returns: (transfer full) (allow-none): the iter where the provider populated, NULL otherwise
 		 */
-		IAnjutaIterable* populate_language (IAnjutaIterable* iter);
+		IAnjutaIterable* populate_completions (IAnjutaIterable* iter);
 	}
 }
 
diff --git a/plugins/language-support-js/plugin.c b/plugins/language-support-js/plugin.c
index 1cbba4e..0ea97e9 100644
--- a/plugins/language-support-js/plugin.c
+++ b/plugins/language-support-js/plugin.c
@@ -567,7 +567,7 @@ ilanguage_provider_iface_init (IAnjutaLanguageProviderIface* iface)
 	iface->get_calltip_cache   = ilanguage_provider_get_calltip_cache;
 	iface->get_calltip_context = ilanguage_provider_get_calltip_context;
 	iface->new_calltip         = ilanguage_provider_new_calltip;
-	iface->populate_language   = ilanguage_provider_populate;
+	iface->populate_completions   = ilanguage_provider_populate;
 }
 
 ANJUTA_PLUGIN_BEGIN (JSLang, js_support_plugin);
diff --git a/plugins/language-support-python/python-assist.c b/plugins/language-support-python/python-assist.c
index 229e874..5eba7ac 100644
--- a/plugins/language-support-python/python-assist.c
+++ b/plugins/language-support-python/python-assist.c
@@ -619,9 +619,9 @@ python_assist_new_calltip (IAnjutaLanguageProvider* self,
 }
 
 static IAnjutaIterable*
-python_assist_populate_language (IAnjutaLanguageProvider* self,
-                                 IAnjutaIterable* cursor,
-                                 GError** e)
+python_assist_populate_completions (IAnjutaLanguageProvider* self,
+                                    IAnjutaIterable* cursor,
+                                    GError** e)
 {
 	PythonAssist* assist = PYTHON_ASSIST (self);
 	IAnjutaIterable* start_iter = NULL;
@@ -815,5 +815,5 @@ ilanguage_provider_iface_init (IAnjutaLanguageProviderIface* iface)
 	iface->get_calltip_cache   = python_assist_get_calltip_cache;
 	iface->get_calltip_context = python_assist_get_calltip_context;
 	iface->new_calltip         = python_assist_new_calltip;
-	iface->populate_language   = python_assist_populate_language;
+	iface->populate_completions   = python_assist_populate_completions;
 }
diff --git a/plugins/parser-cxx/parser-cxx-assist.c b/plugins/parser-cxx/parser-cxx-assist.c
index fb46091..3ace165 100644
--- a/plugins/parser-cxx/parser-cxx-assist.c
+++ b/plugins/parser-cxx/parser-cxx-assist.c
@@ -855,9 +855,9 @@ parser_cxx_assist_new_calltip (IAnjutaLanguageProvider* self,
 }
 
 static IAnjutaIterable*
-parser_cxx_assist_populate_language (IAnjutaLanguageProvider* self,
-                                     IAnjutaIterable* cursor,
-                                     GError** e)
+parser_cxx_assist_populate_completions (IAnjutaLanguageProvider* self,
+                                        IAnjutaIterable* cursor,
+                                        GError** e)
 {
 	ParserCxxAssist* assist = PARSER_CXX_ASSIST (self);
 	IAnjutaIterable* start_iter = NULL;
@@ -1306,5 +1306,5 @@ ilanguage_provider_iface_init (IAnjutaLanguageProviderIface* iface)
 	iface->get_calltip_cache   = parser_cxx_assist_get_calltip_cache;
 	iface->get_calltip_context = parser_cxx_assist_get_calltip_context;
 	iface->new_calltip         = parser_cxx_assist_new_calltip;
-	iface->populate_language   = parser_cxx_assist_populate_language;
+	iface->populate_completions   = parser_cxx_assist_populate_completions;
 }