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 --- libgnomecanvas/gnome-canvas-pixbuf.c | 3 +-- libgnomecanvas/gnome-canvas-rect.c | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'libgnomecanvas') diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index fbe673d4c0..fa6d403959 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -99,8 +99,7 @@ gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class) static void gnome_canvas_pixbuf_init (GnomeCanvasPixbuf *gcp) { - gcp->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - gcp, GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufPrivate); + gcp->priv = G_TYPE_INSTANCE_GET_PRIVATE (gcp, GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufPrivate); } /* Dispose handler for the pixbuf canvas item */ diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c index 3cf71bd1b0..b75a177c81 100644 --- a/libgnomecanvas/gnome-canvas-rect.c +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -28,10 +28,6 @@ #include "gnome-canvas-rect.h" -#define GNOME_CANVAS_RECT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectPrivate)) - struct _GnomeCanvasRectPrivate { cairo_path_t *path; /* Our bezier path representation */ @@ -704,7 +700,7 @@ gnome_canvas_rect_class_init (GnomeCanvasRectClass *class) static void gnome_canvas_rect_init (GnomeCanvasRect *rect) { - rect->priv = GNOME_CANVAS_RECT_GET_PRIVATE (rect); + rect->priv = G_TYPE_INSTANCE_GET_PRIVATE (rect, GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectPrivate); rect->priv->scale = 1.0; -- cgit v1.2.3