From c003c99a75587ba39a45d164272760c33f9666b5 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-calendar-view.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'calendar/gui/e-calendar-view.c') diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index d7aa3d8716..60371ae036 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -61,10 +61,6 @@ #include "goto.h" #include "misc.h" -#define E_CALENDAR_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CALENDAR_VIEW, ECalendarViewPrivate)) - struct _ECalendarViewPrivate { /* The GnomeCalendar we are associated to */ GnomeCalendar *calendar; @@ -322,7 +318,7 @@ calendar_view_dispose (GObject *object) { ECalendarViewPrivate *priv; - priv = E_CALENDAR_VIEW_GET_PRIVATE (object); + priv = E_CALENDAR_VIEW (object)->priv; if (priv->model != NULL) { g_signal_handlers_disconnect_matched ( @@ -351,7 +347,7 @@ calendar_view_finalize (GObject *object) { ECalendarViewPrivate *priv; - priv = E_CALENDAR_VIEW_GET_PRIVATE (object); + priv = E_CALENDAR_VIEW (object)->priv; g_free (priv->default_category); @@ -917,7 +913,7 @@ e_calendar_view_init (ECalendarView *calendar_view) { GtkTargetList *target_list; - calendar_view->priv = E_CALENDAR_VIEW_GET_PRIVATE (calendar_view); + calendar_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar_view, E_TYPE_CALENDAR_VIEW, ECalendarViewPrivate); /* Set this early to avoid a divide-by-zero during init. */ calendar_view->priv->time_divisions = 30; -- cgit v1.2.3