author | zautrix <zautrix> | 2005-11-25 21:00:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 21:00:35 (UTC) |
commit | 81d012860ea3d5d17d0e9cf16ec992baa83efbbf (patch) (side-by-side diff) | |
tree | 2e5ce0b81f1700f9c6dc60a8411029cd194e45a1 | |
parent | 2468bddcb380d8621d5bb49b69b3492d90562d93 (diff) | |
download | kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.zip kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.tar.gz kdepimpi-81d012860ea3d5d17d0e9cf16ec992baa83efbbf.tar.bz2 |
sync
-rw-r--r-- | libkcal/calendarlocal.cpp | 1 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 2a57724..c33581c 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -203,16 +203,17 @@ void CalendarLocal::addCalendar( Calendar* cal ) QPtrList<Event> EventList = cal->rawEvents(); QPtrList<Event> el; Event * ev = EventList.first(); while ( ev ) { if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { Event * se = event( ev->uid() ); if ( se ) el.append( se ); + ev->setCalID( 1 ); } ev->unRegisterObserver( cal ); ev->registerObserver( this ); mEventList.append( ev ); ev = EventList.next(); } for ( ev = el.first(); ev; ev = el.next() ) { deleteIncidence ( ev ); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index d2cb71b..e1b15d2 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1768,11 +1768,11 @@ void KCommandSocket::deleteSocket() tlw->setCaption( i18n("Connection to remote host cancelled!") ); emit commandFinished( this, mRetVal ); return; } //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); if ( mSocket) delete mSocket; mSocket = 0; - qDebug("commandFinished "); + //qDebug("commandFinished "); emit commandFinished( this, mRetVal ); } |