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

[mcora svn gnome org]

Author: mcora
Date: Fri Dec 26 18:08:44 2008
New Revision: 4487
URL: http://svn.gnome.org/viewvc/anjuta?rev=4487&view=rev

Log:
	* plugins/symbol-db/symbol-db-view-search.c
	(sdb_view_search_model_filter),
	(sdb_view_search_on_entry_key_press_event), (sdb_view_search_init):
	fix #565700 â Enter key inserts garbage into Symbols / Search box


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

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 26 18:08:44 2008
@@ -60,6 +60,7 @@
 
 enum {
 	COLUMN_PIXBUF,
+	COLUMN_DESC,
 	COLUMN_NAME,
 	COLUMN_LINE,
 	COLUMN_FILE,
@@ -162,7 +163,8 @@
 									symbol_db_engine_iterator_node_get_symbol_extra_string (
 									iter_node, SYMINFO_ACCESS)
 								),
-							COLUMN_NAME, display,
+							COLUMN_DESC, display,
+							COLUMN_NAME, sym_name,
 							COLUMN_LINE, 
 								symbol_db_engine_iterator_node_get_symbol_file_pos (
 													iter_node),
@@ -323,7 +325,7 @@
 		gint line;
 		gchar *file;
 
-		DEBUG_PRINT("%s", "enter key pressed: getting the first entry found");
+		DEBUG_PRINT("enter key pressed: getting the first entry found");
 
 		/* Get the first entry found. */
 		if (gtk_tree_model_get_iter_first
@@ -432,7 +434,7 @@
 
 	
 	priv->model = GTK_TREE_MODEL (gtk_tree_store_new (COLUMN_MAX, GDK_TYPE_PIXBUF,
-				    G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT));
+				    G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT));
 	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->model),
 										  COLUMN_NAME,
 										  GTK_SORT_ASCENDING);
@@ -457,9 +459,9 @@
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute (column, renderer, "text",
-					    COLUMN_NAME);
+					    COLUMN_DESC);
 	gtk_tree_view_column_set_attributes (column, renderer,
-										 "markup", COLUMN_NAME, NULL);	
+										 "markup", COLUMN_DESC, NULL);	
 
 	gtk_tree_view_append_column (GTK_TREE_VIEW (priv->hitlist), column);
 	gtk_tree_view_set_expander_column (GTK_TREE_VIEW (priv->hitlist),