summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp5
-rw-r--r--libkdepim/ksyncmanager.cpp16
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();