diff options
| -rw-r--r-- | filesharing/advanced/kcm_sambaconf/dictmanager.cpp | 6 | ||||
| -rw-r--r-- | wifi/kcmwifi/wificonfig.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp index c2437f04..04eb0be7 100644 --- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp +++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp @@ -2,7 +2,7 @@ dictmanager.cpp - description ------------------- begin : Wed Jan 1 2003 - copyright : (C) 2003 by Jan Schäfer + copyright : (C) 2003 by Jan Sch�fer email : janschaefer@users.sourceforge.net ***************************************************************************/ @@ -164,7 +164,9 @@ void DictManager::loadComboBoxes(SambaShare* share, bool globalValue, bool defau comboIndex++; } - comboBoxIt.current()->setCurrentItem(comboIndex); + if (comboIndex < comboBoxIt.current()->count()) { + comboBoxIt.current()->setCurrentItem(comboIndex); + } } } diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 53f1c7e0..58379533 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -235,8 +235,8 @@ TQString WifiConfig::autoDetectInterface() if ( !procFile.open( IO_ReadOnly ) ) { - KMessageBox::sorry( 0, - i18n( "Unable to autodetect wireless interface." ) ); +// KMessageBox::sorry( 0, +// i18n( "Unable to autodetect wireless interface." ) ); return m_detectedInterface; } @@ -270,6 +270,7 @@ TQString WifiConfig::autoDetectInterface() test << *it; connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ), this, TQT_SLOT( slotTestInterface( KProcIO * ) ) ); + printf("[kcontrol wificonfig] Checking interface for wireless extensions..."); test.start ( KProcess::Block ); } } |