author | benmeyer <benmeyer> | 2002-10-28 19:54:38 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-28 19:54:38 (UTC) |
commit | e9d8023028b7c996d8ff2a68b87dfde19fcfa892 (patch) (unidiff) | |
tree | 08468bce6771710d32534291ad6e9333f8879490 /noncore/net/networksetup/wlan | |
parent | 0abe89f1b470f94f25f3ab5bb3a9fbc7a0ec9d2f (diff) | |
download | opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.zip opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.tar.gz opie-e9d8023028b7c996d8ff2a68b87dfde19fcfa892.tar.bz2 |
removed return statment that shouldn't be there
Diffstat (limited to 'noncore/net/networksetup/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 1 |
1 files changed, 0 insertions, 1 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() | |||
88 | } | 88 | } |
89 | if( networkInfrastructure->isChecked() ){ | 89 | if( networkInfrastructure->isChecked() ){ |
90 | config->writeEntry( "Mode", "Managed" ); | 90 | config->writeEntry( "Mode", "Managed" ); |
91 | } else if( network802->isChecked() ){ | 91 | } else if( network802->isChecked() ){ |
92 | config->writeEntry( "Mode", "adhoc" ); | 92 | config->writeEntry( "Mode", "adhoc" ); |
93 | } | 93 | } |
94 | config->writeEntry( "CHANNEL", networkChannel->value() ); | 94 | config->writeEntry( "CHANNEL", networkChannel->value() ); |
95 | // config->readEntry( "RATE", "auto" ); | 95 | // config->readEntry( "RATE", "auto" ); |
96 | wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" ); | 96 | wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" ); |
97 | authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" ); | 97 | authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" ); |
98 | key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" ); | 98 | key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" ); |
99 | if( keyRadio0->isChecked() ){ | 99 | if( keyRadio0->isChecked() ){ |
100 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); | 100 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); |
101 | } else if( keyRadio1->isChecked() ){ | 101 | } else if( keyRadio1->isChecked() ){ |
102 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); | 102 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); |
103 | } else if( keyRadio2->isChecked() ){ | 103 | } else if( keyRadio2->isChecked() ){ |
104 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); | 104 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); |
105 | } else if( keyRadio3->isChecked() ){ | 105 | } else if( keyRadio3->isChecked() ){ |
106 | config->writeEntry( "dot11WEPDefaultKeyID", 3 ); | 106 | config->writeEntry( "dot11WEPDefaultKeyID", 3 ); |
107 | } | 107 | } |
108 | config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); | 108 | config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); |
109 | config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); | 109 | config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); |
110 | config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); | 110 | config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); |
111 | config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); | 111 | config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); |
112 | return true; | ||
113 | return writeWirelessOpts( ); | 112 | return writeWirelessOpts( ); |
114 | } | 113 | } |
115 | 114 | ||
116 | /** | 115 | /** |
117 | */ | 116 | */ |
118 | void WLANImp::accept() | 117 | void WLANImp::accept() |
119 | { | 118 | { |
120 | if ( writeConfig() ){ | 119 | if ( writeConfig() ){ |
121 | interfaceSetup->saveChanges(); | 120 | interfaceSetup->saveChanges(); |
122 | QDialog::accept(); | 121 | QDialog::accept(); |
123 | } | 122 | } |
124 | } | 123 | } |
125 | 124 | ||
126 | bool WLANImp::writeWirelessOpts( QString scheme ) | 125 | bool WLANImp::writeWirelessOpts( QString scheme ) |
127 | { | 126 | { |
128 | qWarning( "WLANImp::writeWirelessOpts entered." ); | 127 | qWarning( "WLANImp::writeWirelessOpts entered." ); |
129 | QString prev = "/etc/pcmcia/wireless.opts"; | 128 | QString prev = "/etc/pcmcia/wireless.opts"; |
130 | QFile prevFile(prev); | 129 | QFile prevFile(prev); |
131 | if ( !prevFile.open( IO_ReadOnly ) ) | 130 | if ( !prevFile.open( IO_ReadOnly ) ) |
132 | return false; | 131 | return false; |
133 | 132 | ||
134 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; | 133 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; |
135 | QFile tmpFile(tmp); | 134 | QFile tmpFile(tmp); |
136 | if ( !tmpFile.open( IO_WriteOnly ) ) | 135 | if ( !tmpFile.open( IO_WriteOnly ) ) |