From 07a86951a15301ccb7eb1446cc1e6d3ca7a68f9b Mon Sep 17 00:00:00 2001
From: Alexander Brock <zaibu@lunar-orbit.de>
Date: Wed, 9 Nov 2016 01:23:41 +0100
Subject: Move boolop functions from sp_selected_path_<op> to
 ObjectSet::path<op>

(bzr r15223.1.1)
---
 src/ui/tools/flood-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools/flood-tool.cpp')

diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 0b893a7ba..b01b8ad52 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -446,7 +446,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
                     ngettext("Area filled, path with <b>%d</b> node created and unioned with selection.","Area filled, path with <b>%d</b> nodes created and unioned with selection.",
                     SP_PATH(reprobj)->nodesInPath()), SP_PATH(reprobj)->nodesInPath() );
                 selection->add(reprobj);
-                sp_selected_path_union_skip_undo(desktop->getSelection());
+                selection->pathUnion(true);
             } else {
                 desktop->messageStack()->flashF( Inkscape::WARNING_MESSAGE,
                     ngettext("Area filled, path with <b>%d</b> node created.","Area filled, path with <b>%d</b> nodes created.",
-- 
cgit v1.2.3


From 7d524286a0b613a5a5126884f3fb4f674446096e Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sat, 24 Dec 2016 07:59:17 +0100
Subject: i18n. Flood autogap list not correctly translated at runtime.

(bzr r15351)
---
 src/ui/tools/flood-tool.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools/flood-tool.cpp')

diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index b01b8ad52..1801a0ea0 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -89,10 +89,10 @@ Glib::ustring ch_init[8] = {
 const std::vector<Glib::ustring> FloodTool::channel_list( ch_init, ch_init+8 );
 
 Glib::ustring gap_init[4] = {
-    C_("Flood autogap", "None"),
-    C_("Flood autogap", "Small"),
-    C_("Flood autogap", "Medium"),
-    C_("Flood autogap", "Large")
+    NC_("Flood autogap", "None"),
+    NC_("Flood autogap", "Small"),
+    NC_("Flood autogap", "Medium"),
+    NC_("Flood autogap", "Large")
 };
 const std::vector<Glib::ustring> FloodTool::gap_list( gap_init, gap_init+4 );
 
-- 
cgit v1.2.3