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 /shell/e-shell-view.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 'shell/e-shell-view.c')
-rw-r--r-- | shell/e-shell-view.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 6911b54f59..379b5ab528 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -41,10 +41,6 @@ #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 @@ -498,7 +494,7 @@ shell_view_dispose (GObject *object) { EShellViewPrivate *priv; - priv = E_SHELL_VIEW_GET_PRIVATE (object); + priv = E_SHELL_VIEW (object)->priv; /* Expedite any pending state saves. */ if (priv->state_save_timeout_id > 0) { @@ -555,7 +551,7 @@ shell_view_finalize (GObject *object) { EShellViewPrivate *priv; - priv = E_SHELL_VIEW_GET_PRIVATE (object); + priv = E_SHELL_VIEW (object)->priv; g_key_file_free (priv->state_key_file); @@ -1082,7 +1078,7 @@ e_shell_view_init (EShellView *shell_view, size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); - shell_view->priv = E_SHELL_VIEW_GET_PRIVATE (shell_view); + shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate); shell_view->priv->state_key_file = g_key_file_new (); shell_view->priv->size_group = size_group; } |