[maemo-commits] [maemo-commits] r13783 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-12 18:25:15 +0300 (Wed, 12 Sep 2007)
New Revision: 13783

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
Log:
2007-09-12  Moises Martinez  <moises.martinez at nokia.com>

        * libhildonwm/hd-keys.c: (hd_keys_shortcut_new):
        - Parse + and - as an special case. Fixes: NB#
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-12 15:03:00 UTC (rev 13782)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-12 15:25:15 UTC (rev 13783)
@@ -1,3 +1,8 @@
+2007-09-12  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildonwm/hd-keys.c: (hd_keys_shortcut_new):
+	- Parse + and - as an special case. Fixes: NB#
+
 2007-09-12 Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-home-area.c: propagate double-

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c	2007-09-12 15:03:00 UTC (rev 13782)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c	2007-09-12 15:25:15 UTC (rev 13783)
@@ -472,10 +472,22 @@
     else
       keydef[0] = g_ascii_tolower(keydef[0]);
 
-    if ((ks = XStringToKeysym(keydef)) == (KeySym)NULL)
-      return NULL; /* Couldn't find a keysym */
+    switch (*keydef)
+    {
+      case '+':
+ 	ks = XK_minus;	    
+	break;
+	
+      case '-':
+        ks = XK_plus;
+	break;
+	
+      default:
+        if ((ks = XStringToKeysym(keydef)) == (KeySym)NULL)
+          return NULL; /* Couldn't find a keysym */
+    }
   }
-
+  
   /* Cannot install grab for keys that we are supposed to fake */
   switch (ks)
   {