From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- composer/e-composer-header-table.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 1e78111da4..d2d41dfdcc 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -32,10 +32,6 @@ #include "e-composer-post-header.h" #include "e-composer-text-header.h" -#define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate)) - #define HEADER_TOOLTIP_TO \ _("Enter the recipients of the message") #define HEADER_TOOLTIP_CC \ @@ -538,7 +534,7 @@ composer_header_table_constructor (GType type, e_composer_header_table_parent_class)->constructor ( type, n_construct_properties, construct_properties); - priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (object); + priv = E_COMPOSER_HEADER_TABLE (object)->priv; small_screen_mode = e_shell_get_small_screen_mode (priv->shell); @@ -810,7 +806,7 @@ composer_header_table_dispose (GObject *object) EComposerHeaderTablePrivate *priv; gint ii; - priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (object); + priv = E_COMPOSER_HEADER_TABLE (object)->priv; for (ii = 0; ii < G_N_ELEMENTS (priv->headers); ii++) { if (priv->headers[ii] != NULL) { @@ -998,7 +994,7 @@ e_composer_header_table_init (EComposerHeaderTable *table) GtkWidget *widget; gint ii; - table->priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (table); + table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table, E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate); name_selector = e_name_selector_new (); table->priv->name_selector = name_selector; -- cgit v1.2.3