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

fixed a bad oversight in the implementation of normalized object names. 

2003-11-16  Sven Neumann  <sven@gimp.org>

	* app/core/gimpobject.c: fixed a bad oversight in the
	implementation of normalized object names. Introduced the helper
	function gimp_object_name_free() that takes care of freeing
	the normalized name. Fixes bug #127075.
This commit is contained in:
Sven Neumann 2003-11-16 13:16:10 +00:00 committed by Sven Neumann
parent 799661194a
commit 61aa80dc65
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-11-16 Sven Neumann <sven@gimp.org>
* app/core/gimpobject.c: fixed a bad oversight in the
implementation of normalized object names. Introduced the helper
function gimp_object_name_free() that takes care of freeing
the normalized name. Fixes bug #127075.
2003-11-16 Michael Natterer <mitch@gimp.org>
* app/gui/dialogs-constructors.c

57
app/core/gimpobject.c
View File

@ -60,6 +60,7 @@ static void gimp_object_get_property (GObject *object,
static gsize gimp_object_real_get_memsize (GimpObject *object,
gsize *gui_size);
static void gimp_object_name_normalize (GimpObject *object);
static void gimp_object_name_free (GimpObject *object);
static guint object_signals[LAST_SIGNAL] = { 0 };
@ -168,23 +169,7 @@ gimp_object_dispose (GObject *object)
static void
gimp_object_finalize (GObject *object)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
if (gimp_object->normalized)
{
if (gimp_object->normalized != gimp_object->name)
g_free (gimp_object->normalized);
gimp_object->normalized = NULL;
}
if (gimp_object->name)
{
g_free (gimp_object->name);
gimp_object->name = NULL;
}
gimp_object_name_free (GIMP_OBJECT (object));
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -195,9 +180,7 @@ gimp_object_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
GimpObject *gimp_object = GIMP_OBJECT (object);
switch (property_id)
{
@ -216,9 +199,7 @@ gimp_object_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
GimpObject *gimp_object = GIMP_OBJECT (object);
switch (property_id)
{
@ -249,7 +230,7 @@ gimp_object_set_name (GimpObject *object,
(object->name && name && !strcmp (object->name, name)))
return;
g_free (object->name);
gimp_object_name_free (object);
object->name = g_strdup (name);
@ -275,7 +256,7 @@ gimp_object_set_name_safe (GimpObject *object,
(object->name && name && !strcmp (object->name, name)))
return;
g_free (object->name);
gimp_object_name_free (object);
object->name = gimp_utf8_strtrim (name, 30);
@ -295,14 +276,6 @@ gimp_object_name_changed (GimpObject *object)
{
g_return_if_fail (GIMP_IS_OBJECT (object));
if (object->normalized)
{
if (object->normalized != object->name)
g_free (object->normalized);
object->normalized = NULL;
}
g_signal_emit (object, object_signals[NAME_CHANGED], 0);
}
@ -353,6 +326,24 @@ gimp_object_name_normalize (GimpObject *object)
}
}
static void
gimp_object_name_free (GimpObject *object)
{
if (object->normalized)
{
if (object->normalized != object->name)
g_free (object->normalized);
object->normalized = NULL;
}
if (object->name)
{
g_free (object->name);
object->name = NULL;
}
}
#define DEBUG_MEMSIZE 1