From 59c66fd0169b84fbbccf3dad672589f5d915d4a0 Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 6 Jul 2014 16:31:12 +0200 Subject: Replace GtkObject with GObject also for Gtk+ 2 --- mate-panel/panel-ditem-editor.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'mate-panel/panel-ditem-editor.c') diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index 9521df17..e641e4d3 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -342,11 +342,7 @@ panel_ditem_editor_set_property (GObject *object, } static void -#if GTK_CHECK_VERSION (3, 0, 0) panel_ditem_editor_dispose (GObject *object) -#else -panel_ditem_editor_destroy (GtkObject *object) -#endif { PanelDItemEditor *dialog; @@ -374,30 +370,19 @@ panel_ditem_editor_destroy (GtkObject *object) g_free (dialog->priv->uri); dialog->priv->uri = NULL; -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (panel_ditem_editor_parent_class)->dispose (object); -#else - GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object); -#endif } static void panel_ditem_editor_class_init (PanelDItemEditorClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); -#if !GTK_CHECK_VERSION (3, 0, 0) - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class); -#endif gobject_class->constructor = panel_ditem_editor_constructor; gobject_class->get_property = panel_ditem_editor_get_property; gobject_class->set_property = panel_ditem_editor_set_property; -#if GTK_CHECK_VERSION (3, 0, 0) gobject_class->dispose = panel_ditem_editor_dispose; -#else - gtkobject_class->destroy = panel_ditem_editor_destroy; -#endif g_type_class_add_private (class, sizeof (PanelDItemEditorPrivate)); -- cgit v1.2.1