summaryrefslogtreecommitdiff
path: root/mate-panel/libpanel-util
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-06 16:31:12 +0200
committerinfirit <[email protected]>2015-07-14 13:07:44 +0200
commit59c66fd0169b84fbbccf3dad672589f5d915d4a0 (patch)
tree177b32a5694fb94646d7f6a0b8bcea3448bc2373 /mate-panel/libpanel-util
parent8b65935648a94ba427e1fa457336485662cddd42 (diff)
downloadmate-panel-59c66fd0169b84fbbccf3dad672589f5d915d4a0.tar.bz2
mate-panel-59c66fd0169b84fbbccf3dad672589f5d915d4a0.tar.xz
Replace GtkObject with GObject also for Gtk+ 2
Diffstat (limited to 'mate-panel/libpanel-util')
-rw-r--r--mate-panel/libpanel-util/panel-icon-chooser.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/mate-panel/libpanel-util/panel-icon-chooser.c b/mate-panel/libpanel-util/panel-icon-chooser.c
index 6772019c..03d072f7 100644
--- a/mate-panel/libpanel-util/panel-icon-chooser.c
+++ b/mate-panel/libpanel-util/panel-icon-chooser.c
@@ -141,11 +141,7 @@ panel_icon_chooser_set_property (GObject *object,
}
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
panel_icon_chooser_dispose (GObject *object)
-#else
-panel_icon_chooser_destroy (GtkObject *object)
-#endif
{
PanelIconChooser *chooser;
@@ -170,20 +166,13 @@ panel_icon_chooser_destroy (GtkObject *object)
g_free (chooser->priv->icon_theme_dir);
chooser->priv->icon_theme_dir = NULL;
-#if GTK_CHECK_VERSION (3, 0, 0)
G_OBJECT_CLASS (panel_icon_chooser_parent_class)->dispose (object);
-#else
- GTK_OBJECT_CLASS (panel_icon_chooser_parent_class)->destroy (object);
-#endif
}
static void
panel_icon_chooser_class_init (PanelIconChooserClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class);
-#endif
GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (class);
GtkButtonClass *gtkbutton_class = GTK_BUTTON_CLASS (class);
@@ -191,11 +180,7 @@ panel_icon_chooser_class_init (PanelIconChooserClass *class)
gobject_class->get_property = panel_icon_chooser_get_property;
gobject_class->set_property = panel_icon_chooser_set_property;
-#if GTK_CHECK_VERSION (3, 0, 0)
gobject_class->dispose = panel_icon_chooser_dispose;
-#else
- gtkobject_class->destroy = panel_icon_chooser_destroy;
-#endif
gtkwidget_class->style_set = _panel_icon_chooser_style_set;
gtkwidget_class->screen_changed = _panel_icon_chooser_screen_changed;