6 files changed, 7 insertions, 16 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
@@ -1,46 +1,44 @@
 #include "multiauthconfig.h"
 #include <opie2/oapplication.h>
 #include <opie2/odebug.h>
 
 
 
 int main(int argc, char **argv) {
     Opie::Core::OApplication app(argc, argv, "MultiAuthentication Config");
     // protect this dialog if option set
     Config* pcfg = new Config("Security");
     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();
             }
         }
         dialog.close();
         app.quit();
         return 0;
     } else {
         owarn << "authentication failed, not showing opie-security" << oendl;
         return 1;
     }
 }
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
@@ -223,432 +223,426 @@ void MultiauthConfig::moveSelectedDown()
         item->moveItem( item->itemBelow() );
     }
 }
 
 /// reads the <code>Security.conf</code> Config file, and updates parts of the user interface
 void MultiauthConfig::readConfig()
 {
     // pointer, so we release this Config when we want
     Config* pcfg = new Config("Security");
     pcfg->setGroup( "Misc" );
     m_generalConfig->onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) );
     m_generalConfig->onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) );
     m_generalConfig->nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) );
     m_generalConfig->noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) );
     m_generalConfig->explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) );
     m_generalConfig->allowBypass->setChecked( pcfg->readBoolEntry( "allowBypass", false ) );
 
     pcfg->setGroup( "Plugins" );
     m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' );
     m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' );
 
     /* Login and Sync stuff */
     pcfg->setGroup("Sync");
     int auth_peer = pcfg->readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
     int auth_peer_bits = pcfg->readNumEntry("auth_peer_bits",24);
 
     pcfg->setGroup("SyncMode");
     int mode = pcfg->readNumEntry("Mode",2); // Default to Sharp
     switch( mode ) {
         case 0x01:
             m_syncWidget->syncModeCombo->setCurrentItem( 0 );
             break;
         case 0x02:
         default:
             m_syncWidget->syncModeCombo->setCurrentItem( 1 );
             break;
         case 0x04:
             m_syncWidget->syncModeCombo->setCurrentItem( 2 );
             break;
     }
     /*
        cfg.setGroup("Remote");
        if ( telnetAvailable() )
        telnet->setChecked(cfg.readEntry("allow_telnet"));
        else
        telnet->hide();
 
        if ( sshAvailable() )
        ssh->setChecked(cfg.readEntry("allow_ssh"));
        else
        ssh->hide();
      */
 
     // release the Config handler
     delete pcfg;
     // indeed, selectNet will open the config file...
     selectNet(auth_peer,auth_peer_bits,TRUE);
 
     connect( m_syncWidget->syncnet, SIGNAL(textChanged(const QString&)),
              this, SLOT(setSyncNet(const QString&)));
 
 
 
     QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
 
     loginCfg.setGroup("General");
     autoLoginName=loginCfg.readEntry("AutoLogin","");
 
     if (autoLoginName.stripWhiteSpace().isEmpty()) {
         autoLogin=false;
     } else {
         autoLogin=true;
     }
 
 
     connect(m_loginWidget->autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
     connect(m_loginWidget->userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
     connect(m_syncWidget->restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults()));
     connect(m_syncWidget->deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry()));
 
     loadUsers();
     updateGUI();
 
 }
 
 void MultiauthConfig::writeConfig()
 {
     Config* pcfg = new Config("Security");
     pcfg->setGroup( "Plugins" );
     QStringList exclude;
     QStringList include;
     QStringList allPlugins;
 
     QListViewItemIterator list_it( m_pluginListView );
 
     // this makes sure the names get saved in the order selected
     for ( ; list_it.current(); ++list_it ) {
         QMap <QString, QCheckListItem *>::Iterator it;
         for ( it = m_plugins.begin(); it != m_plugins. end (); ++it ) {
             if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
                 exclude << it.key();
             } else if ( list_it.current() == (*it) && (*it)-> isOn () ){
                 include << it.key();
             }
             if ( list_it.current() == (*it) ) {
                 allPlugins << it.key();
             }
         }
     }
     pcfg->writeEntry( "ExcludePlugins", exclude, ',' );
     pcfg->writeEntry( "IncludePlugins", include, ',' );
     pcfg->writeEntry( "AllPlugins",  allPlugins, ',' );
 
     pcfg->setGroup( "Misc" );
     pcfg->writeEntry( "onStart",  m_generalConfig->onStart->isChecked() );
     pcfg->writeEntry( "onResume",  m_generalConfig->onResume->isChecked() );
     pcfg->writeEntry( "nbSuccessMin",  m_generalConfig->nbSuccessMin->text() );
     pcfg->writeEntry( "noProtectConfig",  m_generalConfig->noProtectConfig->isChecked() );
     pcfg->writeEntry( "explanScreens",  m_generalConfig->explanScreens->isChecked() );
     pcfg->writeEntry( "allowBypass",  m_generalConfig->allowBypass->isChecked() );
 
     /* Login and Sync stuff */
 
     pcfg->setGroup("Sync");
     int auth_peer=0;
     int auth_peer_bits;
     QString sn = m_syncWidget->syncnet->currentText();
     parseNet(sn,auth_peer,auth_peer_bits);
 
     //this is the *selected* (active) net range
     pcfg->writeEntry("auth_peer",auth_peer);
     pcfg->writeEntry("auth_peer_bits",auth_peer_bits);
 
     //write back all other net ranges in *cleartext*
     for (int i=0; i<10; i++) {
         QString target;
         target.sprintf("net%d", i);
         pcfg->writeEntry(target,m_syncWidget->syncnet->text(i));
     }
 
 #ifdef ODP
 #error "Use 0,1,2 and use Launcher"
 #endif
     /* keep the old code so we don't use currentItem directly */
     int value = 0x02;
     switch( m_syncWidget->syncModeCombo->currentItem() ) {
         case 0:
             value = 0x01;
             break;
         case 1:
             value = 0x02;
             break;
         case 2:
             value = 0x04;
             break;
     }
     pcfg->setGroup("SyncMode");
     pcfg->writeEntry( "Mode", value );
 
     /*
        pcfg->setGroup("Remote");
        if ( telnetAvailable() )
        pcfg->writeEntry("allow_telnet",telnet->isChecked());
        if ( sshAvailable() )
        pcfg->writeEntry("allow_ssh",ssh->isChecked());
     // ### write ssh/telnet sys config files
      */
 
     //release the Config handler
     delete pcfg;
 
     QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
     loginCfg.setGroup("General");
 
     if (autoLogin) {
         loginCfg.writeEntry("AutoLogin",autoLoginName);
     } else {
         loginCfg.removeEntry("AutoLogin");
     }
 
 }
 
 /// 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;
             }
 
             plugin.pluginObject = plugin.iface->plugin();
 
             // "prebuffer" it in one more list, to get the sorting done
             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() ) ) {
                 pluginList.append( tempPlugin );
             }
         }
     }
 
 }
 
 void MultiauthConfig::deleteListEntry()
 {
     m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem());
 }
 
 void MultiauthConfig::restoreDefaults()
 {
     QMessageBox unrecbox(
                          tr("Attention"),
                          tr( "<p>All user-defined net ranges will be lost."),
                          QMessageBox::Warning,
                          QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
                          0, QString::null, TRUE, WStyle_StaysOnTop);
     unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));
     unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
 
     if ( unrecbox.exec() == QMessageBox::Yes)
     {
         m_syncWidget->syncnet->clear();
         insertDefaultRanges();
     }
     m_syncWidget->syncModeCombo->setCurrentItem( 2 );
 }
 
 void MultiauthConfig::insertDefaultRanges()
 {
     m_syncWidget->syncnet->insertItem( tr( "192.168.129.0/24" ) );
     m_syncWidget->syncnet->insertItem( tr( "192.168.1.0/24" ) );
     m_syncWidget->syncnet->insertItem( tr( "192.168.0.0/16" ) );
     m_syncWidget->syncnet->insertItem( tr( "172.16.0.0/12" ) );
     m_syncWidget->syncnet->insertItem( tr( "10.0.0.0/8" ) );
     m_syncWidget->syncnet->insertItem( tr( "1.0.0.0/8" ) );
     m_syncWidget->syncnet->insertItem( tr( "Any" ) );
     m_syncWidget->syncnet->insertItem( tr( "None" ) );
 }
 
 void MultiauthConfig::updateGUI()
 {
     m_loginWidget->autologinToggle->setChecked(autoLogin);
     m_loginWidget->userlist->setEnabled(autoLogin);
 }
 
 void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update)
 {
     QString sn;
     if ( auth_peer_bits == 0 && auth_peer == 0 ) {
         sn = tr("Any");
     } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
         sn = tr("None");
     } else {
         sn =
             QString::number((auth_peer>>24)&0xff) + "."
             + QString::number((auth_peer>>16)&0xff) + "."
             + QString::number((auth_peer>>8)&0xff) + "."
             + QString::number((auth_peer>>0)&0xff) + "/"
             + QString::number(auth_peer_bits);
     }
 
     //insert user-defined list of netranges upon start
     if (update) {
         //User selected/active netrange first
         m_syncWidget->syncnet->insertItem( tr(sn) );
         Config cfg("Security");
         cfg.setGroup("Sync");
 
         //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe
         QString test = cfg.readEntry("net0","");
         if (test.isEmpty()) {
             insertDefaultRanges();
         } else {
             // 10 ought to be enough for everybody... :)
             // If you need more, don't forget to edit applySecurity() as well
             bool already_there=FALSE;
             for (int i=0; i<10; i++) {
                 QString target, netrange;
                 target.sprintf("net%d", i);
                 netrange = cfg.readEntry(target,"");
                 if (! netrange.isEmpty()){
                     //make sure we have no "twin" entries
                     for (int i=0; i<m_syncWidget->syncnet->count(); i++) {
                         if ( m_syncWidget->syncnet->text(i) == netrange ) {
                             already_there=TRUE;
                         }
                     }
                     if (! already_there) {
                         m_syncWidget->syncnet->insertItem( tr( netrange ) );
                     } else {
                         already_there=FALSE;
                     }
                 }
             }
         }
     }
 
     for (int i=0; i<m_syncWidget->syncnet->count(); i++) {
         if ( m_syncWidget->syncnet->text(i).left(sn.length()) == sn ) {
             m_syncWidget->syncnet->setCurrentItem(i);
             return;
         }
     }
     odebug << "No match for \"" << sn << "\"" << oendl;
 }
 
 void MultiauthConfig::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
         auth_peer = 0;
         auth_peer_bits = 0;
     } else if ( sn == tr("None") ) {
         auth_peer = 0;
         auth_peer_bits = 32;
     } else {
         int x=0;
         for (int i=0; i<4; i++) {
             int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
             auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
             x = nx+1;
         }
         uint n = (uint)sn.find(' ',x)-x;
         auth_peer_bits = sn.mid(x,n).toInt();
     }
 }
 
 void MultiauthConfig::loadUsers()
 {
     QFile passwd("/etc/passwd");
     if ( passwd.open(IO_ReadOnly) ) {
         QTextStream t( &passwd );
         QString s;
         QStringList account;
         while ( !t.eof() ) {
             account = QStringList::split(':',t.readLine());
             // Hide disabled accounts and some special accounts
             if (*account.at(1)!="*" && *account.at(0)!="ppp" && *account.at(0)!="messagebus") {
 
                 m_loginWidget->userlist->insertItem(*account.at(0));
                 // Highlight this item if it is set to m_loginWidget->autologinToggle
                 if ( *account.at(0) == autoLoginName)
                     m_loginWidget->userlist->setCurrentItem(m_loginWidget->userlist->count()-1);
             }
         }
         passwd.close();
     }
 
 }
 
 void MultiauthConfig::toggleAutoLogin(bool val)
 {
     autoLogin=val;
     m_loginWidget->userlist->setEnabled(val);
     // if autoLogin is true, we will set by default the login currently visible in the userlist
     if (autoLogin)
         autoLoginName=m_loginWidget->userlist->currentText();
 }
 
 
 
 
 void MultiauthConfig::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits,FALSE);
 }
 
 void MultiauthConfig::changeLoginName( int idx )
 {
     autoLoginName = m_loginWidget->userlist->text(idx);;
     updateGUI();
 }
 
 /// \todo do implement that? who? how?
diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp
index f4c5e95..05fd3c2 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.cpp
+++ b/noncore/securityplugins/blueping/bluepingplugin.cpp
@@ -1,201 +1,200 @@
 #include "bluepingplugin.h"
 
 #include <opie2/oapplication.h>
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
 
 using namespace Opie::Core;
 using Opie::Security::MultiauthPluginObject;
 using Opie::Security::MultiauthConfigWidget;
 
 
 /// creates and initializes the m_config Config object
 BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0) {
     m_config = new Config("Security");
     m_config->setGroup("BluepingPlugin");
     bluetoothAlreadyRestarted = false;
 }
 
 /// deletes the m_config Config object and noticeW if necessary
 BluepingPlugin::~BluepingPlugin() {
     delete m_config;
-    if (m_ping != 0)
-        delete m_ping;
+    delete m_ping;
 }
 
 /// Simply return its name (Blueping plugin)
 QString BluepingPlugin::pluginName() const {
     return "Blueping plugin";
 }
 
 /// no configuration widget for the moment
 MultiauthConfigWidget * BluepingPlugin::configWidget(QWidget * parent) {
     return 0l;
 }
 QString BluepingPlugin::pixmapNameWidget() const {
     return "security/bluepingplugin";
 }
 QString BluepingPlugin::pixmapNameConfig() const {
     return 0l;
 }
 
 /// Emit the MultiauthPluginObject::Success emitCode
 void BluepingPlugin::success() {
     emit emitCode(MultiauthPluginObject::Success);
 }
 
 /// Emit the MultiauthPluginObject::Failure emitCode
 void BluepingPlugin::failure() {
     emit emitCode(MultiauthPluginObject::Failure);
 }
 
 /// Emit the MultiauthPluginObject::Skip emitCode
 void BluepingPlugin::skip() {
     emit emitCode(MultiauthPluginObject::Skip);
 }
 
 /// do the actual ping
 void BluepingPlugin::ping() {
     m_ping = new OProcess();
     odebug << "pinging device: " << macToPing << oendl;
     *m_ping << "l2ping" << "-c 1" << macToPing;
 
     // starting to ping in the background
     /// \todo as soon as ping is launched, check RSSI (signal strength) and check
     /// it's high enough, meaning the device is close enough?
     /// \todo make it optionally pollable, so don't finish the ping and call
     /// Opie suspend if l2ping timeouts?
     if ( !m_ping->start() ) {
         oerr << "could not start l2ping" << oendl;
         this->skip();
     }
     QObject::connect(m_ping, SIGNAL(processExited(Opie::Core::OProcess*)),
                      this, SLOT(pingFinished(Opie::Core::OProcess*)) );
 }
 
 /// Deals with m_ping result
     void BluepingPlugin::pingFinished(OProcess * ping) {
         if ( ping->normalExit() && (ping->exitStatus() == 0) )
         {
             odebug << "Successful Bluetooth ping!" << oendl;
             success();
         }
         else
         {
             odebug << "Failed Bluetooth ping..." << oendl;
             failure();
         }
     }
 
 /// Make one authentication attempt with this plugin
 /**
  * (very simple "success" / "failure" buttons in a dialog)
  * \return The outcome code of this  authentication
  */
 int BluepingPlugin::authenticate() {
 
     Config cfg("Security");
     cfg.setGroup("BluepingPlugin");
     macToPing = cfg.readEntry("mac");
     if (!macToPing.isEmpty())
     {
         /* Standard, inescapable authentication dialog
          */
         QDialog bluepingDialog(0,
                                "Blueping dialog",
                                TRUE,
                                Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop);
 
         QRect desk = oApp->desktop()->geometry();
         bluepingDialog.setGeometry( 0, 0, desk.width(), desk.height() );
 
         // Creation of the particular widgets of our Blueping user interface
         QVBoxLayout *layout = new QVBoxLayout(&bluepingDialog);
         layout->setSpacing(11);
         layout->setMargin(11);
         layout->setAlignment( Qt::AlignTop );
 
         QLabel title("<center><h1>\"Blueping\" <br />plugin</h1></center>", &bluepingDialog);
         QLabel subTitle("<center><h2>Trying to reach your configured bluetooth device...</h2></center>", &bluepingDialog);
         QLabel subTitle2("<center>You can skip this step and use another authentication way with the following button</center>", &bluepingDialog);
         QPushButton pbSkip("Skip", &bluepingDialog);
         layout->addWidget(&title);
         layout->addWidget(&subTitle);
         layout->addWidget(&subTitle2);
         layout->addWidget(&pbSkip, 0, Qt::AlignHCenter);
 
         // connect the skip button to the skip signal emitting function
         QObject::connect(&pbSkip, SIGNAL(clicked()), this, SLOT(skip()));
         // connect the signal emitting functions to the bluepingDialog done(int) finishing function
         QObject::connect(this, SIGNAL(emitCode(int)), &bluepingDialog, SLOT(done(int)));
 
         if (!bluetoothAlreadyRestarted)
         {
             // we have just started or resumed the device, so Bluetooth has to be (re)started
             OProcess killB;
             killB << "killall" << "hciattach";
             odebug << "killing Bluetooth..." << oendl;
             if ( !killB.start(OProcess::Block) ) {
                 oerr << "could not kill bluetooth" << oendl;
             }
 
             OProcess startB;
             switch ( ODevice::inst()->model() ) {
                 case Model_iPAQ_H39xx:
                     startB << "/sbin/hciattach" << "/dev/tts/1" << "bcsp" << "921600";
                     break;
 
                 case Model_iPAQ_H5xxx:
                     startB << "/sbin/hciattach" << "/dev/tts/1" << "any" << "921600";
                     break;
 
                 default:
                     startB << "/sbin/hciattach" << "/dev/ttySB0" << "bcsp" << "230400";
                     break;
             } // end switch on device models
 
             if ( !startB.start(OProcess::Block) ) {
                 oerr << "could not (re)start bluetooth" << oendl;
                 return MultiauthPluginObject::Skip;
             }
             else
             {
                 if ( startB.normalExit() && (startB.exitStatus() == 0) )
                 {
                     odebug << "hciattach exited normally."<< oendl;
                     bluetoothAlreadyRestarted = true;
                     // 500 ms timer, so l2ping won't try to find a route before bluetooth has \em really started
                     QTimer::singleShot( 500, this, SLOT(ping()) );
                 }
                 else
                 {
                     owarn << "hciattach exited anormally (error code: " << startB.exitStatus() << ")" << oendl;
                 } // end if startBluetooth exit status == 0
             } // end if startBluetooth started
         }
         else
         {
             // we don't need to wait, since bluetooth has been started long enough ago
             ping();
         } // end if bluetooth not restarted
 
 
         // start the dialog event loop, while the ping is starting (or will start soon) in the background
         return bluepingDialog.exec();
 
 
     }
     else
     {
         owarn << "No Bluetooth device has been set!" << oendl;
         owarn << "We will consider it as a successful authentication though." << oendl;
         return MultiauthPluginObject::Success;
     } // end if mac defined
 }
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp
index e532232..e0468a7 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.cpp
+++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp
@@ -1,83 +1,83 @@
 #include "noticeConfigWidget.h"
 
 #include <opie2/odebug.h>
 
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qgroupbox.h>
 
 using Opie::Security::MultiauthConfigWidget;
 
 /// constructs the widget, filling the noticeMLE QMultiLineEdit with the "noticeText" entry
 NoticeConfigWidget::NoticeConfigWidget(QWidget* parent = 0, const char* name = "Notice configuration widget") : MultiauthConfigWidget(parent, name)
 {
     QVBoxLayout *baseLayout = new QVBoxLayout( this);
     baseLayout->setSpacing(11);
     baseLayout->setMargin(6);
     baseLayout->setAlignment( Qt::AlignTop );
 
     QGroupBox *configBox = new QGroupBox(0, Qt::Vertical, tr("Set the message the user must accept"), this);
     baseLayout->addWidget(configBox);
     QVBoxLayout *boxLayout = new QVBoxLayout( configBox->layout() );
 
     QLabel * comment1 = new QLabel("<p><em>" + tr("You may want to consult your legal department for proper wording here.") + "</em></p>", configBox);
     boxLayout->addWidget(comment1);
 
     // Set the multilineedit box text to getNoticeText()
     noticeMLE = new QMultiLineEdit(configBox, "notice text");
     noticeMLE->setWordWrap(QMultiLineEdit::WidgetWidth);
     noticeMLE->setFocus();
     noticeMLE->setText(getNoticeText());
     boxLayout->addWidget(noticeMLE);
 
     resetNoticeButton = new QPushButton( tr("Reset notice to default"), configBox, "reset Notice Button" );
     connect(resetNoticeButton, SIGNAL( clicked() ), this, SLOT( resetNotice() ));
     boxLayout->addWidget(resetNoticeButton, 0, Qt::AlignHCenter);
 
     QLabel * comment2 = new QLabel("<p>" + tr("Note: you can use HTML tags to improve its layout (example: text between &lt;em&gt; and &lt;/em&gt; will be <em>emphasized</em>)") + "</p>", configBox);
     boxLayout->addWidget(comment2);
 
 }
 
 /// nothing to do
 NoticeConfigWidget::~NoticeConfigWidget()
 {}
 
 /// write the notice text in the multiauth.conf Config file
 void NoticeConfigWidget::writeConfig()
 {
     if ( noticeMLE->edited() ) {
         odebug << "writing new notice text in Security.conf" << oendl;
         setNoticeText(noticeMLE->text());
     }
 }
 
 /// reset the notice text to the hard-coded example defaultNoticeText
 void NoticeConfigWidget::resetNotice()
 {
-    noticeMLE->setText(defaultNoticeText);
+    noticeMLE->setText(QObject::tr(defaultNoticeText));
 }
 
 /// get the notice text from the config file (with true new lines)
 /**
  * if no text has been defined yet returns defaultNoticeText
  */
 QString NoticeConfigWidget::getNoticeText() {
     m_config = new Config("Security");
     m_config->setGroup("NoticePlugin");
     // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-    QString noticeText = m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" );
+    QString noticeText = m_config->readEntry("noticeText", QObject::tr(defaultNoticeText) ).replace( QRegExp("\\\\n"), "\n" );
     delete m_config;
     return noticeText;
 }
 
 /// set the notice text in our m_config config file (escaping new lines)
 void NoticeConfigWidget::setNoticeText(QString noticeText) {
     m_config = new Config("Security");
     m_config->setGroup("NoticePlugin");
     // since Config files do not allow true newlines, we replace them with litteral "\n"
     m_config->writeEntry("noticeText", noticeText.replace( QRegExp("\n"), "\\n" ));
     delete m_config;
 }
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.h b/noncore/securityplugins/notice/noticeConfigWidget.h
index c90484c..f8847e4 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.h
+++ b/noncore/securityplugins/notice/noticeConfigWidget.h
@@ -1,72 +1,72 @@
 /**
  * \file noticeConfigWidget.h
  * \brief Notice plugin configuration widget
  * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
  */
 /*
                =.            This file is part of the Opie Project
              .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef NOTICECONFIGWIDGET_H
 #define NOTICECONFIGWIDGET_H
 
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qpe/config.h>
 
 #include <opie2/multiauthconfigwidget.h>
 
-static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n"
+static char defaultNoticeText [] = QT_TRANSLATE_NOOP( "QObject", "<h2>NOTICE TO USERS</h2>\n"
         "<p>This is a private computer system and is the property of "
         "the company XXX / Mr or Ms X. It is for authorized "
         "use only. Users have no expectation of privacy.</p>\n"
         "<p><strong>Unauthorized or improper use of this system may result in "
         "disciplinary action and civil and criminal penalties. <em>By continuing to use "
         "this system you indicate your awareness of and consent to these "
-        "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>";
+        "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>");
 
 class NoticeConfigWidget : public Opie::Security::MultiauthConfigWidget {
 
     Q_OBJECT
 
 public:
     NoticeConfigWidget(QWidget* parent, const char* name);
     virtual ~NoticeConfigWidget();
     virtual void writeConfig();
 private:
     QMultiLineEdit * noticeMLE;
     QPushButton * resetNoticeButton;
 private slots:
     void resetNotice();
 private:
     Config * m_config;
     QString getNoticeText();
     void setNoticeText(QString noticeText);
 };
 
 #endif // NOTICECONFIGWIDGET_H
 
diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp
index 25a452a..1da260a 100644
--- a/noncore/securityplugins/notice/noticeplugin.cpp
+++ b/noncore/securityplugins/notice/noticeplugin.cpp
@@ -1,86 +1,86 @@
 #include "noticeplugin.h"
 
 #include <opie2/oapplication.h>
 
 #include <qmessagebox.h>
 #include <qregexp.h>
 
 using Opie::Security::MultiauthPluginObject;
 using Opie::Security::MultiauthConfigWidget;
 
 /// creates and initializes the m_config Config object
 NoticePlugin::NoticePlugin() : MultiauthPluginObject(), noticeW(0) {
     m_config = new Config("Security");
     m_config->setGroup("NoticePlugin");
 }
 
 /// deletes the m_config Config object and noticeW if necessary
 NoticePlugin::~NoticePlugin() {
     delete m_config;
     if (noticeW != 0)
         delete noticeW;
 }
 
 /// Simply return its name (Notice plugin)
 QString NoticePlugin::pluginName() const {
     return "Notice plugin";
 }
 
 /// return the Notice widget configuration widget
 /**
  * \return noticeW, the NoticeConfigWidget
  */
 MultiauthConfigWidget * NoticePlugin::configWidget(QWidget * parent) {
     if (noticeW == 0)
         noticeW = new NoticeConfigWidget(parent, "Notice configuration widget");
     return noticeW;
 }
 
 /// return the path of the small tab icon
 QString NoticePlugin::pixmapNameConfig() const {
     return "security/noticeplugin_small";
 }
 
 /// return the path of the big icon for the active/order checklist
 QString NoticePlugin::pixmapNameWidget() const {
     return "security/noticeplugin";
 }
 
 /// Displays the configured message and an 'Accept' button
 /**
  * \return the outcome code of this  authentication (can be only success)
  */
 int NoticePlugin::authenticate() {
     QMessageBox noticeDialog("Notice plugin",
                             getNoticeText(),
                             QMessageBox::Warning,
                             QMessageBox::Yes,
                             0,
                             0,
                             0,
                             "notice plugin dialog",
                             true,
                             Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop);
 
     noticeDialog.setButtonText(QMessageBox::Yes, tr("I accept"));
 
     QRect desk = oApp->desktop()->geometry();
     noticeDialog.setGeometry( 0, 0, desk.width(), desk.height() );
 
     switch (noticeDialog.exec())
     {
         case QMessageBox::Yes:
             return MultiauthPluginObject::Success;
     }
     return 255; //should not be returned anyway
 }
 
 /// get the notice text from our m_config config file (with true new lines)
 /**
  * if no text has been defined yet returns defaultNoticeText
  */
 QString NoticePlugin::getNoticeText() {
       // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-      return m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" );
+    return m_config->readEntry("noticeText", QObject::tr(defaultNoticeText)).replace( QRegExp("\\\\n"), "\n" );
 }