summaryrefslogtreecommitdiff
path: root/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch
blob: 0ef845bd7a4dfe539026b52b23b10a0ab86b365b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
https://bugs.gentoo.org/818106
--- a/tools/browser/canvas/browser-canvas-text.c
+++ b/tools/browser/canvas/browser-canvas-text.c
@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObjec
 	const gchar *cstr = NULL;
 	gchar *str;
 	gdouble size = 0;
-	gboolean bool = FALSE;
+	gboolean bool_var = FALSE;
 
 	ct = BROWSER_CANVAS_TEXT (object);
 
@@ -269,11 +269,11 @@ browser_canvas_text_set_property (GObjec
 			ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR);
 		break;
 	case PROP_UNDERLINE:
-		bool = g_value_get_boolean (value);
-		ct->priv->underline = bool;
+		bool_var = g_value_get_boolean (value);
+		ct->priv->underline = bool_var;
 		adjust_text_pango_attributes (ct);
 		if (ct->priv->text_item) {
-			if (bool) {
+			if (bool_var) {
 				str = g_strdup_printf ("<u>%s</u>", ct->priv->text);
 				g_object_set (G_OBJECT (ct->priv->text_item), 
 					      "text", str,
@@ -286,8 +286,8 @@ browser_canvas_text_set_property (GObjec
 					      "use-markup", FALSE, NULL);
 		}
 	case PROP_BOLD:
-		bool = g_value_get_boolean (value);
-		ct->priv->bold = bool;
+		bool_var = g_value_get_boolean (value);
+		ct->priv->bold = bool_var;
 		adjust_text_pango_attributes (ct);
 		break;
 	default: