Increase sync-friendlyness and repair broken sync with several

programs. Patch by Matthias Hentges <matthias@hentges.net> - thanks!

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
@@ -196,5 +196,14 @@ bool SyncAuthentication::checkPassword( const QString& password )
 
+    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(
@@ -203,3 +212,3 @@ bool SyncAuthentication::checkPassword( const QString& password )
                     "<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,
@@ -214,2 +223,3 @@ bool SyncAuthentication::checkPassword( const QString& password )
         return FALSE;
+           
     }