summaryrefslogtreecommitdiff
authortille <tille>2003-06-17 13:05:55 (UTC)
committer tille <tille>2003-06-17 13:05:55 (UTC)
commit154d6deef15b9f7f83ea7a25f2079d9fca034910 (patch) (unidiff)
tree2cb0428922d8d2a4a2adc49b2c62e44cbbdd3b82
parente3aff4e49db15c44faf874ee96d666ad56c1d37a (diff)
downloadopie-154d6deef15b9f7f83ea7a25f2079d9fca034910.zip
opie-154d6deef15b9f7f83ea7a25f2079d9fca034910.tar.gz
opie-154d6deef15b9f7f83ea7a25f2079d9fca034910.tar.bz2
wellenreiter qcop call works now
dns are saved and read in again
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp3
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp5
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp15
3 files changed, 19 insertions, 4 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 49a47ae..8de30de 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -181,2 +181,3 @@ void InterfaceSetupImp::setProfile(const QString &profile){
181 QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); 181 QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
182 qDebug("dns >%s<",dns.latin1());
182 if(dns.contains(" ")){ 183 if(dns.contains(" ")){
@@ -189,2 +190,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){
189 190
191
192
190 qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1()); 193 qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1());
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 8ea241d..2d714ca 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -642,2 +642,7 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
642 642
643 if (msg == "raise") {
644 raise();
645 return;
646 }
647
643 QString dest = msg.left(msg.find("(")); 648 QString dest = msg.left(msg.find("("));
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){
72QWidget *WLANModule::configure(Interface *i){ 72QWidget *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 &param, 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 &param, 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 &param, 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 &param, const QByteArray &arg)
193 }else if (action.contains("Channel")){ 195 }else if (action.contains("Channel")){
196 bool ok;
197 int chan = value.toInt( &ok );
198 if (ok){
194 wlanconfigWiget->specifyChan->setChecked( true ); 199 wlanconfigWiget->specifyChan->setChecked( true );
195 wlanconfigWiget->networkChannel->setValue( value.toInt() ); 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 &param, const QByteArray &arg)
202 }// while stream 208 }// while stream
209 if (toShow) toShow->exec();
203} 210}