From e78758f48dcab9e0fc697b906a31984647d7e7a0 Mon Sep 17 00:00:00 2001
From: Andrey Kutejko <aku@anahoret.com>
Date: Wed, 9 Apr 2014 16:16:02 +0300
Subject: [PATCH] osx related fixes

---
 .gitignore             |  1 +
 pass-storage.main.lisp | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c3099b9..0c94ea53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+.DS_Store
 data
 
 /sbcl-cl-gtk2
diff --git a/pass-storage.main.lisp b/pass-storage.main.lisp
index bb656047..ae077806 100644
--- a/pass-storage.main.lisp
+++ b/pass-storage.main.lisp
@@ -673,17 +673,17 @@
           (actions-edit (app-actions-edit app))
           (actions-merge (app-actions-merge app)))
       (create-action actions-common (:name "file-menu" :label "_File"))
-      (create-action actions-common (:name "new" :stock-id "gtk-new") "<Control>n" (lambda-u (cb-new app)))
-      (create-action actions-common (:name "open" :stock-id "gtk-open") "<Control>o" (lambda-u (cb-open app)))
+      (create-action actions-common (:name "new" :stock-id "gtk-new") "<Primary>n" (lambda-u (cb-new app)))
+      (create-action actions-common (:name "open" :stock-id "gtk-open") "<Primary>o" (lambda-u (cb-open app)))
       (create-action actions-common (:name "merge-file" :label "_Merge file") nil (lambda-u (cb-merge-file app)))
-      (create-action actions-common (:name "save" :stock-id "gtk-save") "<Control>s" (lambda-u (cb-save app)))
+      (create-action actions-common (:name "save" :stock-id "gtk-save") "<Primary>s" (lambda-u (cb-save app)))
       (create-action actions-common (:name "save-as" :stock-id "gtk-save-as") nil (lambda-u (cb-save-as app)))
-      (create-action actions-common (:name "quit" :stock-id "gtk-quit") "<Control>q" (lambda-u (e-close app)))
+      (create-action actions-common (:name "quit" :stock-id "gtk-quit") "<Primary>q" (lambda-u (e-close app)))
 
       (create-action actions-common (:name "edit-menu" :label "_Edit"))
-      (create-action actions-common (:name "find" :label "_Find") "<Control>f")
-      (create-action actions-edit (:name "copy-name" :label "Copy _name" :sensitive nil) "<Control>c" (lambda-u (cb-copy-name app)))
-      (create-action actions-edit (:name "copy-password" :label "Copy pass_word" :sensitive nil) "<Control><Shift>c" (lambda-u (cb-copy-password app)))
+      (create-action actions-common (:name "find" :label "_Find") "<Primary>f")
+      (create-action actions-edit (:name "copy-name" :label "Copy _name" :sensitive nil) "<Primary>c" (lambda-u (cb-copy-name app)))
+      (create-action actions-edit (:name "copy-password" :label "Copy pass_word" :sensitive nil) "<Primary><Shift>c" (lambda-u (cb-copy-password app)))
       (create-action actions-common (:name "change-password" :label "Change _password") nil (lambda-u (cb-change-password app)))
       (create-toggle-action actions-common (:name "merge-mode" :label "_Merge mode" :stock-id "ps-stock-merge-mode") nil (lambda-u (set-mode app)))
       (create-action actions-common (:name "preferences" :stock-id "gtk-preferences") nil (lambda-u (cb-preferences app)))