diff options
author | Benjamin Otte <otte@redhat.com> | 2011-10-13 03:15:09 -0700 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2011-10-14 00:31:16 -0700 |
commit | aff231dcb848b28ec021d388a310ac4e99b3c710 (patch) | |
tree | 4e444e3c5ea11c12d8c3101c9bce2c2790c0188d | |
parent | 1bb7d32dd96262303f278ca270e10543af59d93d (diff) |
board: Use dispose instead of destroy vfunc
-rw-r--r-- | src/gnome/gnome-board.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gnome/gnome-board.c b/src/gnome/gnome-board.c index 0a2c861..e003685 100644 --- a/src/gnome/gnome-board.c +++ b/src/gnome/gnome-board.c @@ -207,33 +207,31 @@ game_gnome_board_set_property (GObject *object, guint param_id, } static void -game_gnome_board_destroy (GtkObject *object) +game_gnome_board_dispose (GObject *object) { GameGnomeBoard *board = GAME_GNOME_BOARD (object); game_gnome_board_set_graphic (board, NULL); - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (object); } static void game_gnome_board_class_init (gpointer g_class, gpointer class_data) { GObjectClass *object_class = G_OBJECT_CLASS (g_class); - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (g_class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (g_class); parent_class = g_type_class_peek_parent (g_class); + object_class->dispose = game_gnome_board_dispose; object_class->set_property = game_gnome_board_set_property; object_class->get_property = game_gnome_board_get_property; g_object_class_install_property (object_class, PROP_GRAPHIC, g_param_spec_object ("graphic", _("graphic"), _("Graphic that is displayed"), GAME_TYPE_GRAPHIC, G_PARAM_READWRITE)); - - gtkobject_class->destroy = game_gnome_board_destroy; widget_class->size_request = game_gnome_board_size_request; widget_class->size_allocate = game_gnome_board_size_allocate; |