mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-19 06:14:03 +00:00
new file holding the opaque typedefs for libgimpconfig. Includes
2005-01-25 Michael Natterer <mitch@gimp.org> * 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 <glib-object.h> instead of just <glib.h>. * 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".
This commit is contained in:
parent
38c2aa63b3
commit
3592a58d96
34
ChangeLog
34
ChangeLog
|
@ -1,3 +1,37 @@
|
|||
2005-01-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* 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 <glib-object.h> instead of
|
||||
just <glib.h>.
|
||||
|
||||
* 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 <weskaggs@primate.ucdavis.edu>
|
||||
|
||||
* app/config/gimpconfig-deserialize.c
|
||||
|
|
|
@ -23,6 +23,9 @@
|
|||
#define __CONFIG_TYPES_H__
|
||||
|
||||
|
||||
#include "libgimpconfig/gimpconfigtypes.h"
|
||||
|
||||
|
||||
typedef struct _GimpBaseConfig GimpBaseConfig;
|
||||
typedef struct _GimpCoreConfig GimpCoreConfig;
|
||||
typedef struct _GimpDisplayConfig GimpDisplayConfig;
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
#include "config/config-types.h"
|
||||
#include "config/gimpxmlparser.h"
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
#include "tools-types.h"
|
||||
|
||||
#include "config/gimpconfig-utils.h"
|
||||
|
||||
#include "widgets/gimphistogramview.h"
|
||||
#include "widgets/gimppropwidgets.h"
|
||||
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
#include "tools-types.h"
|
||||
|
||||
#include "config/gimpconfig-utils.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimptoolinfo.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"
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#ifndef __GIMP_SESSION_INFO_H__
|
||||
#define __GIMP_SESSION_INFO_H__
|
||||
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
|
||||
struct _GimpSessionInfo
|
||||
{
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
||||
#include "gimpconfigtypes.h"
|
||||
|
||||
#include "gimpconfigwriter.h"
|
||||
#include "gimpconfig-iface.h"
|
||||
#include "gimpconfig-deserialize.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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
#ifndef __GIMP_CONFIG_H__
|
||||
#define __GIMP_CONFIG_H__
|
||||
|
||||
#include <libgimpbase/gimpbase.h>
|
||||
|
||||
#include <libgimpconfig/gimpconfigtypes.h>
|
||||
|
||||
#include <libgimpconfig/gimpconfigwriter.h>
|
||||
#include <libgimpconfig/gimpconfig-iface.h>
|
||||
|
@ -32,4 +33,5 @@
|
|||
#include <libgimpconfig/gimpconfig-path.h>
|
||||
#include <libgimpconfig/gimpscanner.h>
|
||||
|
||||
|
||||
#endif /* __GIMP_CONFIG_H__ */
|
||||
|
|
34
libgimpconfig/gimpconfigtypes.h
Normal file
34
libgimpconfig/gimpconfigtypes.h
Normal file
|
@ -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 <sven@gimp.org>
|
||||
*
|
||||
* 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 <libgimpbase/gimpbasetypes.h>
|
||||
|
||||
|
||||
typedef struct _GimpConfig GimpConfig; /* dummy typedef */
|
||||
typedef struct _GimpConfigWriter GimpConfigWriter;
|
||||
|
||||
|
||||
#endif /* __GIMP_CONFIG_TYPES_H__ */
|
|
@ -40,6 +40,8 @@
|
|||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
||||
#include "gimpconfigtypes.h"
|
||||
|
||||
#include "gimpconfigwriter.h"
|
||||
#include "gimpconfig-iface.h"
|
||||
#include "gimpconfig-error.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,
|
||||
|
|
Loading…
Reference in a new issue