| author | benmeyer <benmeyer> | 2002-10-28 19:54:38 (UTC) |
|---|---|---|
| committer | benmeyer <benmeyer> | 2002-10-28 19:54:38 (UTC) |
| commit | e9d8023028b7c996d8ff2a68b87dfde19fcfa892 (patch) (side-by-side diff) | |
| tree | 08468bce6771710d32534291ad6e9333f8879490 /noncore | |
| parent | 0abe89f1b470f94f25f3ab5bb3a9fbc7a0ec9d2f (diff) | |
| download | opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.zip opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.tar.gz opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.tar.bz2 | |
removed return statment that shouldn't be there
| -rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 1 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index 7c902e0..a466020 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -88,49 +88,48 @@ bool WLANImp::writeConfig() } if( networkInfrastructure->isChecked() ){ config->writeEntry( "Mode", "Managed" ); } else if( network802->isChecked() ){ config->writeEntry( "Mode", "adhoc" ); } config->writeEntry( "CHANNEL", networkChannel->value() ); // config->readEntry( "RATE", "auto" ); wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" ); authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" ); key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" ); if( keyRadio0->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 0 ); } else if( keyRadio1->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 1 ); } else if( keyRadio2->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 2 ); } else if( keyRadio3->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 3 ); } config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); - return true; return writeWirelessOpts( ); } /** */ void WLANImp::accept() { if ( writeConfig() ){ interfaceSetup->saveChanges(); QDialog::accept(); } } bool WLANImp::writeWirelessOpts( QString scheme ) { qWarning( "WLANImp::writeWirelessOpts entered." ); QString prev = "/etc/pcmcia/wireless.opts"; QFile prevFile(prev); if ( !prevFile.open( IO_ReadOnly ) ) return false; QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; QFile tmpFile(tmp); if ( !tmpFile.open( IO_WriteOnly ) ) diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 7c902e0..a466020 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -88,49 +88,48 @@ bool WLANImp::writeConfig() } if( networkInfrastructure->isChecked() ){ config->writeEntry( "Mode", "Managed" ); } else if( network802->isChecked() ){ config->writeEntry( "Mode", "adhoc" ); } config->writeEntry( "CHANNEL", networkChannel->value() ); // config->readEntry( "RATE", "auto" ); wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" ); authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" ); key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" ); if( keyRadio0->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 0 ); } else if( keyRadio1->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 1 ); } else if( keyRadio2->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 2 ); } else if( keyRadio3->isChecked() ){ config->writeEntry( "dot11WEPDefaultKeyID", 3 ); } config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); - return true; return writeWirelessOpts( ); } /** */ void WLANImp::accept() { if ( writeConfig() ){ interfaceSetup->saveChanges(); QDialog::accept(); } } bool WLANImp::writeWirelessOpts( QString scheme ) { qWarning( "WLANImp::writeWirelessOpts entered." ); QString prev = "/etc/pcmcia/wireless.opts"; QFile prevFile(prev); if ( !prevFile.open( IO_ReadOnly ) ) return false; QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; QFile tmpFile(tmp); if ( !tmpFile.open( IO_WriteOnly ) ) |