sync

3 files changed, 29 insertions, 16 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 719d80b..61a9899 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -322,9 +322,9 @@ void KSyncManager::slotSyncMenu( int action )
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
                 if ( temp->getIsPiSyncSpec() )
-                    mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() );
+                    mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                     mPassWordPiSync = temp->getRemotePw();
                     mActiveSyncPort = temp->getRemotePort();
                     mActiveSyncIP = temp->getRemoteIP();
                 } else  {
@@ -664,9 +664,9 @@ int KSyncManager::ringSync()
                             mPassWordPiSync = temp->getRemotePwAB();
                             mActiveSyncPort = temp->getRemotePortAB();
                             mActiveSyncIP = temp->getRemoteIPAB();
                         } else if ( mTargetApp == KOPI ) {
-                            mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() );
+                            mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                             mPassWordPiSync = temp->getRemotePw();
                             mActiveSyncPort = temp->getRemotePort();
                             mActiveSyncIP = temp->getRemoteIP();
                         } else  {
@@ -1140,23 +1140,32 @@ void KSyncManager::syncPi()
     }
     mCurrentResourceLocal = "";
     mCurrentResourceRemote = "";
     if ( mSpecificResources.count() ) {
+        int lastSyncRes = mSpecificResources.count()/2;
+        int ccc = mSpecificResources.count()-1;
+        while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) {
+            --ccc;
+            --lastSyncRes;
+        }
         int startLocal = 0;
         int startRemote = mSpecificResources.count()/2;
         emit multiResourceSyncStart( true );
         while ( startLocal < mSpecificResources.count()/2 ) {
-            if (  startLocal+1 >= mSpecificResources.count()/2 )
+            if (  startLocal+1 >= lastSyncRes )
                 emit multiResourceSyncStart( false );
             mPisyncFinished = false;
             mCurrentResourceLocal = mSpecificResources[ startLocal ];
             mCurrentResourceRemote = mSpecificResources[ startRemote ];
-            KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
-            connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
-            commandSocket->readFile(  syncFileName() );
-            while ( !mPisyncFinished ) {
-                //qDebug("waiting ");
-                qApp->processEvents();
+            if ( !mCurrentResourceRemote.isEmpty() ) {
+                qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
+                KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
+                connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
+                commandSocket->readFile(  syncFileName() );
+                while ( !mPisyncFinished ) {
+                    //qDebug("waiting ");
+                    qApp->processEvents();
+                }
             }
             ++startLocal;
         }
     } else {
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 27f7932..744a914 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -590,16 +590,18 @@ void KSyncPrefsDialog::profileChanged( int item )
     mIsKapiFileL->setChecked(prof->getIsKapiFile()) ;
     mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
 
 
-    QStringList res = QStringList::split( ":",prof->getResSpecKopi());
-    int i= res.count()/2;
-    for ( ;i < res.count(); ++i ) {
-        mResTableKopi->setText( i, 0, res[i] );
+    QStringList res = QStringList::split( ":",prof->getResSpecKopi(), true );
+    int add = res.count()/2;
+    int i;
+    for ( i = 0;i < add ; ++i ) {
+        mResTableKopi->setText( i, 0, res[i+add] );
     } 
-    res = QStringList::split( ":",prof->getResSpecKapi());
-    for ( i = 0;i < res.count(); ++i ) {
-        mResTableKapi->setText( i, 0, res[i] );
+    res = QStringList::split( ":",prof->getResSpecKapi(), true);
+    add = res.count()/2;
+    for ( i = 0;i <  add; ++i ) {
+        mResTableKapi->setText( i, 0, res[i+add] );
     }
     mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec());
     proGr->setEnabled( item > 2 );
     if ( item < 3 ) {
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index d6620c8..b0d3efc 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -141,8 +141,10 @@ void KSyncProfile::setDefault()
     mFilterInCal = "no filter";
     mFilterOutCal = "no filter";
     mFilterInAB = "no filter";
     mFilterOutAB = "no filter";
+    mResSpecKopi = "";
+    mResSpecKapi = "";
 }
 void KSyncProfile::readConfig(KConfig *config )
 {
   if (config)