-rw-r--r-- | core/settings/security/main.cpp | 4 | ||||
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp index f161109..7f24490 100644 --- a/core/settings/security/main.cpp +++ b/core/settings/security/main.cpp | |||
@@ -15,19 +15,17 @@ int main(int argc, char **argv) { | |||
15 | if ( protectConfigDialog ) | 15 | if ( protectConfigDialog ) |
16 | { | 16 | { |
17 | if (Opie::Security::Internal::runPlugins() != 0) | 17 | if (Opie::Security::Internal::runPlugins() != 0) |
18 | { | 18 | { |
19 | // authentication failed | 19 | // authentication failed |
20 | show = false; | 20 | show = false; |
21 | } | 21 | } |
22 | } | 22 | } |
23 | if ( show == true ) | 23 | if ( show == true ){ |
24 | { | ||
25 | printf("building dialog\n"); | ||
26 | MultiauthConfig dialog; | 24 | MultiauthConfig dialog; |
27 | app.setMainWidget(&dialog); | 25 | app.setMainWidget(&dialog); |
28 | 26 | ||
29 | if ( dialog.exec() == QDialog::Accepted ) { | 27 | if ( dialog.exec() == QDialog::Accepted ) { |
30 | // write the general, login and sync config | 28 | // write the general, login and sync config |
31 | dialog.writeConfig(); | 29 | dialog.writeConfig(); |
32 | // call writeConfig() on each plugin config widget | 30 | // call writeConfig() on each plugin config widget |
33 | Opie::Security::MultiauthConfigWidget *confWidget; | 31 | Opie::Security::MultiauthConfigWidget *confWidget; |
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp index 0ce4542..93e73c3 100644 --- a/core/settings/security/multiauthconfig.cpp +++ b/core/settings/security/multiauthconfig.cpp | |||
@@ -407,36 +407,31 @@ void MultiauthConfig::writeConfig() | |||
407 | /// slot used to record the fact plugins order has been modified | 407 | /// slot used to record the fact plugins order has been modified |
408 | void MultiauthConfig::pluginsChanged() { | 408 | void MultiauthConfig::pluginsChanged() { |
409 | m_plugins_changed = true; | 409 | m_plugins_changed = true; |
410 | } | 410 | } |
411 | 411 | ||
412 | /// loads each multiauth plugin | 412 | /// loads each multiauth plugin |
413 | void MultiauthConfig::loadPlugins() { | 413 | void MultiauthConfig::loadPlugins() { |
414 | 414 | ||
415 | odebug << "loading plugins..." << oendl; | ||
416 | QString path = QPEApplication::qpeDir() + "/plugins/security"; | 415 | QString path = QPEApplication::qpeDir() + "/plugins/security"; |
417 | QDir dir( path, "lib*.so" ); | 416 | QDir dir( path, "lib*.so" ); |
418 | 417 | ||
419 | QStringList list = dir.entryList(); | 418 | QStringList list = dir.entryList(); |
420 | QStringList::Iterator it; | 419 | QStringList::Iterator it; |
421 | 420 | ||
422 | // temporary list used to sort plugins | 421 | // temporary list used to sort plugins |
423 | QMap<QString, MultiauthPlugin> sortList; | 422 | QMap<QString, MultiauthPlugin> sortList; |
424 | 423 | ||
425 | for ( it = list.begin(); it != list.end(); ++it ) { | 424 | for ( it = list.begin(); it != list.end(); ++it ) { |
426 | QInterfacePtr<MultiauthPluginInterface> iface; | 425 | QInterfacePtr<MultiauthPluginInterface> iface; |
427 | QLibrary *lib = new QLibrary( path + "/" + *it ); | 426 | QLibrary *lib = new QLibrary( path + "/" + *it ); |
428 | QString libPath(path + "/" + *it); | 427 | QString libPath(path + "/" + *it); |
429 | odebug << "library path: " << libPath << oendl; | ||
430 | 428 | ||
431 | odebug << "querying: " << QString( path + "/" + *it ) << oendl; | ||
432 | if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { | 429 | if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { |
433 | odebug << "accepted: " << QString( path + "/" + *it ) << oendl; | ||
434 | |||
435 | MultiauthPlugin plugin; | 430 | MultiauthPlugin plugin; |
436 | plugin.library = lib; | 431 | plugin.library = lib; |
437 | plugin.iface = iface; | 432 | plugin.iface = iface; |
438 | plugin.name = QString(*it); | 433 | plugin.name = QString(*it); |
439 | 434 | ||
440 | // find out if plugins should be launched | 435 | // find out if plugins should be launched |
441 | if ( m_excludePlugins.grep( *it ).isEmpty() ) { | 436 | if ( m_excludePlugins.grep( *it ).isEmpty() ) { |
442 | plugin.active = true; | 437 | plugin.active = true; |
@@ -454,17 +449,16 @@ void MultiauthConfig::loadPlugins() { | |||
454 | pluginList.append( plugin ); | 449 | pluginList.append( plugin ); |
455 | } | 450 | } |
456 | // if plugin is not yet in the list, add it to the layout too | 451 | // if plugin is not yet in the list, add it to the layout too |
457 | else if ( !m_allPlugins.contains( plugin.name ) ) { | 452 | else if ( !m_allPlugins.contains( plugin.name ) ) { |
458 | pluginList.append( plugin ); | 453 | pluginList.append( plugin ); |
459 | } | 454 | } |
460 | 455 | ||
461 | } else { | 456 | } else { |
462 | odebug << "could not recognize " << QString( path + "/" + *it ) << oendl; | ||
463 | delete lib; | 457 | delete lib; |
464 | } | 458 | } |
465 | 459 | ||
466 | } // end for | 460 | } // end for |
467 | 461 | ||
468 | // put m_allPlugins tempPlugin objects into pluginList | 462 | // put m_allPlugins tempPlugin objects into pluginList |
469 | if ( !m_allPlugins.isEmpty() ) { | 463 | if ( !m_allPlugins.isEmpty() ) { |
470 | MultiauthPlugin tempPlugin; | 464 | MultiauthPlugin tempPlugin; |