1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 50131d8..7e24cda 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -162,66 +162,64 @@ void MainWindowImp::getAllInterfaces(){
     struct ifreq ifrs[100];
     struct ifconf ifc;
     ifc.ifc_len = sizeof(ifrs);
     ifc.ifc_req = ifrs;
     result = ioctl(sockfd, SIOCGIFCONF, &ifc);
     
     for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) {
       struct ifreq *pifr = &ifrs[i];
   
       ifaces += pifr->ifr_name;
     }
   } else {
     procFile.open(IO_ReadOnly);
     QString line;
     QTextStream procTs(&procFile);
     int loc = -1;
 
     procTs.readLine(); // eat a line
     procTs.readLine(); // eat a line
     while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) {
       if((loc = line.find(":")) != -1) {
         ifaces += line.left(loc);
       }
     }
   }
 
   for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {
     int flags = 0, family;
     Interface *i = NULL;
 
     strcpy(ifr.ifr_name, (*it).latin1());
 
-    qWarning("ifr.ifr_name=%s\n", ifr.ifr_name); 
-
     struct ifreq ifcopy;
     ifcopy = ifr;
     result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);
     flags = ifcopy.ifr_flags;
     i = new Interface(this, ifr.ifr_name, false);
 	i->setAttached(true);
     if ((flags & IFF_UP) == IFF_UP)
       i->setStatus(true);
     else
       i->setStatus(false);
 
     if ((flags & IFF_BROADCAST) == IFF_BROADCAST)
       i->setHardwareName("Ethernet");
     else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)
       i->setHardwareName("Point to Point");
     else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)
       i->setHardwareName("Multicast");
     else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)
       i->setHardwareName("Loopback");
     else
       i->setHardwareName("Unknown");
 
     qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name);
     interfaceNames.insert(i->getInterfaceName(), i);
     updateInterface(i);
     connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
   }
 }
 
 /**
  * Load all modules that are found in the path
  * @param path a directory that is scaned for any plugins that can be loaded
@@ -360,77 +358,80 @@ void MainWindowImp::removeClicked(){
   if(!item) {
     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
     return; 
   }
   
   Interface *i = interfaceItems[item];
   if(i->getModuleOwner() == NULL){
     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
   }
   else{
     if(!i->getModuleOwner()->remove(i))
       QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok);
     else{
       QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::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.
  */ 
 void MainWindowImp::configureClicked(){
   QListViewItem *item = connectionList->currentItem();
   if(!item){
     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);
     return;
   } 
 
+  QString currentProfileText = currentProfileLabel->text();
+  if(currentProfileText.upper() == "ALL");
+    currentProfileText = "";
+
   Interface *i = interfaceItems[item];
+
   if(i->getModuleOwner()){
     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
     if(moduleConfigure != NULL){
+      i->getModuleOwner()->setProfile(currentProfileText);
       moduleConfigure->showMaximized();
       return;
     }
   }
   
   InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );
-  QString currentProfileText = currentProfileLabel->text();
-  if(currentProfileText.upper() == "ALL");
-    currentProfileText = "";
   configure->setProfile(currentProfileText);
   configure->showMaximized();
 }
 
 /**
  * Pull up the information about the currently selected interface.
  * Report an error if no interface is selected.
  * If the interface has a module owner then request its configure.
  */ 
 void MainWindowImp::informationClicked(){
   QListViewItem *item = connectionList->currentItem();
   if(!item){
     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
     return;
   } 
  
   Interface *i = interfaceItems[item];
   if(!i->isAttached()){
     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);
     return;
   }
 
   if(i->getModuleOwner()){
     QWidget *moduleInformation = i->getModuleOwner()->information(i);
     if(moduleInformation != NULL){
       moduleInformation->showMaximized();
 #ifdef DEBUG
       qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
 #endif
       return;
     }
   }