diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-12 16:03:46 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-12 16:03:46 +0200 |
| commit | 1f2c549f927a4b6698df4400bcbedbc7b4a1c176 (patch) | |
| tree | 38ebd5dda70155babd807d96ef114d0e11b6629b /lib/experiment-reader/experiment-reader.c | |
| parent | 7489465ed046ef29a34a9cecaf262bdd2c40c3f4 (diff) | |
| download | experiment-player-1f2c549f927a4b6698df4400bcbedbc7b4a1c176.tar.gz | |
fixed experiment-reader destruction (chain up to parent class)
Diffstat (limited to 'lib/experiment-reader/experiment-reader.c')
| -rw-r--r-- | lib/experiment-reader/experiment-reader.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/lib/experiment-reader/experiment-reader.c b/lib/experiment-reader/experiment-reader.c index 739ee41..a97cf8a 100644 --- a/lib/experiment-reader/experiment-reader.c +++ b/lib/experiment-reader/experiment-reader.c @@ -38,31 +38,11 @@ struct _ExperimentReaderPrivate { xmlDoc *doc; }; -/** @private */ -GType -experiment_reader_get_type(void) -{ - static GType type = 0; - - if (!type) { - const GTypeInfo info = { - sizeof(ExperimentReaderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)experiment_reader_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof(ExperimentReader), - 0, /* n_preallocs */ - (GInstanceInitFunc)experiment_reader_init, - }; - - type = g_type_register_static(G_TYPE_OBJECT, - "ExperimentReader", &info, 0); - } - - return type; -} +/** + * @private + * will create experiment_reader_get_type and set experiment_reader_parent_class + */ +G_DEFINE_TYPE(ExperimentReader, experiment_reader, G_TYPE_OBJECT); static void experiment_reader_class_init(ExperimentReaderClass *klass) @@ -92,7 +72,7 @@ experiment_reader_finalize(GObject *gobject) xmlFreeDoc(reader->priv->doc); /* Chain up to the parent class */ - //G_OBJECT_CLASS(experiment_reader_parent_class)->finalize(gobject); + G_OBJECT_CLASS(experiment_reader_parent_class)->finalize(gobject); } static gint64 |