diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 07:22:14 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:43:04 +0800 |
| commit | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (patch) | |
| tree | f99df204ecdd5629acdc9f7e7b00d1c0d7903d6d /shell/e-shell-view.c | |
| parent | 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 (diff) | |
| download | gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.gz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.bz2 gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.lz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.xz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.zst gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.zip | |
Miscellaneous cleanups.
Diffstat (limited to 'shell/e-shell-view.c')
| -rw-r--r-- | shell/e-shell-view.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index a2fc00e3b5..89ac929160 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -45,6 +45,10 @@ #include "e-shell-searchbar.h" #include "e-shell-window-actions.h" +#define E_SHELL_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL_VIEW, EShellViewPrivate)) + #define SIMPLE_SEARCHBAR_WIDTH 300 #define STATE_SAVE_TIMEOUT_SECONDS 3 @@ -502,7 +506,7 @@ shell_view_dispose (GObject *object) { EShellViewPrivate *priv; - priv = E_SHELL_VIEW (object)->priv; + priv = E_SHELL_VIEW_GET_PRIVATE (object); /* Expedite any pending state saves. */ if (priv->state_save_timeout_id > 0) { @@ -568,7 +572,7 @@ shell_view_finalize (GObject *object) { EShellViewPrivate *priv; - priv = E_SHELL_VIEW (object)->priv; + priv = E_SHELL_VIEW_GET_PRIVATE (object); g_key_file_free (priv->state_key_file); @@ -1107,8 +1111,7 @@ e_shell_view_init (EShellView *shell_view, size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); - shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate); + shell_view->priv = E_SHELL_VIEW_GET_PRIVATE (shell_view); shell_view->priv->state_key_file = g_key_file_new (); shell_view->priv->size_group = size_group; } |