2 files changed, 62 insertions, 65 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
@@ -1,667 +1,660 @@
 #include "mainwindowimp.h"
 #include "addconnectionimp.h"
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
 #include "interfaces.h"
 #include "module.h"
 
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qtabwidget.h> // in order to disable the profiles tab
 
 #include <qmessagebox.h>
 
 #ifdef QWS
  #include <qpe/config.h>
  #include <qpe/qlibrary.h>
  #include <qpe/resource.h>
  #include <qpe/qpeapplication.h>
 #else
  #include <klibloader.h>
  #define QLibrary KLibrary
  #include <kconfig.h>
  #define Config KConfig
  #include <kapplication.h>
  #include <kstandarddirs.h>
  #include <kiconloader.h>
  #define showMaximized show
 #endif
 
 #if QT_VERSION < 300
 #include <qlist.h>
 #else
 #include <qptrlist.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
 #define _PROCNETDEV "/proc/net/dev"
 
 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){
   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
   connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
   connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
   connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
 
   connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
   connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
   connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
 
   connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
 
   //FIXME: disable profiles for the moment:
 //  tabWidget->setTabEnabled( tab, false );
 
   // Load connections.
   // /usr/local/kde/lib/libinterfaces.la
 #ifdef QWS
   loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
 #else
   loader = KLibLoader::self();
   loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
 #endif
   getAllInterfaces();
 
   Interfaces i;
   QStringList list = i.getInterfaceList();
   QMap<QString, Interface*>::Iterator it;
   for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {
     bool found = false;
     for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){
       if(it.key() == (*ni))
         found = true;
     }
     if(!found){
       if(!(*ni).contains("_")){
         Interface *i = new Interface(this, *ni, false);
         i->setAttached(false);
         i->setHardwareName(tr("Disconnected"));
         interfaceNames.insert(i->getInterfaceName(), i);
         updateInterface(i);
         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
       }
     }
   }
 
   //getInterfaceList();
   connectionList->header()->hide();
 
   Config cfg("NetworkSetup");
   profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
   for ( QStringList::Iterator it = profiles.begin();
         it != profiles.end(); ++it)
       profilesList->insertItem((*it));
   currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All"));
   advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
   scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME);
 
   QFile file(scheme);
   if ( file.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream stream( &file );        // use a text stream
     while ( !stream.eof() ) {        // until end of file...
       QString line = stream.readLine();       // line of text excluding '\n'
       if(line.contains("SCHEME")){
         line = line.mid(7, line.length());
         currentProfileLabel->setText(line);
         break;
       }
     }
     file.close();
   }
   makeChannel();
 }
 
 /**
  * Deconstructor. Save profiles.  Delete loaded libraries.
  */
 MainWindowImp::~MainWindowImp(){
   // Save profiles.
   Config cfg("NetworkSetup");
   cfg.setGroup("General");
   cfg.writeEntry("Profiles", profiles.join(" "));
 
   // Delete all interfaces that don't have owners.
   QMap<Interface*, QListViewItem*>::Iterator iIt;
   for( iIt = items.begin(); iIt != items.end(); ++iIt ){
     if(iIt.key()->getModuleOwner() == NULL)
       delete iIt.key();
   }
 
 #ifdef QWS
   // Delete Modules and Libraries
   QMap<Module*, QLibrary*>::Iterator it;
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     delete it.key();
     // I wonder why I can't delete the libraries
     // What fucking shit this is.
     //delete it.data();
   }
 #else
   // klibloader automaticly deletes the libraries for us...
 #endif
 }
 
 /**
  * Query the kernel for all of the interfaces.
  */
 void MainWindowImp::getAllInterfaces(){
   int sockfd = socket(PF_INET, SOCK_DGRAM, 0);
   if(sockfd == -1)
     return;
 
   struct ifreq ifr;
   QStringList ifaces;
   QFile procFile(QString(_PROCNETDEV));
   int result;
   Interface *i;
 
   if (! procFile.exists()) {
     struct ifreq ifrs[100];
     struct ifconf ifc;
     ifc.ifc_len = sizeof(ifrs);
     ifc.ifc_req = ifrs;
     result = ioctl(sockfd, SIOCGIFCONF, &ifc);
 
     for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) {
       struct ifreq *pifr = &ifrs[i];
 
       ifaces += pifr->ifr_name;
     }
   } else {
     procFile.open(IO_ReadOnly);
     QString line;
     QTextStream procTs(&procFile);
     int loc = -1;
 
     procTs.readLine(); // eat a line
     procTs.readLine(); // eat a line
     while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) {
       if((loc = line.find(":")) != -1) {
         ifaces += line.left(loc);
       }
     }
   }
 
   for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {
     int flags = 0;
 //    int family;
     i = NULL;
 
     strcpy(ifr.ifr_name, (*it).latin1());
 
     struct ifreq ifcopy;
     ifcopy = ifr;
     result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);
     flags = ifcopy.ifr_flags;
     i = new Interface(this, ifr.ifr_name, false);
         i->setAttached(true);
     if ((flags & IFF_UP) == IFF_UP)
       i->setStatus(true);
     else
       i->setStatus(false);
 
     if ((flags & IFF_BROADCAST) == IFF_BROADCAST)
       i->setHardwareName("Ethernet");
     else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)
       i->setHardwareName("Point to Point");
     else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)
       i->setHardwareName("Multicast");
     else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)
       i->setHardwareName("Loopback");
     else
       i->setHardwareName("Unknown");
 
     qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name);
     interfaceNames.insert(i->getInterfaceName(), i);
     updateInterface(i);
     connect(i, SIGNAL(updateInterface(Interface *)),
             this, SLOT(updateInterface(Interface *)));
   }
   // now lets ask the plugins too ;)
   QMap<Module*, QLibrary*>::Iterator it;
   QList<Interface> ilist;
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     if(it.key()){
         ilist = it.key()->getInterfaces();
         for( i = ilist.first(); i != 0; i = ilist.next() ){
             qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() );
             interfaceNames.insert(i->getInterfaceName(), i);
             updateInterface(i);
             connect(i, SIGNAL(updateInterface(Interface *)),
                     this, SLOT(updateInterface(Interface *)));
         }
     }
   }
 }
 
 /**
  * Load all modules that are found in the path
  * @param path a directory that is scaned for any plugins that can be loaded
  *  and attempts to load them
  */
 void MainWindowImp::loadModules(const QString &path){
 #ifdef DEBUG
   qDebug("MainWindowImp::loadModules: %s", path.latin1());
 #endif
   QDir d(path);
   if(!d.exists())
     return;
 
   // Don't want sym links
   d.setFilter( QDir::Files | QDir::NoSymLinks );
   const QFileInfoList *list = d.entryInfoList();
   QFileInfoListIterator it( *list );
   QFileInfo *fi;
   while ( (fi=it.current()) ) {
 #ifdef QWS
     if(fi->fileName().contains(".so")){
 #else
     if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){
 #endif
       loadPlugin(path + "/" + fi->fileName());
       qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1());
     }
     ++it;
   }
 }
 
 /**
  * Attempt to load a function and resolve a function.
  * @param pluginFileName - the name of the file in which to attempt to load
  * @param resolveString - function pointer to resolve
  * @return pointer to the function with name resolveString or NULL
  */
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){
 #ifdef DEBUG
   qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1());
 #endif
 #ifdef QWS
   QLibrary *lib = new QLibrary(pluginFileName);
   void *functionPointer = lib->resolve(resolveString);
   if( !functionPointer ){
 #ifdef DEBUG
   qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1());
 #endif
     delete lib;
     return NULL;
   }
   // Try to get an object.
   Module *object = ((Module* (*)()) functionPointer)();
   if(object == NULL){
 #ifdef DEBUG
     qDebug("MainWindowImp: Couldn't create object, but did load library!");
 #endif
     delete lib;
     return NULL;
   }
 
   // Store for deletion later
   libraries.insert(object, lib);
   return object;
 
 #else
   QLibrary *lib = loader->library(pluginFileName);
   if( !lib || !lib->hasSymbol(resolveString) ){
       qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
       return NULL;
   }
   // Try to get an object.
   Module *object = ((Module* (*)()) lib->symbol(resolveString))();
   if(object == NULL){
 #ifdef DEBUG
     qDebug("MainWindowImp: Couldn't create object, but did load library!");
 #endif
     return NULL;
   }
 #ifdef DEBUG
   qDebug("MainWindowImp::loadPlugin:: Found object, storing.");
 #endif
   // Store for deletion later
   libraries.insert(object, lib);
   return object;
 #endif
 }
 
 /**
  * The Add button was clicked.  Bring up the add dialog and if OK is hit
  * load the plugin and append it to the list
  */
 void MainWindowImp::addClicked(){
   QMap<Module*, QLibrary*>::Iterator it;
   QMap<QString, QString> list;
   QMap<QString, Module*> newInterfaceOwners;
 
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     if(it.key()){
       (it.key())->possibleNewInterfaces(list);
     }
   }
   // See if the list has anything that we can add.
   if(list.count() == 0){
     QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);
     return;
   }
   AddConnectionImp addNewConnection(this, "AddConnectionImp", true);
   addNewConnection.addConnections(list);
   addNewConnection.showMaximized();
   if(QDialog::Accepted == addNewConnection.exec()){
     QListViewItem *item = addNewConnection.registeredServicesList->currentItem();
     if(!item)
       return;
 
     for( it = libraries.begin(); it != libraries.end(); ++it ){
       if(it.key()){
         Interface *i = (it.key())->addNewInterface(item->text(0));
         if(i){
           qDebug("iface name %s",i->getInterfaceName().latin1());
           interfaceNames.insert(i->getInterfaceName(), i);
           updateInterface(i);
         }
       }
     }
   }
 }
 
 /**
  * Prompt the user to see if they really want to do this.
  * If they do then remove from the list and unload.
  */
 void MainWindowImp::removeClicked(){
   QListViewItem *item = connectionList->currentItem();
   if(!item) {
     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
     return;
   }
 
   Interface *i = interfaceItems[item];
   if(i->getModuleOwner() == NULL){
     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
   }
   else{
     if(!i->getModuleOwner()->remove(i))
       QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok);
     else{
         delete item;
 //      QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);
     }
   }
 }
 
 /**
  * Pull up the configure about the currently selected interface.
  * Report an error if no interface is selected.
  * If the interface has a module owner then request its configure.
  */
 void MainWindowImp::configureClicked(){
   QListViewItem *item = connectionList->currentItem();
   if(!item){
     QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok);
     return;
   }
 
   QString currentProfileText = currentProfileLabel->text();
   if(currentProfileText.upper() == "ALL");
     currentProfileText = "";
 
   Interface *i = interfaceItems[item];
 
   if(i->getModuleOwner()){
     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
     if(moduleConfigure != NULL){
       i->getModuleOwner()->setProfile(currentProfileText);
       moduleConfigure->showMaximized();
       return;
     }
   }
 
   InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );
   configure->setProfile(currentProfileText);
   configure->showMaximized();
 }
 
 /**
  * Pull up the information about the currently selected interface.
  * Report an error if no interface is selected.
  * If the interface has a module owner then request its configure.
  */
 void MainWindowImp::informationClicked(){
   QListViewItem *item = connectionList->currentItem();
   if(!item){
     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
     return;
   }
 
   Interface *i = interfaceItems[item];
 //   if(!i->isAttached()){
 //     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);
 //     return;
 //   }
 
   if(i->getModuleOwner()){
     QWidget *moduleInformation = i->getModuleOwner()->information(i);
     if(moduleInformation != NULL){
       moduleInformation->showMaximized();
 #ifdef DEBUG
       qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
 #endif
       return;
     }
   }
   InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
   information->showMaximized();
 }
 
 /**
  * Update this interface.  If no QListViewItem exists create one.
  * @param Interface* pointer to the interface that needs to be updated.
  */
 void MainWindowImp::updateInterface(Interface *i){
   if(!advancedUserMode){
     if(i->getInterfaceName() == "lo")
       return;
   }
 
   QListViewItem *item = NULL;
 
   // Find the interface, making it if needed.
   if(items.find(i) == items.end()){
     item = new QListViewItem(connectionList, "", "", "");
     // See if you can't find a module owner for this interface
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it ){
       if(it.key()->isOwner(i))
         i->setModuleOwner(it.key());
     }
     items.insert(i, item);
     interfaceItems.insert(item, i);
   }
   else
     item = items[i];
 
   // Update the icons and information
 #ifdef QWS
   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
 #else
   item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
 #endif
 
   QString typeName = "lan";
   if(i->getInterfaceName() == "lo")
     typeName = "lo";
   if(i->getInterfaceName().contains("irda"))
     typeName = "irda";
   if(i->getInterfaceName().contains("wlan"))
     typeName = "wlan";
   if(i->getInterfaceName().contains("usb"))
     typeName = "usb";
 
   if(!i->isAttached())
     typeName = "connect_no";
   // Actually try to use the Module
   if(i->getModuleOwner() != NULL)
     typeName = i->getModuleOwner()->getPixmapName(i);
 
 #ifdef QWS
   item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
 #else
   item->setPixmap(1, (SmallIcon(typeName)));
 #endif
   item->setText(2, i->getHardwareName());
   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));
   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
 }
 
 void MainWindowImp::newProfileChanged(const QString& newText){
   if(newText.length() > 0)
    newProfileButton->setEnabled(true);
   else
     newProfileButton->setEnabled(false);
 }
 
 /**
  * Adds a new profile to the list of profiles.
  * Don't add profiles that already exists.
  * Appends to the list and QStringList
  */
 void MainWindowImp::addProfile(){
   QString newProfileName = newProfile->text();
   if(profiles.grep(newProfileName).count() > 0){
     QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);
     return;
   }
   profiles.append(newProfileName);
   profilesList->insertItem(newProfileName);
 }
 
 /**
  * Removes the currently selected profile in the combo.
  * Doesn't delete if there are less then 2 profiles.
  */
 void MainWindowImp::removeProfile(){
   if(profilesList->count() <= 1){
     QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);
     return;
   }
   QString profileToRemove = profilesList->currentText();
   if(profileToRemove == "All"){
     QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);
     return;
   }
   // Can't remove the curent profile
   if(profileToRemove == currentProfileLabel->text()){
     QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);
     return;
 
   }
 
   if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){
     profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));
     profilesList->clear();
     for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
       profilesList->insertItem((*it));
 
     // Remove any interface settings and mappings.
     Interfaces interfaces;
     // Go through them one by one
     QMap<Interface*, QListViewItem*>::Iterator it;
     for( it = items.begin(); it != items.end(); ++it ){
       QString interfaceName = it.key()->getInterfaceName();
       qDebug(interfaceName.latin1());
       if(interfaces.setInterface(interfaceName + "_" + profileToRemove)){
        interfaces.removeInterface();
        if(interfaces.setMapping(interfaceName)){
          if(profilesList->count() == 1)
             interfaces.removeMapping();
           else{
             interfaces.removeMap("map", interfaceName + "_" + profileToRemove);
           }
         }
         interfaces.write();
         break;
       }
     }
   }
 }
 
 /**
  * A new profile has been selected, change.
  * @param newProfile the new profile.
  */
 void MainWindowImp::changeProfile(){
   if(profilesList->currentItem() == -1){
     QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);
     return;
   }
   QString newProfile = profilesList->text(profilesList->currentItem());
   if(newProfile != currentProfileLabel->text()){
     currentProfileLabel->setText(newProfile);
     QFile::remove(scheme);
     QFile file(scheme);
     if ( file.open(IO_ReadWrite) ) {
       QTextStream stream( &file );
       stream << QString("SCHEME=%1").arg(newProfile);
       file.close();
     }
     // restart all up devices?
     if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){
       // Go through them one by one
       QMap<Interface*, QListViewItem*>::Iterator it;
       for( it = items.begin(); it != items.end(); ++it ){
         if(it.key()->getStatus() == true)
           it.key()->restart();
       }
     }
   }
   // TODO change the profile in the modules
 }
 
 
 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,209 +1,213 @@
 #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)
 {
 }
 
 /**
  * Delete any interfaces that we own.
  */
 WLANModule::~WLANModule(){
   Interface *i;
   for ( i=list.first(); i != 0; i=list.next() )
     delete i;
 
 }
 
 /**
  * Change the current profile
  */
 void WLANModule::setProfile(const QString &newProfile){
   profile = newProfile;
 }
 
 /**
  * get the icon name for this device.
  * @param Interface* can be used in determining the icon.
  * @return QString the icon name (minus .png, .gif etc)
  */
 QString WLANModule::getPixmapName(Interface* ){
   return "wlan";
 }
 
 /**
  * Check to see if the interface i is owned by this module.
  * @param Interface* interface to check against
  * @return bool true if i is owned by this module, false otherwise.
  */
 bool WLANModule::isOwner(Interface *i){
   WExtensions we(i->getInterfaceName());
   if(!we.doesHaveWirelessExtensions())
     return false;
 
   i->setHardwareName("802.11b");
   list.append(i);
   return true;
 }
 
 /**
  * Create, and return the WLANConfigure Module
  * @return QWidget* pointer to this modules configure.
  */
 QWidget *WLANModule::configure(Interface *i){
   WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false,  Qt::WDestructiveClose);
   wlanconfig->setProfile(profile);
   return wlanconfig;
 }
 
 /**
  * Create, and return the Information Module
  * @return QWidget* pointer to this modules info.
  */
 QWidget *WLANModule::information(Interface *i){
   WExtensions we(i->getInterfaceName());
   if(!we.doesHaveWirelessExtensions())
     return NULL;
 
   return getInfo( i );
 }
 
 /**
  * Get all active (up or down) interfaces
  * @return QList<Interface> A list of interfaces that exsist that havn't
  * been called by isOwner()
  */
 QList<Interface> WLANModule::getInterfaces(){
   return list;
 }
 
 /**
  * Attempt to add a new interface as defined by name
  * @param name the name of the type of interface that should be created given
  *  by possibleNewInterfaces();
  * @return Interface* NULL if it was unable to be created.
  */
 Interface *WLANModule::addNewInterface(const QString &){
   // We can't add a 802.11 interface, either the hardware will be there
   // or it wont.
   return NULL;
 }
 
 /**
  * Attempts to remove the interface, doesn't delete i
  * @return bool true if successfull, false otherwise.
  */
 bool WLANModule::remove(Interface*){
   // Can't remove a hardware device, you can stop it though.
   return false;
 }
 
 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;
-
-    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;
+    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());
-    }
 
-    if (count == 2){
-        // those should call the interface directly
-        QWidget *info = getInfo( ifa );
-        info->showMaximized();
-
-        if ( action.contains("start" ) ){
-            ifa->start();
-        } else if ( action.contains("restart" ) ){
-            ifa->restart();
-        } else if ( action.contains("stop" ) ){
-            ifa->stop();
-        }else if ( action.contains("refresh" ) ){
-            ifa->refresh();
-        }
-    }else if (count == 3){
-        QString value;
-        if (!wlanconfigWiget){
-            //FIXME: what if it got closed meanwhile?
-            wlanconfigWiget = (WLANImp*) configure(ifa);
+        if (ifa == 0){
+            qFatal("WLANModule Did not find %s",interface.latin1());
         }
-        wlanconfigWiget->showMaximized();
-        stream >> value;
-        qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
-        if ( action.contains("ESSID") ){
-            QComboBox *combo = wlanconfigWiget->essid;
-            bool found = false;
-            for ( int i = 0; i < combo->count(); i++)
-                if ( combo->text( i ) == value ){
-                    combo->setCurrentItem( i );
-                    found = true;
+
+        if (count == 2){
+            // those should call the interface directly
+            QWidget *info = getInfo( ifa );
+            info->showMaximized();
+
+            if ( action.contains("start" ) ){
+                ifa->start();
+            } else if ( action.contains("restart" ) ){
+                ifa->restart();
+            } else if ( action.contains("stop" ) ){
+                ifa->stop();
+            }else if ( action.contains("refresh" ) ){
+                ifa->refresh();
+            }
+        }else if (count == 3){
+            QString value;
+            if (!wlanconfigWiget){
+                //FIXME: what if it got closed meanwhile?
+                wlanconfigWiget = (WLANImp*) configure(ifa);
+            }
+            wlanconfigWiget->showMaximized();
+            stream >> value;
+            qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
+            if ( action.contains("ESSID") ){
+                QComboBox *combo = wlanconfigWiget->essid;
+                bool found = false;
+                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 ){
+                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
-            qDebug("wlan plugin has no clue");
-    }
-
+                    }
+
+            }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;
 }