mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
|
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
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
tools/browser/canvas/browser-canvas-text.c | 12 ++++++------
|
||
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index b9e973617..fd03152ea 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -240,7 +240,7 @@ then
|
||
|
|
|
||
|
|
if test "$with_goo" = "auto" -o "$with_goo" = "yes"
|
||
|
|
then
|
||
|
|
- PKG_CHECK_MODULES(GOOCANVAS, "goocanvas-2.0", [
|
||
|
|
+ PKG_CHECK_MODULES(GOOCANVAS, "goocanvas-3.0", [
|
||
|
|
AC_DEFINE(HAVE_GOOCANVAS, [1], [GooCanvas support enabled])
|
||
|
|
have_goocanvas=yes], [
|
||
|
|
if test "$with_goo" = "yes"
|
||
|
|
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
|
||
|
|
@@ -231,7 +231,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);
|
||
|
|
|
||
|
|
@@ -269,25 +269,25 @@ 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);
|
||
|
|
}
|
||
|
|
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:
|