diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-02-17 14:47:31 -0500 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-02-17 16:37:39 -0500 |
| commit | 4cf05a8c91bda94aac6d403947cbb402a68019d2 (patch) | |
| tree | 025a91b64fead340191cb4484583430d2c7a06cb /src | |
| parent | 9af483dbbea8fc6fc41f4bc726522d7583ccf677 (diff) | |
| download | nautilus-4cf05a8c91bda94aac6d403947cbb402a68019d2.tar.gz | |
window: fix class casting madness
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-window.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c index f3f0e8f19..6561e42cb 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -1547,22 +1547,26 @@ static void nautilus_window_class_init (NautilusWindowClass *class) { GtkBindingSet *binding_set; + GObjectClass *oclass = G_OBJECT_CLASS (class); + GtkWidgetClass *wclass = GTK_WIDGET_CLASS (class); + + oclass->finalize = nautilus_window_finalize; + oclass->constructor = nautilus_window_constructor; + oclass->constructed = nautilus_window_constructed; + oclass->get_property = nautilus_window_get_property; + oclass->set_property = nautilus_window_set_property; + + wclass->destroy = nautilus_window_destroy; + wclass->show = nautilus_window_show; + wclass->get_preferred_width = nautilus_window_get_preferred_width; + wclass->get_preferred_height = nautilus_window_get_preferred_height; + wclass->realize = nautilus_window_realize; + wclass->key_press_event = nautilus_window_key_press_event; - G_OBJECT_CLASS (class)->finalize = nautilus_window_finalize; - G_OBJECT_CLASS (class)->constructor = nautilus_window_constructor; - G_OBJECT_CLASS (class)->constructed = nautilus_window_constructed; - G_OBJECT_CLASS (class)->get_property = nautilus_window_get_property; - G_OBJECT_CLASS (class)->set_property = nautilus_window_set_property; - GTK_WIDGET_CLASS (class)->destroy = nautilus_window_destroy; - GTK_WIDGET_CLASS (class)->show = nautilus_window_show; - GTK_WIDGET_CLASS (class)->get_preferred_width = nautilus_window_get_preferred_width; - GTK_WIDGET_CLASS (class)->get_preferred_height = nautilus_window_get_preferred_height; - GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize; - GTK_WIDGET_CLASS (class)->key_press_event = nautilus_window_key_press_event; class->set_allow_up = real_set_allow_up; class->close_slot = real_close_slot; - g_object_class_install_property (G_OBJECT_CLASS (class), + g_object_class_install_property (oclass, ARG_APP, g_param_spec_object ("app", "Application", @@ -1645,5 +1649,5 @@ nautilus_window_class_init (NautilusWindowClass *class) class->reload = nautilus_window_reload; class->go_up = nautilus_window_go_up_signal; - g_type_class_add_private (G_OBJECT_CLASS (class), sizeof (NautilusWindowDetails)); + g_type_class_add_private (oclass, sizeof (NautilusWindowDetails)); } |