[Korganizer-devel] [Bug 108982] journal entries from imap resource do not appear
Allen Winter
winter at kde.org
Tue Jan 9 17:10:55 CET 2007
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=108982
winter kde org changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
------- Additional Comments From winter kde org 2007-01-09 17:10 -------
SVN commit 621721 by winterz:
Fix for loading journals.
BUGS: 108982
M +8 -5 resourcekolab.cpp
--- branches/KDE/3.5/kdepim/kresources/kolab/kcal/resourcekolab.cpp #621720:621721
@ -249,7 +249,10 @
{
removeIncidences( "Journal" );
mCalendar.deleteAllJournals();
- return doLoadAll( mJournalSubResources, journalAttachmentMimeType );
+ bool kolabStyle = doLoadAll( mJournalSubResources, journalAttachmentMimeType );
+ bool icalStyle = doLoadAll( mJournalSubResources, incidenceInlineMimeType );
+
+ return kolabStyle && icalStyle;
}
void ResourceKolab::removeIncidences( const QCString& incidenceType )
@ -500,7 +503,7 @
mUidMap[ uid ] = StorageReference( subResource, sernum );
} else {
/* This is a real add, from KMail, we didn't trigger this ourselves.
- * If this uid already exists in this folder, do conflict resolution,
+ * If this uid already exists in this folder, do conflict resolution,
* unless the folder is read-only, in which case the user should not be
* offered a means of putting mails in a folder she'll later be unable to
* upload. Skip the incidence, in this case. */
@ -548,7 +551,7 @
bool ResourceKolab::addEvent( KCal::Event* event )
{
- if ( mUidMap.contains( event->uid() ) )
+ if ( mUidMap.contains( event->uid() ) )
return true; //noop
else
return addIncidence( event, QString::null, 0 );
@ -620,7 +623,7 @
bool ResourceKolab::addTodo( KCal::Todo* todo )
{
- if ( mUidMap.contains( todo->uid() ) )
+ if ( mUidMap.contains( todo->uid() ) )
return true; //noop
else
return addIncidence( todo, QString::null, 0 );
@ -657,7 +660,7 @
bool ResourceKolab::addJournal( KCal::Journal* journal )
{
- if ( mUidMap.contains( journal->uid() ) )
+ if ( mUidMap.contains( journal->uid() ) )
return true; //noop
else
return addIncidence( journal, QString::null, 0 );
More information about the Korganizer-devel
mailing list