diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-05-03 17:07:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-03 17:07:09 +0000 |
| commit | e272345b5d41bfe7272f72cccc7073442db49b8d (patch) | |
| tree | 9e291c6c4e43d40017560b130607f5d597e66e83 /gtk/gtkfilefilter.c | |
| parent | 7f399f19f975dbf667f9df205ca1af3807c80511 (diff) | |
| download | gtk+-e272345b5d41bfe7272f72cccc7073442db49b8d.tar.gz | |
More G_DEFINE_TYPE conversion.
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccessible.c:
* gtk/gtkclipboard.c:
* gtk/gtkfilefilter.c:
* gtk/gtkimmodule.c:
* gtk/gtkmenubar.c: More G_DEFINE_TYPE conversion.
Diffstat (limited to 'gtk/gtkfilefilter.c')
| -rw-r--r-- | gtk/gtkfilefilter.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 4567da98a4..b430a84c38 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -79,24 +79,14 @@ struct _FilterRule } u; }; -static void gtk_file_filter_class_init (GtkFileFilterClass *class); static void gtk_file_filter_finalize (GObject *object); -static GObjectClass *parent_class; -GType -gtk_file_filter_get_type (void) -{ - static GType file_filter_type = 0; - - if (!file_filter_type) - file_filter_type = g_type_register_static_simple (GTK_TYPE_OBJECT, I_("GtkFileFilter"), - sizeof (GtkFileFilterClass), - (GClassInitFunc)gtk_file_filter_class_init, - sizeof (GtkFileFilter), - NULL, 0); +G_DEFINE_TYPE (GtkFileFilter, gtk_file_filter, GTK_TYPE_OBJECT); - return file_filter_type; +static void +gtk_file_filter_init (GtkFileFilter *object) +{ } static void @@ -104,8 +94,6 @@ gtk_file_filter_class_init (GtkFileFilterClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); - parent_class = g_type_class_peek_parent (class); - gobject_class->finalize = gtk_file_filter_finalize; } @@ -145,7 +133,7 @@ gtk_file_filter_finalize (GObject *object) if (filter->name) g_free (filter->name); - parent_class->finalize (object); + G_OBJECT_CLASS (gtk_file_filter_parent_class)->finalize (object); } /** |