author | leseb <leseb> | 2002-06-22 12:21:10 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-22 12:21:10 (UTC) |
commit | 01dce280dcbf2ffd3a3a60001a2876a872440bbb (patch) (unidiff) | |
tree | fb70e4415b14d107f51160f9ce7d6e4bf1505d7b /core/launcher | |
parent | 38dd150a175af073a6df068a930f597c4fa86669 (diff) | |
download | opie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.zip opie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.tar.gz opie-01dce280dcbf2ffd3a3a60001a2876a872440bbb.tar.bz2 |
Fix a bug when config is set to a plugin not available
-rw-r--r-- | core/launcher/inputmethods.cpp | 16 |
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 | |||
@@ -211,25 +211,21 @@ void InputMethods::loadInputMethods() | |||
211 | input.interface = new PickboardImpl(); | 211 | input.interface = new PickboardImpl(); |
212 | input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); | 212 | input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); |
213 | input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); | 213 | input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); |
214 | inputMethodList.append( input ); | 214 | inputMethodList.append( input ); |
215 | #endif | 215 | #endif |
216 | if ( !inputMethodList.isEmpty() ) { | 216 | if ( !inputMethodList.isEmpty() ) { |
217 | method = &inputMethodList[0]; | ||
217 | Config cfg("qpe"); | 218 | Config cfg("qpe"); |
218 | cfg.setGroup("InputMethod"); | 219 | cfg.setGroup("InputMethod"); |
219 | QString curMethod = cfg.readEntry("current",""); | 220 | QString curMethod = cfg.readEntry("current",""); |
220 | if(curMethod.isEmpty()) { | 221 | int i = 0; |
221 | method = &inputMethodList[0]; | 222 | QValueList<InputMethod>::Iterator it; |
222 | } else { | 223 | for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) { |
223 | int i = 0; | 224 | if((*it).interface->name() == curMethod) { |
224 | QValueList<InputMethod>::Iterator it; | 225 | method = &inputMethodList[i]; |
225 | for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) { | ||
226 | if((*it).interface->name() == curMethod) { | ||
227 | method = &inputMethodList[i]; | ||
228 | // qDebug(curMethod); | ||
229 | } | ||
230 | } | 226 | } |
231 | } | 227 | } |
232 | kbdButton->setPixmap( *method->interface->icon() ); | 228 | kbdButton->setPixmap( *method->interface->icon() ); |
233 | } | 229 | } |
234 | if ( !inputMethodList.isEmpty() ) | 230 | if ( !inputMethodList.isEmpty() ) |
235 | kbdButton->show(); | 231 | kbdButton->show(); |