[gimp] libgimpwidgets: implement GObject::finalize() instead of GtkObject::destroy()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: implement GObject::finalize() instead of GtkObject::destroy()
- Date: Fri, 15 Oct 2010 00:12:59 +0000 (UTC)
commit a9e62971108aa294dae6cc0c9f77e1b08517f997
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 02:12:33 2010 +0200
libgimpwidgets: implement GObject::finalize() instead of GtkObject::destroy()
libgimpwidgets/gimpcolorscale.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolorscale.c b/libgimpwidgets/gimpcolorscale.c
index e5ef0c9..6db2d1a 100644
--- a/libgimpwidgets/gimpcolorscale.c
+++ b/libgimpwidgets/gimpcolorscale.c
@@ -44,7 +44,8 @@
**/
-static void gimp_color_scale_destroy (GtkObject *object);
+static void gimp_color_scale_finalize (GObject *object);
+
static void gimp_color_scale_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gimp_color_scale_state_changed (GtkWidget *widget,
@@ -69,10 +70,10 @@ G_DEFINE_TYPE (GimpColorScale, gimp_color_scale, GTK_TYPE_SCALE)
static void
gimp_color_scale_class_init (GimpColorScaleClass *klass)
{
- GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- object_class->destroy = gimp_color_scale_destroy;
+ object_class->finalize = gimp_color_scale_finalize;
widget_class->size_allocate = gimp_color_scale_size_allocate;
widget_class->state_changed = gimp_color_scale_state_changed;
@@ -104,7 +105,7 @@ gimp_color_scale_init (GimpColorScale *scale)
}
static void
-gimp_color_scale_destroy (GtkObject *object)
+gimp_color_scale_finalize (GObject *object)
{
GimpColorScale *scale = GIMP_COLOR_SCALE (object);
@@ -117,7 +118,7 @@ gimp_color_scale_destroy (GtkObject *object)
scale->rowstride = 0;
}
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]