Some deletion coverage

4 files changed, 18 insertions, 6 deletions

diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 843f630..9d81ab1 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,551 +1,558 @@
 #include "mainwindowimp.h"

 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "interfaces.h"

 

 #include "module.h"

 

 #include "kprocess.h"

 

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlineedit.h>

 #include <qlistview.h>

 #include <qheader.h>

 #include <qlabel.h>

 

 #include <qmainwindow.h>

 #include <qmessagebox.h>

 

 #include <qpe/config.h>

 #include <qpe/qlibrary.h>

 #include <qpe/resource.h>

 #include <qpe/qpeapplication.h>

 

 #include <qlist.h>

 #include <qdir.h>

 #include <qfile.h>

 #include <qtextstream.h>

 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

 

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){

   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&)));  

   // Load connections.

   loadModules(QPEApplication::qpeDir() + "/plugins/networksetup");

   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();

   }

 }

 

 /**

  * 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();

+  }

+

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

   for( it = libraries.begin(); it != libraries.end(); ++it ){

     delete it.key();

     delete it.data();

   }

 }

 

 /**

  * 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(QString path){

   //qDebug(path.latin1());

   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()) ) {

     if(fi->fileName().contains(".so")){

       loadPlugin(path + "/" + fi->fileName());

     }

     ++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(QString pluginFileName, QString resolveString){

   //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

     qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

     delete lib;

     return NULL;

   }

   

   // Try to get an object.

   Module *object = ((Module* (*)()) functionPointer)();

   if(object == NULL){

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

     delete lib;

     return NULL;

   }

 

   // Store for deletion later

   libraries.insert(object, lib);

   return object;

 }

 

 /**

  * 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;

   list.insert("USB (PPP) / (ADD_TEST)", "A dialup connection over the USB port");

   list.insert("IrDa (PPP) / (ADD_TEST)", "A dialup connection over the IdDa port");

   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.", "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){

           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.", "Ok");

     return; 

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner() == NULL){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * 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 with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

   QString currentProfile = currentProfileLabel->text();

   if(profilesList->count() <= 1 || currentProfile == "All"){

     currentProfile = "";

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

     i->getModuleOwner()->setProfile(currentProfile);

     QTabWidget *tabWidget = NULL;

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);

     if(moduleConfigure != NULL){

       if(tabWidget != NULL){

         InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);

         configure->setProfile(currentProfile);

         tabWidget->insertTab(configure, "TCP/IP");

       

       }

       moduleConfigure->showMaximized();

       moduleConfigure->show();

       return;

     }

   }

   

   InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);

   configure->setProfile(currentProfile);

   configure->showMaximized();

   configure->show();

 }

 

 /**

  * 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 with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 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;

   }

 

   QStringList list;

   for(uint i = 0; i < profilesList->count(); i++){

     list.append(profilesList->text(i));

   }

           

   if(i->getModuleOwner()){

     QTabWidget *tabWidget = NULL;

     QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget);

     if(moduleInformation != NULL){

       if(tabWidget != NULL){

         InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);

         tabWidget->insertTab(information, "TCP/IP");

       }

       moduleInformation->showMaximized();

       moduleInformation->show();

       return;

     }

   }  

   

   InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);

   information->showMaximized();

   information->show();

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(processAll, TEMP_ALL);

 

   KShellProcess *process = new KShellProcess();

   *process << "/sbin/ifconfig" << " > " TEMP_UP;

   connect(process, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(process, TEMP_UP);

   

   processAll->start(KShellProcess::NotifyOnExit);

   process->start(KShellProcess::NotifyOnExit);

 }

 

 void MainWindowImp::jobDone(KProcess *process){

   QString fileName = threads[process];

   threads.remove(process);

   delete process;

 

   QFile file(fileName);

   if (!file.open(IO_ReadOnly)){

     qDebug(QString("MainWindowImp: Can't open file: %1").arg(fileName).latin1());

     return;

   }

   

   QTextStream stream( &file );

   QString line;

   while ( !stream.eof() ) {

     line = stream.readLine();

     int space = line.find(" ");

     if(space > 1){

       // We have found an interface

       QString interfaceName = line.mid(0, space);

       Interface *i;

       // We have found an interface

       //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

       // See if we already have it

       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

         if(fileName == TEMP_ALL)

           i = new Interface(this, interfaceName, false);

         else

           i = new Interface(this, interfaceName, true);

         i->setAttached(true);

 

         QString hardName = "Ethernet";

         int hardwareName = line.find("Link encap:");

         int macAddress = line.find("HWaddr");

         if(macAddress == -1)

           macAddress = line.length();

         if(hardwareName != -1)

           i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) );

       

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

       // It was an interface we already had.

       else{

         if(fileName != TEMP_ALL)

           (interfaceNames[interfaceName])->setStatus(true);

       }

     }

   }

   file.close();

   QFile::remove(fileName);

   

   if(threads.count() == 0){

     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("Disconnected");

           interfaceNames.insert(i->getInterfaceName(), i);

           updateInterface(i);

                 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

         }

       }

     }

   }

 } 

 

 /**

  * 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 

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     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);

   

   item->setPixmap(1, (Resource::loadPixmap(typeName)));

   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.", "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.", "Ok");

     return;

   }

   QString profileToRemove = profilesList->currentText();

   if(profileToRemove == "All"){

     QMessageBox::information(this, "Can't remove.","Can't remove default.", "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), "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.", "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();

       }

     }

   }

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index cbb520d..24cb1cd 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -1,223 +1,222 @@
 #include "wlanmodule.h"
-#include <qpe/config.h>
 #include "wlanimp.h"
 #include "info.h"
 
-
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <linux/if_ether.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
 #include <linux/wireless.h>
 
 #include <unistd.h>
 #include <math.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 
 #include <qlabel.h>
 
 /**
  * Constructor, find all of the possible interfaces
  */ 
 WLANModule::WLANModule() : Module() {
   // get output from iwconfig
 }
 
 /**
  * Change the current profile
  */ 
 void WLANModule::setProfile(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){
   if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
     i->setHardwareName("802.11b");
     return true;
   }
   return false;
 }
 
 /**
  * Create, set tabWiget and return the WLANConfigure Module
  * @param tabWidget a pointer to the tab widget that this configure has.
  * @return QWidget* pointer to the tab widget in this modules configure.
  */ 
 QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){
-  WLANImp *wlanconfig = new WLANImp( );
+  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig");
   (*tabWidget) = wlanconfig->tabWidget;
   return wlanconfig;
 }
 
 /**
  * Create, set tabWiget and return the Information Module
  * @param tabWidget a pointer to the tab widget that this information has.
  * @return QWidget* pointer to the tab widget in this modules info.
  */ 
 QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
+  return NULL;
   WlanInfo *info = new WlanInfo(0, "wireless info");
   (*tabWidget) = info->tabWidget;
  
   struct ifreq ifr;
   struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
   int fd = socket( AF_INET, SOCK_DGRAM, 0 );
   
   const char* buffer[200];
   struct iwreq iwr;
   memset( &iwr, 0, sizeof( iwr ) );
   iwr.u.essid.pointer = (caddr_t) buffer;
   iwr.u.essid.length = IW_ESSID_MAX_SIZE;
   iwr.u.essid.flags = 0;
   
   // check if it is an IEEE 802.11 standard conform
   // wireless device by sending SIOCGIWESSID
   // which also gives back the Extended Service Set ID
   // (see IEEE 802.11 for more information)
 
   QString n = (i->getInterfaceName());
   const char* iname = n.latin1();
   strcpy( iwr.ifr_ifrn.ifrn_name,  (const char *)iname );
   int result = ioctl( fd, SIOCGIWESSID, &iwr );
   if ( result == 0 ){
     //hasWirelessExtensions = true;
     iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length-1] = '\0';
     info->essidLabel->setText(QString(iwr.u.essid.pointer));
   }
   else
     return info;
   //info->essidLabel->setText("*** Unknown ***");
 
   // Address of associated access-point
   result = ioctl( fd, SIOCGIWAP, &iwr );
   if ( result == 0 ){
     QString foo = foo.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
       iwr.u.ap_addr.sa_data[0]&0xff,
       iwr.u.ap_addr.sa_data[1]&0xff,
       iwr.u.ap_addr.sa_data[2]&0xff,
       iwr.u.ap_addr.sa_data[3]&0xff,
       iwr.u.ap_addr.sa_data[4]&0xff,
       iwr.u.ap_addr.sa_data[5]&0xff );
     info->apLabel->setText(foo);
   }
   else info->apLabel->setText("*** Unknown ***");
 
   iwr.u.data.pointer = (caddr_t) buffer;
   iwr.u.data.length = IW_ESSID_MAX_SIZE;
   iwr.u.data.flags = 0;
   result = ioctl( fd, SIOCGIWNICKN, &iwr );
   if ( result == 0 ){
     iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0';
     info->stationLabel->setText(iwr.u.data.pointer);
   }
   else info->stationLabel->setText("*** Unknown ***");
 
   result = ioctl( fd, SIOCGIWMODE, &iwr );
   if ( result == 0 )
     info->modeLabel->setText( QString("%1").arg(iwr.u.mode == IW_MODE_ADHOC ? "Ad-Hoc" : "Managed"));
   else
     info->modeLabel->setText("*** Unknown ***");
 
   result = ioctl( fd, SIOCGIWFREQ, &iwr );
   if ( result == 0 )
     info->freqLabel->setText(QString("%1").arg((double( iwr.u.freq.m ) * pow( 10, iwr.u.freq.e ) / 1000000000)));
   else
     info->freqLabel->setText("*** Unknown ***");
 
   /*
   // gather link quality from /proc/net/wireless
 
     char c;
     QString status;
     QString name;
     QFile wfile( PROCNETWIRELESS );
     bool hasFile = wfile.open( IO_ReadOnly );
     QTextStream wstream( &wfile );
     if ( hasFile )
     {
         wstream.readLine();  // skip the first two lines
         wstream.readLine();  // because they only contain headers
     }
     if ( ( !hasFile ) || ( wstream.atEnd() ) )
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Someone removed the card..." );
 #endif
         quality = -1;
         signal = IW_LOWER;
         noise = IW_LOWER;
         return false;
     }
 
     wstream >> name >> status >> quality >> c >> signal >> c >> noise;
 
     if ( quality > 92 )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
 #endif
     if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
 #endif
     if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
 #endif
 
     return true;
 
 } 
 */
   return info;
 }
 
 /**
  * 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(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; 
 }
 
 // wlanmodule.cpp
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 843f630..9d81ab1 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,551 +1,558 @@
 #include "mainwindowimp.h"

 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "interfaces.h"

 

 #include "module.h"

 

 #include "kprocess.h"

 

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlineedit.h>

 #include <qlistview.h>

 #include <qheader.h>

 #include <qlabel.h>

 

 #include <qmainwindow.h>

 #include <qmessagebox.h>

 

 #include <qpe/config.h>

 #include <qpe/qlibrary.h>

 #include <qpe/resource.h>

 #include <qpe/qpeapplication.h>

 

 #include <qlist.h>

 #include <qdir.h>

 #include <qfile.h>

 #include <qtextstream.h>

 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

 

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){

   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&)));  

   // Load connections.

   loadModules(QPEApplication::qpeDir() + "/plugins/networksetup");

   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();

   }

 }

 

 /**

  * 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();

+  }

+

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

   for( it = libraries.begin(); it != libraries.end(); ++it ){

     delete it.key();

     delete it.data();

   }

 }

 

 /**

  * 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(QString path){

   //qDebug(path.latin1());

   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()) ) {

     if(fi->fileName().contains(".so")){

       loadPlugin(path + "/" + fi->fileName());

     }

     ++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(QString pluginFileName, QString resolveString){

   //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

     qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

     delete lib;

     return NULL;

   }

   

   // Try to get an object.

   Module *object = ((Module* (*)()) functionPointer)();

   if(object == NULL){

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

     delete lib;

     return NULL;

   }

 

   // Store for deletion later

   libraries.insert(object, lib);

   return object;

 }

 

 /**

  * 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;

   list.insert("USB (PPP) / (ADD_TEST)", "A dialup connection over the USB port");

   list.insert("IrDa (PPP) / (ADD_TEST)", "A dialup connection over the IdDa port");

   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.", "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){

           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.", "Ok");

     return; 

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner() == NULL){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * 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 with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

   QString currentProfile = currentProfileLabel->text();

   if(profilesList->count() <= 1 || currentProfile == "All"){

     currentProfile = "";

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

     i->getModuleOwner()->setProfile(currentProfile);

     QTabWidget *tabWidget = NULL;

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);

     if(moduleConfigure != NULL){

       if(tabWidget != NULL){

         InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);

         configure->setProfile(currentProfile);

         tabWidget->insertTab(configure, "TCP/IP");

       

       }

       moduleConfigure->showMaximized();

       moduleConfigure->show();

       return;

     }

   }

   

   InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);

   configure->setProfile(currentProfile);

   configure->showMaximized();

   configure->show();

 }

 

 /**

  * 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 with a empty

  * tab.  If tab is !NULL then append the interfaces setup widget to it.

  */ 

 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;

   }

 

   QStringList list;

   for(uint i = 0; i < profilesList->count(); i++){

     list.append(profilesList->text(i));

   }

           

   if(i->getModuleOwner()){

     QTabWidget *tabWidget = NULL;

     QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget);

     if(moduleInformation != NULL){

       if(tabWidget != NULL){

         InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);

         tabWidget->insertTab(information, "TCP/IP");

       }

       moduleInformation->showMaximized();

       moduleInformation->show();

       return;

     }

   }  

   

   InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);

   information->showMaximized();

   information->show();

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(processAll, TEMP_ALL);

 

   KShellProcess *process = new KShellProcess();

   *process << "/sbin/ifconfig" << " > " TEMP_UP;

   connect(process, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(process, TEMP_UP);

   

   processAll->start(KShellProcess::NotifyOnExit);

   process->start(KShellProcess::NotifyOnExit);

 }

 

 void MainWindowImp::jobDone(KProcess *process){

   QString fileName = threads[process];

   threads.remove(process);

   delete process;

 

   QFile file(fileName);

   if (!file.open(IO_ReadOnly)){

     qDebug(QString("MainWindowImp: Can't open file: %1").arg(fileName).latin1());

     return;

   }

   

   QTextStream stream( &file );

   QString line;

   while ( !stream.eof() ) {

     line = stream.readLine();

     int space = line.find(" ");

     if(space > 1){

       // We have found an interface

       QString interfaceName = line.mid(0, space);

       Interface *i;

       // We have found an interface

       //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

       // See if we already have it

       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

         if(fileName == TEMP_ALL)

           i = new Interface(this, interfaceName, false);

         else

           i = new Interface(this, interfaceName, true);

         i->setAttached(true);

 

         QString hardName = "Ethernet";

         int hardwareName = line.find("Link encap:");

         int macAddress = line.find("HWaddr");

         if(macAddress == -1)

           macAddress = line.length();

         if(hardwareName != -1)

           i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) );

       

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

       // It was an interface we already had.

       else{

         if(fileName != TEMP_ALL)

           (interfaceNames[interfaceName])->setStatus(true);

       }

     }

   }

   file.close();

   QFile::remove(fileName);

   

   if(threads.count() == 0){

     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("Disconnected");

           interfaceNames.insert(i->getInterfaceName(), i);

           updateInterface(i);

                 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

         }

       }

     }

   }

 } 

 

 /**

  * 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 

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     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);

   

   item->setPixmap(1, (Resource::loadPixmap(typeName)));

   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.", "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.", "Ok");

     return;

   }

   QString profileToRemove = profilesList->currentText();

   if(profileToRemove == "All"){

     QMessageBox::information(this, "Can't remove.","Can't remove default.", "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), "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.", "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();

       }

     }

   }

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index cbb520d..24cb1cd 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -1,223 +1,222 @@
 #include "wlanmodule.h"
-#include <qpe/config.h>
 #include "wlanimp.h"
 #include "info.h"
 
-
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <linux/if_ether.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
 #include <linux/wireless.h>
 
 #include <unistd.h>
 #include <math.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 
 #include <qlabel.h>
 
 /**
  * Constructor, find all of the possible interfaces
  */ 
 WLANModule::WLANModule() : Module() {
   // get output from iwconfig
 }
 
 /**
  * Change the current profile
  */ 
 void WLANModule::setProfile(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){
   if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
     i->setHardwareName("802.11b");
     return true;
   }
   return false;
 }
 
 /**
  * Create, set tabWiget and return the WLANConfigure Module
  * @param tabWidget a pointer to the tab widget that this configure has.
  * @return QWidget* pointer to the tab widget in this modules configure.
  */ 
 QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){
-  WLANImp *wlanconfig = new WLANImp( );
+  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig");
   (*tabWidget) = wlanconfig->tabWidget;
   return wlanconfig;
 }
 
 /**
  * Create, set tabWiget and return the Information Module
  * @param tabWidget a pointer to the tab widget that this information has.
  * @return QWidget* pointer to the tab widget in this modules info.
  */ 
 QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
+  return NULL;
   WlanInfo *info = new WlanInfo(0, "wireless info");
   (*tabWidget) = info->tabWidget;
  
   struct ifreq ifr;
   struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
   int fd = socket( AF_INET, SOCK_DGRAM, 0 );
   
   const char* buffer[200];
   struct iwreq iwr;
   memset( &iwr, 0, sizeof( iwr ) );
   iwr.u.essid.pointer = (caddr_t) buffer;
   iwr.u.essid.length = IW_ESSID_MAX_SIZE;
   iwr.u.essid.flags = 0;
   
   // check if it is an IEEE 802.11 standard conform
   // wireless device by sending SIOCGIWESSID
   // which also gives back the Extended Service Set ID
   // (see IEEE 802.11 for more information)
 
   QString n = (i->getInterfaceName());
   const char* iname = n.latin1();
   strcpy( iwr.ifr_ifrn.ifrn_name,  (const char *)iname );
   int result = ioctl( fd, SIOCGIWESSID, &iwr );
   if ( result == 0 ){
     //hasWirelessExtensions = true;
     iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length-1] = '\0';
     info->essidLabel->setText(QString(iwr.u.essid.pointer));
   }
   else
     return info;
   //info->essidLabel->setText("*** Unknown ***");
 
   // Address of associated access-point
   result = ioctl( fd, SIOCGIWAP, &iwr );
   if ( result == 0 ){
     QString foo = foo.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
       iwr.u.ap_addr.sa_data[0]&0xff,
       iwr.u.ap_addr.sa_data[1]&0xff,
       iwr.u.ap_addr.sa_data[2]&0xff,
       iwr.u.ap_addr.sa_data[3]&0xff,
       iwr.u.ap_addr.sa_data[4]&0xff,
       iwr.u.ap_addr.sa_data[5]&0xff );
     info->apLabel->setText(foo);
   }
   else info->apLabel->setText("*** Unknown ***");
 
   iwr.u.data.pointer = (caddr_t) buffer;
   iwr.u.data.length = IW_ESSID_MAX_SIZE;
   iwr.u.data.flags = 0;
   result = ioctl( fd, SIOCGIWNICKN, &iwr );
   if ( result == 0 ){
     iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0';
     info->stationLabel->setText(iwr.u.data.pointer);
   }
   else info->stationLabel->setText("*** Unknown ***");
 
   result = ioctl( fd, SIOCGIWMODE, &iwr );
   if ( result == 0 )
     info->modeLabel->setText( QString("%1").arg(iwr.u.mode == IW_MODE_ADHOC ? "Ad-Hoc" : "Managed"));
   else
     info->modeLabel->setText("*** Unknown ***");
 
   result = ioctl( fd, SIOCGIWFREQ, &iwr );
   if ( result == 0 )
     info->freqLabel->setText(QString("%1").arg((double( iwr.u.freq.m ) * pow( 10, iwr.u.freq.e ) / 1000000000)));
   else
     info->freqLabel->setText("*** Unknown ***");
 
   /*
   // gather link quality from /proc/net/wireless
 
     char c;
     QString status;
     QString name;
     QFile wfile( PROCNETWIRELESS );
     bool hasFile = wfile.open( IO_ReadOnly );
     QTextStream wstream( &wfile );
     if ( hasFile )
     {
         wstream.readLine();  // skip the first two lines
         wstream.readLine();  // because they only contain headers
     }
     if ( ( !hasFile ) || ( wstream.atEnd() ) )
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Someone removed the card..." );
 #endif
         quality = -1;
         signal = IW_LOWER;
         noise = IW_LOWER;
         return false;
     }
 
     wstream >> name >> status >> quality >> c >> signal >> c >> noise;
 
     if ( quality > 92 )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
 #endif
     if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
 #endif
     if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
 #endif
 
     return true;
 
 } 
 */
   return info;
 }
 
 /**
  * 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(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; 
 }
 
 // wlanmodule.cpp