Replace GtkObject with GObject also for Gtk+ 2

9 files changed, 2 insertions, 117 deletions

diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
index b19d3e2b..970ea218 100644
--- a/applets/clock/calendar-window.c
+++ b/applets/clock/calendar-window.c
@@ -365,11 +365,7 @@ calendar_window_set_property (GObject       *object,
 }
 
 static void
-#if GTK_CHECK_VERSION (3, 0, 0)
 calendar_window_dispose (GObject *object)
-#else
-calendar_window_destroy (GtkObject *object)
-#endif
 {
 	CalendarWindow *calwin;
 
@@ -379,30 +375,19 @@ calendar_window_destroy (GtkObject *object)
 		g_object_unref (calwin->priv->settings);
 	calwin->priv->settings = NULL;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	G_OBJECT_CLASS (calendar_window_parent_class)->dispose (object);
-#else
-	GTK_OBJECT_CLASS (calendar_window_parent_class)->destroy (object);
-#endif
 }
 
 static void
 calendar_window_class_init (CalendarWindowClass *klass)
 {
 	GObjectClass   *gobject_class   = G_OBJECT_CLASS (klass);
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
-#endif
 
 	gobject_class->constructor = calendar_window_constructor;
 	gobject_class->get_property = calendar_window_get_property;
 	gobject_class->set_property = calendar_window_set_property;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	gobject_class->dispose = calendar_window_dispose;
-#else
-	gtkobject_class->destroy = calendar_window_destroy;
-#endif
 
 	g_type_class_add_private (klass, sizeof (CalendarWindowPrivate));
 
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index d097d12d..4562e65e 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -1833,11 +1833,7 @@ static gboolean fishy_factory(MatePanelApplet* applet, const char* iid, gpointer
 	return retval;
 }
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 static void fish_applet_dispose (GObject *object)
-#else
-static void fish_applet_destroy(GtkObject* object)
-#endif
 {
 	FishApplet* fish = (FishApplet*) object;
 
@@ -1896,11 +1892,7 @@ static void fish_applet_destroy(GtkObject* object)
 
 	fish_close_channel (fish);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	G_OBJECT_CLASS (parent_class)->dispose (object);
-#else
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-#endif
 }
 
 static void fish_applet_instance_init(FishApplet* fish, FishAppletClass* klass)
@@ -1964,21 +1956,13 @@ static void fish_applet_instance_init(FishApplet* fish, FishAppletClass* klass)
 static void fish_applet_class_init(FishAppletClass* klass)
 {
 	MatePanelAppletClass* applet_class = (MatePanelAppletClass*) klass;
-#if GTK_CHECK_VERSION (3, 0, 0)
 	GObjectClass *gobject_class        = (GObjectClass *) klass;
-#else
-	GtkObjectClass* gtkobject_class    = (GtkObjectClass*) klass;
-#endif
 
 	parent_class = g_type_class_peek_parent(klass);
 
 	applet_class->change_orient = fish_applet_change_orient;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	gobject_class->dispose = fish_applet_dispose;
-#else
-	gtkobject_class->destroy = fish_applet_destroy;
-#endif
 
 	init_fools_day();
 }
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index 6249a91f..72f3d595 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -2064,9 +2064,6 @@ static void
 mate_panel_applet_class_init (MatePanelAppletClass *klass)
 {
 	GObjectClass   *gobject_class = (GObjectClass *) klass;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-#endif
 	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
 	GtkBindingSet *binding_set;
 
@@ -2236,11 +2233,7 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass)
 			      1,
 			      GTK_TYPE_DIRECTION_TYPE);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	binding_set = gtk_binding_set_by_class (gobject_class);
-#else
-	binding_set = gtk_binding_set_by_class (object_class);
-#endif
 	add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
 	add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 	add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
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;
diff --git a/mate-panel/nothing.cP b/mate-panel/nothing.cP
index 7a416970..71441287 100644
--- a/mate-panel/nothing.cP
+++ b/mate-panel/nothing.cP
@@ -281,7 +281,7 @@ config_event(GtkWidget *widget,GdkEvent *event,GtkNotebook *nbook)
 
 		g_signal_connect (G_OBJECT(goat_darea),"destroy",
 				  G_CALLBACK (destroy_egg),NULL);
-		g_signal_connect (GTK_OBJECT(goat_darea),"expose_event",
+		g_signal_connect (G_OBJECT(goat_darea),"expose_event",
 				  G_CALLBACK (goat_expose),NULL);
 		g_signal_connect_after (G_OBJECT(goat_darea),"realize",
 					G_CALLBACK (goat_realize),NULL);
@@ -1429,7 +1429,7 @@ start_geginv (void)
 			  G_CALLBACK (inv_key_release), NULL);
 	g_signal_connect (G_OBJECT (geginv), "realize",
 			  G_CALLBACK (geginv_realized), NULL);
-	g_signal_connect (GTK_OBJECT (geginv_canvas), "expose_event",
+	g_signal_connect (G_OBJECT (geginv_canvas), "expose_event",
 			  G_CALLBACK (inv_expose), NULL);
 
 	g_slist_foreach (inv_shots, (GFunc)g_free, NULL);
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));
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index 31822e94..0aeef374 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -3084,11 +3084,7 @@ panel_toplevel_unrealize (GtkWidget *widget)
 }
 
 static void
-#if GTK_CHECK_VERSION (3, 0, 0)
 panel_toplevel_dispose (GObject *widget)
-#else
-panel_toplevel_destroy (GtkObject *widget)
-#endif
 {
 	PanelToplevel *toplevel = (PanelToplevel *) widget;
 
@@ -3102,12 +3098,7 @@ panel_toplevel_destroy (GtkObject *widget)
 
 	panel_toplevel_disconnect_timeouts (toplevel);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	G_OBJECT_CLASS (panel_toplevel_parent_class)->dispose (widget);
-#else
-	if (GTK_OBJECT_CLASS (panel_toplevel_parent_class)->destroy)
-		GTK_OBJECT_CLASS (panel_toplevel_parent_class)->destroy (widget);
-#endif
 }
 
 static void
@@ -4414,9 +4405,6 @@ static void
 panel_toplevel_class_init (PanelToplevelClass *klass)
 {
 	GObjectClass      *gobject_class   = (GObjectClass      *) klass;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	GtkObjectClass    *gtkobject_class = (GtkObjectClass    *) klass;
-#endif
 	GtkWidgetClass    *widget_class    = (GtkWidgetClass    *) klass;
 	GtkContainerClass *container_class = (GtkContainerClass *) klass;
 	GtkBindingSet     *binding_set;
@@ -4428,11 +4416,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
         gobject_class->get_property = panel_toplevel_get_property;
 	gobject_class->finalize     = panel_toplevel_finalize;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	gobject_class->dispose = panel_toplevel_dispose;
-#else
-	gtkobject_class->destroy = panel_toplevel_destroy;
-#endif
 
 	widget_class->realize              = panel_toplevel_realize;
 	widget_class->unrealize            = panel_toplevel_unrealize;
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 4841d94f..c9fbb846 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -78,11 +78,7 @@ static void panel_widget_cadd           (GtkContainer     *container,
 					 GtkWidget        *widget);
 static void panel_widget_cremove        (GtkContainer     *container,
 					 GtkWidget        *widget);
-#if GTK_CHECK_VERSION (3, 0, 0)
 static void panel_widget_dispose        (GObject *obj);
-#else
-static void panel_widget_destroy        (GtkObject        *obj);
-#endif
 static void panel_widget_finalize       (GObject          *obj);
 static void panel_widget_realize        (GtkWidget        *widget);
 static void panel_widget_unrealize      (GtkWidget        *panel);
@@ -300,12 +296,7 @@ remove_all_move_bindings (PanelWidget *panel)
 static void
 panel_widget_class_init (PanelWidgetClass *class)
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
 	GObjectClass *object_class = (GObjectClass*) class;
-#else
-	GtkObjectClass *object_class = (GtkObjectClass*) class;
-	GObjectClass *gobject_class = (GObjectClass*) class;
-#endif
 	GtkWidgetClass *widget_class = (GtkWidgetClass*) class;
 	GtkContainerClass *container_class = (GtkContainerClass*) class;
 
@@ -437,13 +428,8 @@ panel_widget_class_init (PanelWidgetClass *class)
 	class->tab_move = panel_widget_tab_move;
 	class->end_move = panel_widget_end_move;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	object_class->dispose = panel_widget_dispose;
 	object_class->finalize = panel_widget_finalize;
-#else
-	object_class->destroy = panel_widget_destroy;
-	gobject_class->finalize = panel_widget_finalize;
-#endif
 
 #if GTK_CHECK_VERSION (3, 0, 0)
 	widget_class->get_preferred_width = panel_widget_get_preferred_width;
@@ -1833,11 +1819,7 @@ panel_widget_destroy_open_dialogs (PanelWidget *panel_widget)
 }
 
 static void
-#if GTK_CHECK_VERSION (3, 0, 0)
 panel_widget_dispose (GObject *obj)
-#else
-panel_widget_destroy (GtkObject *obj)
-#endif
 {
 	PanelWidget *panel;
 
@@ -1858,12 +1840,7 @@ panel_widget_destroy (GtkObject *obj)
 		panel->master_widget = NULL;
 	}
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	G_OBJECT_CLASS (panel_widget_parent_class)->dispose (obj);
-#else
-	if (GTK_OBJECT_CLASS (panel_widget_parent_class)->destroy)
-		GTK_OBJECT_CLASS (panel_widget_parent_class)->destroy (obj);
-#endif
 }
 
 static void
@@ -2506,11 +2483,7 @@ panel_widget_applet_key_press_event (GtkWidget   *widget,
 	if (!mate_panel_applet_in_drag)
 		return FALSE;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	return gtk_bindings_activate (G_OBJECT (panel),
-#else
-	return gtk_bindings_activate (GTK_OBJECT (panel),
-#endif
 				      ((GdkEventKey *)event)->keyval, 
 				      ((GdkEventKey *)event)->state);	
 }
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index 4ffd760d..f0893774 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -399,11 +399,7 @@ panel_key_press_event (GtkWidget   *widget,
 	if (GTK_IS_SOCKET (gtk_window_get_focus (GTK_WINDOW (widget))) &&
 	    event->keyval == GDK_KEY_F10 &&
 	    (event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
-#if GTK_CHECK_VERSION (3, 0, 0)
 		return gtk_bindings_activate (G_OBJECT (widget),
-#else
-		return gtk_bindings_activate (GTK_OBJECT (widget),
-#endif
 					      event->keyval,
 					      event->state);