author | mickeyl <mickeyl> | 2003-11-18 18:43:25 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-18 18:43:25 (UTC) |
commit | 22966b4e27b5460e005bb47b914264495f3f17bf (patch) (side-by-side diff) | |
tree | 28611cac21ec8ede6c9a27e8e238007c5f7b3249 /core/launcher/transferserver.cpp | |
parent | 6b50f01126f1e22ed1cebef7db2901c7ff33116f (diff) | |
download | opie-22966b4e27b5460e005bb47b914264495f3f17bf.zip opie-22966b4e27b5460e005bb47b914264495f3f17bf.tar.gz opie-22966b4e27b5460e005bb47b914264495f3f17bf.tar.bz2 |
Increase sync-friendlyness and repair broken sync with several
programs. Patch by Matthias Hentges <matthias@hentges.net> - thanks!
Diffstat (limited to 'core/launcher/transferserver.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/launcher/transferserver.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 439e110..eea9f3a 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -194,14 +194,23 @@ bool SyncAuthentication::checkPassword( const QString& password ) static int denials=0; int now = time(0); + Config cfg("Security"); + cfg.setGroup("Sync"); + QString syncapp = cfg.readEntry("syncapp","Qtopia"); + + //No password needed if the user really wants it + if (syncapp == "IntelliSync") { + return TRUE; + } + // Detect old Qtopia Desktop (no password) if ( password.isEmpty() ) { - if ( denials < 1 || now > lastdenial+600 ) { + if ( denials < 3 || now > lastdenial+600 ) { QMessageBox unauth( tr("Sync Connection"), tr("<p>An unauthorized system is requesting access to this device." "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " - "please upgrade."), + "please upgrade or change the security setting to use IntelliSync." ), QMessageBox::Warning, QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, 0, QString::null, TRUE, WStyle_StaysOnTop); @@ -212,6 +221,7 @@ bool SyncAuthentication::checkPassword( const QString& password ) lastdenial=now; } return FALSE; + } // Second, check sync password... |