callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed broken implementation of gimp_stroke_desc_duplicate() and

Browse Source 
2006-06-28  Sven Neumann  <sven@gimp.org>

	* app/core/gimpstrokedesc.[ch]: removed broken implementation of
	gimp_stroke_desc_duplicate() and reimplement it by overriding
the
	duplicate() method of the GimpConfig interface.
This commit is contained in:
Sven Neumann
2006-06-28 06:27:15 +00:00
committed by Sven Neumann
parent 6781288d76
commit 1b23834038
3 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-28 Sven Neumann <sven@gimp.org>
* app/core/gimpstrokedesc.[ch]: removed broken implementation of
gimp_stroke_desc_duplicate() and reimplement it by overriding the
duplicate() method of the GimpConfig interface.
2006-06-27 Sven Neumann <sven@gimp.org> 2006-06-27 Sven Neumann <sven@gimp.org>
Applied patch from Zbigniew Chyla (bug 345982): Applied patch from Zbigniew Chyla (bug 345982):

71
app/core/gimpstrokedesc.c
View File

@ -51,6 +51,9 @@ enum
}; };
static void gimp_stroke_desc_config_iface_init (gpointer iface,
gpointer iface_data);
static GObject * gimp_stroke_desc_constructor (GType type, static GObject * gimp_stroke_desc_constructor (GType type,
guint n_params, guint n_params,
GObjectConstructParam *params); GObjectConstructParam *params);
@ -64,9 +67,12 @@ static void gimp_stroke_desc_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static GimpConfig * gimp_stroke_desc_duplicate (GimpConfig *config);
G_DEFINE_TYPE_WITH_CODE (GimpStrokeDesc, gimp_stroke_desc, GIMP_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (GimpStrokeDesc, gimp_stroke_desc, GIMP_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL)) G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
gimp_stroke_desc_config_iface_init))
#define parent_class gimp_stroke_desc_parent_class #define parent_class gimp_stroke_desc_parent_class
@ -109,6 +115,15 @@ gimp_stroke_desc_class_init (GimpStrokeDescClass *klass)
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
} }
static void
gimp_stroke_desc_config_iface_init (gpointer iface,
gpointer iface_data)
{
GimpConfigInterface *config_iface = (GimpConfigInterface *) iface;
config_iface->duplicate = gimp_stroke_desc_duplicate;
}
static void static void
gimp_stroke_desc_init (GimpStrokeDesc *desc) gimp_stroke_desc_init (GimpStrokeDesc *desc)
{ {
@ -231,6 +246,32 @@ gimp_stroke_desc_get_property (GObject *object,
} }
} }
static GimpConfig *
gimp_stroke_desc_duplicate (GimpConfig *config)
{
GimpStrokeDesc *desc = GIMP_STROKE_DESC (config);
GimpStrokeDesc *new_desc;
new_desc = gimp_stroke_desc_new (desc->gimp,
GIMP_CONTEXT (desc->stroke_options));
gimp_config_sync (G_OBJECT (desc->stroke_options),
G_OBJECT (new_desc->stroke_options), 0);
gimp_config_sync (G_OBJECT (desc->paint_info),
G_OBJECT (new_desc->paint_info), 0);
if (desc->paint_options)
{
GObject *options;
options = gimp_config_duplicate (GIMP_CONFIG (desc->paint_options));
g_object_set (new_desc, "paint-options", options, NULL);
g_object_unref (options);
}
return GIMP_CONFIG (new_desc);
}
/* public functions */ /* public functions */
@ -268,34 +309,6 @@ gimp_stroke_desc_new (Gimp *gimp,
return desc; return desc;
} }
GimpStrokeDesc *
gimp_stroke_desc_duplicate (GimpStrokeDesc *desc)
{
GimpStrokeDesc *new_desc;
GimpStrokeOptions *stroke_options = NULL;
GimpPaintInfo *paint_info = NULL;
GimpPaintOptions *paint_options = NULL;
new_desc = gimp_stroke_desc_new (desc->gimp,
GIMP_CONTEXT (desc->stroke_options));
new_desc->method = desc->method;
g_object_get (G_OBJECT (desc),
"stroke-options", stroke_options,
"paint-info", paint_info,
"paint-options", paint_options,
NULL);
g_object_set (G_OBJECT (new_desc),
"stroke-options", stroke_options,
"paint-info", paint_info,
"paint-options", paint_options,
NULL);
return new_desc;
}
void void
gimp_stroke_desc_prepare (GimpStrokeDesc *desc, gimp_stroke_desc_prepare (GimpStrokeDesc *desc,
GimpContext *context, GimpContext *context,

3
app/core/gimpstrokedesc.h
View File

@ -60,9 +60,6 @@ GType gimp_stroke_desc_get_type (void) G_GNUC_CONST;
GimpStrokeDesc * gimp_stroke_desc_new (Gimp *gimp, GimpStrokeDesc * gimp_stroke_desc_new (Gimp *gimp,
GimpContext *context); GimpContext *context);
GimpStrokeDesc * gimp_stroke_desc_duplicate (GimpStrokeDesc *desc);
void gimp_stroke_desc_prepare (GimpStrokeDesc *desc, void gimp_stroke_desc_prepare (GimpStrokeDesc *desc,
GimpContext *context, GimpContext *context,
gboolean use_default_values); gboolean use_default_values);