Index: gok/gok-keyboard.c
===================================================================
RCS file: /cvs/gnome/gok/gok/gok-keyboard.c,v
retrieving revision 1.152
diff -u -r1.152 gok-keyboard.c
--- gok/gok-keyboard.c	10 May 2004 18:04:28 -0000	1.152
+++ gok/gok-keyboard.c	12 May 2004 14:57:23 -0000
@@ -61,6 +61,7 @@
 #define CORE_KEYBOARD "Keyboard"
 
 #define ALPHA_KEYBOARD "Alpha"
+#define TEST_GOK_FREQUENCY_BASED_KEY_PLACEMENT
 
 #if (!defined CSPI_1_5 || (CSPI_1_5 == 0))
 /* missing from cspi headers in 1.4 series, but present in libcspi */
@@ -3138,9 +3139,9 @@
 			
 		case KEYBOARD_SHAPE_KEYSQUARE:
 #ifdef TEST_GOK_FREQUENCY_BASED_KEY_PLACEMENT
-			if (layout == KEYBOARD_LAYOUT_UPPERL) {
+			/* if (layout == KEYBOARD_LAYOUT_UPPERL) {*/
 			/* FIXME - we assume this is the frequency case for testing */
-			maxKeysPerRow = (gint)sqrt (totalKeys);
+			maxKeysPerRow = (gint) (sqrt (totalKeys));
 			pKey = pKeyboard->pKeyFirst;
 			/* fill top left triangle of keyboard */
 			for (diag=0; diag <= maxKeysPerRow; diag++) {
