summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-30 15:39:19 (UTC)
committer zecke <zecke>2002-09-30 15:39:19 (UTC)
commitd2a7ac3311bda821ee07ff070c24f17958657129 (patch) (side-by-side diff)
treed616be7f21e75c0a7f27f2155fbb5bb5a0855266
parentda273e4780502b8819118c5e31c9d565fc1a1b49 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp19
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
@@ -601,13 +601,13 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
tabs = 0;
rootFolder = 0;
docsFolder = 0;
int stamp = uidgen.generate(); // this is our timestamp to see which devices we know
//uidgen.store( stamp );
- m_timeStamp = QString::number( stamp );
+ m_timeStamp = QString::number( stamp );
tabs = new CategoryTabWidget( this );
tabs->setMaximumWidth( qApp->desktop()->width() );
setCentralWidget( tabs );
connect( tabs, SIGNAL(selected(const QString&)),
@@ -976,17 +976,22 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
if (!appName.isEmpty()) {
cfg.writeEntry("Apps", appName);
cfg.writeEntry("Delay", delay);
}
} else {
}
- } 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;
//qDebug("version %s\n", line.latin1());
} else if ( msg == "sendCardInfo()" ) {
#ifndef QT_NO_COP
QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
#endif
@@ -1047,13 +1052,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
syncDialog = new SyncDialog( this, "syncProgress", FALSE,
WStyle_Tool | WStyle_Customize |
Qt::WStyle_StaysOnTop );
syncDialog->showMaximized();
syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
- SLOT( cancelSync() ) );
+ SLOT( cancelSync() ) );
} else if ( msg == "stopSync()") {
delete syncDialog; syncDialog = 0;
} else if ( msg == "getAllDocLinks()" ) {
loadDocs();
QString contents;
@@ -1090,13 +1095,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
//qDebug( "sending length %d", contents.length() );
#ifndef QT_NO_COP
QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
e << contents;
#endif
-
+
//qDebug( "================ \n\n%s\n\n===============",
//contents.latin1() );
delete docsFolder;
docsFolder = 0;
#ifdef QWS