Don't use custom font.

2002-05-11  Alex Larsson  <alexl@redhat.com>

	* components/music/nautilus-music-view.c: (set_up_tree_view):
	Don't use custom font.

	* libnautilus-private/apps_nautilus_preferences.schemas:
	Add preferences/desktop_font.
	Remove old fonts keys

	* libnautilus-private/nautilus-file.c:
	(nautilus_file_get_display_name_nocopy):
	Don't leak.

	* libnautilus-private/nautilus-global-preferences.c:
	* libnautilus-private/nautilus-global-preferences.h:
	Remove old font prefs. Add desktop font prefs.

	* libnautilus-private/nautilus-icon-canvas-item.c:
	(create_label_layout):
	Use default widget font unless one is set.

	* libnautilus-private/nautilus-icon-container.c: (finalize),
	(style_set), (nautilus_icon_container_class_init),
	(nautilus_icon_container_instance_init),
	(nautilus_icon_container_set_font):
	* libnautilus-private/nautilus-icon-container.h:
 	* libnautilus-private/nautilus-icon-private.h:
	Change nautilus_icon_container_set_font_name to
	nautilus_icon_container_set_font.
	Change font_size_table to have the difference from the base font size.
	Invalidate labels on style_set.

	* libnautilus-private/nautilus-icon-factory.c:
	(embedded_text_font_changed_callback), (embed_text):
	Use default widget font for embedded text.

	* src/nautilus-preferences-dialog.c:
	* src/nautilus-sidebar-title.c:
	Remove font prefs. Update on style_set.

	* src/nautilus-sidebar-tabs.c: (nautilus_sidebar_tabs_class_init),
	(nautilus_sidebar_tabs_load_theme_data), (style_set),
	(nautilus_sidebar_tabs_init), (nautilus_sidebar_tabs_destroy),
	(make_tab_text_layout):
	Use normal gtk+ fonts.

	* src/file-manager/fm-desktop-icon-view.c: (font_changed_callback),
	(fm_desktop_icon_view_update_icon_container_fonts),
	(fm_desktop_icon_view_init):
	Use desktop font.

	* src/file-manager/fm-icon-view.c:
	(default_zoom_level_changed_callback), (create_icon_container),
	(fm_icon_view_instance_init):
	(nautilus_sidebar_title_class_init), (style_set),
	(nautilus_sidebar_title_init), (update_title_font):
	Remove font handling.

1 files changed, 1 insertions, 8 deletions

diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index c7311241c..c292ffd67 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -46,6 +46,7 @@ G_BEGIN_DECLS
 /* Desktop options */
 #define NAUTILUS_PREFERENCES_SHOW_DESKTOP			"preferences/show_desktop"
 #define NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR                "preferences/desktop_is_home_dir"
+#define NAUTILUS_PREFERENCES_DESKTOP_FONT			"preferences/desktop_font"
 
 /* Display  */
 #define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES  		"/desktop/gnome/file_views/show_hidden_files"
@@ -59,10 +60,6 @@ G_BEGIN_DECLS
 #define NAUTILUS_PREFERENCES_HOME_URI                 		"preferences/home_uri"
 #define NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS		"preferences/hide_built_in_bookmarks"
 
-/* Content fonts */
-#define NAUTILUS_PREFERENCES_DEFAULT_FONT			"preferences/default_font"
-#define NAUTILUS_PREFERENCES_DEFAULT_FONT_SIZE			"preferences/default_font_size"
-
 /* Single/Double click preference  */
 #define NAUTILUS_PREFERENCES_CLICK_POLICY			"preferences/click_policy"
 
@@ -102,9 +99,7 @@ enum
 #define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER		"icon_view/default_sort_order"
 #define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT	"icon_view/default_use_tighter_layout"
 #define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL		"icon_view/default_zoom_level"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"icon_view/default_zoom_level_font_size"
 #define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT	"icon_view/default_use_manual_layout"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_FONT				"icon_view/font"
 
 /* The icon view uses 2 variables to store the sort order and
  * whether to use manual layout.  However, the UI for these
@@ -122,8 +117,6 @@ enum
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"list_view/default_sort_in_reverse_order"
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER		"list_view/default_sort_order"
 #define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL		"list_view/default_zoom_level"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"list_view/default_zoom_level_font_size"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_FONT				"list_view/font"
 
 /* News panel */
 #define NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS				"news/max_items"