Replace GtkObject with GObject also for Gtk+ 2

2 files changed, 0 insertions, 31 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();
 }