1 files changed, 37 insertions, 39 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -3,8 +3,8 @@
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
-#include "interface.h"
 #include "kprocess.h"
 #include "module.h"
 
+
 #include <qpushbutton.h>
 #include <qtabwidget.h>
@@ -32,9 +32,4 @@
 #define TEMP_UP "/tmp/ifconfig"
 
-#define NO_SELECT_ERROR_AND_RETURN { \
-  QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \
-  return; \
-}
-
 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {
   connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));
@@ -82,4 +77,22 @@ MainWindowImp::~MainWindowImp(){
 
 void MainWindowImp::loadModules(QString path){
+  qDebug(path.latin1());
+  QDir d;
+  d.setPath(path);
+  if(!d.exists()){
+    qDebug("MainWindowImp:: Path doesn't exists");
+    return;
+  }
+  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")){
+      qDebug("Found");
+      Module *foo = loadPlugin(path + "/" + fi->fileName());
+    }
+    ++it;
+  }
 }
 
@@ -91,5 +104,5 @@ void MainWindowImp::loadModules(QString path){
  */ 
 Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
-  //qDebug(pluginFileName.latin1());
+  qDebug(pluginFileName.latin1());
   QLibrary *lib = new QLibrary(pluginFileName);
   void *functionPointer = lib->resolve(resolveString);
@@ -113,32 +126,4 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
 }
 
-/*
-QList<QString> MainWindowImp::retrieveUnloadedPluginList(){
-  QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
-  QString path = DirStr + "plugins";
-  QDir d(path);
-  d.setFilter( QDir::Files | QDir::Hidden );
-
-  QMap<QObject*, QLibrary*>::Iterator libraryIt;
-  QList<QString> rlist; 
-  rlist.setAutoDelete(false);
-	  
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
-  QFileInfo *fi;
-  while ( (fi=it.current()) ) {
-    if(fi->fileName().contains(".so")){
-      for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )
-        if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){
-          QString *s = new QString(path + "/" + fi->fileName());
-          rlist.append(s);
-	}
-    }
-    ++it;
-  }
-  return rlist;
-}
-*/
-
 /**
  * The Add button was clicked.  Bring up the add dialog and if OK is hit
@@ -162,5 +147,8 @@ void MainWindowImp::addClicked(){
 void MainWindowImp::removeClicked(){
   QListViewItem *item = serviceList->currentItem();
-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+  if(item == NULL) {
+     QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+     return; 
+  }
   
   if(modules.find(interfaceItems[item]) == modules.end()){
@@ -179,5 +167,8 @@ void MainWindowImp::removeClicked(){
 void MainWindowImp::configureClicked(){
   QListViewItem *item = serviceList->currentItem();
-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+  if(item == NULL){
+   	 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+     return;
+  } 
   
   if(modules.find(interfaceItems[item]) == modules.end()){
@@ -198,6 +189,9 @@ void MainWindowImp::configureClicked(){
 void MainWindowImp::informationClicked(){
   QListViewItem *item = serviceList->currentItem();
-  if(item == NULL)NO_SELECT_ERROR_AND_RETURN
-	
+  if(item == NULL){
+    QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+    return;
+  }
+
   if(modules.find(interfaceItems[item]) == modules.end()){
     InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
@@ -312,4 +306,8 @@ void MainWindowImp::updateInterface(Interface *i){
   if(i->getHardwareName().contains("Local Loopback"))
     typeName = "lo";
+  if(i->getInterfaceName().contains("irda"))
+    typeName = "irda";
+  if(i->getInterfaceName().contains("wlan"))
+    typeName = "wlan";
   QPixmap type = (Resource::loadPixmap(typeName));
   item->setPixmap(1, type);