summaryrefslogtreecommitdiff
authorleseb <leseb>2002-06-22 12:21:10 (UTC)
committer leseb <leseb>2002-06-22 12:21:10 (UTC)
commit01dce280dcbf2ffd3a3a60001a2876a872440bbb (patch) (side-by-side diff)
treefb70e4415b14d107f51160f9ce7d6e4bf1505d7b
parent38dd150a175af073a6df068a930f597c4fa86669 (diff)
downloadopie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.zip
opie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.tar.gz
opie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.tar.bz2
Fix a bug when config is set to a plugin not available
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/inputmethods.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index ac72b02..acd0d59 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -213,21 +213,17 @@ void InputMethods::loadInputMethods()
input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
inputMethodList.append( input );
#endif
if ( !inputMethodList.isEmpty() ) {
+ method = &inputMethodList[0];
Config cfg("qpe");
cfg.setGroup("InputMethod");
QString curMethod = cfg.readEntry("current","");
- if(curMethod.isEmpty()) {
- method = &inputMethodList[0];
- } else {
- int i = 0;
- QValueList<InputMethod>::Iterator it;
- for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
- if((*it).interface->name() == curMethod) {
- method = &inputMethodList[i];
-// qDebug(curMethod);
- }
+ int i = 0;
+ QValueList<InputMethod>::Iterator it;
+ for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
+ if((*it).interface->name() == curMethod) {
+ method = &inputMethodList[i];
}
}
kbdButton->setPixmap( *method->interface->icon() );
}