summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-07 22:22:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-07 22:22:18 +0000
commit009631d0fc83f471d6c515e2a5001337a5a2ea21 (patch)
tree1692afe93289775c346a2e2cc731e9f3acab4afc
parenta00e1eb8e17855b3fb9288dd43bde66ffce14069 (diff)
downloadtdepim-009631d0fc83f471d6c515e2a5001337a5a2ea21.tar.gz
tdepim-009631d0fc83f471d6c515e2a5001337a5a2ea21.zip
* Batch 1/2 of bugfix patches from the Chakra project
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172724 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kmail/kmtransport.cpp2
-rw-r--r--kmail/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 690329715..a5bf6b9ce 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -670,7 +670,7 @@ void KMTransportDialog::enableAuthMethods( unsigned int auth ) {
// LOGIN doesn't offer anything over PLAIN, requires more server
// roundtrips and is not an official SASL mechanism, but a MS-ism,
// so only enable it if PLAIN isn't available:
- mSmtp.authLogin->setEnabled( auth & LOGIN && !(auth & PLAIN));
+ mSmtp.authLogin->setEnabled( auth & LOGIN /*&& !(auth & PLAIN)*/);
mSmtp.authCramMd5->setEnabled( auth & CRAM_MD5 );
mSmtp.authDigestMd5->setEnabled( auth & DIGEST_MD5 );
mSmtp.authNTLM->setEnabled( auth & NTLM );
diff --git a/kmail/main.cpp b/kmail/main.cpp
index 640fdc6f0..b06bf8a45 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
kmsetSignalHandler(kmsignalHandler);
kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
- kmkernel->setStartingUp( false ); // Starting up is finished
+ kmailKernel.setStartingUp( false ); // Starting up is finished
// Go!
int ret = kapp->exec();
// clean up