1 files changed, 36 insertions, 38 deletions
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -4,3 +4,2 @@
 #include "interfacesetupimp.h"
-#include "interface.h"
 #include "kprocess.h"
@@ -8,2 +7,3 @@
 
+
 #include <qpushbutton.h>
@@ -33,7 +33,2 @@
 
-#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) {
@@ -83,2 +78,20 @@ 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;
+  }
 }
@@ -92,3 +105,3 @@ void MainWindowImp::loadModules(QString path){
 Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
-  //qDebug(pluginFileName.latin1());
+  qDebug(pluginFileName.latin1());
   QLibrary *lib = new QLibrary(pluginFileName);
@@ -114,30 +127,2 @@ 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;
-}
-*/
-
 /**
@@ -163,3 +148,6 @@ 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; 
+  }
   
@@ -180,3 +168,6 @@ 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;
+  } 
   
@@ -199,3 +190,6 @@ 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;
+  }
 	
@@ -313,2 +307,6 @@ void MainWindowImp::updateInterface(Interface *i){
     typeName = "lo";
+  if(i->getInterfaceName().contains("irda"))
+    typeName = "irda";
+  if(i->getInterfaceName().contains("wlan"))
+    typeName = "wlan";
   QPixmap type = (Resource::loadPixmap(typeName));