summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-10-10 15:39:43 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-10-10 15:39:43 +0000
commitbc724a01fb8a6fe7fa3b446a6665c440c97616f6 (patch)
treed462aeb95d497e6fb38763bceb1c3bc5e68ca0b8 /src
parentLast style.css change (diff)
downloadinkscape-bc724a01fb8a6fe7fa3b446a6665c440c97616f6.tar.gz
inkscape-bc724a01fb8a6fe7fa3b446a6665c440c97616f6.zip
Fix GC warnings
Diffstat (limited to 'src')
-rw-r--r--src/desktop-style.cpp4
-rw-r--r--src/object/sp-text.cpp1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 427ca31fe..666044bd6 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -368,10 +368,12 @@ sp_desktop_get_color_tool(SPDesktop *desktop, Glib::ustring const &tool, bool is
guint32 r = 0; // if there's no color, return black
if (has_color)
*has_color = false;
- if (prefs->getBool(tool + "/usecurrent")) {
+ bool styleFromCurrent = prefs->getBool(tool + "/usecurrent");
+ if (styleFromCurrent) {
css = sp_desktop_get_style(desktop, true);
} else {
css = prefs->getStyle(tool + "/style");
+ Inkscape::GC::anchor(css);
}
if (css) {
diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp
index 0da5eccf4..94c35169c 100644
--- a/src/object/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -1138,6 +1138,7 @@ SPItem *create_text_with_rectangle (SPDesktop *desktop, Geom::Point p0, Geom::Po
defs_repr = xml_doc->createElement("svg:defs");
xml_doc->root()->addChild(defs_repr, nullptr);
}
+ else Inkscape::GC::anchor(defs_repr);
// Add rectangle to defs.
defs_repr->addChild(rect_repr, nullptr);