author | zecke <zecke> | 2002-10-04 21:16:03 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-04 21:16:03 (UTC) |
commit | 10048c2dd7f7cd26c582d64b5e255b00b47de304 (patch) (side-by-side diff) | |
tree | 3b2a79d8218efe5f80d1b2e79e77b22cbc27c2ba | |
parent | dc0344e987ba9b386056dd7bab7c5e34922eff5c (diff) | |
download | opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.zip opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.tar.gz opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.tar.bz2 |
Weird for some of you
_OS_LINUX_ does not get defined
so now it's a if !define(_OS_LINUX)
but this means you need to libuuid again
I don't know how to fix that right. I should ask tt
-rw-r--r-- | core/launcher/transferserver.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index a20df2f..f9204ab 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -67,68 +67,68 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent , : QServerSocket( port, 1, parent, name ) { if ( !ok() ) qWarning( "Failed to bind to port %d", port ); } TransferServer::~TransferServer() { } void TransferServer::newConnection( int socket ) { (void) new ServerPI( socket, this ); } /* * small class in anonymous namespace * to generate a QUUid for us */ namespace { struct UidGen { QString uuid(); }; -#if defined(_OS_LINUX_) +#if !defined(_OS_LINUX_) + QString UidGen::uuid() { + uuid_t uuid; + uuid_generate( uuid ); + return QUUid( uuid ).toString(); + } +#else /* * linux got a /proc/sys/kernel/random/uuid file * it'll generate the uuids for us */ QString UidGen::uuid() { QFile file( "/proc/sys/kernel/random/uuid" ); if (!file.open(IO_ReadOnly ) ) return QString::null; QTextStream stream(&file); return "{" + stream.read().stripWhiteSpace() + "}"; } -#else - QString UidGen::uuid() { - uuid_t uuid; - uuid_generate( uuid ); - return QUUid( uuid ).toString(); - } #endif } QString SyncAuthentication::serverId() { Config cfg("Security"); cfg.setGroup("Sync"); QString r=cfg.readEntry("serverid"); if ( r.isEmpty() ) { UidGen gen; r = gen.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(); |