| author | zautrix <zautrix> | 2004-10-07 10:37:59 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-07 10:37:59 (UTC) |
| commit | f0e8b8f36bccda952fa662e4faf2d58fcee67262 (patch) (side-by-side diff) | |
| tree | f1d26c6d9e8bdba9b15464682b8a64b1d3e04d8b | |
| parent | 95508093d45aaf062813b7824884f964ee2d4d9a (diff) | |
| download | kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.zip kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.tar.gz kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.tar.bz2 | |
fix for different targets
| -rw-r--r-- | korganizer/calendarview.cpp | 5 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e4c067e..ea9607d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -129,2 +129,3 @@ #endif + #ifdef DESKTOP_VERSION @@ -159,5 +160,3 @@ class KOBeamPrefs : public QDialog local = new QRadioButton(i18n(" Local time "), time ); - tz->setChecked( true );#ifdef DESKTOP_VERSION -#include <kabc/stdaddressbook.h> -#endif + tz->setChecked( true ); QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index ea543dd..b360644 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -219,5 +219,15 @@ void KSyncManager::slotSyncMenu( int action ) } else if ( temp->getIsPiSync() ) { - mPassWordPiSync = temp->getRemotePw(); - mActiveSyncPort = temp->getRemotePort(); - mActiveSyncIP = temp->getRemoteIP(); + if ( mTargetApp == KAPI ) { + mPassWordPiSync = temp->getRemotePwAB(); + mActiveSyncPort = temp->getRemotePortAB(); + mActiveSyncIP = temp->getRemoteIPAB(); + } else if ( mTargetApp == KOPI ) { + mPassWordPiSync = temp->getRemotePw(); + mActiveSyncPort = temp->getRemotePort(); + mActiveSyncIP = temp->getRemoteIP(); + } else { + mPassWordPiSync = temp->getRemotePwPWM(); + mActiveSyncPort = temp->getRemotePortPWM(); + mActiveSyncIP = temp->getRemoteIPPWM(); + } syncPi(); |