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 /modules/calendar/e-memo-shell-content.c | |
| parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
| download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.bz2 gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.lz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.xz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip | |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'modules/calendar/e-memo-shell-content.c')
| -rw-r--r-- | modules/calendar/e-memo-shell-content.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index a9d299e221..37e96fe47a 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -35,10 +35,6 @@ #include "calendar/gui/e-cal-model-memos.h" #include "calendar/gui/e-memo-table.h" -#define E_MEMO_SHELL_CONTENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_MEMO_SHELL_CONTENT, EMemoShellContentPrivate)) - #define E_MEMO_TABLE_DEFAULT_STATE \ "<?xml version=\"1.0\"?>" \ "<ETableState>" \ @@ -277,7 +273,7 @@ memo_shell_content_restore_state_cb (EShellWindow *shell_window, GObject *object; const gchar *key; - priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (shell_content); + priv = E_MEMO_SHELL_CONTENT (shell_content)->priv; /* Bind GObject properties to GConf keys. */ @@ -367,7 +363,7 @@ memo_shell_content_dispose (GObject *object) { EMemoShellContentPrivate *priv; - priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (object); + priv = E_MEMO_SHELL_CONTENT (object)->priv; if (priv->paned != NULL) { g_object_unref (priv->paned); @@ -403,7 +399,7 @@ memo_shell_content_finalize (GObject *object) { EMemoShellContentPrivate *priv; - priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (object); + priv = E_MEMO_SHELL_CONTENT (object)->priv; g_free (priv->current_uid); @@ -428,7 +424,7 @@ memo_shell_content_constructed (GObject *object) GtkWidget *widget; gint n_targets; - priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (object); + priv = E_MEMO_SHELL_CONTENT (object)->priv; /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (parent_class)->constructed (object); @@ -606,7 +602,7 @@ memo_shell_content_focus_search_results (EShellContent *shell_content) { EMemoShellContentPrivate *priv; - priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (shell_content); + priv = E_MEMO_SHELL_CONTENT (shell_content)->priv; gtk_widget_grab_focus (priv->memo_table); } @@ -659,8 +655,7 @@ memo_shell_content_class_init (EMemoShellContentClass *class) static void memo_shell_content_init (EMemoShellContent *memo_shell_content) { - memo_shell_content->priv = - E_MEMO_SHELL_CONTENT_GET_PRIVATE (memo_shell_content); + memo_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_content, E_TYPE_MEMO_SHELL_CONTENT, EMemoShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } |