From 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a 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 --- widgets/misc/e-image-chooser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'widgets/misc/e-image-chooser.c') diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index e9a497f4c4..4da38be9a9 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -30,10 +30,6 @@ #include "e-util/e-util.h" #include "e-util/e-icon-factory.h" -#define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate)) - struct _EImageChooserPrivate { GtkWidget *frame; GtkWidget *image; @@ -374,7 +370,7 @@ image_chooser_dispose (GObject *object) { EImageChooserPrivate *priv; - priv = E_IMAGE_CHOOSER_GET_PRIVATE (object); + priv = E_IMAGE_CHOOSER (object)->priv; if (priv->frame != NULL) { g_object_unref (priv->frame); @@ -395,7 +391,7 @@ image_chooser_finalize (GObject *object) { EImageChooserPrivate *priv; - priv = E_IMAGE_CHOOSER_GET_PRIVATE (object); + priv = E_IMAGE_CHOOSER (object)->priv; g_free (priv->image_buf); g_free (priv->icon_name); @@ -444,7 +440,7 @@ e_image_chooser_init (EImageChooser *chooser) GtkWidget *container; GtkWidget *widget; - chooser->priv = E_IMAGE_CHOOSER_GET_PRIVATE (chooser); + chooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser, E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate); container = GTK_WIDGET (chooser); -- cgit v1.2.3