diff options
Diffstat (limited to 'calendar/gui/e-cal-model.c')
| -rw-r--r-- | calendar/gui/e-cal-model.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 87f23b2f45..77f7e622ef 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1,7 +1,6 @@ /* Evolution calendar - Data model for ETable * - * Copyright (C) 2000 Ximian, Inc. - * Copyright (C) 2000 Ximian, Inc. + * Copyright (C) 2004 Ximian, Inc. * * Authors: Rodrigo Moya <rodrigo@ximian.com> * @@ -26,7 +25,6 @@ #include <string.h> #include <glib/garray.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> #include <e-util/e-time-utils.h> #include <libecal/e-cal-time-util.h> #include "comp-util.h" @@ -76,8 +74,6 @@ struct _ECalModelPrivate { gboolean use_24_hour_format; }; -static void e_cal_model_class_init (ECalModelClass *klass); -static void e_cal_model_init (ECalModel *model, ECalModelClass *klass); static void e_cal_model_dispose (GObject *object); static void e_cal_model_finalize (GObject *object); @@ -109,10 +105,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -static GObjectClass *parent_class = NULL; - -E_MAKE_TYPE (e_cal_model, "ECalModel", ECalModel, e_cal_model_class_init, - e_cal_model_init, E_TABLE_MODEL_TYPE); +G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE); static void e_cal_model_class_init (ECalModelClass *klass) @@ -120,8 +113,6 @@ e_cal_model_class_init (ECalModelClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); ETableModelClass *etm_class = E_TABLE_MODEL_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->dispose = e_cal_model_dispose; object_class->finalize = e_cal_model_finalize; @@ -160,7 +151,7 @@ e_cal_model_class_init (ECalModelClass *klass) } static void -e_cal_model_init (ECalModel *model, ECalModelClass *klass) +e_cal_model_init (ECalModel *model) { ECalModelPrivate *priv; @@ -271,8 +262,8 @@ e_cal_model_dispose (GObject *object) priv->clients = NULL; } - if (parent_class->dispose) - parent_class->dispose (object); + if (G_OBJECT_CLASS (e_cal_model_parent_class)->dispose) + G_OBJECT_CLASS (e_cal_model_parent_class)->dispose (object); } static void @@ -295,8 +286,8 @@ e_cal_model_finalize (GObject *object) g_free (priv); - if (parent_class->finalize) - parent_class->finalize (object); + if (G_OBJECT_CLASS (e_cal_model_parent_class)->finalize) + G_OBJECT_CLASS (e_cal_model_parent_class)->finalize (object); } /* ETableModel methods */ |