From f72a5768d2bfedc88084a84c9a9ea52d395f1234 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Wed, 28 Mar 2018 13:08:27 -0400
Subject: Allow MacOSX builds to use a specially design carbon keyboard set

---
 src/shortcuts.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/shortcuts.cpp')

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"));
-- 
cgit v1.2.3