author | zecke <zecke> | 2004-07-17 20:29:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-17 20:29:06 (UTC) |
commit | 872d24ff104d9ea9a7ea8ef68c8b3f98531ed677 (patch) (side-by-side diff) | |
tree | c889395e77601bdebe3ba21b5230640501c7e083 /core | |
parent | d68baedc489a7ab4ab1419144608d28d5336a884 (diff) | |
download | opie-872d24ff104d9ea9a7ea8ef68c8b3f98531ed677.zip opie-872d24ff104d9ea9a7ea8ef68c8b3f98531ed677.tar.gz opie-872d24ff104d9ea9a7ea8ef68c8b3f98531ed677.tar.bz2 |
Be less verbose
clean ups
-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 @@ -11,27 +11,25 @@ int main(int argc, char **argv) { pcfg->setGroup( "Misc" ); bool protectConfigDialog = ! pcfg->readBoolEntry("noProtectConfig", true); delete pcfg; bool show = true; if ( protectConfigDialog ) { if (Opie::Security::Internal::runPlugins() != 0) { // authentication failed show = false; } } - if ( show == true ) - { - printf("building dialog\n"); + if ( show == true ){ MultiauthConfig dialog; app.setMainWidget(&dialog); if ( dialog.exec() == QDialog::Accepted ) { // write the general, login and sync config dialog.writeConfig(); // call writeConfig() on each plugin config widget Opie::Security::MultiauthConfigWidget *confWidget; for ( confWidget = dialog.configWidgetList.first(); confWidget != 0; confWidget = dialog.configWidgetList.next() ) { confWidget->writeConfig(); } 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 @@ -403,44 +403,39 @@ void MultiauthConfig::writeConfig() } } /// slot used to record the fact plugins order has been modified void MultiauthConfig::pluginsChanged() { m_plugins_changed = true; } /// loads each multiauth plugin void MultiauthConfig::loadPlugins() { - odebug << "loading plugins..." << oendl; QString path = QPEApplication::qpeDir() + "/plugins/security"; QDir dir( path, "lib*.so" ); QStringList list = dir.entryList(); QStringList::Iterator it; // temporary list used to sort plugins QMap<QString, MultiauthPlugin> sortList; for ( it = list.begin(); it != list.end(); ++it ) { QInterfacePtr<MultiauthPluginInterface> iface; QLibrary *lib = new QLibrary( path + "/" + *it ); QString libPath(path + "/" + *it); - odebug << "library path: " << libPath << oendl; - odebug << "querying: " << QString( path + "/" + *it ) << oendl; if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { - odebug << "accepted: " << QString( path + "/" + *it ) << oendl; - MultiauthPlugin plugin; plugin.library = lib; plugin.iface = iface; plugin.name = QString(*it); // find out if plugins should be launched if ( m_excludePlugins.grep( *it ).isEmpty() ) { plugin.active = true; } else { plugin.active = false; } @@ -450,25 +445,24 @@ void MultiauthConfig::loadPlugins() { sortList.insert( plugin.name, plugin ); // on first start the list is off course empty if ( m_allPlugins.isEmpty() ) { pluginList.append( plugin ); } // if plugin is not yet in the list, add it to the layout too else if ( !m_allPlugins.contains( plugin.name ) ) { pluginList.append( plugin ); } } else { - odebug << "could not recognize " << QString( path + "/" + *it ) << oendl; delete lib; } } // end for // put m_allPlugins tempPlugin objects into pluginList if ( !m_allPlugins.isEmpty() ) { MultiauthPlugin tempPlugin; QStringList::Iterator stringit; for( stringit = m_allPlugins.begin(); stringit != m_allPlugins.end(); ++stringit ) { tempPlugin = ( sortList.find( *stringit ) ).data(); if ( !( (tempPlugin.name).isEmpty() ) ) { |