Commit d75a2f79 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/config/Makefile.am moved code from gimpconfig.[ch] to these new files.

2003-07-24  Sven Neumann  <sven@gimp.org>

	* app/config/Makefile.am
	* app/config/gimpconfig-error.[ch]: moved code from gimpconfig.[ch]
	to these new files.

	* app/config/gimpconfig-utils.[ch]: moved gimp_config_string_indent()
	here from gimpconfig.[ch].

	* app/config/gimpconfig.[ch]
	* app/config/gimpconfigwriter.c
	* app/config/gimprc.c
	* app/config/gimpscanner.c
	* app/core/gimp-documents.c
	* app/core/gimp-parasites.c
	* app/core/gimp-templates.c
	* app/widgets/gimpdevices.c: changed accordingly.
parent 8ea47faa
2003-07-24 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am
* app/config/gimpconfig-error.[ch]: moved code from gimpconfig.[ch]
to these new files.
* app/config/gimpconfig-utils.[ch]: moved gimp_config_string_indent()
here from gimpconfig.[ch].
* app/config/gimpconfig.[ch]
* app/config/gimpconfigwriter.c
* app/config/gimprc.c
* app/config/gimpscanner.c
* app/core/gimp-documents.c
* app/core/gimp-parasites.c
* app/core/gimp-templates.c
* app/widgets/gimpdevices.c: changed accordingly.
2003-07-24 Michael Natterer <mitch@gimp.org>
* app/text/gimptext-vectors.c: added control points.
......@@ -8,6 +8,8 @@ libappconfig_a_SOURCES = \
gimpconfig.h \
gimpconfig-deserialize.c \
gimpconfig-deserialize.h \
gimpconfig-error.c \
gimpconfig-error.h \
gimpconfig-params.c \
gimpconfig-params.h \
gimpconfig-path.c \
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* Config file serialization and deserialization interface
* Copyright (C) 2001-2002 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib.h>
#include "gimpconfig-error.h"
GQuark
gimp_config_error_quark (void)
{
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("gimp-config-error-quark");
return q;
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Copyright (C) 2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_CONFIG_ERROR_H__
#define __GIMP_CONFIG_ERROR_H__
typedef enum
{
GIMP_CONFIG_ERROR_OPEN, /* open failed */
GIMP_CONFIG_ERROR_OPEN_ENOENT, /* file does not exist */
GIMP_CONFIG_ERROR_WRITE, /* write failed */
GIMP_CONFIG_ERROR_PARSE /* parser error */
} GimpConfigError;
#define GIMP_CONFIG_ERROR (gimp_config_error_quark ())
GQuark gimp_config_error_quark (void) G_GNUC_CONST;
#endif /* __GIMP_CONFIG_ERROR_H__ */
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Utitility functions for GimpConfig.
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -39,10 +39,10 @@
* @a: a #GObject
* @b: another #GObject of the same type as @a
* @flags: a mask of GParamFlags
*
*
* Compares all properties of @a and @b that have all @flags set. If
* @flags is 0, all properties are compared.
*
*
* Return value: a GList of differing GParamSpecs.
**/
GList *
......@@ -109,7 +109,7 @@ gimp_config_connect_notify (GObject *src,
* gimp_config_connect:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Connects @dest with @src so that all property changes of @src are
* applied to @dest using a "notify" handler.
**/
......@@ -130,7 +130,7 @@ gimp_config_connect (GObject *src,
* gimp_config_disconnect:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Removes a connection between @dest and @src that was previously set
* up using gimp_config_connect().
**/
......@@ -150,7 +150,7 @@ gimp_config_disconnect (GObject *src,
* gimp_config_copy_properties:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Retrieves all read and writeable property settings from @src and
* applies the values to @dest.
**/
......@@ -234,7 +234,7 @@ gimp_config_copy_properties (GObject *src,
/**
* gimp_config_reset_properties:
* @object: a #GObject
*
*
* Resets all writable properties of @object to the default values as
* defined in their #GParamSpec.
**/
......@@ -248,7 +248,7 @@ gimp_config_reset_properties (GObject *object)
guint i;
g_return_if_fail (G_IS_OBJECT (object));
klass = G_OBJECT_GET_CLASS (object);
property_specs = g_object_class_list_properties (klass, &n_property_specs);
......@@ -261,7 +261,7 @@ gimp_config_reset_properties (GObject *object)
for (i = 0; i < n_property_specs; i++)
{
GParamSpec *prop_spec;
prop_spec = property_specs[i];
if (prop_spec->flags & G_PARAM_WRITABLE)
......@@ -308,7 +308,7 @@ gimp_config_reset_properties (GObject *object)
* gimp_config_string_append_escaped:
* @string: pointer to a #GString
* @val: a string to append or %NULL
*
*
* Escapes and quotes @val and appends it to @string. The escape
* algorithm is different from the one used by g_strescape() since it
* leaves non-ASCII characters intact and thus preserves UTF-8
......@@ -356,7 +356,7 @@ gimp_config_string_append_escaped (GString *string,
case '"':
buf[1] = *p;
break;
default:
len = 4;
buf[1] = '0' + (((*p) >> 6) & 07);
......@@ -366,7 +366,7 @@ gimp_config_string_append_escaped (GString *string,
}
g_string_append_len (string, buf, len);
val = p + 1;
len = 0;
}
......@@ -385,6 +385,19 @@ gimp_config_string_append_escaped (GString *string,
}
}
void
gimp_config_string_indent (GString *string,
gint indent_level)
{
gint i;
g_return_if_fail (string != NULL);
g_return_if_fail (indent_level >= 0);
for (i = 0; i < indent_level; i++)
g_string_append_len (string, " ", 4);
}
/*
* GimpConfig path utilities
......@@ -399,7 +412,7 @@ gimp_config_build_data_path (const gchar *name)
NULL);
}
gchar *
gchar *
gimp_config_build_plug_in_path (const gchar *name)
{
return g_strconcat ("${gimp_dir}", G_DIR_SEPARATOR_S, name,
......
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Utitility functions for GimpConfig.
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -36,6 +36,8 @@ void gimp_config_reset_properties (GObject *object);
void gimp_config_string_append_escaped (GString *string,
const gchar *val);
void gimp_config_string_indent (GString *string,
gint indent_level);
gchar * gimp_config_build_data_path (const gchar *name);
gchar * gimp_config_build_plug_in_path (const gchar *name);
......
......@@ -392,28 +392,6 @@ gimp_config_deserialize_return (GScanner *scanner,
return TRUE;
}
GQuark
gimp_config_error_quark (void)
{
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("gimp-config-error-quark");
return q;
}
void
gimp_config_string_indent (GString *string,
gint indent_level)
{
gint i;
g_return_if_fail (string != NULL);
g_return_if_fail (indent_level >= 0);
for (i = 0; i < indent_level; i++)
g_string_append_len (string, " ", 4);
}
/**
* gimp_config_duplicate:
......
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Config file serialization and deserialization interface
* Copyright (C) 2001-2002 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -22,14 +22,6 @@
#ifndef __GIMP_CONFIG_H__
#define __GIMP_CONFIG_H__
typedef enum
{
GIMP_CONFIG_ERROR_OPEN, /* open failed */
GIMP_CONFIG_ERROR_OPEN_ENOENT, /* file does not exist */
GIMP_CONFIG_ERROR_WRITE, /* write failed */
GIMP_CONFIG_ERROR_PARSE /* parser error */
} GimpConfigError;
#define GIMP_TYPE_CONFIG_INTERFACE (gimp_config_interface_get_type ())
#define GIMP_GET_CONFIG_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG_INTERFACE, GimpConfigInterface))
......@@ -110,12 +102,4 @@ void gimp_config_foreach_unknown_token (GObject *object,
gpointer user_data);
#define GIMP_CONFIG_ERROR (gimp_config_error_quark ())
GQuark gimp_config_error_quark (void) G_GNUC_CONST;
void gimp_config_string_indent (GString *string,
gint indent_level);
#endif /* __GIMP_CONFIG_H__ */
......@@ -39,7 +39,7 @@
#include "config-types.h"
#include "gimpconfig.h"
#include "gimpconfig-error.h"
#include "gimpconfig-serialize.h"
#include "gimpconfig-utils.h"
#include "gimpconfigwriter.h"
......
......@@ -39,6 +39,7 @@
#include "gimpconfig.h"
#include "gimpconfig-deserialize.h"
#include "gimpconfig-error.h"
#include "gimpconfig-params.h"
#include "gimpconfig-path.h"
#include "gimpconfig-serialize.h"
......
......@@ -43,7 +43,7 @@
#include "config-types.h"
#include "gimpconfig.h"
#include "gimpconfig-error.h"
#include "gimpscanner.h"
#include "gimp-intl.h"
......
......@@ -25,6 +25,7 @@
#include "core-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-error.h"
#include "config/gimpcoreconfig.h"
#include "gimp.h"
......
......@@ -23,12 +23,13 @@
#include "core-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-error.h"
#include "gimp.h"
#include "gimp-parasites.h"
#include "gimpparasitelist.h"
#include "config/gimpconfig.h"
void
gimp_parasite_attach (Gimp *gimp,
......
......@@ -25,6 +25,7 @@
#include "core-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-error.h"
#include "gimp.h"
#include "gimp-templates.h"
......
......@@ -33,6 +33,7 @@
#include "core/gimptoolinfo.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-error.h"
#include "gimpdeviceinfo.h"
#include "gimpdevices.h"
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* Config file serialization and deserialization interface
* Copyright (C) 2001-2002 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib.h>
#include "gimpconfig-error.h"
GQuark
gimp_config_error_quark (void)
{
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("gimp-config-error-quark");
return q;
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Copyright (C) 2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_CONFIG_ERROR_H__
#define __GIMP_CONFIG_ERROR_H__
typedef enum
{
GIMP_CONFIG_ERROR_OPEN, /* open failed */
GIMP_CONFIG_ERROR_OPEN_ENOENT, /* file does not exist */
GIMP_CONFIG_ERROR_WRITE, /* write failed */
GIMP_CONFIG_ERROR_PARSE /* parser error */
} GimpConfigError;
#define GIMP_CONFIG_ERROR (gimp_config_error_quark ())
GQuark gimp_config_error_quark (void) G_GNUC_CONST;
#endif /* __GIMP_CONFIG_ERROR_H__ */
......@@ -392,28 +392,6 @@ gimp_config_deserialize_return (GScanner *scanner,
return TRUE;
}
GQuark
gimp_config_error_quark (void)
{
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("gimp-config-error-quark");
return q;
}
void
gimp_config_string_indent (GString *string,
gint indent_level)
{
gint i;
g_return_if_fail (string != NULL);
g_return_if_fail (indent_level >= 0);
for (i = 0; i < indent_level; i++)
g_string_append_len (string, " ", 4);
}
/**
* gimp_config_duplicate:
......
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Config file serialization and deserialization interface
* Copyright (C) 2001-2002 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -22,14 +22,6 @@
#ifndef __GIMP_CONFIG_H__
#define __GIMP_CONFIG_H__
typedef enum
{
GIMP_CONFIG_ERROR_OPEN, /* open failed */
GIMP_CONFIG_ERROR_OPEN_ENOENT, /* file does not exist */
GIMP_CONFIG_ERROR_WRITE, /* write failed */
GIMP_CONFIG_ERROR_PARSE /* parser error */
} GimpConfigError;
#define GIMP_TYPE_CONFIG_INTERFACE (gimp_config_interface_get_type ())
#define GIMP_GET_CONFIG_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG_INTERFACE, GimpConfigInterface))
......@@ -110,12 +102,4 @@ void gimp_config_foreach_unknown_token (GObject *object,
gpointer user_data);
#define GIMP_CONFIG_ERROR (gimp_config_error_quark ())
GQuark gimp_config_error_quark (void) G_GNUC_CONST;
void gimp_config_string_indent (GString *string,
gint indent_level);
#endif /* __GIMP_CONFIG_H__ */
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Utitility functions for GimpConfig.
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -39,10 +39,10 @@
* @a: a #GObject
* @b: another #GObject of the same type as @a
* @flags: a mask of GParamFlags
*
*
* Compares all properties of @a and @b that have all @flags set. If
* @flags is 0, all properties are compared.
*
*
* Return value: a GList of differing GParamSpecs.
**/
GList *
......@@ -109,7 +109,7 @@ gimp_config_connect_notify (GObject *src,
* gimp_config_connect:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Connects @dest with @src so that all property changes of @src are
* applied to @dest using a "notify" handler.
**/
......@@ -130,7 +130,7 @@ gimp_config_connect (GObject *src,
* gimp_config_disconnect:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Removes a connection between @dest and @src that was previously set
* up using gimp_config_connect().
**/
......@@ -150,7 +150,7 @@ gimp_config_disconnect (GObject *src,
* gimp_config_copy_properties:
* @src: a #GObject
* @dest: another #GObject of the same type as @src
*
*
* Retrieves all read and writeable property settings from @src and
* applies the values to @dest.
**/
......@@ -234,7 +234,7 @@ gimp_config_copy_properties (GObject *src,
/**
* gimp_config_reset_properties:
* @object: a #GObject
*
*
* Resets all writable properties of @object to the default values as
* defined in their #GParamSpec.
**/
......@@ -248,7 +248,7 @@ gimp_config_reset_properties (GObject *object)
guint i;
g_return_if_fail (G_IS_OBJECT (object));
klass = G_OBJECT_GET_CLASS (object);
property_specs = g_object_class_list_properties (klass, &n_property_specs);
......@@ -261,7 +261,7 @@ gimp_config_reset_properties (GObject *object)
for (i = 0; i < n_property_specs; i++)
{
GParamSpec *prop_spec;
prop_spec = property_specs[i];
if (prop_spec->flags & G_PARAM_WRITABLE)
......@@ -308,7 +308,7 @@ gimp_config_reset_properties (GObject *object)
* gimp_config_string_append_escaped:
* @string: pointer to a #GString
* @val: a string to append or %NULL
*
*
* Escapes and quotes @val and appends it to @string. The escape
* algorithm is different from the one used by g_strescape() since it
* leaves non-ASCII characters intact and thus preserves UTF-8
......@@ -356,7 +356,7 @@ gimp_config_string_append_escaped (GString *string,
case '"':
buf[1] = *p;
break;
default:
len = 4;
buf[1] = '0' + (((*p) >> 6) & 07);
......@@ -366,7 +366,7 @@ gimp_config_string_append_escaped (GString *string,
}
g_string_append_len (string, buf, len);
val = p + 1;
len = 0;
}
......@@ -385,6 +385,19 @@ gimp_config_string_append_escaped (GString *string,
}
}
void
gimp_config_string_indent (GString *string,
gint indent_level)
{
gint i;
g_return_if_fail (string != NULL);
g_return_if_fail (indent_level >= 0);
for (i = 0; i < indent_level; i++)
g_string_append_len (string, " ", 4);
}
/*
* GimpConfig path utilities
......@@ -399,7 +412,7 @@ gimp_config_build_data_path (const gchar *name)
NULL);
}
gchar *
gchar *
gimp_config_build_plug_in_path (const gchar *name)
{
return g_strconcat ("${gimp_dir}", G_DIR_SEPARATOR_S, name,
......
......@@ -2,8 +2,8 @@
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* Utitility functions for GimpConfig.
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
......@@ -36,6 +36,8 @@ void gimp_config_reset_properties (GObject *object);
void gimp_config_string_append_escaped (GString *string,
const gchar *val);
void gimp_config_string_indent (GString *string,
gint indent_level);
gchar * gimp_config_build_data_path (const gchar *name);
gchar * gimp_config_build_plug_in_path (const gchar *name);
......
......@@ -39,7 +39,7 @@
#include "config-types.h"
#include "gimpconfig.h"
#include "gimpconfig-error.h"
#include "gimpconfig-serialize.h"
#include "gimpconfig-utils.h"
#include "gimpconfigwriter.h"
......
......@@ -43,7 +43,7 @@
#include "config-types.h"
#include "gimpconfig.h"
#include "gimpconfig-error.h"
#include "gimpscanner.h"
#include "gimp-intl.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment