-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 8 |
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 | |||
1909 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1909 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1910 | if ( mMultiResourceSync ) { | 1910 | if ( mMultiResourceSync ) { |
1911 | remote->removeSyncInfo( "" ); //all | 1911 | remote->removeSyncInfo( "" ); //all |
1912 | 1912 | qDebug("KO: Remoing all sync info on remote "); | |
1913 | } else { | 1913 | } else { |
1914 | eventLSync->setReadOnly( false ); | 1914 | eventLSync->setReadOnly( false ); |
1915 | eventLSync->setDtStart( mLastCalendarSync ); | 1915 | 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 ) | |||
985 | QPtrList<Event> EventList = mEventList; | 985 | QPtrList<Event> EventList = mEventList; |
986 | Event * ev = EventList.first(); | 986 | Event * ev = EventList.first(); |
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 ); |
990 | ev = EventList.next(); | 990 | ev = EventList.next(); |
991 | } | 991 | } |
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 | |||
1275 | void KServerSocket::waitForSocketFinish() | 1275 | void KServerSocket::waitForSocketFinish() |
1276 | { | 1276 | { |
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())); |
1280 | return; | 1280 | return; |
1281 | } | 1281 | } |
@@ -1588,7 +1588,7 @@ void KCommandSocket::readFile( QString fn ) | |||
1588 | { | 1588 | { |
1589 | if ( !mSocket ) { | 1589 | if ( !mSocket ) { |
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()) ); |
1593 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1593 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1594 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1594 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
@@ -1607,12 +1607,12 @@ void KCommandSocket::updateConnectDialog() | |||
1607 | { | 1607 | { |
1608 | 1608 | ||
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 ); |
1612 | mConnectProgress.show(); | 1612 | mConnectProgress.show(); |
1613 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); | 1613 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); |
1614 | } | 1614 | } |
1615 | qDebug("updateConnectDialog() %d", mConnectCount); | 1615 | //qDebug("updateConnectDialog() %d", mConnectCount); |
1616 | mConnectProgress.raise(); | 1616 | mConnectProgress.raise(); |
1617 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); | 1617 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); |
1618 | --mConnectCount; | 1618 | --mConnectCount; |