From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 14 Mar 2021 23:41:28 +0000
Subject: [PATCH] Use goocanvas-3.0

---
 meson.build                               |  4 +-
 tools/browser/canvas/browser-canvas-text.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
--- a/meson.build
+++ b/meson.build
@@ -59,7 +59,7 @@
 gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version : req_ver_glib)
 libxml_dep = dependency('libxml-2.0')
 
-goocanvas_dep = dependency('goocanvas-2.0', required : false)
+goocanvas_dep = dependency('goocanvas-3.0', required : false)
 graphviz_dep = dependency('libgvc', required : false)
 libxslt_dep = dependency('libxslt', required: false)
 jsonglib_dep = dependency('json-glib-1.0',required : false)
@@ -323,7 +323,7 @@
 if enable_ui
 	gdkpixbuf_dep = dependency('gdk-pixbuf-2.0')
 	glade_dep = dependency('gladeui-2.0', required : false)
-	goocanvas_dep = dependency('goocanvas-2.0', required: false)
+	goocanvas_dep = dependency('goocanvas-3.0', required: false)
 	if goocanvas_dep.found()
 		math_dep = compiler.find_library('m')
 	endif
diff --git a/tools/browser/canvas/browser-canvas-text.c b/tools/browser/canvas/browser-canvas-text.c
index 644bca9a8..4f0649443 100644
--- a/tools/browser/canvas/browser-canvas-text.c
+++ b/tools/browser/canvas/browser-canvas-text.c
@@ -232,7 +232,7 @@ browser_canvas_text_set_property (GObject *object,
 	const gchar *cstr = NULL;
 	gchar *str;
 	gdouble size = 0;
-	gboolean bool = FALSE;
+	gboolean abool = FALSE;
 
 	ct = BROWSER_CANVAS_TEXT (object);
 
@@ -270,26 +270,26 @@ browser_canvas_text_set_property (GObject *object,
 			ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR);
 		break;
 	case PROP_UNDERLINE:
-		bool = g_value_get_boolean (value);
-		ct->priv->underline = bool;
+		abool = g_value_get_boolean (value);
+		ct->priv->underline = abool;
 		adjust_text_pango_attributes (ct);
 		if (ct->priv->text_item) {
-			if (bool) {
+			if (abool) {
 				str = g_strdup_printf ("<u>%s</u>", ct->priv->text);
 				g_object_set (G_OBJECT (ct->priv->text_item), 
 					      "text", str,
 					      "use-markup", TRUE, NULL);
 				g_free (str);
 			}
 			else 
 				g_object_set (G_OBJECT (ct->priv->text_item), 
 					      "text", ct->priv->text,
 					      "use-markup", FALSE, NULL);
 		}
 		break;
 	case PROP_BOLD:
-		bool = g_value_get_boolean (value);
-		ct->priv->bold = bool;
+		abool = g_value_get_boolean (value);
+		ct->priv->bold = abool;
 		adjust_text_pango_attributes (ct);
 		break;
 	default:
