diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-09-30 02:33:09 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-09-30 19:37:18 +0200 |
| commit | 1ff975f0f4c0bacebb70441f3c05fe6377e747ab (patch) | |
| tree | a8704d3c99cfd0b3bf37b0580ccc1dfddbbd3255 /libwnck | |
| parent | b8463d7bd8c70b7b49c568b04284e9faf99d53ea (diff) | |
| download | libwnck-1ff975f0f4c0bacebb70441f3c05fe6377e747ab.tar.gz | |
Adapt to GtkObject removal in GTK3
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=630970
Diffstat (limited to 'libwnck')
| -rw-r--r-- | libwnck/selector.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libwnck/selector.c b/libwnck/selector.c index fc5b608..ee0b365 100644 --- a/libwnck/selector.c +++ b/libwnck/selector.c @@ -77,10 +77,10 @@ G_DEFINE_TYPE (WnckSelector, wnck_selector, GTK_TYPE_MENU_BAR); static GObject *wnck_selector_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties); +static void wnck_selector_dispose (GObject *object); static void wnck_selector_finalize (GObject *object); static void wnck_selector_realize (GtkWidget *widget); static void wnck_selector_unrealize (GtkWidget *widget); -static void wnck_selector_destroy (GtkObject *object); static void wnck_selector_connect_to_window (WnckSelector *selector, WnckWindow *window); @@ -1246,16 +1246,14 @@ static void wnck_selector_class_init (WnckSelectorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); g_type_class_add_private (klass, sizeof (WnckSelectorPrivate)); object_class->constructor = wnck_selector_constructor; + object_class->dispose = wnck_selector_dispose; object_class->finalize = wnck_selector_finalize; - gtk_object_class->destroy = wnck_selector_destroy; - widget_class->realize = wnck_selector_realize; widget_class->unrealize = wnck_selector_unrealize; } @@ -1292,7 +1290,7 @@ wnck_selector_finalize (GObject *object) } static void -wnck_selector_destroy (GtkObject *object) +wnck_selector_dispose (GObject *object) { WnckSelector *selector; @@ -1305,7 +1303,7 @@ wnck_selector_destroy (GtkObject *object) selector->priv->image = NULL; selector->priv->icon_window = NULL; - GTK_OBJECT_CLASS (wnck_selector_parent_class)->destroy (object); + G_OBJECT_CLASS (wnck_selector_parent_class)->dispose (object); } static void |