3 files changed, 35 insertions, 3 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index a62a90c..71d0cf5 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index f19cbdd..b40d101 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -189,2 +189,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
189 | subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); | 189 | subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); |
190 | if (subnetMaskEdit->text().isEmpty()) | ||
191 | subnetMaskEdit->setText( "255.255.255.0" ); | ||
190 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); | 192 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 7bded85..a4488f9 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -134,5 +134,22 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
134 | QString action; | 134 | QString action; |
135 | int countMsgs = 0; | ||
136 | stream >> interface; | ||
137 | qDebug("got count? >%s<",interface.latin1()); | ||
138 | if (interface == "count"){ | ||
139 | qDebug("got count"); | ||
140 | stream >> action; | ||
141 | qDebug("Got count num >%s<", action.latin1()); | ||
142 | countMsgs = action.toInt(); | ||
143 | } | ||
144 | |||
135 | QDialog *toShow; | 145 | QDialog *toShow; |
136 | while (! stream.atEnd() ){ | 146 | //while (! stream.atEnd() ){ |
147 | for (int i = 0; i < countMsgs; i++){ | ||
148 | qDebug("start stream %d/%d",i,countMsgs); | ||
149 | if (stream.atEnd()){ | ||
150 | qDebug("end of stream"); | ||
151 | return; | ||
152 | } | ||
137 | stream >> interface; | 153 | stream >> interface; |
154 | qDebug("got iface"); | ||
138 | stream >> action; | 155 | stream >> action; |
@@ -177,3 +194,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
177 | stream >> value; | 194 | stream >> value; |
178 | qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); | 195 | qDebug("WLANModule (build 4) is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); |
196 | if (value.isEmpty()){ | ||
197 | qDebug("value is empty!!!\nreturning"); | ||
198 | return; | ||
199 | } | ||
179 | if ( action.contains("ESSID") ){ | 200 | if ( action.contains("ESSID") ){ |
@@ -196,4 +217,6 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
196 | bool ok; | 217 | bool ok; |
218 | qDebug("converting channel"); | ||
197 | int chan = value.toInt( &ok ); | 219 | int chan = value.toInt( &ok ); |
198 | if (ok){ | 220 | if (ok){ |
221 | qDebug("ok setting channel"); | ||
199 | wlanconfigWiget->specifyChan->setChecked( true ); | 222 | wlanconfigWiget->specifyChan->setChecked( true ); |
@@ -207,4 +230,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
207 | } | 230 | } |
231 | qDebug("next stream"); | ||
208 | }// while stream | 232 | }// while stream |
233 | qDebug("end of stream"); | ||
209 | if (toShow) toShow->exec(); | 234 | if (toShow) toShow->exec(); |
235 | qDebug("returning"); | ||
210 | } | 236 | } |
@@ -217,3 +243,7 @@ QWidget *WLANModule::getInfo( Interface *i) | |||
217 | info->tabWidget->insertTab(information, "TCP/IP", 0); | 243 | info->tabWidget->insertTab(information, "TCP/IP", 0); |
218 | 244 | info->tabWidget->setCurrentPage( 0 ); | |
245 | info->tabWidget->showPage( information ); | ||
246 | if (info->tabWidget->currentPage() == information ) qDebug("infotab OK"); | ||
247 | else qDebug("infotab NOT OK"); | ||
248 | qDebug("current idx %d", info->tabWidget->currentPageIndex()); | ||
219 | qDebug("WLANModule::getInfo return"); | 249 | qDebug("WLANModule::getInfo return"); |