Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 371b689..7bded85 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -72,3 +72,3 @@ bool WLANModule::isOwner(Interface *i){ | |||
72 | QWidget *WLANModule::configure(Interface *i){ | 72 | QWidget *WLANModule::configure(Interface *i){ |
73 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); | 73 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, true, Qt::WDestructiveClose); |
74 | wlanconfig->setProfile(profile); | 74 | wlanconfig->setProfile(profile); |
@@ -134,2 +134,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
134 | QString action; | 134 | QString action; |
135 | QDialog *toShow; | ||
135 | while (! stream.atEnd() ){ | 136 | while (! stream.atEnd() ){ |
@@ -149,4 +150,4 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
149 | qDebug("WLANModule Did not find %s",interface.latin1()); | 150 | qDebug("WLANModule Did not find %s",interface.latin1()); |
150 | qDebug("returning"); | 151 | qDebug("skipping"); |
151 | return; | 152 | count = 0; |
152 | } | 153 | } |
@@ -172,2 +173,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
172 | wlanconfigWiget = (WLANImp*) configure(ifa); | 173 | wlanconfigWiget = (WLANImp*) configure(ifa); |
174 | toShow = (QDialog*) wlanconfigWiget; | ||
173 | } | 175 | } |
@@ -193,4 +195,8 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
193 | }else if (action.contains("Channel")){ | 195 | }else if (action.contains("Channel")){ |
194 | wlanconfigWiget->specifyChan->setChecked( true ); | 196 | bool ok; |
195 | wlanconfigWiget->networkChannel->setValue( value.toInt() ); | 197 | int chan = value.toInt( &ok ); |
198 | if (ok){ | ||
199 | wlanconfigWiget->specifyChan->setChecked( true ); | ||
200 | wlanconfigWiget->networkChannel->setValue( chan ); | ||
201 | } | ||
196 | }else if (action.contains("MacAddr")){ | 202 | }else if (action.contains("MacAddr")){ |
@@ -202,2 +208,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
202 | }// while stream | 208 | }// while stream |
209 | if (toShow) toShow->exec(); | ||
203 | } | 210 | } |