author | tille <tille> | 2003-05-22 15:10:21 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-22 15:10:21 (UTC) |
commit | 00cbc1e933f90fe67f53928472567ddf4a17eabd (patch) (unidiff) | |
tree | f5e0d34303afcc688a0ad38be5e5489f6f0c8a6f | |
parent | 273857932d4d4af9bf78bfca92f2986163e5f4f6 (diff) | |
download | opie-00cbc1e933f90fe67f53928472567ddf4a17eabd.zip opie-00cbc1e933f90fe67f53928472567ddf4a17eabd.tar.gz opie-00cbc1e933f90fe67f53928472567ddf4a17eabd.tar.bz2 |
pppplugin
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 7e24cda..56bbd2c 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -242,12 +242,13 @@ void MainWindowImp::loadModules(const QString &path){ | |||
242 | #ifdef QWS | 242 | #ifdef QWS |
243 | if(fi->fileName().contains(".so")){ | 243 | if(fi->fileName().contains(".so")){ |
244 | #else | 244 | #else |
245 | if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){ | 245 | if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){ |
246 | #endif | 246 | #endif |
247 | loadPlugin(path + "/" + fi->fileName()); | 247 | loadPlugin(path + "/" + fi->fileName()); |
248 | qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1()); | ||
248 | } | 249 | } |
249 | ++it; | 250 | ++it; |
250 | } | 251 | } |
251 | } | 252 | } |
252 | 253 | ||
253 | /** | 254 | /** |
@@ -284,15 +285,13 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & | |||
284 | libraries.insert(object, lib); | 285 | libraries.insert(object, lib); |
285 | return object; | 286 | return object; |
286 | 287 | ||
287 | #else | 288 | #else |
288 | QLibrary *lib = loader->library(pluginFileName); | 289 | QLibrary *lib = loader->library(pluginFileName); |
289 | if( !lib || !lib->hasSymbol(resolveString) ){ | 290 | if( !lib || !lib->hasSymbol(resolveString) ){ |
290 | #ifdef DEBUG | ||
291 | qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); | 291 | qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); |
292 | #endif | ||
293 | return NULL; | 292 | return NULL; |
294 | } | 293 | } |
295 | // Try to get an object. | 294 | // Try to get an object. |
296 | Module *object = ((Module* (*)()) lib->symbol(resolveString))(); | 295 | Module *object = ((Module* (*)()) lib->symbol(resolveString))(); |
297 | if(object == NULL){ | 296 | if(object == NULL){ |
298 | #ifdef DEBUG | 297 | #ifdef DEBUG |
@@ -338,12 +337,13 @@ void MainWindowImp::addClicked(){ | |||
338 | return; | 337 | return; |
339 | 338 | ||
340 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 339 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
341 | if(it.key()){ | 340 | if(it.key()){ |
342 | Interface *i = (it.key())->addNewInterface(item->text(0)); | 341 | Interface *i = (it.key())->addNewInterface(item->text(0)); |
343 | if(i){ | 342 | if(i){ |
343 | qDebug("iface name %s",i->getInterfaceName().latin1()); | ||
344 | interfaceNames.insert(i->getInterfaceName(), i); | 344 | interfaceNames.insert(i->getInterfaceName(), i); |
345 | updateInterface(i); | 345 | updateInterface(i); |
346 | } | 346 | } |
347 | } | 347 | } |
348 | } | 348 | } |
349 | } | 349 | } |