summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--libkcal/calendarlocal.cpp2
-rw-r--r--libkdepim/ksyncmanager.cpp8
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
@@ -1911,3 +1911,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
1911 remote->removeSyncInfo( "" ); //all 1911 remote->removeSyncInfo( "" ); //all
1912 1912 qDebug("KO: Remoing all sync info on remote ");
1913 } else { 1913 } else {
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c33581c..c82ea92 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -987,3 +987,3 @@ void CalendarLocal::setCalendarRemove( int id )
987 while ( ev ) { 987 while ( ev ) {
988 if ( ev->calID() == id ) 988 if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") )
989 deleteEvent( ev ); 989 deleteEvent( ev );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8bf0d27..fa7804e 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1277,3 +1277,3 @@ void KServerSocket::waitForSocketFinish()
1277 if ( mSocket ) { 1277 if ( mSocket ) {
1278 qDebug("KSS:: waiting for finish operation"); 1278 //qDebug("KSS:: waiting for finish operation");
1279 QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish())); 1279 QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
@@ -1590,3 +1590,3 @@ void KCommandSocket::readFile( QString fn )
1590 mSocket = new QSocket( this ); 1590 mSocket = new QSocket( this );
1591 qDebug("KCS: read file - new socket"); 1591 //qDebug("KCS: read file - new socket");
1592 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); 1592 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
@@ -1609,3 +1609,3 @@ void KCommandSocket::updateConnectDialog()
1609 if ( mConnectCount == mConnectMax ) { 1609 if ( mConnectCount == mConnectMax ) {
1610 qDebug("MAXX %d", mConnectMax); 1610 //qDebug("MAXX %d", mConnectMax);
1611 mConnectProgress.setTotalSteps ( 30 ); 1611 mConnectProgress.setTotalSteps ( 30 );
@@ -1614,3 +1614,3 @@ void KCommandSocket::updateConnectDialog()
1614 } 1614 }
1615 qDebug("updateConnectDialog() %d", mConnectCount); 1615 //qDebug("updateConnectDialog() %d", mConnectCount);
1616 mConnectProgress.raise(); 1616 mConnectProgress.raise();