diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2015-11-21 12:48:59 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2015-11-21 12:48:59 +0000 |
| commit | 83f263c97c5499811d3f30a86271a2981c35a97a (patch) | |
| tree | 90a94397e32a9a61926f793a2c476f15c503295c /src/shortcuts.cpp | |
| parent | window/task bar icon missing when installed in non-standard location (diff) | |
| parent | Add warning about missing Potrace to CMake build (diff) | |
| download | inkscape-83f263c97c5499811d3f30a86271a2981c35a97a.tar.gz inkscape-83f263c97c5499811d3f30a86271a2981c35a97a.zip | |
Compile against external libpotrace
Fixed bugs:
- https://launchpad.net/bugs/1156664
(bzr r14480)
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 9 |
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; } |