1 files changed, 18 insertions, 9 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 {