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
@@ -632,36 +632,29 @@ void MainWindowImp::makeChannel()
 {
  	channel = new QCopChannel( "QPE/Application/networksettings", this );
  	connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
  		this, SLOT(receive(const QCString&, const QByteArray&)) );
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
 
     QString dest = msg.left(msg.find("("));
     QCString param = msg.right(msg.length() - msg.find("(") - 1);
     param = param.left( param.length() - 1 );
     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 ){
          qDebug("plugin >%s<", it.key()->type().latin1() );
          if(it.key()->type() == dest){
              it.key()->receive( param, arg );
              found = true;
          }
      }
 
 
      if (found) QPEApplication::setKeepRunning();
      else qDebug("Huh what do ya want");
 }
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
@@ -1,25 +1,26 @@
 #include "wlanmodule.h"
 #include "wlanimp.h"
 #include "infoimp.h"
 #include "wextensions.h"
 #include "interfaceinformationimp.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
+#include <qlineedit.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 
 
 
 
 /**
  * Constructor, find all of the possible interfaces
  */
 WLANModule::WLANModule()
     : Module(),
       wlanconfigWiget(0)
 {
 }
 
@@ -118,33 +119,33 @@ bool WLANModule::remove(Interface*){
 
 void WLANModule::receive(const QCString &param, const QByteArray &arg)
 {
     qDebug("WLANModule::receive "+param);
     QStringList params = QStringList::split(",",param);
     int count = params.count();
     qDebug("WLANModule got %i params", count );
     if (count < 2){
         qDebug("Erorr less than 2 parameter");
         qDebug("RETURNING");
         return;
     }
 
     QDataStream stream(arg,IO_ReadOnly);
     QString interface;
     QString action;
-
+    while (! stream.atEnd() ){
     stream >> interface;
     stream >> action;
     qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1());
     // find interfaces
     Interface *ifa=0;
     for ( Interface *i=list.first(); i != 0; i=list.next() ){
         if (i->getInterfaceName() == interface){
             qDebug("WLANModule found interface %s",interface.latin1());
             ifa = i;
         }
     }
 
     if (ifa == 0){
         qFatal("WLANModule Did not find %s",interface.latin1());
     }
 
@@ -177,33 +178,36 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
             for ( int i = 0; i < combo->count(); i++)
                 if ( combo->text( i ) == value ){
                     combo->setCurrentItem( i );
                     found = true;
                 }
             if (!found) combo->insertItem( value, 0 );
         }else if ( action.contains("Mode") ){
             QComboBox *combo = wlanconfigWiget->mode;
             for ( int i = 0; i < combo->count(); i++)
                 if ( combo->text( i ) == value ){
                     combo->setCurrentItem( i );
                 }
 
         }else if (action.contains("Channel")){
             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
 }
 
 QWidget *WLANModule::getInfo( Interface *i)
 {
     qDebug("WLANModule::getInfo start");
     WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose);
     InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i);
     info->tabWidget->insertTab(information, "TCP/IP", 0);
 
     qDebug("WLANModule::getInfo return");
     return info;
 }