summaryrefslogtreecommitdiff
Unidiff
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
@@ -214,19 +214,15 @@ void InputMethods::loadInputMethods()
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() );