2 files changed, 5 insertions, 3 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 1dd8ca1..de3aa52 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -98,5 +98,5 @@ void Keyboard::resizeEvent(QResizeEvent*)
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );
-    keyHeight = (height()-(usePicks ? ph : 0))/keys->rows();
+    keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1);
 
     int nk; // number of keys?
@@ -1322,5 +1322,8 @@ Keys::Keys() {
 
     } 
-
+    if (map.isNull() || !(QFile(map).exists())) {
+        map = QPEApplication::qpeDir() + "/share/multikey/en.keymap";
+    }
+    
     setKeysFromFile(map);
 }
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp
index 2bcb0fa..cebd43d 100644
--- a/inputmethods/multikey/keyboardimpl.cpp
+++ b/inputmethods/multikey/keyboardimpl.cpp
@@ -79,5 +79,4 @@ QString KeyboardImpl::name()
 {
     return qApp->translate( "InputMethods", "Multikey" );
-//    return qApp->translate( "InputMethods", "Opti" );
 }