summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -603,9 +603,9 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
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 );
@@ -978,13 +978,18 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
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
@@ -1049,9 +1054,9 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
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();
@@ -1092,9 +1097,9 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
#ifndef QT_NO_COP
QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
e << contents;
#endif
-
+
//qDebug( "================ \n\n%s\n\n===============",
//contents.latin1() );
delete docsFolder;