author | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
commit | 8511273d7122d50ffea27f78ba13ab72af60326d (patch) (unidiff) | |
tree | ab7fae876ce1af5665a882b1a53b5f3e240cf4ab /noncore/settings/networksettings/mainwindowimp.cpp | |
parent | 18cc7321db186865629a5c4702074211e42b92fd (diff) | |
download | opie-8511273d7122d50ffea27f78ba13ab72af60326d.zip opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.gz opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.bz2 |
fix interface name bug
Diffstat (limited to 'noncore/settings/networksettings/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 117bac1..a446d29 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -305,13 +305,13 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
305 | QString interfaceName = line.mid(0, space); | 305 | QString interfaceName = line.mid(0, space); |
306 | Interface *i; | 306 | Interface *i; |
307 | // We have found an interface | 307 | // We have found an interface |
308 | //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); | 308 | //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); |
309 | // See if we already have it | 309 | // See if we already have it |
310 | if(interfaceNames.find(interfaceName) == interfaceNames.end()){ | 310 | if(interfaceNames.find(interfaceName) == interfaceNames.end()){ |
311 | if(fileName == TEMP_ALL) | 311 | if(fileName == TEMP_ALL) |
312 | i = new Interface(this, interfaceName, false); | 312 | i = new Interface(this, interfaceName, false); |
313 | else | 313 | else |
314 | i = new Interface(this, interfaceName, true); | 314 | i = new Interface(this, interfaceName, true); |
315 | i->setAttached(true); | 315 | i->setAttached(true); |
316 | 316 | ||
317 | QString hardName = "Ethernet"; | 317 | QString hardName = "Ethernet"; |
@@ -325,15 +325,14 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
325 | interfaceNames.insert(i->getInterfaceName(), i); | 325 | interfaceNames.insert(i->getInterfaceName(), i); |
326 | updateInterface(i); | 326 | updateInterface(i); |
327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
328 | } | 328 | } |
329 | // It was an interface we already had. | 329 | // It was an interface we already had. |
330 | else{ | 330 | else{ |
331 | i = interfaceNames[interfaceName]; | ||
332 | if(fileName != TEMP_ALL) | 331 | if(fileName != TEMP_ALL) |
333 | i->setStatus(true); | 332 | (interfaceNames[interfaceName])->setStatus(true); |
334 | } | 333 | } |
335 | } | 334 | } |
336 | } | 335 | } |
337 | file.close(); | 336 | file.close(); |
338 | QFile::remove(fileName); | 337 | QFile::remove(fileName); |
339 | 338 | ||
@@ -395,13 +394,13 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
395 | if(i->getInterfaceName().contains("irda")) | 394 | if(i->getInterfaceName().contains("irda")) |
396 | typeName = "irda"; | 395 | typeName = "irda"; |
397 | if(i->getInterfaceName().contains("wlan")) | 396 | if(i->getInterfaceName().contains("wlan")) |
398 | typeName = "wlan"; | 397 | typeName = "wlan"; |
399 | if(i->getInterfaceName().contains("usb")) | 398 | if(i->getInterfaceName().contains("usb")) |
400 | typeName = "usb"; | 399 | typeName = "usb"; |
401 | 400 | ||
402 | if(!i->isAttached()) | 401 | if(!i->isAttached()) |
403 | typeName = "connect_no"; | 402 | typeName = "connect_no"; |
404 | // Actually try to use the Module | 403 | // Actually try to use the Module |
405 | if(i->getModuleOwner() != NULL) | 404 | if(i->getModuleOwner() != NULL) |
406 | typeName = i->getModuleOwner()->getPixmapName(i); | 405 | typeName = i->getModuleOwner()->getPixmapName(i); |
407 | 406 | ||