6 files changed, 26 insertions, 28 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index 1e01da4..a84b91f 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -1,287 +1,287 @@
 #include "interface.h"
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #define IFCONFIG "/sbin/ifconfig"
 #define HDCP_INFO_DIR "/etc/dhcpc"
 #include <stdio.h>
 #include <stdlib.h>
-Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
  refresh();
 }
 /**
 * Set status
 * @param newStatus - the new status
 * emit updateInterface
 */ 
 void Interface::setStatus(bool newStatus){
  if(status != newStatus){
    status = newStatus;
    refresh();
  }
 };
 /**
 * Set if attached or not (802.11 card pulled out for example)
 * @param isAttached - if attached
 * emit updateInterface
 */ 
 void Interface::setAttached(bool isAttached){
  attached = isAttached;
  emit(updateInterface(this));
 };
  
 /**
 * Set Hardware name
 * @param name - the new name
 * emit updateInterface
 */ 
 void Interface::setHardwareName(QString name){
-  hardareName = name;
+  hardwareName = name;
  emit(updateInterface(this));
 };
 
 /**
 * Set Module owner
 * @param owner - the new owner
 * emit updateInterface
 */ 
 void Interface::setModuleOwner(Module *owner){
  moduleOwner = owner;
  emit(updateInterface(this));
 };
 /**
 * Try to start the interface.
 */ 
 void Interface::start(){
          // check to see if we are already running.
  if(true == status)
    return;
-  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
  // See if it was successfull...
  if(ret != 0)
    return;
  
  status = true;
  refresh();
 }
 /**
 * Try to stop the interface.
 */
 void Interface::stop(){
          // check to see if we are already stopped.
  if(false == status)
    return;
          
-  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
  if(ret != 0)
    return;
  status = true;
  refresh();
 }
 /**
 * Try to restart the interface.
 */ 
 void Interface::restart(){
  stop();
  start();
 }
 /**
 * Try to refresh the information about the interface.
 * First call ifconfig, then check the dhcp-info file
 * @return bool true if successfull.
 */
 bool Interface::refresh(){
  // See if we are up.
  if(status == false){
    macAddress = "";
    ip = "0.0.0.0";
    subnetMask = "0.0.0.0";
    broadcast = "";
    dhcp = false;
    dhcpServerIp = "";
    leaseObtained = "";
    leaseExpires = "";
    emit(updateInterface(this));
    return true;
  }
        
-  QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
+  QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name());
-  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
+  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1());
  if(ret != 0){
    qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1());
    return false;
  }
  
  QFile file(fileName);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
    return false;
  }
  // Set to the defaults
  macAddress = "";
  ip = "0.0.0.0";
  subnetMask = "0.0.0.0";
  broadcast = "";
  
  QTextStream stream( &file );
  QString line;
  while ( !stream.eof() ) {
    line = stream.readLine();
    if(line.contains("HWaddr")){
      int mac = line.find("HWaddr");
      macAddress = line.mid(mac+7, line.length());
    }
    if(line.contains("inet addr")){
      int ipl = line.find("inet addr");
      int space = line.find(" ", ipl+10);
      ip = line.mid(ipl+10, space-ipl-10);
    }
    if(line.contains("Mask")){
      int mask = line.find("Mask");
      subnetMask = line.mid(mask+5, line.length());
    }
    if(line.contains("Bcast")){
      int mask = line.find("Bcast");
      int space = line.find(" ", mask+6);
      broadcast = line.mid(mask+6, space-mask-6);
    }
  }
  file.close();
  QFile::remove(fileName);
  // DHCP TESTING
  // reset DHCP info
  dhcpServerIp = "";
  leaseObtained = "";
  leaseExpires = "";
  dhcp = false;
   
  QString dhcpDirectory(HDCP_INFO_DIR);
  QDir d(dhcpDirectory);
  if(!d.exists(dhcpDirectory))
    dhcpDirectory = "/var/run";
  
  // See if we have 
-  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name()));
  // If there is no DHCP information then exit now with no errors.
  if(!QFile::exists(dhcpFile)){
    emit(updateInterface(this));
    return true;
  }
  
  file.setName(dhcpFile);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
    return false;
  }
  
  // leaseTime and renewalTime and used if pid and deamon exe can be accessed.
  int leaseTime = 0;
  int renewalTime = 0;
  
  stream.setDevice( &file );
  while ( !stream.eof() ) {
    line = stream.readLine();
    if(line.contains("DHCPSIADDR="))
      dhcpServerIp = line.mid(11, line.length());
    if(line.contains("LEASETIME="))
      leaseTime = line.mid(10, line.length()).toInt();
    if(line.contains("RENEWALTIME="))
      renewalTime = line.mid(12, line.length()).toInt();
  }
  file.close();
  //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1());
  //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1());
  
  // Get the pid of the deamond
-  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName));
+  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name()));
  file.setName(dhcpFile);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
    return false;
  }
  int pid = -1;
  stream.setDevice( &file );
  while ( !stream.eof() ) {
    line = stream.readLine();
    pid = line.toInt();
  }
  file.close();
  if( pid == -1){
    qDebug("Interface: Could not get pid of dhcpc deamon.");
    return false;
  }
  // Get the start running time of the deamon 
  fileName = (QString("/proc/%1/stat").arg(pid));
  file.setName(fileName);
  stream.setDevice( &file );
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
    return false;
  }
  while ( !stream.eof() ) {
    line = stream.readLine();
  }
  file.close();
  long time = 0;
  // Grab the start time  
  //                     pid com state ppid pgrp session tty_nr tpgid flags
  sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
  //   minflt cminflt majflt cmajflt utime stime cutime cstime priority
      "%*u    %*u    %*u    %*u     %*u   %*u   %*d   %*d   %*d "
  //   nice 0   itrealvalue starttime
      "%*d  %*d %*d %lu", (long*) &time);
  time = time/100;
  
  QDateTime datetime(QDateTime::currentDateTime());
  // Get the uptime of the computer.
  QFile f("/proc/uptime");
  if ( f.open(IO_ReadOnly) ) {    // file opened successfully
    QTextStream t( &f );        // use a text stream
    int sec = 0;
    t >> sec;
    datetime = datetime.addSecs((-1*sec));
    f.close();
  }
  else{
    qDebug("Interface: Can't open /proc/uptime to retrive uptime.");
    return false;
  }
  
  datetime = datetime.addSecs(time);
  //qDebug(QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1());
   
  // Calculate the start and renew times 
          leaseObtained= datetime.toString();
  
  // Calculate the start and renew times 
  datetime = datetime.addSecs(leaseTime);
  leaseExpires = datetime.toString();
  
  dhcp = true;
  
  emit(updateInterface(this));
  return true;
 }
 // interface.cpp
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h
index 980171a..7943fd6 100644
--- a/noncore/net/networksetup/interface.h
+++ b/noncore/net/networksetup/interface.h
@@ -1,72 +1,72 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 #include <qstring.h>
 #include <qobject.h>
 class Module;
 class Interface : public QObject{
  Q_OBJECT
 signals:
  void updateInterface(Interface *i);
        
 public:
  Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
  virtual ~Interface(){};
  
  virtual QString getInterfaceName(){ QString n(this->name()); return n; };
  
  virtual bool getStatus(){ return status; };
  virtual void setStatus(bool newStatus);
  virtual bool isAttached(){ return attached; };
  virtual void setAttached(bool isAttached=false);
  
-  virtual QString getHardwareName(){ return hardareName; };
+  virtual QString getHardwareName(){ return hardwareName; };
  virtual void setHardwareName(QString name="Unknown");
  
  virtual Module* getModuleOwner(){ return moduleOwner; };
  virtual void setModuleOwner(Module *owner=NULL);
  // inet information.
  QString getMacAddress(){ return macAddress; };
  QString getIp(){ return ip; };
  QString getSubnetMask(){ return subnetMask; };
  QString getBroadcast(){ return broadcast; };
  bool isDhcp(){ return dhcp; };
  QString getDhcpServerIp(){ return dhcpServerIp; };
  QString getLeaseObtained(){ return leaseObtained; };
  QString getLeaseExpires(){ return leaseExpires; };
 public slots:
  bool refresh();
  void start();
  void stop();
  void restart();
 private:
  // Interface information
  bool status;
  bool attached;
  QString interfaceName;
-  QString hardareName;
+  QString hardwareName;
  Module *moduleOwner;
  
  // Network information
  QString macAddress;
  QString ip;
  QString broadcast;
  QString subnetMask;
  bool dhcp;
  QString dhcpServerIp;
  QString leaseObtained;
  QString leaseExpires;
 };
 #endif
 // interface.h
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 117bac1..a446d29 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -119,345 +119,344 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
  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, "Error","Please select an interface.", "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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
  Interface *i = interfaceItems[item];
  if(i->getModuleOwner()){
    QTabWidget *tabWidget = NULL;
    QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
    if(moduleConfigure != NULL){
      if(tabWidget != NULL){
        InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
        tabWidget->insertTab(configure, "TCP/IP");
      }
      moduleConfigure->showMaximized();
      moduleConfigure->show();
      return;
    }
  }
  
  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
  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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
  Interface *i = interfaceItems[item];
  if(!i->isAttached()){
    QMessageBox::information(this, "Error","No information about\na disconnected interface.", QMessageBox::Ok);
    return;
  }
  if(i->getModuleOwner()){
    QTabWidget *tabWidget = NULL;
    QWidget *moduleInformation = i->getModuleOwner()->information(&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)
+        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)) + QString(" (%1)").arg(i->getInterfaceName()));
      
        interfaceNames.insert(i->getInterfaceName(), i);
        updateInterface(i);
        connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
      }
      // It was an interface we already had.
      else{
-        i = interfaceNames[interfaceName];
        if(fileName != TEMP_ALL)
-          i->setStatus(true);
+          (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){
        Interface *i = new Interface(this, *ni, false);
        i->setAttached(false);
        i->setHardwareName(QString("Disconnected (%1)").arg(*ni));
        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, (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 anything.","Need One Profile.", "Ok");
    return;
  }
  QString profileToRemove = profilesList->currentText();
  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));
  }
 }
 /**
 * A new profile has been selected, change.
 * @param newProfile the new profile.
 */ 
 void MainWindowImp::changeProfile(){
  currentProfileLabel->setText(profilesList->text(profilesList->currentItem()));
 }
 // mainwindowimp.cpp
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index 1e01da4..a84b91f 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -1,287 +1,287 @@
 #include "interface.h"
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #define IFCONFIG "/sbin/ifconfig"
 #define HDCP_INFO_DIR "/etc/dhcpc"
 #include <stdio.h>
 #include <stdlib.h>
-Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
  refresh();
 }
 /**
 * Set status
 * @param newStatus - the new status
 * emit updateInterface
 */ 
 void Interface::setStatus(bool newStatus){
  if(status != newStatus){
    status = newStatus;
    refresh();
  }
 };
 /**
 * Set if attached or not (802.11 card pulled out for example)
 * @param isAttached - if attached
 * emit updateInterface
 */ 
 void Interface::setAttached(bool isAttached){
  attached = isAttached;
  emit(updateInterface(this));
 };
  
 /**
 * Set Hardware name
 * @param name - the new name
 * emit updateInterface
 */ 
 void Interface::setHardwareName(QString name){
-  hardareName = name;
+  hardwareName = name;
  emit(updateInterface(this));
 };
 
 /**
 * Set Module owner
 * @param owner - the new owner
 * emit updateInterface
 */ 
 void Interface::setModuleOwner(Module *owner){
  moduleOwner = owner;
  emit(updateInterface(this));
 };
 /**
 * Try to start the interface.
 */ 
 void Interface::start(){
          // check to see if we are already running.
  if(true == status)
    return;
-  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1());
  // See if it was successfull...
  if(ret != 0)
    return;
  
  status = true;
  refresh();
 }
 /**
 * Try to stop the interface.
 */
 void Interface::stop(){
          // check to see if we are already stopped.
  if(false == status)
    return;
          
-  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1());
+  int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1());
  if(ret != 0)
    return;
  status = true;
  refresh();
 }
 /**
 * Try to restart the interface.
 */ 
 void Interface::restart(){
  stop();
  start();
 }
 /**
 * Try to refresh the information about the interface.
 * First call ifconfig, then check the dhcp-info file
 * @return bool true if successfull.
 */
 bool Interface::refresh(){
  // See if we are up.
  if(status == false){
    macAddress = "";
    ip = "0.0.0.0";
    subnetMask = "0.0.0.0";
    broadcast = "";
    dhcp = false;
    dhcpServerIp = "";
    leaseObtained = "";
    leaseExpires = "";
    emit(updateInterface(this));
    return true;
  }
        
-  QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
+  QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name());
-  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
+  int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1());
  if(ret != 0){
    qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1());
    return false;
  }
  
  QFile file(fileName);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
    return false;
  }
  // Set to the defaults
  macAddress = "";
  ip = "0.0.0.0";
  subnetMask = "0.0.0.0";
  broadcast = "";
  
  QTextStream stream( &file );
  QString line;
  while ( !stream.eof() ) {
    line = stream.readLine();
    if(line.contains("HWaddr")){
      int mac = line.find("HWaddr");
      macAddress = line.mid(mac+7, line.length());
    }
    if(line.contains("inet addr")){
      int ipl = line.find("inet addr");
      int space = line.find(" ", ipl+10);
      ip = line.mid(ipl+10, space-ipl-10);
    }
    if(line.contains("Mask")){
      int mask = line.find("Mask");
      subnetMask = line.mid(mask+5, line.length());
    }
    if(line.contains("Bcast")){
      int mask = line.find("Bcast");
      int space = line.find(" ", mask+6);
      broadcast = line.mid(mask+6, space-mask-6);
    }
  }
  file.close();
  QFile::remove(fileName);
  // DHCP TESTING
  // reset DHCP info
  dhcpServerIp = "";
  leaseObtained = "";
  leaseExpires = "";
  dhcp = false;
   
  QString dhcpDirectory(HDCP_INFO_DIR);
  QDir d(dhcpDirectory);
  if(!d.exists(dhcpDirectory))
    dhcpDirectory = "/var/run";
  
  // See if we have 
-  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name()));
  // If there is no DHCP information then exit now with no errors.
  if(!QFile::exists(dhcpFile)){
    emit(updateInterface(this));
    return true;
  }
  
  file.setName(dhcpFile);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
    return false;
  }
  
  // leaseTime and renewalTime and used if pid and deamon exe can be accessed.
  int leaseTime = 0;
  int renewalTime = 0;
  
  stream.setDevice( &file );
  while ( !stream.eof() ) {
    line = stream.readLine();
    if(line.contains("DHCPSIADDR="))
      dhcpServerIp = line.mid(11, line.length());
    if(line.contains("LEASETIME="))
      leaseTime = line.mid(10, line.length()).toInt();
    if(line.contains("RENEWALTIME="))
      renewalTime = line.mid(12, line.length()).toInt();
  }
  file.close();
  //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1());
  //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1());
  
  // Get the pid of the deamond
-  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName));
+  dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name()));
  file.setName(dhcpFile);
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
    return false;
  }
  int pid = -1;
  stream.setDevice( &file );
  while ( !stream.eof() ) {
    line = stream.readLine();
    pid = line.toInt();
  }
  file.close();
  if( pid == -1){
    qDebug("Interface: Could not get pid of dhcpc deamon.");
    return false;
  }
  // Get the start running time of the deamon 
  fileName = (QString("/proc/%1/stat").arg(pid));
  file.setName(fileName);
  stream.setDevice( &file );
  if (!file.open(IO_ReadOnly)){
    qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
    return false;
  }
  while ( !stream.eof() ) {
    line = stream.readLine();
  }
  file.close();
  long time = 0;
  // Grab the start time  
  //                     pid com state ppid pgrp session tty_nr tpgid flags
  sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
  //   minflt cminflt majflt cmajflt utime stime cutime cstime priority
      "%*u    %*u    %*u    %*u     %*u   %*u   %*d   %*d   %*d "
  //   nice 0   itrealvalue starttime
      "%*d  %*d %*d %lu", (long*) &time);
  time = time/100;
  
  QDateTime datetime(QDateTime::currentDateTime());
  // Get the uptime of the computer.
  QFile f("/proc/uptime");
  if ( f.open(IO_ReadOnly) ) {    // file opened successfully
    QTextStream t( &f );        // use a text stream
    int sec = 0;
    t >> sec;
    datetime = datetime.addSecs((-1*sec));
    f.close();
  }
  else{
    qDebug("Interface: Can't open /proc/uptime to retrive uptime.");
    return false;
  }
  
  datetime = datetime.addSecs(time);
  //qDebug(QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1());
   
  // Calculate the start and renew times 
          leaseObtained= datetime.toString();
  
  // Calculate the start and renew times 
  datetime = datetime.addSecs(leaseTime);
  leaseExpires = datetime.toString();
  
  dhcp = true;
  
  emit(updateInterface(this));
  return true;
 }
 // interface.cpp
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h
index 980171a..7943fd6 100644
--- a/noncore/settings/networksettings/interface.h
+++ b/noncore/settings/networksettings/interface.h
@@ -1,72 +1,72 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 #include <qstring.h>
 #include <qobject.h>
 class Module;
 class Interface : public QObject{
  Q_OBJECT
 signals:
  void updateInterface(Interface *i);
        
 public:
  Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
  virtual ~Interface(){};
  
  virtual QString getInterfaceName(){ QString n(this->name()); return n; };
  
  virtual bool getStatus(){ return status; };
  virtual void setStatus(bool newStatus);
  virtual bool isAttached(){ return attached; };
  virtual void setAttached(bool isAttached=false);
  
-  virtual QString getHardwareName(){ return hardareName; };
+  virtual QString getHardwareName(){ return hardwareName; };
  virtual void setHardwareName(QString name="Unknown");
  
  virtual Module* getModuleOwner(){ return moduleOwner; };
  virtual void setModuleOwner(Module *owner=NULL);
  // inet information.
  QString getMacAddress(){ return macAddress; };
  QString getIp(){ return ip; };
  QString getSubnetMask(){ return subnetMask; };
  QString getBroadcast(){ return broadcast; };
  bool isDhcp(){ return dhcp; };
  QString getDhcpServerIp(){ return dhcpServerIp; };
  QString getLeaseObtained(){ return leaseObtained; };
  QString getLeaseExpires(){ return leaseExpires; };
 public slots:
  bool refresh();
  void start();
  void stop();
  void restart();
 private:
  // Interface information
  bool status;
  bool attached;
  QString interfaceName;
-  QString hardareName;
+  QString hardwareName;
  Module *moduleOwner;
  
  // Network information
  QString macAddress;
  QString ip;
  QString broadcast;
  QString subnetMask;
  bool dhcp;
  QString dhcpServerIp;
  QString leaseObtained;
  QString leaseExpires;
 };
 #endif
 // interface.h
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 117bac1..a446d29 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -119,345 +119,344 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
  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, "Error","Please select an interface.", "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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
  Interface *i = interfaceItems[item];
  if(i->getModuleOwner()){
    QTabWidget *tabWidget = NULL;
    QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
    if(moduleConfigure != NULL){
      if(tabWidget != NULL){
        InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
        tabWidget->insertTab(configure, "TCP/IP");
      }
      moduleConfigure->showMaximized();
      moduleConfigure->show();
      return;
    }
  }
  
  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
  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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
  Interface *i = interfaceItems[item];
  if(!i->isAttached()){
    QMessageBox::information(this, "Error","No information about\na disconnected interface.", QMessageBox::Ok);
    return;
  }
  if(i->getModuleOwner()){
    QTabWidget *tabWidget = NULL;
    QWidget *moduleInformation = i->getModuleOwner()->information(&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)
+        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)) + QString(" (%1)").arg(i->getInterfaceName()));
      
        interfaceNames.insert(i->getInterfaceName(), i);
        updateInterface(i);
        connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
      }
      // It was an interface we already had.
      else{
-        i = interfaceNames[interfaceName];
        if(fileName != TEMP_ALL)
-          i->setStatus(true);
+          (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){
        Interface *i = new Interface(this, *ni, false);
        i->setAttached(false);
        i->setHardwareName(QString("Disconnected (%1)").arg(*ni));
        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, (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 anything.","Need One Profile.", "Ok");
    return;
  }
  QString profileToRemove = profilesList->currentText();
  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));
  }
 }
 /**
 * A new profile has been selected, change.
 * @param newProfile the new profile.
 */ 
 void MainWindowImp::changeProfile(){
  currentProfileLabel->setText(profilesList->text(profilesList->currentItem()));
 }
 // mainwindowimp.cpp