diff options
| author | Benedikt Meurer <benny@xfce.org> | 2005-06-06 15:55:34 +0000 |
|---|---|---|
| committer | Benedikt Meurer <benny@xfce.org> | 2005-06-06 15:55:34 +0000 |
| commit | ca001a2ae4d5535a204bde61d1acdee0e8281bfc (patch) | |
| tree | 223810555ca43bf016591f5c57178026e29a65f1 /thunar/thunar-icon-view.c | |
| parent | 2efd9af27b569784a0159665bd3d36b2ff5d6361 (diff) | |
| download | thunar-ca001a2ae4d5535a204bde61d1acdee0e8281bfc.tar.gz | |
2005-06-06 Benedikt Meurer <benny@xfce.org>
* thunar-vfs/thunar-vfs-uri.c(thunar_vfs_uri_finalize): Use the
parent_class variable set by G_DEFINE_TYPE instead of dynamically
querying the parent class on-demand.
* thunar/thunar-application.c, thunar/thunar-desktop-view.c,
thunar/thunar-favourites-model.c, thunar/thunar-favourites-pane.c,
thunar/thunar-favourites-view.c, thunar/thunar-file.c,
thunar/thunar-folder.c, thunar/thunar-icon-view.c,
thunar/thunar-preferences.c, thunar/thunar-statusbar.c,
thunar/thunar-window.c: G_DEFINE_TYPE and G_DEFINE_TYPE_WITH_CODE
already generate a parent_class variable, so we don't need to do
that manually as well. It looks like this was added with GLib 2.4.x
and I somehow missed that changed. Thanks to Jeff Franks for pointing
this out.
(Old svn revision: 16321)
Diffstat (limited to 'thunar/thunar-icon-view.c')
| -rw-r--r-- | thunar/thunar-icon-view.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/thunar/thunar-icon-view.c b/thunar/thunar-icon-view.c index bc8c553d..357d2592 100644 --- a/thunar/thunar-icon-view.c +++ b/thunar/thunar-icon-view.c @@ -76,10 +76,6 @@ struct _ThunarIconView -static GObjectClass *parent_class; - - - G_DEFINE_TYPE_WITH_CODE (ThunarIconView, thunar_icon_view, EXO_TYPE_ICON_VIEW, @@ -94,8 +90,6 @@ thunar_icon_view_class_init (ThunarIconViewClass *klass) ExoIconViewClass *exoicon_view_class; GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = thunar_icon_view_finalize; gobject_class->get_property = thunar_icon_view_get_property; @@ -157,7 +151,7 @@ thunar_icon_view_finalize (GObject *object) /* free the model association */ thunar_view_set_list_model (THUNAR_VIEW (icon_view), NULL); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (thunar_icon_view_parent_class)->finalize (object); } @@ -233,8 +227,8 @@ thunar_icon_view_item_activated (ExoIconView *view, thunar_view_change_directory (THUNAR_VIEW (icon_view), file); /* invoke the item_activated method on the parent class */ - if (EXO_ICON_VIEW_CLASS (parent_class)->item_activated != NULL) - EXO_ICON_VIEW_CLASS (parent_class)->item_activated (view, path); + if (EXO_ICON_VIEW_CLASS (thunar_icon_view_parent_class)->item_activated != NULL) + EXO_ICON_VIEW_CLASS (thunar_icon_view_parent_class)->item_activated (view, path); } @@ -326,8 +320,8 @@ thunar_icon_view_selection_changed (ExoIconView *view) /* update the status text */ thunar_icon_view_update (THUNAR_ICON_VIEW (view)); - if (EXO_ICON_VIEW_CLASS (parent_class)->selection_changed != NULL) - EXO_ICON_VIEW_CLASS (parent_class)->selection_changed (view); + if (EXO_ICON_VIEW_CLASS (thunar_icon_view_parent_class)->selection_changed != NULL) + EXO_ICON_VIEW_CLASS (thunar_icon_view_parent_class)->selection_changed (view); } |