[anjuta/gnome-3-6] python: Fix bgo#687646 - Auto-completion causes a segfault in Anjuta 3.6.1

[Johannes Schmid <jhs src gnome org>]

commit eea2b90ea92d3b655612438bdc6c445d128875bc
Author: Johannes Schmid <jhs gnome org>
Date:   Sun Nov 18 15:14:01 2012 +0100

    python: Fix bgo#687646 - Auto-completion causes a segfault in Anjuta 3.6.1

 libanjuta/anjuta-language-provider.h            |    3 +--
 plugins/language-support-python/python-assist.c |   10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/libanjuta/anjuta-language-provider.h b/libanjuta/anjuta-language-provider.h
index b876087..fbaa5d2 100644
--- a/libanjuta/anjuta-language-provider.h
+++ b/libanjuta/anjuta-language-provider.h
@@ -30,8 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define ANJUTA_TYPE_LANGUAGE_PROPOSAL_DATA             (anjuta_language_proposal_data_get_type ())
-#define ANJUTA_LANGUAGE_PROPOSAL_DATA(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_LANGUAGE_PROPOSAL_DATA, AnjutaLanguageProposalData))
+#define ANJUTA_LANGUAGE_PROPOSAL_DATA(obj)             (AnjutaLanguageProposalData*)((obj))
 
 typedef struct _AnjutaLanguageProposalData AnjutaLanguageProposalData;
 
diff --git a/plugins/language-support-python/python-assist.c b/plugins/language-support-python/python-assist.c
index 8379c5e..cbe399f 100644
--- a/plugins/language-support-python/python-assist.c
+++ b/plugins/language-support-python/python-assist.c
@@ -228,7 +228,7 @@ on_autocomplete_output (AnjutaLauncher *launcher,
 	PythonAssist* assist = PYTHON_ASSIST (user_data);
 	if (output_type == ANJUTA_LAUNCHER_OUTPUT_STDOUT)
 	{
-		printf ("chars from script: %s", chars);
+		DEBUG_PRINT ("chars from script: %s", chars);
 		if (assist->priv->rope_cache)
 		{
 			g_string_append (assist->priv->rope_cache, chars);
@@ -280,10 +280,11 @@ on_autocomplete_finished (AnjutaLauncher* launcher,
 			if (g_match_info_matches (match_info) && 
 			    g_match_info_get_match_count (match_info) == 6)
 			{
+				gchar* name = g_match_info_fetch (match_info, 1);
 				gchar* type = g_match_info_fetch (match_info, 3); 
 				gchar* location = g_match_info_fetch (match_info, 4); 
 				gchar* info = g_match_info_fetch (match_info, 5); 
-				tag = anjuta_language_proposal_data_new (g_match_info_fetch (match_info, 1));
+				tag = anjuta_language_proposal_data_new (name);
 
 				/* info will be set to "_" if there is no relevant info */
 				tag->info = NULL; 
@@ -322,13 +323,14 @@ on_autocomplete_finished (AnjutaLauncher* launcher,
 
 		g_regex_unref (regex);
 		g_strfreev (completions);
+
 		g_string_free (assist->priv->rope_cache, TRUE);
 		assist->priv->rope_cache = NULL;
-		
+
 		assist->priv->completion_cache = g_completion_new (completion_function);
 		g_completion_add_items (assist->priv->completion_cache, suggestions);
 		g_list_free (suggestions);
-
+		
 		/* Show autocompletion */
 		python_assist_update_autocomplete (assist);
 	}