From 5198408affd3cb6b02dc4ed2681cc2f014a9635e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 3 Mar 2004 14:00:00 +0000 Subject: [PATCH] moved the (disabled) ENABLE_FILE_SYSTEM_ICONS from the .c to the .h file 2004-03-03 Michael Natterer * app/widgets/gimppreviewrendererimagefile.[ch]: moved the (disabled) ENABLE_FILE_SYSTEM_ICONS from the .c to the .h file and #ifdef the "gpointer file_system" member with it. --- ChangeLog | 6 ++++++ app/widgets/gimppreviewrendererimagefile.c | 9 +++++---- app/widgets/gimppreviewrendererimagefile.h | 6 ++++++ app/widgets/gimpviewrendererimagefile.c | 9 +++++---- app/widgets/gimpviewrendererimagefile.h | 6 ++++++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcafcf8e60..bf8956822f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-03 Michael Natterer + + * app/widgets/gimppreviewrendererimagefile.[ch]: moved the + (disabled) ENABLE_FILE_SYSTEM_ICONS from the .c to the .h file and + #ifdef the "gpointer file_system" member with it. + 2004-03-03 Simon Budig * app/vectors/gimpvectors.c: fixed offset handling. Vectors diff --git a/app/widgets/gimppreviewrendererimagefile.c b/app/widgets/gimppreviewrendererimagefile.c index a204ee8083..1f765a25d2 100644 --- a/app/widgets/gimppreviewrendererimagefile.c +++ b/app/widgets/gimppreviewrendererimagefile.c @@ -24,10 +24,6 @@ #include #include -#ifdef ENABLE_FILE_SYSTEM_ICONS -#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -#include -#endif #include "libgimpthumb/gimpthumb.h" #include "libgimpwidgets/gimpwidgets.h" @@ -40,6 +36,11 @@ #include "gimppreviewrendererimagefile.h" +#ifdef ENABLE_FILE_SYSTEM_ICONS +#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED +#include +#endif + static void gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass); static void gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer); diff --git a/app/widgets/gimppreviewrendererimagefile.h b/app/widgets/gimppreviewrendererimagefile.h index e36b34133b..446fcfee1a 100644 --- a/app/widgets/gimppreviewrendererimagefile.h +++ b/app/widgets/gimppreviewrendererimagefile.h @@ -22,8 +22,12 @@ #ifndef __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ #define __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ + #include "gimppreviewrenderer.h" +/* #define ENABLE_FILE_SYSTEM_ICONS 1 */ + + #define GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE (gimp_preview_renderer_imagefile_get_type ()) #define GIMP_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefile)) #define GIMP_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass)) @@ -38,7 +42,9 @@ struct _GimpPreviewRendererImagefile { GimpPreviewRenderer parent_instance; +#ifdef ENABLE_FILE_SYSTEM_ICONS gpointer file_system; +#endif }; struct _GimpPreviewRendererImagefileClass diff --git a/app/widgets/gimpviewrendererimagefile.c b/app/widgets/gimpviewrendererimagefile.c index a204ee8083..1f765a25d2 100644 --- a/app/widgets/gimpviewrendererimagefile.c +++ b/app/widgets/gimpviewrendererimagefile.c @@ -24,10 +24,6 @@ #include #include -#ifdef ENABLE_FILE_SYSTEM_ICONS -#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -#include -#endif #include "libgimpthumb/gimpthumb.h" #include "libgimpwidgets/gimpwidgets.h" @@ -40,6 +36,11 @@ #include "gimppreviewrendererimagefile.h" +#ifdef ENABLE_FILE_SYSTEM_ICONS +#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED +#include +#endif + static void gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass); static void gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer); diff --git a/app/widgets/gimpviewrendererimagefile.h b/app/widgets/gimpviewrendererimagefile.h index e36b34133b..446fcfee1a 100644 --- a/app/widgets/gimpviewrendererimagefile.h +++ b/app/widgets/gimpviewrendererimagefile.h @@ -22,8 +22,12 @@ #ifndef __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ #define __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ + #include "gimppreviewrenderer.h" +/* #define ENABLE_FILE_SYSTEM_ICONS 1 */ + + #define GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE (gimp_preview_renderer_imagefile_get_type ()) #define GIMP_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefile)) #define GIMP_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass)) @@ -38,7 +42,9 @@ struct _GimpPreviewRendererImagefile { GimpPreviewRenderer parent_instance; +#ifdef ENABLE_FILE_SYSTEM_ICONS gpointer file_system; +#endif }; struct _GimpPreviewRendererImagefileClass