adium 4354:ba723c50ed40: Quoting Zac (http://hg.adium.im/adium/r...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/ba723c50ed40
revision:	4354:ba723c50ed40
branch:		(none)
author:		Robert Vehse
date:		Thu Dec 08 00:09:53 2011 +0100

Quoting Zac (http://hg.adium.im/adium/rev/9f0e1528dd62):

"Allow shortcut keys with the letter 'a'. Fixes #12013.
The code was setting a keyCode of 0 for A. 0 was considered an invalid value (when reading in) but not when setting or anywhere else, causing it to become -1. the next time it loaded."

diffs (22 lines):

diff -r 74bf184a8283 -r ba723c50ed40 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Tue Dec 06 18:15:56 2011 +0100
+++ b/ChangeLogs/Changes Between Betas.txt	Thu Dec 08 00:09:53 2011 +0100
@@ -1,5 +1,6 @@
 Adium 1.5b8
  * Twitter: Use the non-truncated version of retweets if they are included. (#15226)
+ * Fixed setting a global shortcut which used the letter "a". (#12013)
 
 Adium 1.5b7
  * Make sure nibs are not stripped so they can be localized.
diff -r 74bf184a8283 -r ba723c50ed40 Source/SGKeyCombo.m
--- a/Source/SGKeyCombo.m	Tue Dec 06 18:15:56 2011 +0100
+++ b/Source/SGKeyCombo.m	Thu Dec 08 00:09:53 2011 +0100
@@ -45,7 +45,7 @@
     theModifiers = -1;
   } else {
     theKeyCode = [[thePlist objectForKey:kKeyCodeDictionaryKey] integerValue];
-    if (theKeyCode <= 0) theKeyCode = -1;
+    if (theKeyCode < 0) theKeyCode = -1;
     
     theModifiers = [[thePlist objectForKey:kModifiersDictionaryKey] integerValue];
     if (theModifiers <= 0) theModifiers = -1;