Increase sync-friendlyness and repair broken sync with several

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

4 files changed, 99 insertions, 27 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
@@ -1,990 +1,1000 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 //#define _XOPEN_SOURCE
 
 #include <qtopia/global.h>
 #include <qtopia/qpeapplication.h>
 
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
 #include <shadow.h>
 #include <crypt.h>
 #endif /* Q_OS_MACX */ 
 
 #else
 #include <stdlib.h>
 #include <time.h>
 #endif
 
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qmessagebox.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //#include <qtopia/qcopchannel_qws.h>
 #include <qtopia/process.h>
 #include <qtopia/global.h>
 #include <qtopia/config.h>
 #include <qtopia/private/contact.h>
 #include <qtopia/quuid.h>
 #include <qtopia/version.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
 #include "launcherglobal.h"
 
 #include "transferserver.h"
 #include <qtopia/qprocess.h>
 
 const int block_size = 51200;
 
 TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
         const char* name)
     : QServerSocket( port, 1, parent, name )
 {
     connections.setAutoDelete( TRUE );
     if ( !ok() )
         qWarning( "Failed to bind to port %d", port );
 }
 
 void TransferServer::authorizeConnections()
 {
     QListIterator<ServerPI> it(connections);
     while ( it.current() ) {
         if ( !it.current()->verifyAuthorised() ) {
             disconnect( it.current(), SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
             connections.removeRef( it.current() );
         } else
             ++it;
     }
 }
 
 void TransferServer::closed(ServerPI *item)
 {
     connections.removeRef(item);
 }
 
 TransferServer::~TransferServer()
 {
 }
 
 void TransferServer::newConnection( int socket )
 {
     ServerPI *ptr = new ServerPI( socket, this );
     connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
     connections.append( ptr );
 }
 
 QString SyncAuthentication::serverId()
 {
     Config cfg("Security");
     cfg.setGroup("Sync");
     QString r = cfg.readEntry("serverid");
 
     if ( r.isEmpty() ) {
         r = Opie::Global::uuid();
         cfg.writeEntry("serverid", r );
     }
    return r;
 }
 
 QString SyncAuthentication::ownerName()
 {
     QString vfilename = Global::applicationFileName("addressbook",
                 "businesscard.vcf");
     if (QFile::exists(vfilename)) {
         Contact c;
         c = Contact::readVCard( vfilename )[0];
         return c.fullName();
     }
 
     return QString::null;
 }
 
 QString SyncAuthentication::loginName()
 {
     struct passwd *pw = 0L;
 #ifndef Q_OS_WIN32
     pw = getpwuid( geteuid() );
     return QString::fromLocal8Bit( pw->pw_name );
 #else
     //### revise
     return QString();
 #endif
 }
 
 int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
 {
     Config cfg("Security");
         cfg.setGroup("Sync");
         //    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
         uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
 
         //    QHostAddress allowed;
         //    allowed.setAddress(allowedstr);
         //    uint auth_peer = allowed.ip4Addr();
         uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
         uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
                     ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
 
         return (peeraddress.ip4Addr() & mask) == auth_peer;
 }
 
 bool SyncAuthentication::checkUser( const QString& user )
 {
     if ( user.isEmpty() ) return FALSE;
     QString euser = loginName();
     return user == euser;
 }
 
 bool SyncAuthentication::checkPassword( const QString& password )
 {
 #ifdef ALLOW_UNIX_USER_FTP
     // First, check system password...
 
     struct passwd *pw = 0;
     struct spwd *spw = 0;
 
     pw = getpwuid( geteuid() );
     spw = getspnam( pw->pw_name );
 
     QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
     if ( cpwd == "x" && spw )
         cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
 
     // Note: some systems use more than crypt for passwords.
     QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
     if ( cpwd == cpassword )
         return TRUE;
 #endif
 
     static int lastdenial=0;
     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 ) {
-            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."),
-                QMessageBox::Warning,
-                QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
-                0, QString::null, TRUE, WStyle_StaysOnTop);
-            unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
-            unauth.exec();
-
-            denials++;
-            lastdenial=now;
-        }
-        return FALSE;
-    }
+            if ( password.isEmpty() ) {
+                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 or change the security setting to use IntelliSync." ),
+                        QMessageBox::Warning,
+                        QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+                        0, QString::null, TRUE, WStyle_StaysOnTop);
+                    unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
+                    unauth.exec();
+
+                    denials++;
+                    lastdenial=now;
+                 } 
+                return FALSE;
+           
+    } 
 
     // Second, check sync password...
 
     static int lock=0;
     if ( lock ) return FALSE;
 
-    ++lock;
+    ++lock;    
 
     /*
      *  we need to support old Sync software and QtopiaDesktop
      */
     if ( password.left(6) == "Qtopia" || password.left(6) == "rootme" ) {
         Config cfg( "Security" );
         cfg.setGroup("Sync");
         QStringList pwds = cfg.readListEntry("Passwords",' ');
         for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
 #ifndef Q_OS_WIN32
             QString cpassword = QString::fromLocal8Bit(
                 crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
 #else
             // ### revise
             QString cpassword("");
 #endif
             if ( *it == cpassword ) {
                 lock--;
                 return TRUE;
             }
         }
 
         // Unrecognized system. Be careful...
         QMessageBox unrecbox(
             tr("Sync Connection"),
                     tr("<p>An unrecognized system is requesting access to this device."
                 "<p>If you have just initiated a Sync for the first time, this is normal."),
                 QMessageBox::Warning,
                 QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
                 0, QString::null, TRUE, WStyle_StaysOnTop);
         unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
         unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
 
         if ( (denials > 2 && now < lastdenial+600)
             || unrecbox.exec() != QMessageBox::Yes)
         {
             denials++;
             lastdenial=now;
             lock--;
             return FALSE;
         } else {
             const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
             char salt[2];
             salt[0]= salty[rand() % (sizeof(salty)-1)];
             salt[1]= salty[rand() % (sizeof(salty)-1)];
 #ifndef Q_OS_WIN32
             QString cpassword = QString::fromLocal8Bit(
                 crypt( password.mid(8).local8Bit(), salt ) );
 #else
             //### revise
             QString cpassword("");
 #endif
             denials=0;
             pwds.prepend(cpassword);
             cfg.writeEntry("Passwords",pwds,' ');
             lock--;
             return TRUE;
         }
     }
     lock--;
 
     return FALSE;
 }
 
 
 ServerPI::ServerPI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ),
       storFileSize(-1)
 {
     state = Connected;
 
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
         state = Forbidden;
         startTimer( 0 );
     } else
 #endif
     {
         connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
         connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
         passiv = FALSE;
         for( int i = 0; i < 4; i++ )
             wait[i] = FALSE;
 
         send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
         state = Wait_USER;
 
         dtp = new ServerDTP( this );
         connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
         connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
         connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
 
 
         directory = QDir::currentDirPath();
 
         static int p = 1024;
 
         while ( !serversocket || !serversocket->ok() ) {
             delete serversocket;
             serversocket = new ServerSocket( ++p, this );
         }
         connect( serversocket, SIGNAL( newIncomming( int ) ),
                  SLOT( newConnection( int ) ) );
     }
 }
 
 ServerPI::~ServerPI()
 {
     close();
     dtp->close();
     delete dtp;
     delete serversocket;
 }
 
 bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
         state = Forbidden;
         return FALSE;
     }
     return TRUE;
 }
 
 void ServerPI::connectionClosed()
 {
     // qDebug( "Debug: Connection closed" );
     emit connectionClosed(this);
 }
 
 void ServerPI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "Reply: %s", msg.latin1() );
 }
 
 void ServerPI::read()
 {
     while ( canReadLine() )
         process( readLine().stripWhiteSpace() );
 }
 
 bool ServerPI::checkReadFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
         filename = directory.path() + "/" + file;
     else
         filename = file;
 
     QFileInfo fi( filename );
     return ( fi.exists() && fi.isReadable() );
 }
 
 bool ServerPI::checkWriteFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
         filename = directory.path() + "/" + file;
     else
         filename = file;
 
     QFileInfo fi( filename );
 
     if ( fi.exists() )
         if ( !QFile( filename ).remove() )
             return FALSE;
     return TRUE;
 }
 
 void ServerPI::process( const QString& message )
 {
     //qDebug( "Command: %s", message.latin1() );
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;
 
     // command token
     QString cmd = msg[0].upper();
 
     // argument token
     QString arg;
     if ( msg.count() >= 2 )
         arg = msg[1];
 
     // full argument string
     QString args;
     if ( msg.count() >= 2 ) {
         QStringList copy( msg );
         // FIXME: for Qt3
         // copy.pop_front()
         copy.remove( copy.begin() );
         args = copy.join( " " );
     }
 
     //qDebug( "args: %s", args.latin1() );
 
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
         send( "211 Good bye!" ); // No tr
         close();
         return;
     }
 
     // connected to client
     if ( Connected == state )
         return;
 
     // waiting for user name
     if ( Wait_USER == state ) {
 
         if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
             send( "530 Please login with USER and PASS" ); // No tr
             return;
         }
         send( "331 User name ok, need password" ); // No tr
         state = Wait_PASS;
         return;
     }
 
     // waiting for password
     if ( Wait_PASS == state ) {
 
         if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
             send( "530 Please login with USER and PASS" ); // No tr
             return;
         }
         send( "230 User logged in, proceed" ); // No tr
         state = Ready;
         return;
     }
 
     // ACCESS CONTROL COMMANDS
 
     // Only an ALLO sent immediately before STOR is valid.
     if ( cmd != "STOR" )
         storFileSize = -1;
 
     // account (ACCT)
     if ( cmd == "ACCT" ) {
         // even wu-ftp does not support it
         send( "502 Command not implemented" ); // No tr
     }
 
     // change working directory (CWD)
     else if ( cmd == "CWD" ) {
 
         if ( !args.isEmpty() ) {
             if ( directory.cd( args, TRUE ) )
                 send( "250 Requested file action okay, completed" ); // No tr
             else
                 send( "550 Requested action not taken" ); // No tr
         }
         else
             send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // change to parent directory (CDUP)
     else if ( cmd == "CDUP" ) {
         if ( directory.cdUp() )
             send( "250 Requested file action okay, completed" ); // No tr
         else
             send( "550 Requested action not taken" ); // No tr
     }
 
     // structure mount (SMNT)
     else if ( cmd == "SMNT" ) {
         // even wu-ftp does not support it
         send( "502 Command not implemented" ); // No tr
     }
 
     // reinitialize (REIN)
     else if ( cmd == "REIN" ) {
         // even wu-ftp does not support it
         send( "502 Command not implemented" ); // No tr
     }
 
 
     // TRANSFER PARAMETER COMMANDS
 
 
     // data port (PORT)
     else if ( cmd == "PORT" ) {
         if ( parsePort( arg ) )
             send( "200 Command okay" ); // No tr
         else
             send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // passive (PASV)
     else if ( cmd == "PASV" ) {
         passiv = TRUE;
         send( "227 Entering Passive Mode (" // No tr
               + address().toString().replace( QRegExp( "\\." ), "," ) + ","
               + QString::number( ( serversocket->port() ) >> 8 ) + ","
               + QString::number( ( serversocket->port() ) & 0xFF ) +")" );
     }
 
     // representation type (TYPE)
     else if ( cmd == "TYPE" ) {
         if ( arg.upper() == "A" || arg.upper() == "I" )
             send( "200 Command okay" ); // No tr
         else
             send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // file structure (STRU)
     else if ( cmd == "STRU" ) {
         if ( arg.upper() == "F" )
             send( "200 Command okay" ); // No tr
         else
             send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // transfer mode (MODE)
     else if ( cmd == "MODE" ) {
         if ( arg.upper() == "S" )
             send( "200 Command okay" ); // No tr
         else
             send( "504 Command not implemented for that parameter" ); // No tr
     }
 
 
     // FTP SERVICE COMMANDS
 
 
     // retrieve (RETR)
     else if ( cmd == "RETR" )
         if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
              || backupRestoreGzip( absFilePath( args ) ) ) {
             send( "150 File status okay" ); // No tr
             sendFile( absFilePath( args ) );
         }
         else {
             qDebug("550 Requested action not taken");
             send( "550 Requested action not taken" ); // No tr
         }
 
     // store (STOR)
     else if ( cmd == "STOR" )
         if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
             send( "150 File status okay" ); // No tr
             retrieveFile( absFilePath( args ) );
         }
         else
             send( "550 Requested action not taken" ); // No tr
 
     // store unique (STOU)
     else if ( cmd == "STOU" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // append (APPE)
     else if ( cmd == "APPE" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // allocate (ALLO)
     else if ( cmd == "ALLO" ) {
         storFileSize = args.toInt();
         send( "200 Command okay" ); // No tr
     }
 
     // restart (REST)
     else if ( cmd == "REST" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // rename from (RNFR)
     else if ( cmd == "RNFR" ) {
         renameFrom = QString::null;
         if ( args.isEmpty() )
             send( "500 Syntax error, command unrecognized" ); // No tr
         else {
             QFile file( absFilePath( args ) );
             if ( file.exists() ) {
                 send( "350 File exists, ready for destination name" ); // No tr
                 renameFrom = absFilePath( args );
             }
             else
                 send( "550 Requested action not taken" ); // No tr
         }
     }
 
     // rename to (RNTO)
     else if ( cmd == "RNTO" ) {
         if ( lastCommand != "RNFR" )
             send( "503 Bad sequence of commands" ); // No tr
         else if ( args.isEmpty() )
             send( "500 Syntax error, command unrecognized" ); // No tr
         else {
             QDir dir( absFilePath( args ) );
             if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
                 send( "250 Requested file action okay, completed." ); // No tr
             else
                 send( "550 Requested action not taken" ); // No tr
         }
     }
 
     // abort (ABOR)
     else if ( cmd.contains( "ABOR" ) ) {
         dtp->close();
         if ( dtp->dtpMode() != ServerDTP::Idle )
             send( "426 Connection closed; transfer aborted" ); // No tr
         else
             send( "226 Closing data connection" ); // No tr
     }
 
     // delete (DELE)
     else if ( cmd == "DELE" ) {
         if ( args.isEmpty() )
             send( "500 Syntax error, command unrecognized" ); // No tr
         else {
             QFile file( absFilePath( args ) ) ;
             if ( file.remove() ) {
                 send( "250 Requested file action okay, completed" ); // No tr
                 QCopEnvelope e("QPE/System", "linkChanged(QString)" );
                 e << file.name();
             } else {
                 send( "550 Requested action not taken" ); // No tr
             }
         }
     }
 
     // remove directory (RMD)
     else if ( cmd == "RMD" ) {
         if ( args.isEmpty() )
             send( "500 Syntax error, command unrecognized" ); // No tr
         else {
             QDir dir;
             if ( dir.rmdir( absFilePath( args ), TRUE ) )
                 send( "250 Requested file action okay, completed" ); // No tr
             else
                 send( "550 Requested action not taken" ); // No tr
         }
     }
 
     // make directory (MKD)
     else if ( cmd == "MKD" ) {
         if ( args.isEmpty() ) {
             qDebug(" Error: no arg");
             send( "500 Syntax error, command unrecognized" ); // No tr
         }
         else {
             QDir dir;
             if ( dir.mkdir( absFilePath( args ), TRUE ) )
                 send( "250 Requested file action okay, completed." ); // No tr
             else
                 send( "550 Requested action not taken" ); // No tr
         }
     }
 
     // print working directory (PWD)
     else if ( cmd == "PWD" ) {
         send( "257 \"" + directory.path() +"\"" );
     }
 
     // list (LIST)
     else if ( cmd == "LIST" ) {
         if ( sendList( absFilePath( args ) ) )
             send( "150 File status okay" ); // No tr
         else
             send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // size (SIZE)
     else if ( cmd == "SIZE" ) {
         QString filePath = absFilePath( args );
         QFileInfo fi( filePath );
         bool gzipfile = backupRestoreGzip( filePath );
         if ( !fi.exists() && !gzipfile )
             send( "500 Syntax error, command unrecognized" ); // No tr
         else {
             if ( !gzipfile )
                 send( "213 " + QString::number( fi.size() ) );
             else {
                 Process duproc( QString("du") );
                 duproc.addArgument("-s");
                 QString in, out;
                 if ( !duproc.exec(in, out) ) {
                     qDebug("du process failed; just sending back 1K");
                     send( "213 1024");
                 }
                 else {
                     QString size = out.left( out.find("\t") );
                     int guess = size.toInt()/5;
                     if ( filePath.contains("doc") ) // No tr
                         guess *= 1000;
                     qDebug("sending back gzip guess of %d", guess);
                     send( "213 " + QString::number(guess) );
                 }
             }
         }
     }
     // name list (NLST)
     else if ( cmd == "NLST" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // site parameters (SITE)
     else if ( cmd == "SITE" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // system (SYST)
     else if ( cmd == "SYST" ) {
         send( "215 UNIX Type: L8" ); // No tr
     }
 
     // status (STAT)
     else if ( cmd == "STAT" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // help (HELP )
     else if ( cmd == "HELP" ) {
         send( "502 Command not implemented" ); // No tr
     }
 
     // noop (NOOP)
     else if ( cmd == "NOOP" ) {
         send( "200 Command okay" ); // No tr
     }
 
     // not implemented
     else
         send( "502 Command not implemented" ); // No tr
 
     lastCommand = cmd;
 }
 
 bool ServerPI::backupRestoreGzip( const QString &file )
 {
     return (file.find( "backup" ) != -1 && // No tr
             file.findRev( ".tgz" ) == (int)file.length()-4 );
 }
 
 bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
 {
   if ( file.find( "backup" ) != -1 && // No tr
        file.findRev( ".tgz" ) == (int)file.length()-4 ) {
       QFileInfo info( file );
       targets = info.dirPath( TRUE );
       qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
              targets.join(" ").latin1() );
       return true;
   }
   return false;
 }
 
 void ServerPI::sendFile( const QString& file )
 {
     if ( passiv ) {
         wait[SendFile] = TRUE;
         waitfile = file;
         if ( waitsocket )
             newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
           dtp->sendGzipFile( file, targets, peeraddress, peerport );
       else dtp->sendFile( file, peeraddress, peerport );
     }
 }
 
 void ServerPI::retrieveFile( const QString& file )
 {
     if ( passiv ) {
         wait[RetrieveFile] = TRUE;
         waitfile = file;
         if ( waitsocket )
             newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
         dtp->retrieveGzipFile( file, peeraddress, peerport );
       else
         dtp->retrieveFile( file, peeraddress, peerport, storFileSize );
     }
 }
 
 bool ServerPI::parsePort( const QString& pp )
 {
     QStringList p = QStringList::split( ",", pp );
     if ( p.count() != 6 ) return FALSE;
 
     // h1,h2,h3,h4,p1,p2
     peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
                                 ( p[2].toInt() << 8 ) + p[3].toInt() );
     peerport = ( p[4].toInt() << 8 ) + p[5].toInt();
     return TRUE;
 }
 
 void ServerPI::dtpCompleted()
 {
     send( "226 Closing data connection, file transfer successful" ); // No tr
     if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) {
         QString fn = dtp->fileName();
         if ( fn.right(8)==".desktop" && fn.find("/Documents/")>=0 ) {
             QCopEnvelope e("QPE/System", "linkChanged(QString)" );
             e << fn;
         }
     }
     waitsocket = 0;
     dtp->close();
     storFileSize = -1;
 }
 
 void ServerPI::dtpFailed()
 {
     dtp->close();
     waitsocket = 0;
     send( "451 Requested action aborted: local error in processing" ); // No tr
     storFileSize = -1;
 }
 
 void ServerPI::dtpError( int )
 {
     dtp->close();
     waitsocket = 0;
     send( "451 Requested action aborted: local error in processing" ); // No tr
     storFileSize = -1;
 }
 
 bool ServerPI::sendList( const QString& arg )
 {
     QByteArray listing;
     QBuffer buffer( listing );
 
     if ( !buffer.open( IO_WriteOnly ) )
         return FALSE;
 
     QTextStream ts( &buffer );
     QString fn = arg;
 
     if ( fn.isEmpty() )
         fn = directory.path();
 
     QFileInfo fi( fn );
     if ( !fi.exists() ) return FALSE;
 
     // return file listing
     if ( fi.isFile() ) {
         ts << fileListing( &fi ) << endl;
     }
 
     // return directory listing
     else if ( fi.isDir() ) {
         QDir dir( fn );
         const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
 
         QFileInfoListIterator it( *list );
         QFileInfo *info;
 
         unsigned long total = 0;
         while ( ( info = it.current() ) ) {
             if ( info->fileName() != "." && info->fileName() != ".." )
                 total += info->size();
             ++it;
         }
 
         ts << "total " << QString::number( total / 1024 ) << endl; // No tr
 
         it.toFirst();
         while ( ( info = it.current() ) ) {
             if ( info->fileName() == "." || info->fileName() == ".." ) {
                 ++it;
                 continue;
             }
             ts << fileListing( info ) << endl;
             ++it;
         }
     }
 
     if ( passiv ) {
         waitarray = buffer.buffer();
         wait[SendByteArray] = TRUE;
         if ( waitsocket )
             newConnection( waitsocket );
     }
     else
         dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
     return TRUE;
 }
 
 QString ServerPI::fileListing( QFileInfo *info )
 {
     if ( !info ) return QString::null;
     QString s;
 
     // type char
     if ( info->isDir() )
         s += "d";
     else if ( info->isSymLink() )
         s += "l";
     else
         s += "-";
 
     // permisson string
     s += permissionString( info ) + " ";
 
     // number of hardlinks
     int subdirs = 1;
 
     if ( info->isDir() )
         subdirs = 2;
     // FIXME : this is to slow
     //if ( info->isDir() )
     //subdirs = QDir( info->absFilePath() ).entryList( QDir::Dirs ).count();
 
     s += QString::number( subdirs ).rightJustify( 3, ' ', TRUE ) + " ";
 
     // owner
     QString o = info->owner();
     if ( o.isEmpty() )
         o = QString::number(info->ownerId());
     s += o.leftJustify( 8, ' ', TRUE ) + " ";
 
     // group
     QString g = info->group();
     if ( g.isEmpty() )
         g = QString::number(info->groupId());
     s += g.leftJustify( 8, ' ', TRUE ) + " ";
 
     // file size in bytes
     s += QString::number( info->size() ).rightJustify( 9, ' ', TRUE ) + " ";
 
     // last modified date
     QDate date = info->lastModified().date();
     QTime time = info->lastModified().time();
     s += date.monthName( date.month() ) + " "
          + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
          + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
          + QString::number( time.minute() ).rightJustify( 2,'0', TRUE ) + " ";
 
     // file name
     s += info->fileName();
 
     return s;
 }
 
 QString ServerPI::permissionString( QFileInfo *info )
 {
     if ( !info ) return QString( "---------" );
     QString s;
 
     // user
     if ( info->permission( QFileInfo::ReadUser ) ) s += "r";
     else s += "-";
     if ( info->permission( QFileInfo::WriteUser ) ) s += "w";
     else s += "-";
     if ( info->permission( QFileInfo::ExeUser ) ) s += "x";
     else s += "-";
 
     // group
     if ( info->permission( QFileInfo::ReadGroup ) ) s += "r";
     else s += "-";
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 81363d2..1b90121 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -1,320 +1,351 @@
 /**********************************************************************
  ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
  **
  ** This file is part of Qtopia Environment.
  **
  ** This file may be distributed and/or modified under the terms of the
  ** GNU General Public License version 2 as published by the Free Software
  ** Foundation and appearing in the file LICENSE.GPL included in the
  ** packaging of this file.
  **
  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  ** See http://www.trolltech.com/gpl/ for GPL licensing information.
  **
  ** Contact info@trolltech.com if any conditions of this licensing are
  ** not clear to you.
  **
  **********************************************************************/
 #include "security.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/password.h>
 #include <qpe/qpedialog.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qlistview.h>
 #include <qtextstream.h>
 
     Security::Security( QWidget* parent,  const char* name, WFlags fl )
 : SecurityBase( parent, name, TRUE, fl )
 {
     valid=FALSE;
     Config cfg("Security");
     cfg.setGroup("Passcode");
     passcode = cfg.readEntry("passcode");
     passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
     cfg.setGroup("Sync");
     int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
     int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
     selectNet(auth_peer,auth_peer_bits);
     connect(syncnet, SIGNAL(textChanged(const QString&)),
             this, SLOT(setSyncNet(const QString&)));
 
+    cfg.setGroup("Sync");
+    QString sa = cfg.readEntry("syncapp","Qtopia");
+
+    //There must be a better way to do that...
+    for (int i=0; i<syncapp->count(); i++) {
+        if ( syncapp->text(i) == sa ) {
+                   syncapp->setCurrentItem(i);           
+        }
+    }  
+    
     /*
        cfg.setGroup("Remote");
        if ( telnetAvailable() )
        telnet->setChecked(cfg.readEntry("allow_telnet"));
        else
        telnet->hide();
 
        if ( sshAvailable() )
        ssh->setChecked(cfg.readEntry("allow_ssh"));
        else
        ssh->hide();
        */
 
     QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
-
+        
     loginCfg.setGroup("General");
     autoLoginName=loginCfg.readEntry("AutoLogin","");
 
     if (autoLoginName.stripWhiteSpace().isEmpty()) {
         autoLogin=false;
     } else {
         autoLogin=true;
     }
 
     cfg.setGroup("SyncMode");
     int mode = cfg.readNumEntry("Mode",2); // Default to Sharp
     syncModeCombo->setCurrentItem( mode - 1 );
 
     connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
     connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
     connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
     connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
-
+    connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp()));
+    
     loadUsers();
     updateGUI();
 
     dl = new QPEDialogListener(this);
     showMaximized();
 }
 
 Security::~Security()
 {
 }
 
 
 void Security::updateGUI()
 {
     bool empty = passcode.isEmpty();
 
     changepasscode->setText( empty ? tr("Set passcode" )
             : tr("Change passcode" )  );
     passcode_poweron->setEnabled( !empty );
     clearpasscode->setEnabled( !empty );
 
     autologinToggle->setChecked(autoLogin);
-    userlist->setEnabled(autoLogin);
-
+    userlist->setEnabled(autoLogin);    
 }
 
 
 void Security::show()
 {
     //valid=FALSE;
     setEnabled(FALSE);
     SecurityBase::show();
     if ( passcode.isEmpty() ) {
         // could insist...
         //changePassCode();
         //if ( passcode.isEmpty() )
         //reject();
     } else {
                 if (!valid) // security passcode was not asked yet, so ask now
                 {
                         QString pc = enterPassCode(tr("Enter passcode"));
                         if ( pc != passcode ) {
                                 QMessageBox::critical(this, tr("Passcode incorrect"),
                                                 tr("The passcode entered is incorrect.\nAccess denied"));
                                 reject();
                                 return;
                         }
                 }
     }
     setEnabled(TRUE);
     valid=TRUE;
 }
 
 void Security::accept()
 {
     applySecurity();
     QDialog::accept();
     QCopEnvelope env("QPE/System", "securityChanged()" );
 }
 
 void Security::done(int r)
 {
     QDialog::done(r);
     close();
 }
 
 void Security::selectNet(int auth_peer,int auth_peer_bits)
 {
     QString sn;
     if ( auth_peer_bits == 0 && auth_peer == 0 ) {
         sn = tr("Any");
     } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
         sn = tr("None");
     } else {
         sn =
             QString::number((auth_peer>>24)&0xff) + "."
             + QString::number((auth_peer>>16)&0xff) + "."
             + QString::number((auth_peer>>8)&0xff) + "."
             + QString::number((auth_peer>>0)&0xff) + "/"
             + QString::number(auth_peer_bits);
     }
     for (int i=0; i<syncnet->count(); i++) {
         if ( syncnet->text(i).left(sn.length()) == sn ) {
             syncnet->setCurrentItem(i);
             return;
         }
     }
     qDebug("No match for \"%s\"",sn.latin1());
 }
 
 void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
         auth_peer = 0;
         auth_peer_bits = 0;
     } else if ( sn == tr("None") ) {
         auth_peer = 0;
         auth_peer_bits = 32;
     } else {
         int x=0;
         for (int i=0; i<4; i++) {
             int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
             auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
             x = nx+1;
         }
         uint n = (uint)sn.find(' ',x)-x;
         auth_peer_bits = sn.mid(x,n).toInt();
     }
 }
 
 void Security::loadUsers ( void )
 {
     QFile passwd("/etc/passwd");
     if ( passwd.open(IO_ReadOnly) ) {
         QTextStream t( &passwd );
         QString s;
         QStringList account;
         while ( !t.eof() ) {
             account = QStringList::split(':',t.readLine());
 
             // Hide disabled accounts
             if (*account.at(1)!="*") {
 
                 userlist->insertItem(*account.at(0));
                 // Highlight this item if it is set to autologinToggle
                 if ( *account.at(0) == autoLoginName)
                     userlist->setCurrentItem(userlist->count()-1);
             }
         }
         passwd.close();
     }
 
 }
 
 void Security::toggleAutoLogin(bool val)
 {
     autoLogin=val;
     userlist->setEnabled(val);
     if (!autoLogin)
         autoLoginName=userlist->currentText();
 }
 
 
 
 
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
         cfg.setGroup("Sync");
         int auth_peer=0;
         int auth_peer_bits;
         QString sn = syncnet->currentText();
         parseNet(sn,auth_peer,auth_peer_bits);
         cfg.writeEntry("auth_peer",auth_peer);
-        cfg.writeEntry("auth_peer_bits",auth_peer_bits);
+                cfg.writeEntry("auth_peer_bits",auth_peer_bits);
+        cfg.writeEntry("syncapp",syncapp->currentText());
+        
         /*
            cfg.setGroup("Remote");
            if ( telnetAvailable() )
            cfg.writeEntry("allow_telnet",telnet->isChecked());
            if ( sshAvailable() )
            cfg.writeEntry("allow_ssh",ssh->isChecked());
         // ### write ssh/telnet sys config files
         */
 
         QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
         Config loginCfg(configFile,Config::File);
         loginCfg.setGroup("General");
 
         if (autoLogin) {
             loginCfg.writeEntry("AutoLogin",autoLoginName);
         } else {
             loginCfg.removeEntry("AutoLogin");
         }
 
     }
 }
+void Security::changeSyncApp()
+{
+    // Don't say i didn't tell ya
+    if (syncapp->currentText() == "IntelliSync") {
+            QMessageBox attn(
+                tr("WARNING"),
+                tr("<p>Selecting IntelliSync here will disable the FTP password."
+                    "<p>Every machine in your netrange will be able to sync with "
+                    "your Zaurus!"),
+                QMessageBox::Warning,
+                QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+                0, QString::null, TRUE, WStyle_StaysOnTop);
+            attn.setButtonText(QMessageBox::Cancel, tr("Ok"));
+            attn.exec();
+    } 
+    updateGUI();
+}
+
+
 
 void Security::changeLoginName( int idx )
 {
     autoLoginName = userlist->text(idx);;
     updateGUI();
 }
 
 void Security::changePassCode()
 {
     QString new1;
     QString new2;
 
     do {
         new1 = enterPassCode(tr("Enter new passcode"));
         if ( new1.isNull() )
             return;
         new2 = enterPassCode(tr("Re-enter new passcode"));
         if ( new2.isNull() )
             return;
     } while (new1 != new2);
 
     passcode = new1;
     updateGUI();
 }
 
 void Security::clearPassCode()
 {
     passcode = QString::null;
     updateGUI();
 }
 
 
 QString Security::enterPassCode(const QString& prompt)
 {
     return Password::getPassword(prompt);
 }
 
 bool Security::telnetAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
 
 bool Security::sshAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
diff --git a/core/settings/security/security.h b/core/settings/security/security.h
index 52d56de..b1a3eca 100644
--- a/core/settings/security/security.h
+++ b/core/settings/security/security.h
@@ -1,71 +1,72 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SECURITY_H
 #define SECURITY_H
 
 #include "securitybase.h"
 
 class QPEDialogListener;
 
 class Security : public SecurityBase
 { 
     Q_OBJECT
 
 public:
     static QString appName() { return QString::fromLatin1("security"); }
     Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Security();
 
     void show();
 
 protected:
     void accept();
     void applySecurity();
     void done(int);
 
 private slots:
     void changePassCode();
     void clearPassCode();
     void setSyncNet(const QString&);
     void changeLoginName(int);
     void toggleAutoLogin(bool);
+    void changeSyncApp();
 
 
 private:
     void loadUsers(void);
     bool telnetAvailable() const;
     bool sshAvailable() const;
     void updateGUI();
 
     static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits);
     void selectNet(int auth_peer,int auth_peer_bits);
     
     QString enterPassCode(const QString&);
     QString passcode;
     bool valid;
     bool autoLogin;
     QString autoLoginName;
 
     QPEDialogListener *dl;
 };
 
 
 #endif // SECURITY_H
 
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui
index 9fb63a8..934111e 100644
--- a/core/settings/security/securitybase.ui
+++ b/core/settings/security/securitybase.ui
@@ -1,437 +1,467 @@
 <!DOCTYPE UI><UI>
 <class>SecurityBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>SecurityBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>329</width>
+            <width>321</width>
             <height>483</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Security Settings</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidget2</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Passcode</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox4</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Passcode</string>
                         </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Layout1</cstring>
                                 </property>
                                 <property>
                                     <name>layoutSpacing</name>
                                 </property>
                                 <hbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>-1</number>
                                     </property>
                                     <widget>
                                         <class>QPushButton</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>changepasscode</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Change passcode</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QPushButton</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>clearpasscode</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Clear passcode</string>
                                         </property>
                                     </widget>
                                 </hbox>
                             </widget>
                             <widget>
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>passcode_poweron</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Require pass code at power-on</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>5</hsizetype>
                                         <vsizetype>7</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</string>
                                 </property>
                                 <property stdset="1">
                                     <name>textFormat</name>
                                     <enum>RichText</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>alignment</name>
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property>
                                     <name>vAlign</name>
                                 </property>
                             </widget>
                         </vbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer3</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                 </vbox>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Login</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox3</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Login</string>
                         </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>autologinToggle</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Login Automatically</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QComboBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>userlist</cstring>
                                 </property>
                             </widget>
                         </vbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer2</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                 </vbox>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Sync</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>6</number>
+                        <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox2</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Sync</string>
                         </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Accept sync from network:</string>
                                 </property>
                                 <property stdset="1">
                                     <name>textFormat</name>
                                     <enum>RichText</enum>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QComboBox</class>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>192.168.129.0/24 (default)</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>192.168.1.0/24</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>192.168.0.0/16</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>172.16.0.0/12</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>10.0.0.0/8</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>1.0.0.0/8</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>Any</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>None</string>
                                     </property>
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>syncnet</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>editable</name>
                                     <bool>true</bool>
                                 </property>
                             </widget>
                             <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel2</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Select your sync software</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QComboBox</class>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>QTopia</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>IntelliSync</string>
+                                    </property>
+                                </item>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>syncapp</cstring>
+                                </property>
+                            </widget>
+                            <widget>
                                 <class>QComboBox</class>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>Qtopia 1.7</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>Opie 1.0</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>Both</string>
                                     </property>
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>syncModeCombo</cstring>
                                 </property>
                             </widget>
                         </vbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer1</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                 </vbox>
             </widget>
         </widget>
     </vbox>
 </widget>
 </UI>