1 files changed, 13 insertions, 8 deletions

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
@@ -68,68 +68,73 @@ bool InterfaceSetupImp::saveSettings(){
     interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
     interfaces->setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
     interfaces->setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
   }
   else{
     interfaces->setInterfaceMethod("static");
     interfaces->setInterfaceOption("address", ipAddressEdit->text());
     interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
     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);
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
   QString dns = interfaces->getInterfaceOption("up interfacednsscript add", error);
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 
   }