dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no need to reimplement the default GimpConfigInterface implementation. 

2003-10-22  Sven Neumann  <sven@gimp.org>

	* app/core/gimptemplate.c: no need to reimplement the default
	GimpConfigInterface implementation.

	* app/config/gimpcoreconfig.c: renamed notify handlers.
This commit is contained in:
Sven Neumann 2003-10-22 12:37:10 +00:00 committed by Sven Neumann
parent bac2d9fcc0
commit 07b6d2103b
3 changed files with 49 additions and 82 deletions

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-10-22 Sven Neumann <sven@gimp.org>
* app/core/gimptemplate.c: no need to reimplement the default
GimpConfigInterface implementation.
* app/config/gimpcoreconfig.c: renamed notify handlers.
2003-10-21 Dave Neary <bolsh@gimp.org>
* app/core/gimpimage-convert.c: Applied a slightly modified

62
app/config/gimpcoreconfig.c
View File

@ -42,23 +42,23 @@
#include "gimp-intl.h"
static void gimp_core_config_class_init (GimpCoreConfigClass *klass);
static void gimp_core_config_init (GimpCoreConfig *config);
static void gimp_core_config_finalize (GObject *object);
static void gimp_core_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_core_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_core_config_default_image_changed (GObject *object,
GParamSpec *pspec,
gpointer data);
static void gimp_core_config_default_grid_changed (GObject *object,
GParamSpec *pspec,
gpointer data);
static void gimp_core_config_class_init (GimpCoreConfigClass *klass);
static void gimp_core_config_init (GimpCoreConfig *config);
static void gimp_core_config_finalize (GObject *object);
static void gimp_core_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_core_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_core_config_default_image_notify (GObject *object,
GParamSpec *pspec,
gpointer data);
static void gimp_core_config_default_grid_notify (GObject *object,
GParamSpec *pspec,
gpointer data);
#define DEFAULT_BRUSH "Circle (11)"
@ -266,12 +266,12 @@ gimp_core_config_init (GimpCoreConfig *config)
"comment", DEFAULT_COMMENT,
NULL);
g_signal_connect (config->default_image, "notify",
G_CALLBACK (gimp_core_config_default_image_changed),
G_CALLBACK (gimp_core_config_default_image_notify),
config);
config->default_grid = g_object_new (GIMP_TYPE_GRID, NULL);
g_signal_connect (config->default_grid, "notify",
G_CALLBACK (gimp_core_config_default_grid_changed),
G_CALLBACK (gimp_core_config_default_grid_notify),
config);
}
@ -513,21 +513,17 @@ gimp_core_config_get_property (GObject *object,
}
static void
gimp_core_config_default_image_changed (GObject *object,
GParamSpec *pspec,
gpointer data)
{
GimpCoreConfig *core_config = GIMP_CORE_CONFIG (data);
g_object_notify (G_OBJECT (core_config), "default-image");
}
static void
gimp_core_config_default_grid_changed (GObject *object,
gimp_core_config_default_image_notify (GObject *object,
GParamSpec *pspec,
gpointer data)
{
GimpCoreConfig *core_config = GIMP_CORE_CONFIG (data);
g_object_notify (G_OBJECT (core_config), "default-grid");
g_object_notify (G_OBJECT (data), "default-image");
}
static void
gimp_core_config_default_grid_notify (GObject *object,
GParamSpec *pspec,
gpointer data)
{
g_object_notify (G_OBJECT (data), "default-grid");
}

62
app/core/gimptemplate.c
View File

@ -30,8 +30,6 @@
#include "core-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-deserialize.h"
#include "config/gimpconfig-serialize.h"
#include "config/gimpconfig-params.h"
#include "config/gimpcoreconfig.h"
@ -59,28 +57,19 @@ enum
};
static void gimp_template_class_init (GimpTemplateClass *klass);
static void gimp_template_config_iface_init (GimpConfigInterface *config_iface);
static void gimp_template_class_init (GimpTemplateClass *klass);
static void gimp_template_finalize (GObject *object);
static void gimp_template_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_template_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_template_notify (GObject *object,
GParamSpec *pspec);
static gboolean gimp_template_serialize (GimpConfig *config,
GimpConfigWriter *writer,
gpointer data);
static gboolean gimp_template_deserialize (GimpConfig *config,
GScanner *scanner,
gint nest_level,
gpointer data);
static void gimp_template_finalize (GObject *object);
static void gimp_template_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_template_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_template_notify (GObject *object,
GParamSpec *pspec);
static GimpViewableClass *parent_class = NULL;
@ -107,7 +96,7 @@ gimp_template_get_type (void)
};
static const GInterfaceInfo config_iface_info =
{
(GInterfaceInitFunc) gimp_template_config_iface_init,
NULL, /* iface_init */
NULL, /* iface_finalize */
NULL /* iface_data */
};
@ -198,13 +187,6 @@ gimp_template_class_init (GimpTemplateClass *klass)
0);
}
static void
gimp_template_config_iface_init (GimpConfigInterface *config_iface)
{
config_iface->serialize = gimp_template_serialize;
config_iface->deserialize = gimp_template_deserialize;
}
static void
gimp_template_finalize (GObject *object)
{
@ -358,24 +340,6 @@ gimp_template_notify (GObject *object,
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (object));
}
static gboolean
gimp_template_serialize (GimpConfig *config,
GimpConfigWriter *writer,
gpointer data)
{
return gimp_config_serialize_properties (config, writer);
}
static gboolean
gimp_template_deserialize (GimpConfig *config,
GScanner *scanner,
gint nest_level,
gpointer data)
{
return gimp_config_deserialize_properties (config,
scanner, nest_level, FALSE);
}
/* public functions */