fix for different targets

1 files changed, 13 insertions, 3 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index ea543dd..b360644 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -172,99 +172,109 @@ void KSyncManager::slotSyncMenu( int action )
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     mAskForPreferences = temp->getAskForPreferences();
     mSyncAlgoPrefs = temp->getSyncPrefs();
     mWriteBackFile = temp->getWriteBackFile();
     mWriteBackExistingOnly = temp->getWriteBackExisting();
     mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
 	  switch(mTargetApp)
 	  {
 	    case (KAPI):
 	      if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileNameAB();
 	      break;
 	    case (KOPI):
 	      if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileName();
 	      break;
 	    case (PWMPI):
 	      if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
 	      break;
 	    default:
 	      qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
 	      break;
 	      
 	  }
         } 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);
 }
 void KSyncManager::enableQuick()
 {
     QDialog dia ( 0, "input-dialog", true );
     QLineEdit lab ( &dia );
     QVBoxLayout lay( &dia );
     lab.setText( mPrefs->mPassiveSyncPort );
     lay.setMargin(7);
     lay.setSpacing(7);
     int po = 9197+mTargetApp;
     QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
     lay.addWidget( &label);
     lay.addWidget( &lab);
 
     QLineEdit lepw ( &dia );
     lepw.setText( mPrefs->mPassiveSyncPw );
     QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
     lay.addWidget( &label2);
     lay.addWidget( &lepw);
     dia.setFixedSize( 230,80 );
     dia.setCaption( i18n("Enter port for Pi-Sync") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     if ( ! dia.exec() )
         return;
     dia.hide();
     qApp->processEvents();
     mPrefs->mPassiveSyncPw = lepw.text();
     mPrefs->mPassiveSyncPort = lab.text();
     bool ok;
     Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         KMessageBox::information( 0, i18n("No valid port"));
         return;
     }
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );