anjuta r3731 - in trunk: . plugins/language-support-cpp-java plugins/sourceview

[jhs svn gnome org]

Author: jhs
Date: Fri Feb 29 18:26:19 2008
New Revision: 3731
URL: http://svn.gnome.org/viewvc/anjuta?rev=3731&view=rev

Log:
2008-02-29  Johannes Schmid  <jhs gnome org>

	* plugins/language-support-cpp-java/cpp-java-assist.c
	(cpp_java_assist_get_calltip_context), (cpp_java_assist_check):
	Removed some debug code
	
	* plugins/sourceview/assist-tip.c (assist_tip_set_tips):
	Escape tooltip text to avoid broken markup

Modified:
   trunk/ChangeLog
   trunk/plugins/language-support-cpp-java/cpp-java-assist.c
   trunk/plugins/sourceview/assist-tip.c

Modified: trunk/plugins/language-support-cpp-java/cpp-java-assist.c
==============================================================================
--- trunk/plugins/language-support-cpp-java/cpp-java-assist.c	(original)
+++ trunk/plugins/language-support-cpp-java/cpp-java-assist.c	Fri Feb 29 18:26:19 2008
@@ -434,10 +434,6 @@
 	gchar ch;
 	gchar *context = NULL;
 	
-#ifdef DEBUG
-	GTimer* timer = g_timer_new ();
-#endif
-	
 	ch = ianjuta_editor_cell_get_char (IANJUTA_EDITOR_CELL (iter), 0, NULL);
 	if (ch == ')')
 	{
@@ -445,14 +441,12 @@
 			return NULL;
 		if (!ianjuta_iterable_previous (iter, NULL))
 			return NULL;
-		//DEBUG_PRINT ("calltip ')' brace: %f", g_timer_elapsed (timer, NULL));
 	}
 	if (ch != '(')
 	{
 		if (!cpp_java_util_jump_to_matching_brace (iter, ')',
 												   BRACE_SEARCH_LIMIT))
 			return NULL;
-		//DEBUG_PRINT ("calltip ')' brace: %f", g_timer_elapsed (timer, NULL));
 	}
 	
 	/* Skip white spaces */
@@ -460,22 +454,14 @@
 		&& g_ascii_isspace (ianjuta_editor_cell_get_char
 								(IANJUTA_EDITOR_CELL (iter), 0, NULL)));
 
-	//DEBUG_PRINT ("calltip skip whitespace: %f", g_timer_elapsed (timer, NULL));
 	
 	context = cpp_java_assist_get_scope_context
 		(IANJUTA_EDITOR (assist->priv->iassist), "(", iter);
 	
-	//DEBUG_PRINT ("calltip get scope context: %f", g_timer_elapsed (timer, NULL));
-	
 	if (context_offset)
 	{
 		*context_offset = get_iter_column (assist, iter);
-		//DEBUG_PRINT ("calltip get iter column: %f", g_timer_elapsed (timer, NULL));
 	}
-
-#ifdef DEBUG
-	g_timer_destroy (timer);
-#endif
 	
 	return context;
 }
@@ -561,9 +547,6 @@
 	IAnjutaIterable *iter, *iter_save;
 	IAnjutaEditorAttribute attribute;
 	gchar *pre_word = NULL, *scope_operator = NULL;
-#ifdef DEBUG
-	GTimer* timer = g_timer_new();
-#endif
 	
 	//DEBUG_PRINT ("Autocomplete enable is: %d", autocomplete);
 	//DEBUG_PRINT ("Calltips enable is: %d", calltips);
@@ -609,7 +592,6 @@
 															   scope_operator,
 															   iter);
 			
-			DEBUG_PRINT ("assist scope context: %f", g_timer_elapsed (timer, NULL));
 			DEBUG_PRINT ("Scope context: %s", scope_context);
 			
 			if (scope_context)
@@ -643,9 +625,6 @@
 		}
 		//DEBUG_PRINT ("assist autocomplete: %f", g_timer_elapsed (timer, NULL));
 	}
-#ifdef DEBUG
-	g_timer_reset (timer);
-#endif
 	if (calltips)
 	{
 		if (!shown)
@@ -671,10 +650,6 @@
 	g_object_unref (iter_save);
 	g_free (pre_word);
 	g_free (scope_operator);
-#ifdef DEBUG
-	g_timer_stop (timer);
-	g_timer_destroy (timer);
-#endif
 	return shown;
 }
 

Modified: trunk/plugins/sourceview/assist-tip.c
==============================================================================
--- trunk/plugins/sourceview/assist-tip.c	(original)
+++ trunk/plugins/sourceview/assist-tip.c	Fri Feb 29 18:26:19 2008
@@ -98,7 +98,7 @@
 		g_free(text);
 		text = new_text;
 	}
-	tip_text = g_strdup_printf("<tt>%s</tt>", text);
+	tip_text = g_markup_printf_escaped ("<tt>%s</tt>", text);
 	gtk_label_set_markup(GTK_LABEL(tip->label), tip_text);
 	gtk_widget_show (tip->label);
 	g_free(text);