Merge remote-tracking branch 'github/merge-requests/428'

* github/merge-requests/428:
  Wrap cairo_destroy call with appropriate CPP macro
  Fix memory leak

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index e4d0729..7de28db 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -692,7 +692,9 @@ gqv_cell_renderer_icon_render(GtkCellRenderer               *cell,
 
        if (!pixbuf && !text)
                {
+#if !GTK_CHECK_VERSION(3,0,0)
                cairo_destroy(cr);
+#endif
                return;
                }
 

diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index dd25cfc..c6d87cb 100644 (file)
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -222,9 +222,9 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint y, gint w, gint h)
                        cairo_set_source_rgb(cr, (double)pr->color.red/65535, (double)pr->color.green/65535, (double)pr->color.blue/65535);
                        cairo_rectangle(cr, rx + rt->stereo_off_x, ry + rt->stereo_off_y, rw, rh);
                        cairo_fill(cr);
-                       cairo_destroy(cr);
                        rt_overlay_draw(rt, rx, ry, rw, rh, NULL);
                        }
+               cairo_destroy(cr);
                return;
                }