[geany/geany] 918539: Merge pull request #1636 from techee/kb_osx_fix

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 12 Oct 2017 22:14:11 UTC
Commit:      9185395c40c68b87cc462fe8ac5bdc95e069ea93
             https://github.com/geany/geany/commit/9185395c40c68b87cc462fe8ac5bdc95e069ea93

Log Message:
-----------
Merge pull request #1636 from techee/kb_osx_fix

Make sure GDK_MOD2_MASK is cleared when getting modifiers.


Modified Paths:
--------------
    src/keybindings.c

Modified: src/keybindings.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -124,7 +124,10 @@ GdkModifierType keybindings_get_modifiers(GdkModifierType mods)
 {
 #ifdef __APPLE__
 	if (mods & GDK_MOD2_MASK)
+	{
 		mods |= GEANY_PRIMARY_MOD_MASK;
+		mods &= ~GDK_MOD2_MASK;
+	}
 #endif
 	return mods & gtk_accelerator_get_default_mod_mask();
 }



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).