From 59d13a601def58ced67591e56b50ca79e7c84916 Mon Sep 17 00:00:00 2001 From: Richard Hestilow Date: Tue, 12 Mar 2002 22:53:54 +0000 Subject: [PATCH] Move CappletDirViewLayout enum here, remove include to preferences.h. 2002-03-12 Richard Hestilow * capplet-dir-view.h: Move CappletDirViewLayout enum here, remove include to preferences.h. * Makefile.am: Remove preferences.h again. --- control-center/ChangeLog | 7 +++++++ control-center/Makefile.am | 1 - control-center/capplet-dir-view.h | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/control-center/ChangeLog b/control-center/ChangeLog index c6446f91e..f246b6673 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,10 @@ +2002-03-12 Richard Hestilow + + * capplet-dir-view.h: Move CappletDirViewLayout enum here, + remove include to preferences.h. + + * Makefile.am: Remove preferences.h again. + 2002-03-12 jacob berkman * capplet-dir-view.c (prefs_menu_cb): comment this out as it makes diff --git a/control-center/Makefile.am b/control-center/Makefile.am index d78ef5850..5fbcb691a 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -29,7 +29,6 @@ bin_PROGRAMS = gnome2-control-center gnome2_control_center_SOURCES = \ main.c \ - preferences.h \ capplet-dir.c capplet-dir.h \ capplet-dir-view.c capplet-dir-view.h \ capplet-dir-view-list.c diff --git a/control-center/capplet-dir-view.h b/control-center/capplet-dir-view.h index 8b25abcdf..7fe6394cf 100644 --- a/control-center/capplet-dir-view.h +++ b/control-center/capplet-dir-view.h @@ -28,7 +28,6 @@ #include #include "capplet-dir.h" -#include "preferences.h" G_BEGIN_DECLS @@ -55,6 +54,13 @@ struct _CappletDirViewImpl GtkWidget *(*create) (CappletDirView *); }; +typedef enum _CappletDirViewLayout { + LAYOUT_NONE, + LAYOUT_ICON_LIST, +#ifdef USE_HTML + LAYOUT_HTML +#endif +} CappletDirViewLayout; struct _CappletDirView {