diff options
| author | JP Rosevear <jpr@novell.com> | 2004-10-14 23:36:27 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-10-14 23:36:27 +0800 |
| commit | 086338bb035c96491b792bd93f65a94d1f236916 (patch) | |
| tree | bf14d53b366e260b5018646b26d3edbfdee68983 /calendar/gui/e-comp-editor-registry.c | |
| parent | d976bf57c403c11f800ad49340466146fd56a6eb (diff) | |
| download | gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar.gz gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar.bz2 gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar.lz gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar.xz gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.tar.zst gsoc2013-evolution-086338bb035c96491b792bd93f65a94d1f236916.zip | |
convert to G_DEFINE_TYPE
2004-10-14 JP Rosevear <jpr@novell.com>
* gui/e-cell-date-edit-config.c: convert to G_DEFINE_TYPE
* gui/e-cell-date-edit-text.c: ditto
* gui/e-comp-editor-registry.c: ditto
* gui/e-date-edit-config.c: ditto
* gui/e-mini-calendar-config.c: ditto
svn path=/trunk/; revision=27583
Diffstat (limited to 'calendar/gui/e-comp-editor-registry.c')
| -rw-r--r-- | calendar/gui/e-comp-editor-registry.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c index c576ea7465..1f679097bd 100644 --- a/calendar/gui/e-comp-editor-registry.c +++ b/calendar/gui/e-comp-editor-registry.c @@ -25,7 +25,6 @@ #endif #include <gnome.h> -#include <gal/util/e-util.h> #include "e-comp-editor-registry.h" struct _ECompEditorRegistryPrivate { @@ -42,10 +41,10 @@ struct _ECompEditorRegistryData typedef struct _ECompEditorRegistryData ECompEditorRegistryData; typedef struct _ECompEditorRegistryForeachData ECompEditorRegistryForeachData; -static GObjectClass *parent_class = NULL; - static void editor_destroy_cb (gpointer data, GObject *where_object_was); +G_DEFINE_TYPE (ECompEditorRegistry, e_comp_editor_registry, G_TYPE_OBJECT); + static void registry_data_free (gpointer data) { @@ -58,7 +57,7 @@ registry_data_free (gpointer data) } static void -dispose (GObject *obj) +e_comp_editor_registry_dispose (GObject *obj) { ECompEditorRegistry *reg; ECompEditorRegistryPrivate *priv; @@ -71,11 +70,11 @@ dispose (GObject *obj) priv->editors = NULL; } - (* G_OBJECT_CLASS (parent_class)->dispose) (obj); + (* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->dispose) (obj); } static void -finalize (GObject *obj) +e_comp_editor_registry_finalize (GObject *obj) { ECompEditorRegistry *reg; ECompEditorRegistryPrivate *priv; @@ -85,24 +84,22 @@ finalize (GObject *obj) g_free (priv); - (* G_OBJECT_CLASS (parent_class)->finalize) (obj); + (* G_OBJECT_CLASS (e_comp_editor_registry_parent_class)->finalize) (obj); } static void -class_init (ECompEditorRegistryClass *klass) +e_comp_editor_registry_class_init (ECompEditorRegistryClass *klass) { GObjectClass *object_class; object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - - object_class->dispose = dispose; - object_class->finalize = finalize; + object_class->dispose = e_comp_editor_registry_dispose; + object_class->finalize = e_comp_editor_registry_finalize; } static void -init (ECompEditorRegistry *reg) +e_comp_editor_registry_init (ECompEditorRegistry *reg) { ECompEditorRegistryPrivate *priv; @@ -112,11 +109,6 @@ init (ECompEditorRegistry *reg) priv->editors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, registry_data_free); } - - -E_MAKE_TYPE (e_comp_editor_registry, "ECompEditorRegistry", ECompEditorRegistry, - class_init, init, G_TYPE_OBJECT); - GObject * e_comp_editor_registry_new (void) { |