1 files changed, 13 insertions, 43 deletions

diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index a4a2875..fb7d7c9 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -56,10 +56,5 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi
     // Load connections.
     // /usr/local/kde/lib/libinterfaces.la
-#ifdef QWS
     loadModules(QPEApplication::qpeDir() + "plugins/networksettings");
-#else
-    loader = KLibLoader::self();
-    loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
-#endif
     getAllInterfaces();
 
@@ -147,5 +142,4 @@ MainWindowImp::~MainWindowImp()
     }
 
-#ifdef QWS
     // Delete Modules and Libraries
     QMap<Module*, QLibrary*>::Iterator it;
@@ -157,7 +151,4 @@ MainWindowImp::~MainWindowImp()
         //delete it.data();
     }
-#else
-    // klibloader automaticly deletes the libraries for us...
-#endif
 }
 
@@ -285,4 +276,5 @@ void MainWindowImp::loadModules(const QString &path)
         return;
 
+    QString lang = ::getenv("LANG");
     // Don't want sym links
     d.setFilter( QDir::Files | QDir::NoSymLinks );
@@ -292,12 +284,15 @@ void MainWindowImp::loadModules(const QString &path)
     while ( (fi=it.current()) )
     {
-#ifdef QWS
         if(fi->fileName().contains(".so"))
         {
-#else
-        if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_"))
-        {
-#endif
-            loadPlugin(path + "/" + fi->fileName());
+            /* if loaded install translation */
+            if( loadPlugin(path + "/" + fi->fileName()) != 0l ){
+                QTranslator *trans = new QTranslator(qApp);
+                QString fn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+ fi->fileName().left( fi->fileName().find(".") )+".qm";
+                if( trans->load( fn ) )
+                    qApp->installTranslator( trans );
+                else
+                    delete trans;
+            }
             odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl;
         }
@@ -317,5 +312,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
     odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl;
 #endif
-#ifdef QWS
     QLibrary *lib = new QLibrary(pluginFileName);
     void *functionPointer = lib->resolve(resolveString);
@@ -326,9 +320,9 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
 #endif
         delete lib;
-        return NULL;
+        return 0;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) functionPointer)();
-    if(object == NULL)
+    if(object == 0)
     {
 #ifdef DEBUG
@@ -336,5 +330,5 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
 #endif
         delete lib;
-        return NULL;
+        return 0;
     }
 
@@ -343,28 +337,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
     libraries.insert(object, lib);
     return object;
-
-#else
-    QLibrary *lib = loader->library(pluginFileName);
-    if( !lib || !lib->hasSymbol(resolveString) )
-    {
-        odebug << QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1() << oendl;
-        return NULL;
-    }
-    // Try to get an object.
-    Module *object = ((Module* (*)()) lib->symbol(resolveString))();
-    if(object == NULL)
-    {
-#ifdef DEBUG
-        odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
-#endif
-        return NULL;
-    }
-#ifdef DEBUG
-    odebug << "MainWindowImp::loadPlugin:: Found object, storing." << oendl;
-#endif
-    // Store for deletion later
-    libraries.insert(object, lib);
-    return object;
-#endif
 }