From 710f9d6272b6964496da3d9d57a55da4e2c8e07d Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 21 Sep 2010 22:56:50 +0000 Subject: [PATCH] Fix log messages git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1177996 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- filesharing/advanced/kcm_sambaconf/dictmanager.cpp | 6 ++++-- 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 ); } }