summaryrefslogtreecommitdiffstats
path: root/src/shortcuts.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-14 16:47:47 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-14 16:47:47 +0000
commitfee7ec667cc353e1efda6a1a92f1f4715836fa4f (patch)
tree63fe115530cd3f8511b29cf2e250fcf23dc8fe08 /src/shortcuts.cpp
parentupdate credits (diff)
parent"Relative to" option for node alignment. (diff)
downloadinkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.tar.gz
inkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.zip
update to trunk
(bzr r13682.1.32)
Diffstat (limited to '')
-rw-r--r--src/shortcuts.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index e72c16de0..194d4d2a4 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -575,7 +575,14 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) {
}
Inkscape::Verb *verb=Inkscape::Verb::getbyid(verb_name);
- if (!verb) {
+ if (!verb
+#if !HAVE_POTRACE
+ // Squash warning about disabled features
+ && strcmp(verb_name, "ToolPaintBucket") != 0
+ && strcmp(verb_name, "SelectionTrace") != 0
+ && strcmp(verb_name, "PaintBucketPrefs") != 0
+#endif
+ ) {
g_warning("Unknown verb name: %s", verb_name);
continue;
}