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
@@ -122,16 +122,17 @@
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
 #endif
+
 #ifdef DESKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
@@ -152,19 +153,17 @@ class KOBeamPrefs : public QDialog
         format->setExclusive ( true ) ;
         QButtonGroup* time = new  QButtonGroup(1, Horizontal, i18n("Time format"), this );
         lay->addWidget( time ); time->setExclusive ( true ) ;
         vcal = new QRadioButton(" vCalendar ", format );
         ical = new QRadioButton(" iCalendar ", format );
         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 );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 200, 200 );
     }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index ea543dd..b360644 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -212,19 +212,29 @@ void KSyncManager::slotSyncMenu( int action )
           }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 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 );
 
         }
     }
     delete temp;
     setBlockSave(false);