diff --git a/ChangeLog b/ChangeLog index db6c4d93d1..0c106d1945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2005-01-25 Michael Natterer + + * libgimpconfig/gimpconfigtypes.h: new file holding the opaque + typedefs for libgimpconfig. Includes "libgimpbase/gimpbasetypes.h" + + * libgimpconfig/Makefile.am: added the new file. Removed stuff + that is not needed. + + * libgimpconfig/gimpconfigwriter.h + * libgimpconfig/gimpconfig-iface.h: removed typedefs here. + + * libgimpconfig/gimpconfig-deserialize.c + * libgimpconfig/gimpconfig-iface.c + * libgimpconfig/gimpconfig-serialize.c + * libgimpconfig/gimpconfig-utils.c + * libgimpconfig/gimpconfig.h + * libgimpconfig/gimpconfigwriter.c: include it before including + any other libgimpconfig stuff. + + * app/config/config-types.h: #include "libgimpbase/gimpbasetypes.h" + + * app/config/gimpconfig-utils.h: changed include guards to + __APP_GIMP_CONFIG_UTILS_H__. + + * app/dialogs/tips-parser.c: include instead of + just . + + * app/tools/gimphistogramoptions.c + * app/tools/gimptextoptions.c: include "config/gimpconfig-utils.h" + + * app/widgets/gimpdialogfactory.h + * app/widgets/gimpsessioninfo.h: removed inclusion of + "libgimpbase/gimpbasetypes.h". + 2005-01-25 Bill Skaggs * app/config/gimpconfig-deserialize.c diff --git a/app/config/config-types.h b/app/config/config-types.h index 9d5c1eacc0..4947bb938e 100644 --- a/app/config/config-types.h +++ b/app/config/config-types.h @@ -23,6 +23,9 @@ #define __CONFIG_TYPES_H__ +#include "libgimpconfig/gimpconfigtypes.h" + + typedef struct _GimpBaseConfig GimpBaseConfig; typedef struct _GimpCoreConfig GimpCoreConfig; typedef struct _GimpDisplayConfig GimpDisplayConfig; diff --git a/app/config/gimpconfig-utils.h b/app/config/gimpconfig-utils.h index 6c5399d11b..7cff27e194 100644 --- a/app/config/gimpconfig-utils.h +++ b/app/config/gimpconfig-utils.h @@ -19,14 +19,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GIMP_CONFIG_UTILS_H__ -#define __GIMP_CONFIG_UTILS_H__ +#ifndef __APP_GIMP_CONFIG_UTILS_H__ +#define __APP_GIMP_CONFIG_UTILS_H__ -void gimp_config_connect (GObject *a, - GObject *b, - const gchar *property_name); -void gimp_config_disconnect (GObject *a, - GObject *b); +void gimp_config_connect (GObject *a, + GObject *b, + const gchar *property_name); +void gimp_config_disconnect (GObject *a, + GObject *b); -#endif /* __GIMP_CONFIG_UTILS_H__ */ + +#endif /* __APP_GIMP_CONFIG_UTILS_H__ */ diff --git a/app/dialogs/tips-parser.c b/app/dialogs/tips-parser.c index cf702ddc35..24b239e69e 100644 --- a/app/dialogs/tips-parser.c +++ b/app/dialogs/tips-parser.c @@ -23,7 +23,7 @@ #include -#include +#include #include "config/config-types.h" #include "config/gimpxmlparser.h" diff --git a/app/tools/gimphistogramoptions.c b/app/tools/gimphistogramoptions.c index 55643fad15..0c4ef03660 100644 --- a/app/tools/gimphistogramoptions.c +++ b/app/tools/gimphistogramoptions.c @@ -24,6 +24,8 @@ #include "tools-types.h" +#include "config/gimpconfig-utils.h" + #include "widgets/gimphistogramview.h" #include "widgets/gimppropwidgets.h" diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index a3ca05141d..8f91c827f9 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -27,6 +27,8 @@ #include "tools-types.h" +#include "config/gimpconfig-utils.h" + #include "core/gimp.h" #include "core/gimptoolinfo.h" diff --git a/app/widgets/gimpdialogfactory.h b/app/widgets/gimpdialogfactory.h index 0353481db6..3bb48d1b73 100644 --- a/app/widgets/gimpdialogfactory.h +++ b/app/widgets/gimpdialogfactory.h @@ -23,7 +23,6 @@ #define __GIMP_DIALOG_FACTORY_H__ -#include "libgimpconfig/gimpconfig.h" #include "core/gimpobject.h" #define GIMP_DIALOG_VISIBILITY_KEY "gimp-dialog-visibility" diff --git a/app/widgets/gimpsessioninfo.h b/app/widgets/gimpsessioninfo.h index 4b8b17b4ac..c5942025b7 100644 --- a/app/widgets/gimpsessioninfo.h +++ b/app/widgets/gimpsessioninfo.h @@ -22,7 +22,6 @@ #ifndef __GIMP_SESSION_INFO_H__ #define __GIMP_SESSION_INFO_H__ -#include "libgimpconfig/gimpconfig.h" struct _GimpSessionInfo { diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index 35ed945db6..d07255102f 100644 --- a/libgimpconfig/Makefile.am +++ b/libgimpconfig/Makefile.am @@ -40,13 +40,7 @@ endif libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig AM_CPPFLAGS = \ - -DPREFIX=\""$(prefix)"\" \ - -DGIMPDIR=\""$(gimpdir)"\" \ - -DDATADIR=\""$(gimpdatadir)"\" \ - -DLOCALEDIR=\""$(localedir)"\" \ - -DPLUGINDIR=\""$(gimpplugindir)"\" \ - -DSYSCONFDIR=\""$(gimpsysconfdir)"\" \ - -DG_LOG_DOMAIN=\"LibGimpConfig\" \ + -DG_LOG_DOMAIN=\"LibGimpConfig\" \ @GIMP_THREAD_FLAGS@ INCLUDES = \ @@ -60,14 +54,9 @@ EXTRA_DIST = \ lib_LTLIBRARIES = libgimpconfig-2.0.la -# help `make' along by giving another name for the file, which it knows -# how to build -../libgimpconfig/gimpversion.h: gimpversion.h - @: - - libgimpconfig_sources = \ gimpconfig.h \ + gimpconfigtypes.h \ gimpconfig-iface.c \ gimpconfig-iface.h \ gimpconfig-deserialize.c \ @@ -94,6 +83,7 @@ libgimpconfig_2_0_la_SOURCES = $(libgimpconfig_sources) $(libgimpconfig_built_so libgimpconfiginclude_HEADERS = \ gimpconfig.h \ + gimpconfigtypes.h \ gimpconfig-iface.h \ gimpconfig-deserialize.h \ gimpconfig-error.h \ diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c index a66cc7a7a2..0a10503d49 100644 --- a/libgimpconfig/gimpconfig-deserialize.c +++ b/libgimpconfig/gimpconfig-deserialize.c @@ -27,6 +27,8 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "gimpconfigtypes.h" + #include "gimpconfigwriter.h" #include "gimpconfig-iface.h" #include "gimpconfig-deserialize.h" diff --git a/libgimpconfig/gimpconfig-iface.c b/libgimpconfig/gimpconfig-iface.c index c0b27c31a4..74ac89b882 100644 --- a/libgimpconfig/gimpconfig-iface.c +++ b/libgimpconfig/gimpconfig-iface.c @@ -27,6 +27,8 @@ #include "libgimpbase/gimpbase.h" +#include "gimpconfigtypes.h" + #include "gimpconfigwriter.h" #include "gimpconfig-iface.h" #include "gimpconfig-deserialize.h" diff --git a/libgimpconfig/gimpconfig-iface.h b/libgimpconfig/gimpconfig-iface.h index 5adb7d8333..514ee3b602 100644 --- a/libgimpconfig/gimpconfig-iface.h +++ b/libgimpconfig/gimpconfig-iface.h @@ -21,7 +21,7 @@ */ #ifndef __GIMP_CONFIG_IFACE_H__ -#define __GIMP_CONFIG__IFACE_H__ +#define __GIMP_CONFIG_IFACE_H__ #define GIMP_TYPE_CONFIG (gimp_config_interface_get_type ()) @@ -30,8 +30,6 @@ #define GIMP_CONFIG_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG, GimpConfigInterface)) -typedef struct _GimpConfig GimpConfig; /* dummy typedef */ - typedef struct _GimpConfigInterface GimpConfigInterface; struct _GimpConfigInterface diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c index 205e7bebdf..aef61a54c2 100644 --- a/libgimpconfig/gimpconfig-serialize.c +++ b/libgimpconfig/gimpconfig-serialize.c @@ -27,6 +27,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpcolor/gimpcolor.h" +#include "gimpconfigtypes.h" + #include "gimpconfigwriter.h" #include "gimpconfig-iface.h" #include "gimpconfig-params.h" diff --git a/libgimpconfig/gimpconfig-utils.c b/libgimpconfig/gimpconfig-utils.c index 447b0a0c76..1fb00a14e4 100644 --- a/libgimpconfig/gimpconfig-utils.c +++ b/libgimpconfig/gimpconfig-utils.c @@ -25,11 +25,14 @@ #include "libgimpbase/gimpbase.h" +#include "gimpconfigtypes.h" + #include "gimpconfigwriter.h" #include "gimpconfig-iface.h" #include "gimpconfig-params.h" #include "gimpconfig-utils.h" + static gboolean gimp_config_diff_property (GObject *a, GObject *b, diff --git a/libgimpconfig/gimpconfig.h b/libgimpconfig/gimpconfig.h index de3067dc39..155d0827f0 100644 --- a/libgimpconfig/gimpconfig.h +++ b/libgimpconfig/gimpconfig.h @@ -20,7 +20,8 @@ #ifndef __GIMP_CONFIG_H__ #define __GIMP_CONFIG_H__ -#include + +#include #include #include @@ -32,4 +33,5 @@ #include #include + #endif /* __GIMP_CONFIG_H__ */ diff --git a/libgimpconfig/gimpconfigtypes.h b/libgimpconfig/gimpconfigtypes.h new file mode 100644 index 0000000000..bdf7bfae08 --- /dev/null +++ b/libgimpconfig/gimpconfigtypes.h @@ -0,0 +1,34 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis + * + * Config file serialization and deserialization interface + * Copyright (C) 2001-2003 Sven Neumann + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GIMP_CONFIG_TYPES_H__ +#define __GIMP_CONFIG_TYPES_H__ + + +#include + + +typedef struct _GimpConfig GimpConfig; /* dummy typedef */ +typedef struct _GimpConfigWriter GimpConfigWriter; + + +#endif /* __GIMP_CONFIG_TYPES_H__ */ diff --git a/libgimpconfig/gimpconfigwriter.c b/libgimpconfig/gimpconfigwriter.c index 89e54f17ac..d597f26da9 100644 --- a/libgimpconfig/gimpconfigwriter.c +++ b/libgimpconfig/gimpconfigwriter.c @@ -40,6 +40,8 @@ #include "libgimpbase/gimpbase.h" +#include "gimpconfigtypes.h" + #include "gimpconfigwriter.h" #include "gimpconfig-iface.h" #include "gimpconfig-error.h" diff --git a/libgimpconfig/gimpconfigwriter.h b/libgimpconfig/gimpconfigwriter.h index 9d0a0cdb1f..b3481f59e3 100644 --- a/libgimpconfig/gimpconfigwriter.h +++ b/libgimpconfig/gimpconfigwriter.h @@ -23,8 +23,6 @@ #ifndef __GIMP_CONFIG_WRITER_H__ #define __GIMP_CONFIG_WRITER_H__ -typedef struct _GimpConfigWriter GimpConfigWriter; - GimpConfigWriter * gimp_config_writer_new_file (const gchar *filename, gboolean atomic,