| author | zecke <zecke> | 2002-09-30 15:39:19 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-09-30 15:39:19 (UTC) |
| commit | d2a7ac3311bda821ee07ff070c24f17958657129 (patch) (side-by-side diff) | |
| tree | d616be7f21e75c0a7f27f2155fbb5bb5a0855266 | |
| parent | da273e4780502b8819118c5e31c9d565fc1a1b49 (diff) | |
| download | opie-d2a7ac3311bda821ee07ff070c24f17958657129.zip opie-d2a7ac3311bda821ee07ff070c24f17958657129.tar.gz opie-d2a7ac3311bda821ee07ff070c24f17958657129.tar.bz2 | |
Make QtopiaDesktop1.6 work with Opie again
it did rely on the counter part to send a version number starting with 1
| -rw-r--r-- | core/launcher/launcher.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 1bd1156..6948976 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp @@ -606,3 +606,3 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) //uidgen.store( stamp ); - m_timeStamp = QString::number( stamp ); + m_timeStamp = QString::number( stamp ); @@ -981,7 +981,12 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) } - } else if ( msg == "sendVersionInfo()" ) { + } + /* + * QtopiaDesktop relies on the major number + * to start with 1. We're at 0.9 + * so wee need to fake at least 1.4 to be able + * to sync with QtopiaDesktop1.6 + */ + else if ( msg == "sendVersionInfo()" ) { QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); - QString v = QPE_VERSION; - QStringList l = QStringList::split( '.', v ); - QString v2 = l[0] + '.' + l[1]; + QString v2 = QString::fromLatin1("1.4"); e << v2; @@ -1052,3 +1057,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) connect( syncDialog->buttonCancel, SIGNAL( clicked() ), - SLOT( cancelSync() ) ); + SLOT( cancelSync() ) ); } else if ( msg == "stopSync()") { @@ -1095,3 +1100,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) #endif - + //qDebug( "================ \n\n%s\n\n===============", |