Fix korgac abort on startup due to oversized tray icon creation when icon widget has not yet been shown

Properly print caldav/carddav wallet warnings to prevent backtrace spew

2 files changed, 16 insertions, 16 deletions

diff --git a/tderesources/caldav/preferences.cpp b/tderesources/caldav/preferences.cpp
index a4be7cc13..a9ba68785 100644
--- a/tderesources/caldav/preferences.cpp
+++ b/tderesources/caldav/preferences.cpp
@@ -47,12 +47,12 @@ bool CalDavPrefs::setWalletFolder(const TQString& folder) {
         if (!mWallet->hasFolder(folder)) {
             if (!mWallet->createFolder(folder)) {
                 ret = false;
-                kdWarning() << "can't create the wallet folder for CalDAV passwords";
+                kdWarning() << "can't create the wallet folder for CalDAV passwords\n";
             }
         }
         if (!mWallet->setFolder(folder)) {
             ret = false;
-            kdWarning() << "can't set the wallet folder for CalDAV passwords";
+            kdWarning() << "can't set the wallet folder for CalDAV passwords\n";
         }
     } else {
         // the wallet is inaccessible or not configured
@@ -69,18 +69,18 @@ Wallet* CalDavPrefs::getWallet() {
         // the wallet is not marked as inaccessible
 
         if (NULL == mWallet) {
-            kdDebug() << "creating wallet for " + mPrefix << '\n';
+            kdDebug() << "creating wallet for " << mPrefix << '\n';
 
             mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0);
             if (NULL == mWallet) {
                 mNoWallet = true; // can't open the wallet, mark it inaccessible
-                kdWarning() << "can't create a wallet for CalDAV passwords";
+                kdWarning() << "can't create a wallet for CalDAV passwords\n";
             } else {
                 if (setWalletFolder(WALLET_FOLDER)) {
                     // reserved
                 } else {
                     // can't set the wallet folder, remove the wallet and mark it inaccessible
-                    kdWarning() << "can't set the walet folder for CalDAV passwords";
+                    kdWarning() << "can't set the walet folder for CalDAV passwords\n";
                     removeWallet(true);
                 }
             }
@@ -115,7 +115,7 @@ bool CalDavPrefs::writePasswordToWallet(const TQString& password) {
     if (NULL != w) {
         int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password);
         if (0 != rc) {
-            kdWarning() << "CalDAV: can't write password to the wallet";
+            kdWarning() << "CalDAV: can't write password to the wallet\n";
         } else {
             ret = true;
         }
@@ -136,7 +136,7 @@ bool CalDavPrefs::readPasswordFromWallet(TQString& password) {
             password = p;
             ret = true;
         } else {
-            kdWarning() << "CalDAV: can't read password from the wallet";
+            kdWarning() << "CalDAV: can't read password from the wallet\n";
             password = NO_PASSWORD;
         }
     }
@@ -154,7 +154,7 @@ bool CalDavPrefs::removePasswordFromWallet() {
         if (0 == rc) {
             ret = true;
         } else {
-            kdWarning() << "CalDAV: can't remove password from the wallet";
+            kdWarning() << "CalDAV: can't remove password from the wallet\n";
         }
     }
 
diff --git a/tderesources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp
index a37931741..3be1f21a8 100644
--- a/tderesources/carddav/preferences.cpp
+++ b/tderesources/carddav/preferences.cpp
@@ -46,12 +46,12 @@ bool CardDavPrefs::setWalletFolder(const TQString& folder) {
         if (!mWallet->hasFolder(folder)) {
             if (!mWallet->createFolder(folder)) {
                 ret = false;
-                kdWarning() << "can't create the wallet folder for CardDAV passwords";
+                kdWarning() << "can't create the wallet folder for CardDAV passwords\n";
             }
         }
         if (!mWallet->setFolder(folder)) {
             ret = false;
-            kdWarning() << "can't set the wallet folder for CardDAV passwords";
+            kdWarning() << "can't set the wallet folder for CardDAV passwords\n";
         }
     } else {
         // the wallet is inaccessible or not configured
@@ -68,18 +68,18 @@ Wallet* CardDavPrefs::getWallet() {
         // the wallet is not marked as inaccessible
 
         if (NULL == mWallet) {
-            kdDebug() << "creating wallet for " + mPrefix << '\n';
+            kdDebug() << "creating wallet for " << mPrefix << '\n';
 
             mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0);
             if (NULL == mWallet) {
                 mNoWallet = true; // can't open the wallet, mark it inaccessible
-                kdWarning() << "can't create a wallet for CardDAV passwords";
+                kdWarning() << "can't create a wallet for CardDAV passwords\n";
             } else {
                 if (setWalletFolder(WALLET_FOLDER)) {
                     // reserved
                 } else {
                     // can't set the wallet folder, remove the wallet and mark it inaccessible
-                    kdWarning() << "can't set the walet folder for CardDAV passwords";
+                    kdWarning() << "can't set the walet folder for CardDAV passwords\n";
                     removeWallet(true);
                 }
             }
@@ -114,7 +114,7 @@ bool CardDavPrefs::writePasswordToWallet(const TQString& password) {
     if (NULL != w) {
         int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password);
         if (0 != rc) {
-            kdWarning() << "CardDAV: can't write password to the wallet";
+            kdWarning() << "CardDAV: can't write password to the wallet\n";
         } else {
             ret = true;
         }
@@ -135,7 +135,7 @@ bool CardDavPrefs::readPasswordFromWallet(TQString& password) {
             password = p;
             ret = true;
         } else {
-            kdWarning() << "CardDAV: can't read password from the wallet";
+            kdWarning() << "CardDAV: can't read password from the wallet\n";
             password = NO_PASSWORD;
         }
     }
@@ -153,7 +153,7 @@ bool CardDavPrefs::removePasswordFromWallet() {
         if (0 == rc) {
             ret = true;
         } else {
-            kdWarning() << "CardDAV: can't remove password from the wallet";
+            kdWarning() << "CardDAV: can't remove password from the wallet\n";
         }
     }