summaryrefslogtreecommitdiff
path: root/applets/fish/fish.c
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 /applets/fish/fish.c
parent8b65935648a94ba427e1fa457336485662cddd42 (diff)
downloadmate-panel-59c66fd0169b84fbbccf3dad672589f5d915d4a0.tar.bz2
mate-panel-59c66fd0169b84fbbccf3dad672589f5d915d4a0.tar.xz
Replace GtkObject with GObject also for Gtk+ 2
Diffstat (limited to 'applets/fish/fish.c')
-rw-r--r--applets/fish/fish.c16
1 files changed, 0 insertions, 16 deletions
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();
}