From 1487f3adc0e7d905ed9b25daf7c6d5a302aa1ca6 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 25 May 2016 17:48:51 +0200
Subject: [Bug #1508400] self-intersecting shape display and union error -
 reverting rev. 14224 and applying the patch at the right place (thanks
 ~suv!).

Fixed bugs:
  - https://launchpad.net/bugs/1508400

(bzr r14917)
---
 src/preferences-skeleton.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 9f2e68b1d..5ccc4d729 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -91,11 +91,11 @@ static char const preferences_skeleton[] =
 "      <eventcontext id=\"spiral\" style=\"fill:none;\" usecurrent=\"0\"/>\n"
 "    </group>\n"
 "    <group id=\"freehand\"\n"
-"         style=\"fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-linejoin:miter;stroke-linecap:butt;\">\n"
+"         style=\"fill:none;stroke:black;stroke-opacity:1;stroke-linejoin:miter;stroke-linecap:butt;\">\n"
 "      <eventcontext id=\"pencil\" tolerance=\"4.0\" selcue=\"1\" style=\"stroke-width:1px;\" usecurrent=\"0\" average_all_sketches=\"1\"/>\n"
 "      <eventcontext id=\"pen\" mode=\"drag\" selcue=\"1\" style=\"stroke-width:1px;\" usecurrent=\"0\"/>\n"
 "    </group>\n"
-"    <eventcontext id=\"calligraphic\" style=\"fill:black;fill-opacity:1;stroke:none;\"\n"
+"    <eventcontext id=\"calligraphic\" style=\"fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;\"\n"
 "                       mass=\"2\" angle=\"30\" width=\"15\" thinning=\"10\" flatness=\"90\" cap_rounding=\"0.0\" usecurrent=\"1\"\n"
 "                       tracebackground=\"0\" usepressure=\"1\" usetilt=\"0\" keep_selected=\"1\">\n"
 "    <group id=\"preset\">\n"
-- 
cgit v1.2.3