aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog10
-rw-r--r--widgets/misc/e-clipped-label.c13
-rw-r--r--widgets/misc/e-title-bar.c12
3 files changed, 22 insertions, 13 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index d24084acf6..a7a83d6d76 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,5 +1,15 @@
2002-11-14 Ettore Perazzoli <ettore@ximian.com>
+ * e-clipped-label.c (e_clipped_label_finalize): New.
+ (e_clipped_label_destroy): Removed.
+
+ * e-title-bar.c (destroy): Removed.
+ (impl_finalize): New.
+ (class_init): Install GObject::finalize handler instead of
+ GtkObject::destroy handler.
+
+2002-11-14 Ettore Perazzoli <ettore@ximian.com>
+
* e-filter-bar.c: Changed to use g_object_*() and g_signal_*()
functions instead of gtk_object_*() and gtk_signal_*().
(destroy): Removed.
diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
index adefe64048..2115e8e038 100644
--- a/widgets/misc/e-clipped-label.c
+++ b/widgets/misc/e-clipped-label.c
@@ -52,7 +52,7 @@ static void e_clipped_label_size_allocate (GtkWidget *widget,
static gint e_clipped_label_expose (GtkWidget *widget,
GdkEventExpose *event);
static void e_clipped_label_recalc_chars_displayed (EClippedLabel *label);
-static void e_clipped_label_destroy (GtkObject *object);
+static void e_clipped_label_finalize (GObject *object);
static GtkMiscClass *parent_class;
@@ -94,10 +94,10 @@ e_clipped_label_get_type (void)
static void
e_clipped_label_class_init (EClippedLabelClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GtkWidgetClass *widget_class;
- object_class = (GtkObjectClass *) class;
+ object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
/* Method override */
@@ -105,7 +105,7 @@ e_clipped_label_class_init (EClippedLabelClass *class)
widget_class->size_allocate = e_clipped_label_size_allocate;
widget_class->expose_event = e_clipped_label_expose;
- object_class->destroy = e_clipped_label_destroy;
+ object_class->finalize = e_clipped_label_finalize;
e_clipped_label_ellipsis = _("...");
}
@@ -256,7 +256,7 @@ e_clipped_label_expose (GtkWidget *widget,
static void
-e_clipped_label_destroy (GtkObject *object)
+e_clipped_label_finalize (GObject *object)
{
EClippedLabel *label;
@@ -267,8 +267,7 @@ e_clipped_label_destroy (GtkObject *object)
g_free (label->label);
g_free (label->label_wc);
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
diff --git a/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c
index bcc645573d..ffe249628b 100644
--- a/widgets/misc/e-title-bar.c
+++ b/widgets/misc/e-title-bar.c
@@ -231,10 +231,10 @@ label_button_press_event_cb (GtkWidget *widget,
}
-/* GtkObject methods. */
+/* GObject methods. */
static void
-destroy (GtkObject *object)
+impl_finalize (GObject *object)
{
ETitleBar *title_bar;
ETitleBarPrivate *priv;
@@ -244,17 +244,17 @@ destroy (GtkObject *object)
g_free (priv);
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
class_init (ETitleBarClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = (GtkObjectClass*) klass;
- object_class->destroy = destroy;
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = impl_finalize;
parent_class = gtk_type_class (gtk_frame_get_type ());