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
@@ -21,7 +21,5 @@ int main(int argc, char **argv) {
         }
     }
-    if ( show == true )
-    {
-    printf("building dialog\n");
+    if ( show == true ){
         MultiauthConfig dialog;
         app.setMainWidget(&dialog);
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
@@ -413,5 +413,4 @@ void MultiauthConfig::pluginsChanged() {
 void MultiauthConfig::loadPlugins() {
 
-    odebug << "loading plugins..." << oendl;
     QString path = QPEApplication::qpeDir() + "/plugins/security";
     QDir dir( path, "lib*.so" );
@@ -427,10 +426,6 @@ void MultiauthConfig::loadPlugins() {
         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;
@@ -460,5 +455,4 @@ void MultiauthConfig::loadPlugins() {
 
         } else {
-            odebug <<  "could not recognize " << QString( path + "/" + *it ) << oendl;
             delete lib;
         }
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
@@ -27,6 +27,5 @@ BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0) {
 BluepingPlugin::~BluepingPlugin() {
     delete m_config;
-    if (m_ping != 0)
-        delete m_ping;
+    delete m_ping;
 }
 
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
@@ -58,5 +58,5 @@ void NoticeConfigWidget::writeConfig()
 void NoticeConfigWidget::resetNotice()
 {
-    noticeMLE->setText(defaultNoticeText);
+    noticeMLE->setText(QObject::tr(defaultNoticeText));
 }
 
@@ -69,5 +69,5 @@ QString NoticeConfigWidget::getNoticeText() {
     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;
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
@@ -41,5 +41,5 @@
 #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 "
@@ -48,5 +48,5 @@ static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n"
         "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 {
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
@@ -82,5 +82,5 @@ int NoticePlugin::authenticate() {
 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" );
 }