Diffstat (limited to 'core/launcher/transferserver.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/launcher/transferserver.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 9519d11..9cb9d7a 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -20,5 +20,5 @@ //#define _XOPEN_SOURCE -#include <qtopia/global.h> +#include <opie2/oglobal.h> #include <qtopia/qpeapplication.h> @@ -33,5 +33,5 @@ #include <shadow.h> #include <crypt.h> -#endif /* Q_OS_MACX */ +#endif /* Q_OS_MACX */ #else @@ -64,5 +64,4 @@ #endif -#include "launcherglobal.h" #include "transferserver.h" @@ -115,5 +114,5 @@ QString SyncAuthentication::serverId() if ( r.isEmpty() ) { - r = Opie::Global::uuid(); + r = OGlobal::generateUuid(); cfg.writeEntry("serverid", r ); } @@ -194,16 +193,16 @@ bool SyncAuthentication::checkPassword( const QString& password ) static int denials=0; int now = time(0); - + Config cfg("Security"); - cfg.setGroup("Sync"); + 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 ( password.isEmpty() ) { if ( denials < 3 || now > lastdenial+600 ) { QMessageBox unauth( @@ -220,8 +219,8 @@ bool SyncAuthentication::checkPassword( const QString& password ) denials++; lastdenial=now; - } + } return FALSE; - - } + + } // Second, check sync password... @@ -230,5 +229,5 @@ bool SyncAuthentication::checkPassword( const QString& password ) if ( lock ) return FALSE; - ++lock; + ++lock; /* |