-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 | |||
@@ -605,5 +605,5 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) | |||
605 | int stamp = uidgen.generate(); // this is our timestamp to see which devices we know | 605 | int stamp = uidgen.generate(); // this is our timestamp to see which devices we know |
606 | //uidgen.store( stamp ); | 606 | //uidgen.store( stamp ); |
607 | m_timeStamp = QString::number( stamp ); | 607 | m_timeStamp = QString::number( stamp ); |
608 | 608 | ||
609 | tabs = new CategoryTabWidget( this ); | 609 | tabs = new CategoryTabWidget( this ); |
@@ -980,9 +980,14 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
980 | } else { | 980 | } else { |
981 | } | 981 | } |
982 | } else if ( msg == "sendVersionInfo()" ) { | 982 | } |
983 | /* | ||
984 | * QtopiaDesktop relies on the major number | ||
985 | * to start with 1. We're at 0.9 | ||
986 | * so wee need to fake at least 1.4 to be able | ||
987 | * to sync with QtopiaDesktop1.6 | ||
988 | */ | ||
989 | else if ( msg == "sendVersionInfo()" ) { | ||
983 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); | 990 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); |
984 | QString v = QPE_VERSION; | 991 | QString v2 = QString::fromLatin1("1.4"); |
985 | QStringList l = QStringList::split( '.', v ); | ||
986 | QString v2 = l[0] + '.' + l[1]; | ||
987 | e << v2; | 992 | e << v2; |
988 | //qDebug("version %s\n", line.latin1()); | 993 | //qDebug("version %s\n", line.latin1()); |
@@ -1051,5 +1056,5 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
1051 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); | 1056 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); |
1052 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), | 1057 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), |
1053 | SLOT( cancelSync() ) ); | 1058 | SLOT( cancelSync() ) ); |
1054 | } else if ( msg == "stopSync()") { | 1059 | } else if ( msg == "stopSync()") { |
1055 | delete syncDialog; syncDialog = 0; | 1060 | delete syncDialog; syncDialog = 0; |
@@ -1094,5 +1099,5 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
1094 | e << contents; | 1099 | e << contents; |
1095 | #endif | 1100 | #endif |
1096 | 1101 | ||
1097 | //qDebug( "================ \n\n%s\n\n===============", | 1102 | //qDebug( "================ \n\n%s\n\n===============", |
1098 | //contents.latin1() ); | 1103 | //contents.latin1() ); |