author | zautrix <zautrix> | 2005-11-25 21:00:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 21:00:35 (UTC) |
commit | 81d012860ea3d5d17d0e9cf16ec992baa83efbbf (patch) (unidiff) | |
tree | 2e5ce0b81f1700f9c6dc60a8411029cd194e45a1 | |
parent | 2468bddcb380d8621d5bb49b69b3492d90562d93 (diff) | |
download | kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.zip kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.tar.gz kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.tar.bz2 |
sync
-rw-r--r-- | libkcal/calendarlocal.cpp | 3 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 2a57724..c33581c 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -204,13 +204,14 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
204 | QPtrList<Event> el; | 204 | QPtrList<Event> el; |
205 | Event * ev = EventList.first(); | 205 | Event * ev = EventList.first(); |
206 | while ( ev ) { | 206 | while ( ev ) { |
207 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { | 207 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { |
208 | Event * se = event( ev->uid() ); | 208 | Event * se = event( ev->uid() ); |
209 | if ( se ) | 209 | if ( se ) |
210 | el.append( se ); | 210 | el.append( se ); |
211 | ev->setCalID( 1 ); | ||
211 | } | 212 | } |
212 | ev->unRegisterObserver( cal ); | 213 | ev->unRegisterObserver( cal ); |
213 | ev->registerObserver( this ); | 214 | ev->registerObserver( this ); |
214 | mEventList.append( ev ); | 215 | mEventList.append( ev ); |
215 | ev = EventList.next(); | 216 | ev = EventList.next(); |
216 | } | 217 | } |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index d2cb71b..e1b15d2 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1770,9 +1770,9 @@ void KCommandSocket::deleteSocket() | |||
1770 | return; | 1770 | return; |
1771 | } | 1771 | } |
1772 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1772 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1773 | if ( mSocket) | 1773 | if ( mSocket) |
1774 | delete mSocket; | 1774 | delete mSocket; |
1775 | mSocket = 0; | 1775 | mSocket = 0; |
1776 | qDebug("commandFinished "); | 1776 | //qDebug("commandFinished "); |
1777 | emit commandFinished( this, mRetVal ); | 1777 | emit commandFinished( this, mRetVal ); |
1778 | } | 1778 | } |