diff options
Diffstat (limited to 'calendar/gui/dialogs/memo-page.c')
-rw-r--r-- | calendar/gui/dialogs/memo-page.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index bf60445001..5348a19328 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -57,6 +57,10 @@ #include "e-send-options-utils.h" #include "memo-page.h" +#define MEMO_PAGE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), TYPE_MEMO_PAGE, MemoPagePrivate)) + /* Private part of the MemoPage structure */ struct _MemoPagePrivate { GtkBuilder *builder; @@ -190,7 +194,7 @@ memo_page_dispose (GObject *object) { MemoPagePrivate *priv; - priv = MEMO_PAGE (object)->priv; + priv = MEMO_PAGE_GET_PRIVATE (object); if (priv->open_cancellable) { g_cancellable_cancel (priv->open_cancellable); @@ -213,7 +217,7 @@ memo_page_finalize (GObject *object) { MemoPagePrivate *priv; - priv = MEMO_PAGE (object)->priv; + priv = MEMO_PAGE_GET_PRIVATE (object); if (priv->name_selector) { e_name_selector_cancel_loading (priv->name_selector); @@ -240,7 +244,7 @@ memo_page_finalize (GObject *object) static GtkWidget * memo_page_get_widget (CompEditorPage *page) { - MemoPagePrivate *priv = MEMO_PAGE (page)->priv; + MemoPagePrivate *priv = MEMO_PAGE_GET_PRIVATE (page); return priv->main; } @@ -248,7 +252,7 @@ memo_page_get_widget (CompEditorPage *page) static void memo_page_focus_main_widget (CompEditorPage *page) { - MemoPagePrivate *priv = MEMO_PAGE (page)->priv; + MemoPagePrivate *priv = MEMO_PAGE_GET_PRIVATE (page); gtk_widget_grab_focus (priv->summary_entry); } @@ -398,9 +402,7 @@ memo_page_class_init (MemoPageClass *class) static void memo_page_init (MemoPage *mpage) { - mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - mpage, TYPE_MEMO_PAGE, MemoPagePrivate); - mpage->priv->open_cancellable = NULL; + mpage->priv = MEMO_PAGE_GET_PRIVATE (mpage); } /* returns whether changed info text */ |