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

reverted a small part of my last commit. It doesn't seem to be a good idea 

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

	* app/widgets/gimpdock.c: reverted a small part of my last commit.
	It doesn't seem to be a good idea to unref the context in dispose().
	Do it in destroy() just like we used to do.
This commit is contained in:
Sven Neumann 2003-11-20 22:32:59 +00:00 committed by Sven Neumann
parent 689c754e28
commit a7bdb891e6
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-20 Sven Neumann <sven@gimp.org>
* app/widgets/gimpdock.c: reverted a small part of my last commit.
It doesn't seem to be a good idea to unref the context in dispose().
Do it in destroy() just like we used to do.
2003-11-20 Sven Neumann <sven@gimp.org>
* app/gui/info-dialog.c (info_dialog_new_extended)

22
app/widgets/gimpdock.c
View File

@ -75,7 +75,6 @@ static void gimp_dock_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_dock_dispose (GObject *object);
static void gimp_dock_destroy (GtkObject *object);
@ -178,7 +177,6 @@ gimp_dock_class_init (GimpDockClass *klass)
object_class->constructor = gimp_dock_constructor;
object_class->set_property = gimp_dock_set_property;
object_class->get_property = gimp_dock_get_property;
object_class->dispose = gimp_dock_dispose;
gtk_object_class->destroy = gimp_dock_destroy;
@ -293,20 +291,6 @@ gimp_dock_constructor (GType type,
return object;
}
static void
gimp_dock_dispose (GObject *object)
{
GimpDock *dock = GIMP_DOCK (object);
if (dock->context)
{
g_object_unref (dock->context);
dock->context = NULL;
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_dock_destroy (GtkObject *object)
{
@ -315,6 +299,12 @@ gimp_dock_destroy (GtkObject *object)
while (dock->dockbooks)
gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->dockbooks->data));
if (dock->context)
{
g_object_unref (dock->context);
dock->context = NULL;
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}