summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-11-25 22:51:38 (UTC)
committer zautrix <zautrix>2005-11-25 22:51:38 (UTC)
commit0e18027f386280bf427ef9d0ffec61a5516cebda (patch) (side-by-side diff)
tree91f93d724d141b9f087e4cef0c1a11e354ee389a
parentb71ee5442df23bb9900d3db6e6244773ee34ef13 (diff)
downloadkdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.zip
kdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.tar.gz
kdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.tar.bz2
sync
Diffstat (more/less context) (show 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
remote->removeSyncInfo( "" ); //all
-
+ qDebug("KO: Remoing all sync info on remote ");
} 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 )
while ( ev ) {
- if ( ev->calID() == id )
+ if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") )
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()
if ( mSocket ) {
- qDebug("KSS:: waiting for finish operation");
+ //qDebug("KSS:: waiting for finish operation");
QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
@@ -1590,3 +1590,3 @@ void KCommandSocket::readFile( QString fn )
mSocket = new QSocket( this );
- qDebug("KCS: read file - new socket");
+ //qDebug("KCS: read file - new socket");
connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
@@ -1609,3 +1609,3 @@ void KCommandSocket::updateConnectDialog()
if ( mConnectCount == mConnectMax ) {
- qDebug("MAXX %d", mConnectMax);
+ //qDebug("MAXX %d", mConnectMax);
mConnectProgress.setTotalSteps ( 30 );
@@ -1614,3 +1614,3 @@ void KCommandSocket::updateConnectDialog()
}
- qDebug("updateConnectDialog() %d", mConnectCount);
+ //qDebug("updateConnectDialog() %d", mConnectCount);
mConnectProgress.raise();