diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-03-28 17:08:27 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-03-28 17:08:27 +0000 |
| commit | f72a5768d2bfedc88084a84c9a9ea52d395f1234 (patch) | |
| tree | 60744408bb8e2ff3ce68ea1f07a873d8addd856a /src/shortcuts.cpp | |
| parent | Merge branch 'master' of gitlab.com:inkscape/inkscape (diff) | |
| download | inkscape-f72a5768d2bfedc88084a84c9a9ea52d395f1234.tar.gz inkscape-f72a5768d2bfedc88084a84c9a9ea52d395f1234.zip | |
Allow MacOSX builds to use a specially design carbon keyboard set
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index d49bdc29d..0d6adb096 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -94,6 +94,12 @@ void sp_shortcut_init() success = try_shortcuts_file(shortcutfile.c_str()); reason = "Unable to read key file set in preferences"; } +#ifdef WITH_CARBON_INTEGRATION + if (!success) { + g_info("%s. Falling back to 'carbon.xml' for MacOSX keyboards.", reason); + success = try_shortcuts_file(get_path(SYSTEM, KEYS, "carbon.xml")); + } +#endif if (!success) { g_info("%s. Falling back to 'default.xml'.", reason); success = try_shortcuts_file(get_path(SYSTEM, KEYS, "default.xml")); |