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
@@ -647,9 +647,2 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 
-//     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;
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
@@ -9,2 +9,3 @@
 #include <qlabel.h>
+#include <qlineedit.h>
 #include <qprogressbar.h>
@@ -133,3 +134,3 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
     QString action;
-
+    while (! stream.atEnd() ){
     stream >> interface;
@@ -192,2 +193,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
             wlanconfigWiget->networkChannel->setValue( value.toInt() );
+            }else if (action.contains("MacAddr")){
+                wlanconfigWiget->specifyAp->setChecked( true );
+                wlanconfigWiget->macEdit->setText( value );
         }else
@@ -195,3 +199,3 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
     }
-
+    }// while stream
 }