From f0e8b8f36bccda952fa662e4faf2d58fcee67262 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 07 Oct 2004 10:37:59 +0000
Subject: fix for different targets

---
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e4c067e..ea9607d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -127,6 +127,7 @@
 #else
 #include <qprocess.h>
 #endif
+
 #ifdef DESKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #endif
@@ -157,9 +158,7 @@ class KOBeamPrefs : public QDialog
         vcal->setChecked( true );
         tz = new QRadioButton(i18n(" With timezone "), time );
         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 );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index ea543dd..b360644 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -217,9 +217,19 @@ void KSyncManager::slotSyncMenu( int action )
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } 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();
             }
                 syncRemote( temp );
--
cgit v0.9.0.2