-rw-r--r-- | libkdepim/externalapphandler.cpp | 12 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 0e9c5e5..2ce6926 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -30,6 +30,7 @@ $Id$ #include <stdlib.h> #include <qfile.h> +#include <qtimer.h> #include <qmap.h> #include <qregexp.h> @@ -1129,15 +1130,20 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) { - + qDebug("ExternalAppHandler::appMessage %s %x", cmsg.data(), this); if ( cmsg == "nextView()" ) { qDebug("nextView()"); - emit nextView(); + QTimer::singleShot( 0, this, SIGNAL ( nextView() )); return; } if ( cmsg == "callContactdialog()" ) { qDebug("callContactdialog()"); - emit callContactdialog(); + QTimer::singleShot( 0, this, SIGNAL ( callContactdialog() )); + return; + } + if ( cmsg == "doRingSync" ) { + qDebug("doRingSync"); + QTimer::singleShot( 0, this, SIGNAL ( doRingSync() )); return; } diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 097f306..b899ad7 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h @@ -235,6 +235,7 @@ class ExternalAppHandler : public QObject signals: void callContactdialog(); void nextView(); + void doRingSync(); // Emmitted when the target app receives a request from the source app void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index db815d6..038e032 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -521,6 +521,7 @@ void KSyncManager::multiSync( bool askforPrefs ) if (blockSave()) return; setBlockSave(true); + if ( askforPrefs ) { QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), question, @@ -530,6 +531,7 @@ void KSyncManager::multiSync( bool askforPrefs ) mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); return; } + } mCurrentSyncDevice = i18n("Multiple profiles") ; mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; if ( askforPrefs ) { |