diff options
author | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
commit | 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a (patch) | |
tree | 8d5f3985a82ec7d330af27ee0a29a79a2f0ecfa3 /calendar/gui/e-cal-model.c | |
parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'calendar/gui/e-cal-model.c')
-rw-r--r-- | calendar/gui/e-cal-model.c | 14 |
1 files changed, 3 insertions, 11 deletions
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; |