8 files changed, 148 insertions, 44 deletions
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp
index eef42df..0927258 100644
--- a/noncore/net/networksetup/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces.cpp
@@ -154,32 +154,58 @@ bool Interfaces::isInterfaceSet(){
 * @param family the family of this interface inet or inet, ipx or inet6
 *  Must of one of the families defined in interfaces.h
 * @param method for the family.  see interfaces man page for family methods.
 * @return true if successfull.
 */ 
 bool Interfaces::addInterface(QString interface, QString family, QString method){
  if(acceptedFamily.contains(family)==0)
    return false;
  interface = interface.simplifyWhiteSpace();
  interface = interface.replace(QRegExp(" "), "");
  interfaces.append("");
  interfaces.append(QString(IFACE " %1 %2 %3").arg(interface).arg(family).arg(method));
  return true;
 }
 /**
+ * Copies interface with name interface to name newInterface
+ * @param newInterface name of the new interface.
+ * @return bool true if successfull
+ */ 
+bool Interfaces::copyInterface(QString interface, QString newInterface){
+  if(!setInterface(interface)) return false;
+         
+  QStringList::Iterator it = currentIface;
+  it++;
+  
+  bool error;
+  addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error));
+  if(!setInterface(newInterface)) return false;
+  QStringList::Iterator newIface = currentIface;
+  newIface++;
+  
+  for ( it; it != interfaces.end(); ++it ){
+    if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)))
+      break;
+    newIface = interfaces.insert(newIface, *it);
+  }
+ 
+  return true;
+}
+/**
 * Remove the currently selected interface and all of its options.
 * @return bool if successfull or not.
 */ 
 bool Interfaces::removeInterface(){
  if(currentIface == interfaces.end())
    return false;
  (*currentIface) = "";
  return removeAllInterfaceOptions();
 }
 /**
 * Gets the hardware name of the interface that is currently selected.
 * @return QString name of the hardware interface (eth0, usb2, wlan1...).
 * @param error set to true if any error occurs, false otherwise.
 */ 
 QString Interfaces::getInterfaceName(bool &error){
@@ -388,38 +414,52 @@ QString Interfaces::getScript(bool &error){
 }
 /**
 * Helper function used to parse through the QStringList and put pointers in 
 *  the correct place.
 * @param stanza The stanza (auto, iface, mapping) to look for.
 * @param option string that must be in the stanza's main line.
 * @param interator interator to place at location of stanza if successfull.
 * @return bool true if the stanza is found.
 */ 
 bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){
  bool found = false;
  iterator = interfaces.end();
  for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
    QString line = (*it).simplifyWhiteSpace();
    if(line.contains(stanza) && line.contains(option)){
-      if(found == true){
+      uint point = line.find(option);
-        qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
+      bool valid = true;
+      if(point > 0){
+        // There are more chars in the line. check +1
+        if(line.at(point-1) != ' ')
+          valid = false;
+      }
+      point += option.length();
+      if(point < line.length()-1){
+        // There are more chars in the line. check -1
+        if(line.at(point) != ' ')
+          valid = false;
+      }
+      if(valid){
+        if(found == true){
+          qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
+        }
+        found = true;
+        iterator = it;
      }
-      qDebug("Found");
-      found = true;
-      iterator = it;
    }
  }
  return found;
 }
 /**
 * Sets a value of an option in a stanza
 * @param start the start of the stanza
 * @param option the option to use when setting value.
 * @return bool true if successfull, false otherwise.
 */
 bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){
  if(start == interfaces.end())
    return false;
  
  bool found = false;
diff --git a/noncore/net/networksetup/interfaces.h b/noncore/net/networksetup/interfaces.h
index e617c17..7cf04f0 100644
--- a/noncore/net/networksetup/interfaces.h
+++ b/noncore/net/networksetup/interfaces.h
@@ -17,32 +17,33 @@
 /**
 * This class provides a clean frontend for parsing the network interfaces file.
 * It provides helper functions to minipulate the options within the file.
 * See the interfaces man page for the syntax rules.
 */
 class Interfaces {
 public:
  Interfaces(QString useInterfacesFile = "/etc/network/interfaces");
  QStringList getInterfaceList();
  
  bool isAuto(QString interface);
  bool setAuto(QString interface, bool setAuto);
  
  bool removeInterface();
  bool addInterface(QString interface, QString family, QString method);
+  bool copyInterface(QString oldInterface, QString newInterface);
  bool setInterface(QString interface);
  bool isInterfaceSet();
  QString getInterfaceName(bool &error);
  bool setInterfaceName(QString newName);
  QString getInterfaceFamily(bool &error);
  bool setInterfaceFamily(QString newName);
  QString getInterfaceMethod(bool &error);
  bool setInterfaceMethod(QString newName);
  QString getInterfaceOption(QString option, bool &error); 
  bool setInterfaceOption(QString option, QString value);
  bool removeAllInterfaceOptions();
  
  bool setMapping(QString interface);
  void addMapping(QString options);
  bool setMap(QString map, QString value);
  QString getMap(QString map, bool &error);
diff --git a/noncore/net/networksetup/interfacesetupimp.cpp b/noncore/net/networksetup/interfacesetupimp.cpp
index c16d821..bdbdfde 100644
--- a/noncore/net/networksetup/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfacesetupimp.cpp
@@ -76,52 +76,57 @@ bool InterfaceSetupImp::saveSettings(){
    interfaces->setInterfaceOption("gateway", gatewayEdit->text());
    QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
    interfaces->setInterfaceOption("up "DNSSCRIPT" add ", dns);
    interfaces->setInterfaceOption("down "DNSSCRIPT" remove ", dns);
  }
  
  // IP Information
  interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
  return true;
 }
 /**
 * The Profile has changed.
 * @profile the new profile.
 */ 
 void InterfaceSetupImp::setProfile(const QString &profile){
-  QString newInterfaceName = interface->getInterfaceName() + profile;
+  QString newInterfaceName = interface->getInterfaceName();
-  
+  if(profile.length() > 0)
+    newInterfaceName += "_" + profile;
+  qDebug( newInterfaceName.latin1());
  // See if we have to make a interface.
  if(!interfaces->setInterface(newInterfaceName)){
-    interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
-    if(!interfaces->setInterface(newInterfaceName)){
-      qDebug("InterfaceSetupImp: Added interface, but still can't set.");
-              return;      
-    }
    // Add making for this new interface if need too
    if(profile != ""){
+      interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
      if(!interfaces->setMapping(interface->getInterfaceName())){
        interfaces->addMapping(interface->getInterfaceName());
        if(!interfaces->setMapping(interface->getInterfaceName())){
          qDebug("InterfaceSetupImp: Added Mapping, but still can't set.");
          return;
        }
      }
-      interfaces->setScript("getprofile.sh");
      interfaces->setMap("map", newInterfaceName);
+      interfaces->setScript("getprofile.sh");
+    }
+    else{
+      interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
+      if(!interfaces->setInterface(newInterfaceName)){
+        qDebug("InterfaceSetupImp: Added interface, but still can't set.");
+                return;      
+      }
    }
  }
  
  // We must have a valid interface to get this far so read some settings.
  
  // DHCP
  bool error = false;
  if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
    dhcpCheckBox->setChecked(true);
  else
    dhcpCheckBox->setChecked(false);
  leaseTime->setValue(interfaces->getInterfaceOption("leasehours", error).toInt());
  if(error)
    leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
  if(error)
    leaseTime->setValue(24);
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 3c0af6a..9f07f0d 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -215,50 +215,50 @@ void MainWindowImp::removeClicked(){
 * 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;
  } 
  QString currentProfile = currentProfileLabel->text();
  if(profilesList->count() <= 1 || currentProfile == "All"){
    currentProfile = "";
  }
  
  Interface *i = interfaceItems[item];
  if(i->getModuleOwner()){
-    i->getModuleOwner()->setProfile(currentProfileLabel->text());
+    i->getModuleOwner()->setProfile(currentProfile);
    QTabWidget *tabWidget = NULL;
    QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
    if(moduleConfigure != NULL){
      if(tabWidget != NULL){
        InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
-        configure->setProfile(currentProfileLabel->text());
+        configure->setProfile(currentProfile);
        tabWidget->insertTab(configure, "TCP/IP");
      
      }
      moduleConfigure->showMaximized();
      moduleConfigure->show();
      return;
    }
  }
  
  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
-  configure->setProfile(currentProfileLabel->text());
+  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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
@@ -364,38 +364,40 @@ void MainWindowImp::jobDone(KProcess *process){
    }
  }
  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);
+        if(!(*ni).contains("_")){
-        i->setAttached(false);
+          Interface *i = new Interface(this, *ni, false);
-        i->setHardwareName("Disconnected");
+          i->setAttached(false);
-        interfaceNames.insert(i->getInterfaceName(), i);
+          i->setHardwareName("Disconnected");
-        updateInterface(i);
+          interfaceNames.insert(i->getInterfaceName(), i);
-              connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+          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;
@@ -476,46 +478,50 @@ void MainWindowImp::removeProfile(){
    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.
+  //TODO
 }
 /**
 * 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();
      }
    }
  }
diff --git a/noncore/settings/networksettings/interfaces.cpp b/noncore/settings/networksettings/interfaces.cpp
index eef42df..0927258 100644
--- a/noncore/settings/networksettings/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces.cpp
@@ -154,32 +154,58 @@ bool Interfaces::isInterfaceSet(){
 * @param family the family of this interface inet or inet, ipx or inet6
 *  Must of one of the families defined in interfaces.h
 * @param method for the family.  see interfaces man page for family methods.
 * @return true if successfull.
 */ 
 bool Interfaces::addInterface(QString interface, QString family, QString method){
  if(acceptedFamily.contains(family)==0)
    return false;
  interface = interface.simplifyWhiteSpace();
  interface = interface.replace(QRegExp(" "), "");
  interfaces.append("");
  interfaces.append(QString(IFACE " %1 %2 %3").arg(interface).arg(family).arg(method));
  return true;
 }
 /**
+ * Copies interface with name interface to name newInterface
+ * @param newInterface name of the new interface.
+ * @return bool true if successfull
+ */ 
+bool Interfaces::copyInterface(QString interface, QString newInterface){
+  if(!setInterface(interface)) return false;
+         
+  QStringList::Iterator it = currentIface;
+  it++;
+  
+  bool error;
+  addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error));
+  if(!setInterface(newInterface)) return false;
+  QStringList::Iterator newIface = currentIface;
+  newIface++;
+  
+  for ( it; it != interfaces.end(); ++it ){
+    if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)))
+      break;
+    newIface = interfaces.insert(newIface, *it);
+  }
+ 
+  return true;
+}
+/**
 * Remove the currently selected interface and all of its options.
 * @return bool if successfull or not.
 */ 
 bool Interfaces::removeInterface(){
  if(currentIface == interfaces.end())
    return false;
  (*currentIface) = "";
  return removeAllInterfaceOptions();
 }
 /**
 * Gets the hardware name of the interface that is currently selected.
 * @return QString name of the hardware interface (eth0, usb2, wlan1...).
 * @param error set to true if any error occurs, false otherwise.
 */ 
 QString Interfaces::getInterfaceName(bool &error){
@@ -388,38 +414,52 @@ QString Interfaces::getScript(bool &error){
 }
 /**
 * Helper function used to parse through the QStringList and put pointers in 
 *  the correct place.
 * @param stanza The stanza (auto, iface, mapping) to look for.
 * @param option string that must be in the stanza's main line.
 * @param interator interator to place at location of stanza if successfull.
 * @return bool true if the stanza is found.
 */ 
 bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){
  bool found = false;
  iterator = interfaces.end();
  for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
    QString line = (*it).simplifyWhiteSpace();
    if(line.contains(stanza) && line.contains(option)){
-      if(found == true){
+      uint point = line.find(option);
-        qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
+      bool valid = true;
+      if(point > 0){
+        // There are more chars in the line. check +1
+        if(line.at(point-1) != ' ')
+          valid = false;
+      }
+      point += option.length();
+      if(point < line.length()-1){
+        // There are more chars in the line. check -1
+        if(line.at(point) != ' ')
+          valid = false;
+      }
+      if(valid){
+        if(found == true){
+          qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
+        }
+        found = true;
+        iterator = it;
      }
-      qDebug("Found");
-      found = true;
-      iterator = it;
    }
  }
  return found;
 }
 /**
 * Sets a value of an option in a stanza
 * @param start the start of the stanza
 * @param option the option to use when setting value.
 * @return bool true if successfull, false otherwise.
 */
 bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){
  if(start == interfaces.end())
    return false;
  
  bool found = false;
diff --git a/noncore/settings/networksettings/interfaces.h b/noncore/settings/networksettings/interfaces.h
index e617c17..7cf04f0 100644
--- a/noncore/settings/networksettings/interfaces.h
+++ b/noncore/settings/networksettings/interfaces.h
@@ -17,32 +17,33 @@
 /**
 * This class provides a clean frontend for parsing the network interfaces file.
 * It provides helper functions to minipulate the options within the file.
 * See the interfaces man page for the syntax rules.
 */
 class Interfaces {
 public:
  Interfaces(QString useInterfacesFile = "/etc/network/interfaces");
  QStringList getInterfaceList();
  
  bool isAuto(QString interface);
  bool setAuto(QString interface, bool setAuto);
  
  bool removeInterface();
  bool addInterface(QString interface, QString family, QString method);
+  bool copyInterface(QString oldInterface, QString newInterface);
  bool setInterface(QString interface);
  bool isInterfaceSet();
  QString getInterfaceName(bool &error);
  bool setInterfaceName(QString newName);
  QString getInterfaceFamily(bool &error);
  bool setInterfaceFamily(QString newName);
  QString getInterfaceMethod(bool &error);
  bool setInterfaceMethod(QString newName);
  QString getInterfaceOption(QString option, bool &error); 
  bool setInterfaceOption(QString option, QString value);
  bool removeAllInterfaceOptions();
  
  bool setMapping(QString interface);
  void addMapping(QString options);
  bool setMap(QString map, QString value);
  QString getMap(QString map, bool &error);
diff --git a/noncore/settings/networksettings/interfacesetupimp.cpp b/noncore/settings/networksettings/interfacesetupimp.cpp
index c16d821..bdbdfde 100644
--- a/noncore/settings/networksettings/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfacesetupimp.cpp
@@ -76,52 +76,57 @@ bool InterfaceSetupImp::saveSettings(){
    interfaces->setInterfaceOption("gateway", gatewayEdit->text());
    QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
    interfaces->setInterfaceOption("up "DNSSCRIPT" add ", dns);
    interfaces->setInterfaceOption("down "DNSSCRIPT" remove ", dns);
  }
  
  // IP Information
  interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
  return true;
 }
 /**
 * The Profile has changed.
 * @profile the new profile.
 */ 
 void InterfaceSetupImp::setProfile(const QString &profile){
-  QString newInterfaceName = interface->getInterfaceName() + profile;
+  QString newInterfaceName = interface->getInterfaceName();
-  
+  if(profile.length() > 0)
+    newInterfaceName += "_" + profile;
+  qDebug( newInterfaceName.latin1());
  // See if we have to make a interface.
  if(!interfaces->setInterface(newInterfaceName)){
-    interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
-    if(!interfaces->setInterface(newInterfaceName)){
-      qDebug("InterfaceSetupImp: Added interface, but still can't set.");
-              return;      
-    }
    // Add making for this new interface if need too
    if(profile != ""){
+      interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
      if(!interfaces->setMapping(interface->getInterfaceName())){
        interfaces->addMapping(interface->getInterfaceName());
        if(!interfaces->setMapping(interface->getInterfaceName())){
          qDebug("InterfaceSetupImp: Added Mapping, but still can't set.");
          return;
        }
      }
-      interfaces->setScript("getprofile.sh");
      interfaces->setMap("map", newInterfaceName);
+      interfaces->setScript("getprofile.sh");
+    }
+    else{
+      interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
+      if(!interfaces->setInterface(newInterfaceName)){
+        qDebug("InterfaceSetupImp: Added interface, but still can't set.");
+                return;      
+      }
    }
  }
  
  // We must have a valid interface to get this far so read some settings.
  
  // DHCP
  bool error = false;
  if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
    dhcpCheckBox->setChecked(true);
  else
    dhcpCheckBox->setChecked(false);
  leaseTime->setValue(interfaces->getInterfaceOption("leasehours", error).toInt());
  if(error)
    leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
  if(error)
    leaseTime->setValue(24);
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 3c0af6a..9f07f0d 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -215,50 +215,50 @@ void MainWindowImp::removeClicked(){
 * 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;
  } 
  QString currentProfile = currentProfileLabel->text();
  if(profilesList->count() <= 1 || currentProfile == "All"){
    currentProfile = "";
  }
  
  Interface *i = interfaceItems[item];
  if(i->getModuleOwner()){
-    i->getModuleOwner()->setProfile(currentProfileLabel->text());
+    i->getModuleOwner()->setProfile(currentProfile);
    QTabWidget *tabWidget = NULL;
    QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
    if(moduleConfigure != NULL){
      if(tabWidget != NULL){
        InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
-        configure->setProfile(currentProfileLabel->text());
+        configure->setProfile(currentProfile);
        tabWidget->insertTab(configure, "TCP/IP");
      
      }
      moduleConfigure->showMaximized();
      moduleConfigure->show();
      return;
    }
  }
  
  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
-  configure->setProfile(currentProfileLabel->text());
+  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, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
@@ -364,38 +364,40 @@ void MainWindowImp::jobDone(KProcess *process){
    }
  }
  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);
+        if(!(*ni).contains("_")){
-        i->setAttached(false);
+          Interface *i = new Interface(this, *ni, false);
-        i->setHardwareName("Disconnected");
+          i->setAttached(false);
-        interfaceNames.insert(i->getInterfaceName(), i);
+          i->setHardwareName("Disconnected");
-        updateInterface(i);
+          interfaceNames.insert(i->getInterfaceName(), i);
-              connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+          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;
@@ -476,46 +478,50 @@ void MainWindowImp::removeProfile(){
    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.
+  //TODO
 }
 /**
 * 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();
      }
    }
  }