summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-10-12 08:08:55 (UTC)
committer llornkcor <llornkcor>2004-10-12 08:08:55 (UTC)
commitc1be01cafaa3b9f22586c73d14c5eaf0e7c6848d (patch) (unidiff)
tree449ad16813a1779a9dc1739a60b30fbc7ebad5c4
parentc4471939b0b1a187646a85c04d3290c23db78c9d (diff)
downloadopie-c1be01cafaa3b9f22586c73d14c5eaf0e7c6848d.zip
opie-c1be01cafaa3b9f22586c73d14c5eaf0e7c6848d.tar.gz
opie-c1be01cafaa3b9f22586c73d14c5eaf0e7c6848d.tar.bz2
QD knows versioninfo, opie needs it's own identity here
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/server.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 524e6dd..0eaebcf 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -372,50 +372,50 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
372#endif 372#endif
373 } else if ( msg == "rdiffCleanup()" ) { 373 } else if ( msg == "rdiffCleanup()" ) {
374 mkdir( "/tmp/rdiff" ); 374 mkdir( "/tmp/rdiff" );
375 QDir dir; 375 QDir dir;
376 dir.setPath( "/tmp/rdiff" ); 376 dir.setPath( "/tmp/rdiff" );
377 QStringList entries = dir.entryList(); 377 QStringList entries = dir.entryList();
378 for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) 378 for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
379 dir.remove( *it ); 379 dir.remove( *it );
380 } else if ( msg == "sendHandshakeInfo()" ) { 380 } else if ( msg == "sendHandshakeInfo()" ) {
381 QString home = getenv( "HOME" ); 381 QString home = getenv( "HOME" );
382#ifndef QT_NO_COP 382#ifndef QT_NO_COP
383 QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" ); 383 QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
384 e << home; 384 e << home;
385 int locked = (int) ServerApplication::screenLocked(); 385 int locked = (int) ServerApplication::screenLocked();
386 e << locked; 386 e << locked;
387#endif 387#endif
388 } else if ( msg == "sendVersionInfo()" ) { 388 } else if ( msg == "sendVersionInfo()" ) {
389 /* 389 /*
390 * QtopiaDesktop relies on the major number 390 * QtopiaDesktop relies on the major number
391 * to start with 1. 391 * to start with 1.
392 * we need to fake at least 1.4 to be able 392 * we need to fake at least 1.4 to be able
393 * to sync with QtopiaDesktop1.6 393 * to sync with QtopiaDesktop1.6
394 */ 394 */
395 QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" ); 395 QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" );
396 /* ### FIXME Architecture ### */ 396 QString opiename = "Opie";
397 e << QString::fromLatin1("1.7") << "Uncustomized Device"; 397 e << QString(QPE_VERSION) << opiename;
398 } else if ( msg == "sendCardInfo()" ) { 398 } else if ( msg == "sendCardInfo()" ) {
399#ifndef QT_NO_COP 399#ifndef QT_NO_COP
400 QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); 400 QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
401#endif 401#endif
402 storage->update(); 402 storage->update();
403 const QList<FileSystem> &fs = storage->fileSystems(); 403 const QList<FileSystem> &fs = storage->fileSystems();
404 QListIterator<FileSystem> it ( fs ); 404 QListIterator<FileSystem> it ( fs );
405 QString s; 405 QString s;
406 QString homeDir = getenv("HOME"); 406 QString homeDir = getenv("HOME");
407 QString homeFs, homeFsPath; 407 QString homeFs, homeFsPath;
408 for ( ; it.current(); ++it ) { 408 for ( ; it.current(); ++it ) {
409 int k4 = (*it)->blockSize()/256; 409 int k4 = (*it)->blockSize()/256;
410 if ( (*it)->isRemovable() ) { 410 if ( (*it)->isRemovable() ) {
411 s += (*it)->name() + "=" + (*it)->path() + "/Documents " // No tr 411 s += (*it)->name() + "=" + (*it)->path() + "/Documents " // No tr
412 + QString::number( (*it)->availBlocks() * k4/4 ) 412 + QString::number( (*it)->availBlocks() * k4/4 )
413 + "K " + (*it)->options() + ";"; 413 + "K " + (*it)->options() + ";";
414 } else if ( homeDir.contains( (*it)->path() ) && 414 } else if ( homeDir.contains( (*it)->path() ) &&
415 (*it)->path().length() > homeFsPath.length() ) { 415 (*it)->path().length() > homeFsPath.length() ) {
416 homeFsPath = (*it)->path(); 416 homeFsPath = (*it)->path();
417 homeFs = 417 homeFs =
418 (*it)->name() + "=" + homeDir + "/Documents " // No tr 418 (*it)->name() + "=" + homeDir + "/Documents " // No tr
419 + QString::number( (*it)->availBlocks() * k4/4 ) 419 + QString::number( (*it)->availBlocks() * k4/4 )
420 + "K " + (*it)->options() + ";"; 420 + "K " + (*it)->options() + ";";
421 } 421 }