[gtk-mac-integration] Change 'NSAlternate' to be used with GDK_MOD1_MASK, matching changes in Gtk keyhandling.

[John Ralls <jralls src gnome org>]

commit 19cf4ee74821aa5d6d70d0a069178fa5a684ff7f
Author: John Ralls <jralls ceridwen us>
Date:   Sat Nov 12 14:37:39 2011 -0800

    Change 'NSAlternate' to be used with GDK_MOD1_MASK, matching changes in Gtk keyhandling.

 accel_map              |    2 +-
 src/cocoa_menu_item.c  |    2 +-
 src/test-integration.c |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/accel_map b/accel_map
index eb15bde..c9597bd 100644
--- a/accel_map
+++ b/accel_map
@@ -9,5 +9,5 @@
 ; (gtk_accel_path "<Actions>/TestActions/QuitAction" "<Control>q")
 ; (gtk_accel_path "<Actions>/TestActions/HelpMenuAction" "")
 ; (gtk_accel_path "<Actions>/TestActions/EditMenuAction" "")
-; (gtk_accel_path "<Actions>/TestActions/PrefsAction" "")
+ (gtk_accel_path "<Actions>/TestActions/PrefsAction" "<control><alt>p")
 ; (gtk_accel_path "<Actions>/TestActions/FileMenuAction" "")
diff --git a/src/cocoa_menu_item.c b/src/cocoa_menu_item.c
index 76856cd..9a95846 100644
--- a/src/cocoa_menu_item.c
+++ b/src/cocoa_menu_item.c
@@ -275,7 +275,7 @@ cocoa_menu_item_update_accelerator (GNSMenuItem *cocoa_item,
 	      }
 
 	      /* gdk/quartz maps Alt/Option to Mod5 */
-	      if (key->accel_mods & (GDK_MOD5_MASK)) {
+	      if (key->accel_mods & (GDK_MOD1_MASK)) {
 		modifiers |= NSAlternateKeyMask;
 	      }
 
diff --git a/src/test-integration.c b/src/test-integration.c
index 8b94d17..0143097 100644
--- a/src/test-integration.c
+++ b/src/test-integration.c
@@ -210,7 +210,8 @@ static GtkActionEntry test_actions[] =
      G_CALLBACK(action_activate_cb)},
     {"PasteAction", GTK_STOCK_PASTE, "_Paste", NULL, NULL,
      G_CALLBACK(action_activate_cb)},
-    {"PrefsAction", GTK_STOCK_PREFERENCES, "Pr_eferences", NULL, NULL, NULL },
+    {"PrefsAction", GTK_STOCK_PREFERENCES, "Pr_eferences", NULL, NULL,
+     G_CALLBACK(action_activate_cb) },
     {"MinimizeAction", NULL, "_Minimize", "<meta>m", NULL, G_CALLBACK(minimize_cb)},
     {"FrontAction", NULL, "Bring All to Front", NULL, NULL, G_CALLBACK(front_cb)},
     {"AddWindowAction", NULL, "_Add Window", NULL, NULL,