anjuta r4457 - in trunk: . plugins/symbol-db

[mcora svn gnome org]

Author: mcora
Date: Fri Dec 19 21:32:32 2008
New Revision: 4457
URL: http://svn.gnome.org/viewvc/anjuta?rev=4457&view=rev

Log:
	* plugins/symbol-db/plugin.c (value_added_current_editor):
	* plugins/symbol-db/symbol-db-view.c (on_symbol_removed):
	removed DEBUG_PRINT. 

	* plugins/symbol-db/symbol-db-engine.c
	(symbol_db_engine_get_file_db_path):
	* plugins/symbol-db/symbol-db-view-search.c
	(sdb_view_search_model_filter), (sdb_view_search_init):
	fixed #563980 - displayed some more info on search tab.

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/plugin.c
   trunk/plugins/symbol-db/symbol-db-engine.c
   trunk/plugins/symbol-db/symbol-db-view-search.c
   trunk/plugins/symbol-db/symbol-db-view.c

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Fri Dec 19 21:32:32 2008
@@ -359,7 +359,6 @@
 	
 	if (sdb_plugin->session_loading)
 	{
-		DEBUG_PRINT ("%s", "session_loading");
 		return;
 	}
 	else

Modified: trunk/plugins/symbol-db/symbol-db-engine.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine.c	Fri Dec 19 21:32:32 2008
@@ -6023,6 +6023,7 @@
 	gchar *relative_path;
 	const gchar *tmp;
 	g_return_val_if_fail (dbe != NULL, NULL);
+	g_return_val_if_fail (full_local_file_path != NULL, NULL);
 		
 	priv = dbe->priv;
 	

Modified: trunk/plugins/symbol-db/symbol-db-view-search.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-search.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-view-search.c	Fri Dec 19 21:32:32 2008
@@ -134,23 +134,39 @@
 			
 			for (i = 0; i < max_hits; ++i)
 			{
-				GtkTreeIter iter;
-				
+				GtkTreeIter iter;				
 				iter_node = SYMBOL_DB_ENGINE_ITERATOR_NODE (iterator);
 				
 				const gchar *sym_name = 
 					symbol_db_engine_iterator_node_get_symbol_name (iter_node);
-								
-				if (sym_name)
-				{
-					/* get the full file path instead of a database-oriented one. */
-					const gchar *file_path = 
-						symbol_db_engine_iterator_node_get_symbol_extra_string (
+
+				/* get the full file path instead of a database-oriented one. */					
+				const gchar *file_path = 
+					symbol_db_engine_iterator_node_get_symbol_extra_string (
 									iter_node, SYMINFO_FILE_PATH);
-								
+				
+				if (sym_name && file_path)
+				{
+					gchar *display;
+					gchar *db_file_path;
+					gint pos;
+					
+					/* and now get the relative one */
+					db_file_path = symbol_db_engine_get_file_db_path (priv->sdbe,
+																	  file_path);
+					
+					pos = symbol_db_engine_iterator_node_get_symbol_file_pos (iter_node);
+					display = g_markup_printf_escaped("<b>%s</b>\n"
+										"<small><tt>%s:%d</tt></small>",
+										sym_name,
+										db_file_path,
+										pos);
+					g_free (db_file_path);
+					
 					/* add a new iter */
 					gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
 					
+
 					gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
 							COLUMN_PIXBUF, symbol_db_view_get_pixbuf (
 								symbol_db_engine_iterator_node_get_symbol_extra_string (
@@ -158,7 +174,7 @@
 									symbol_db_engine_iterator_node_get_symbol_extra_string (
 									iter_node, SYMINFO_ACCESS)
 								),
-							COLUMN_NAME, sym_name,
+							COLUMN_NAME, display,
 							COLUMN_LINE, 
 								symbol_db_engine_iterator_node_get_symbol_file_pos (
 													iter_node),
@@ -168,7 +184,9 @@
 							-1);
 					
 					completion_list = g_list_prepend (completion_list,
-							g_strdup (sym_name));					
+							g_strdup (sym_name));
+					
+					g_free (display);
 				}
 
 				symbol_db_engine_iterator_move_next (iterator);
@@ -203,7 +221,6 @@
 	return FALSE;
 }
 
-
 static void
 sdb_view_search_on_entry_changed (GtkEntry * entry,
 				   SymbolDBViewSearch * search)
@@ -243,8 +260,6 @@
 	sdb_view_search_model_filter (search, str);
 }
 
-
-
 static gboolean
 sdb_view_search_on_tree_row_activate (GtkTreeView * view,
 				       GtkTreePath * arg1,
@@ -287,8 +302,6 @@
 	return FALSE;
 }
 
-
-
 static gboolean
 sdb_view_search_on_entry_key_press_event (GtkEntry * entry,
 					   GdkEventKey * event,
@@ -457,6 +470,8 @@
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute (column, renderer, "text",
 					    COLUMN_NAME);
+	gtk_tree_view_column_set_attributes (column, renderer,
+										 "markup", COLUMN_NAME, NULL);	
 
 	gtk_tree_view_append_column (GTK_TREE_VIEW (priv->hitlist), column);
 	gtk_tree_view_set_expander_column (GTK_TREE_VIEW (priv->hitlist),

Modified: trunk/plugins/symbol-db/symbol-db-view.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-view.c	Fri Dec 19 21:32:32 2008
@@ -762,7 +762,7 @@
 
 	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (dbv)));
 
-	DEBUG_PRINT ("on_symbol_removed (): -global- %d", symbol_id);
+	/*DEBUG_PRINT ("on_symbol_removed (): -global- %d", symbol_id);*/
 
 	row_ref = g_tree_lookup (priv->nodes_displayed, GINT_TO_POINTER (symbol_id));
 	if (sdb_view_get_iter_from_row_ref (dbv, row_ref, &iter) == FALSE)