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.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'composer/e-composer-header.c') diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 76c5d89b14..baf5ea3845 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -24,10 +24,6 @@ #include -#define E_COMPOSER_HEADER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate)) - enum { PROP_0, PROP_BUTTON, @@ -122,7 +118,7 @@ composer_header_set_property (GObject *object, { EComposerHeaderPrivate *priv; - priv = E_COMPOSER_HEADER_GET_PRIVATE (object); + priv = E_COMPOSER_HEADER (object)->priv; switch (property_id) { case PROP_BUTTON: /* construct only */ @@ -157,7 +153,7 @@ composer_header_get_property (GObject *object, { EComposerHeaderPrivate *priv; - priv = E_COMPOSER_HEADER_GET_PRIVATE (object); + priv = E_COMPOSER_HEADER (object)->priv; switch (property_id) { case PROP_BUTTON: /* construct only */ @@ -282,7 +278,7 @@ e_composer_header_class_init (EComposerHeaderClass *class) static void e_composer_header_init (EComposerHeader *header) { - header->priv = E_COMPOSER_HEADER_GET_PRIVATE (header); + header->priv = G_TYPE_INSTANCE_GET_PRIVATE (header, E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate); } gchar * -- cgit