diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
| commit | 00e495279937c6495d6fab99fe7f89583859ecd1 (patch) | |
| tree | 34b9779e6406e44a646bd8bf65a66dc55654f51a /mail/e-mail-view.c | |
| parent | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (diff) | |
| parent | f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5 (diff) | |
| download | gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.gz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.zst gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.zip | |
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
Diffstat (limited to 'mail/e-mail-view.c')
| -rw-r--r-- | mail/e-mail-view.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c index 90c74d7299..72884dcc4b 100644 --- a/mail/e-mail-view.c +++ b/mail/e-mail-view.c @@ -28,6 +28,10 @@ #include <glib/gi18n-lib.h> +#define E_MAIL_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_VIEW, EMailViewPrivate)) + struct _EMailViewPrivate { EShellView *shell_view; GtkOrientation orientation; @@ -154,7 +158,7 @@ mail_view_dispose (GObject *object) { EMailViewPrivate *priv; - priv = E_MAIL_VIEW (object)->priv; + priv = E_MAIL_VIEW_GET_PRIVATE (object); if (priv->shell_view != NULL) { g_object_unref (priv->shell_view); @@ -319,8 +323,7 @@ e_mail_view_class_init (EMailViewClass *class) static void e_mail_view_init (EMailView *view) { - view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - view, E_TYPE_MAIL_VIEW, EMailViewPrivate); + view->priv = E_MAIL_VIEW_GET_PRIVATE (view); } EShellView * |