sync

3 files changed, 6 insertions, 6 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 6128137..538325e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1909,7 +1909,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
     if ( mMultiResourceSync ) {
         remote->removeSyncInfo( "" ); //all
-
+        qDebug("KO: Remoing all sync info on remote ");
     } else {
         eventLSync->setReadOnly( false );
         eventLSync->setDtStart( mLastCalendarSync );
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c33581c..c82ea92 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -985,7 +985,7 @@ void CalendarLocal::setCalendarRemove( int id )
         QPtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
         while ( ev ) {
-            if ( ev->calID() == id )
+            if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") )
                 deleteEvent( ev );
             ev = EventList.next();
         }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8bf0d27..fa7804e 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1275,7 +1275,7 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject
 void KServerSocket::waitForSocketFinish()
 {
     if (  mSocket ) {
-        qDebug("KSS:: waiting for finish operation");
+        //qDebug("KSS:: waiting for finish operation");
         QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
         return;
     }
@@ -1588,7 +1588,7 @@ void KCommandSocket::readFile( QString fn )
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this ); 
-        qDebug("KCS: read file - new socket");
+        //qDebug("KCS: read file - new socket");
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
         connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
@@ -1607,12 +1607,12 @@ void KCommandSocket::updateConnectDialog()
 {
     
     if ( mConnectCount == mConnectMax  ) {
-        qDebug("MAXX %d", mConnectMax);
+        //qDebug("MAXX %d", mConnectMax);
         mConnectProgress.setTotalSteps ( 30 );
         mConnectProgress.show();
         mConnectProgress.setLabelText( i18n("Trying to connect to remote...") );
     }
-    qDebug("updateConnectDialog() %d", mConnectCount);
+    //qDebug("updateConnectDialog() %d", mConnectCount);
     mConnectProgress.raise();
     mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 );
     --mConnectCount;