add support for multiline qcop calls

and macaddrs

2 files changed, 6 insertions, 9 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 5029525..544498f 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -646,11 +646,4 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
     qDebug("dest >%s< param >"+param+"<",dest.latin1());
 
-//     if (param.contains("QString,QString,QString")) {
-//         QDataStream stream(arg,IO_ReadOnly);
-//         QString arg1, arg2, arg3;
-//         stream >> arg1 >> arg2 >> arg3 ;
-//         qDebug("args: >%s< >%s< >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
-//     }
-
      QMap<Module*, QLibrary*>::Iterator it;
      for( it = libraries.begin(); it != libraries.end(); ++it ){
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index bc467bb..e34f0ce 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -8,4 +8,5 @@
 #include <qcombobox.h>
 #include <qlabel.h>
+#include <qlineedit.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
@@ -132,5 +133,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
     QString interface;
     QString action;
-
+    while (! stream.atEnd() ){
     stream >> interface;
     stream >> action;
@@ -191,8 +192,11 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
             wlanconfigWiget->specifyChan->setChecked( true );
             wlanconfigWiget->networkChannel->setValue( value.toInt() );
+            }else if (action.contains("MacAddr")){
+                wlanconfigWiget->specifyAp->setChecked( true );
+                wlanconfigWiget->macEdit->setText( value );
         }else
             qDebug("wlan plugin has no clue");
     }
-
+    }// while stream
 }