Merge branch 'symbols-tree-update-fixes'

geany · Nov 21, 2011 · 425e0e3 · 425e0e3
2 parents 39606dd + 319a635
commit 425e0e3
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 179 deletions.
diff --git a/src/sidebar.c b/src/sidebar.c
@@ -216,7 +216,7 @@ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update)
 		if (doc->priv->tag_tree == NULL)
 		{
 			doc->priv->tag_store = gtk_tree_store_new(
-				SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING, G_TYPE_BOOLEAN);
+				SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING);
 			doc->priv->tag_tree = gtk_tree_view_new();
 			prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store);
 			gtk_widget_show(doc->priv->tag_tree);

diff --git a/src/sidebar.h b/src/sidebar.h
@@ -41,7 +41,6 @@ enum
 	SYMBOLS_COLUMN_NAME,
 	SYMBOLS_COLUMN_TAG,
 	SYMBOLS_COLUMN_TOOLTIP,
-	SYMBOLS_COLUMN_VALID,
 	SYMBOLS_N_COLUMNS
 };