nautilus r14756 - in trunk: . src/file-manager

[awalton svn gnome org]

Author: awalton
Date: Wed Oct 22 08:06:34 2008
New Revision: 14756
URL: http://svn.gnome.org/viewvc/nautilus?rev=14756&view=rev

Log:
2008-10-22  A. Walton  <awalton gnome org>

	* src/file-manager/fm-tree-model.c (fm_tree_model_get_column_type),
	(fm_tree_model_get_value):
	* src/file-manager/fm-tree-model.h:
	* src/file-manager/fm-tree-view.c (create_tree):
	Use normal weighting in the tree view sidebar. Closes bug #311786.



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-tree-model.c
   trunk/src/file-manager/fm-tree-model.h
   trunk/src/file-manager/fm-tree-view.c

Modified: trunk/src/file-manager/fm-tree-model.c
==============================================================================
--- trunk/src/file-manager/fm-tree-model.c	(original)
+++ trunk/src/file-manager/fm-tree-model.c	Wed Oct 22 08:06:34 2008
@@ -1133,8 +1133,6 @@
 		return GDK_TYPE_PIXBUF;
 	case FM_TREE_MODEL_FONT_STYLE_COLUMN:
 		return PANGO_TYPE_STYLE;
-	case FM_TREE_MODEL_FONT_WEIGHT_COLUMN:
-		return PANGO_TYPE_WEIGHT;
 	default:
 		g_assert_not_reached ();
 	}
@@ -1288,14 +1286,6 @@
 			g_value_set_enum (value, PANGO_STYLE_NORMAL);
 		}
 		break;
-	case FM_TREE_MODEL_FONT_WEIGHT_COLUMN:
-		g_value_init (value, PANGO_TYPE_STYLE);
-		if (node != NULL && node->parent == NULL) {
-			g_value_set_enum (value, PANGO_WEIGHT_BOLD);
-		} else {
-			g_value_set_enum (value, PANGO_WEIGHT_NORMAL);
-		}
-		break;
 	default:
 		g_assert_not_reached ();
 	}

Modified: trunk/src/file-manager/fm-tree-model.h
==============================================================================
--- trunk/src/file-manager/fm-tree-model.h	(original)
+++ trunk/src/file-manager/fm-tree-model.h	Wed Oct 22 08:06:34 2008
@@ -44,7 +44,6 @@
 	FM_TREE_MODEL_OPEN_PIXBUF_COLUMN,
 	FM_TREE_MODEL_EMBLEM_PIXBUF_COLUMN,
 	FM_TREE_MODEL_FONT_STYLE_COLUMN,
-	FM_TREE_MODEL_FONT_WEIGHT_COLUMN,
 	FM_TREE_MODEL_NUM_COLUMNS
 };
 

Modified: trunk/src/file-manager/fm-tree-view.c
==============================================================================
--- trunk/src/file-manager/fm-tree-view.c	(original)
+++ trunk/src/file-manager/fm-tree-view.c	Wed Oct 22 08:06:34 2008
@@ -1434,7 +1434,6 @@
 	gtk_tree_view_column_set_attributes (column, cell,
 					     "text", FM_TREE_MODEL_DISPLAY_NAME_COLUMN,
 					     "style", FM_TREE_MODEL_FONT_STYLE_COLUMN,
-					     "weight", FM_TREE_MODEL_FONT_WEIGHT_COLUMN,
 					     NULL);
 
 	gtk_tree_view_append_column (view->details->tree_widget, column);