summaryrefslogtreecommitdiffstats
path: root/tderesources/carddav
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-07-07 19:51:30 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-07-07 19:51:30 -0500
commit8231cc23f3e8b266a6b0e229865905233e867cbf (patch)
treec3392a7bf9a843f9f46de3bee0ec895ce4d2a068 /tderesources/carddav
parent93aee1b625df28b290eaf0779ee241ddce27cb69 (diff)
downloadtdepim-8231cc23f3e8b266a6b0e229865905233e867cbf.tar.gz
tdepim-8231cc23f3e8b266a6b0e229865905233e867cbf.zip
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
Diffstat (limited to 'tderesources/carddav')
-rw-r--r--tderesources/carddav/preferences.cpp16
1 files changed, 8 insertions, 8 deletions
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";
}
}