Make QtopiaDesktop1.6 work with Opie again

it did rely on the counter part to send a version number starting with 1

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
@@ -595,25 +595,25 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
 
     syncDialog = 0;
 
     // we have a pretty good idea how big we'll be
     setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() );
 
     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&)),
 	this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
 	this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
 	this, SLOT(properties(AppLnk*)));
 
@@ -970,29 +970,34 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
          QString modifier, appName, delay;
          stream >> modifier >> appName >> delay;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( modifier.compare("add") == 0 ){
             // only add it appname is entered
             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
 	const QList<FileSystem> &fs = storage->fileSystems();
 	QListIterator<FileSystem> it ( fs );
 	QString s;
 	QString homeDir = getenv("HOME");
 	QString hardDiskHome, hardDiskHomePath;
 	for ( ; it.current(); ++it ) {
@@ -1041,25 +1046,25 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 	cfg.writeEntry( app, date );
 	//qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
     } else if ( msg == "startSync(QString)" ) {
 	QString what;
 	stream >> what;
 	delete syncDialog; syncDialog = 0;
 	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;
 
 //	Categories cats;
 	for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
 	    DocLnk *doc = it.current();
 	    QFileInfo fi( doc->file() );
 	    if ( !fi.exists() )
@@ -1084,25 +1089,25 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 		contents += "Name = "+doc->name()+"\n"; // No tr
 		contents += "Type = "+doc->type()+"\n"; // No tr
 	    }
 	    contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
 	    contents += QString("Size = %1\n").arg( fi.size() ); // No tr
 	}
 
 	//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
     } else if ( msg == "setMouseProto(QString)" ) {
 	QString mice;
 	stream >> mice;
 	setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
 	qwsServer->openMouse();
     } else if ( msg == "setKeyboard(QString)" ) {