From 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- calendar/gui/e-cal-model.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'calendar/gui/e-cal-model.c') diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index d0b0c988d3..c9f92b626d 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -40,14 +40,6 @@ #include "e-util/e-extensible.h" #include "e-util/e-util-enumtypes.h" -#define E_CAL_MODEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_MODEL, ECalModelPrivate)) - -#define E_CAL_MODEL_COMPONENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_MODEL_COMPONENT, ECalModelComponentPrivate)) - typedef struct { ECal *client; ECalView *query; @@ -385,7 +377,7 @@ cal_model_dispose (GObject *object) { ECalModelPrivate *priv; - priv = E_CAL_MODEL_GET_PRIVATE (object); + priv = E_CAL_MODEL (object)->priv; if (priv->clients) { while (priv->clients != NULL) { @@ -419,7 +411,7 @@ cal_model_finalize (GObject *object) ECalModelPrivate *priv; gint ii; - priv = E_CAL_MODEL_GET_PRIVATE (object); + priv = E_CAL_MODEL (object)->priv; g_free (priv->search_sexp); g_free (priv->full_sexp); @@ -698,7 +690,7 @@ e_cal_model_class_init (ECalModelClass *class) static void e_cal_model_init (ECalModel *model) { - model->priv = E_CAL_MODEL_GET_PRIVATE (model); + model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, E_TYPE_CAL_MODEL, ECalModelPrivate); /* match none by default */ model->priv->start = -1; -- cgit v1.2.3