? gok/GNOME_Gok.server
? gok/GNOME_Gok.server.in
? gok/create-branching-keyboard
? gok/keyboard-geometry
? gok/test-focus-reject
? gok/test-gok-wordcomplete
Index: gok/gok-keyboard.c
===================================================================
RCS file: /cvs/gnome/gok/gok/gok-keyboard.c,v
retrieving revision 1.153
diff -u -r1.153 gok-keyboard.c
--- gok/gok-keyboard.c	12 May 2004 19:11:38 -0000	1.153
+++ gok/gok-keyboard.c	12 May 2004 20:42:28 -0000
@@ -3137,10 +3137,9 @@
 			break;
 			
 		case KEYBOARD_SHAPE_KEYSQUARE:
-#ifdef TEST_GOK_FREQUENCY_BASED_KEY_PLACEMENT
-			if (layout == KEYBOARD_LAYOUT_UPPERL) {
-			/* FIXME - we assume this is the frequency case for testing */
-			maxKeysPerRow = (gint)sqrt (totalKeys);
+		    if (layout == KEYBOARD_LAYOUT_UPPERL) {
+			/* FIXME - we assume this is the frequency case */
+			maxKeysPerRow = (gint) (sqrt (totalKeys));
 			pKey = pKeyboard->pKeyFirst;
 			/* fill top left triangle of keyboard */
 			for (diag=0; diag <= maxKeysPerRow; diag++) {
@@ -3170,7 +3169,8 @@
 			}
 			/* FIXME - now bang out required cells */
 			break;
-#endif /* TEST_GOK_FREQUENCY_BASED_KEY_PLACEMENT */
+		    }
+		    else ; /* fall through */
 		default:
 			maxKeysPerRow = (gint)sqrt (totalKeys);
 			if (totalKeys - (maxKeysPerRow * maxKeysPerRow) > 0) {
Index: gok/main.c
===================================================================
RCS file: /cvs/gnome/gok/gok/main.c,v
retrieving revision 1.150
diff -u -r1.150 main.c
--- gok/main.c	12 May 2004 19:11:38 -0000	1.150
+++ gok/main.c	12 May 2004 20:42:32 -0000
@@ -1308,7 +1308,7 @@
 	}
 	
 	/* layout the keys on the keyboard */
-	if (gok_keyboard_layout (pKeyboard, KEYBOARD_LAYOUT_NORMAL, 
+	if (gok_keyboard_layout (pKeyboard, pKeyboard->LayoutType, 
 		 	/*KEYBOARD_SHAPE_WIDE KEYBOARD_SHAPE_SQUARE*/ 
 			KEYBOARD_SHAPE_KEYSQUARE
 			, FALSE) == FALSE)
