journal fix

2 files changed, 6 insertions, 0 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 52590d8..21cee6e 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,61 +1,64 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.17 ************
 
 KO/Pi:
 Added option to display times in What's Next View on two lines.
 (Useful for display on the Zaurus with 240x320 screen)
 Removed "Allday" for allday events of one day duration in What's Next View.
 Added date range for allday events of more than one day duration in What's Next View.
 Fixed two problems in the data importing from Outlook:
   Fixed the duplicated import if the summary, location or description had whitespaces at the end.
   Fixed a problem importing certain recurrence rules.  
 
+A journal in an ics file may have no dtStart value (as files from KNotes, which stores its notes in an ics journal file).
+If now a journal has no dtStart value the dtStart value is set to the created value of the journal when loading the file. That makes it possible to view and edit "notes" from KNotes. Simply add another Resource in KO/Pi which is a copy of the ics file from KNotes. You will find the "notes" in KO/Pi as a journal entry on the date you created it.
+
 ********** VERSION 2.1.16 ************
 
 Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
 Added columns for datetime in todo view: Last modified, created and last modified subtodo
 Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
 Made conflict detection up to 4 times faster.
 
 ********** VERSION 2.1.15 ************
 
 Fixed two layout problems on the Z:
 Made the with of the newly added buttons on the Quick-Todo smaller.
 Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
 
 
 ********** VERSION 2.1.14 ************
 
 Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
 Added a button to add a subtodo quickly.
 
 Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
 Added an option to change the layout of the list week to column mode.
 
 Fixed some usability problems in pi-sync mode by adding some progress information about file transfer.
 
 Fixed pi-sync problems with the new multi calendar feature.
 Now pi-sync behaviour should be:
 1) Local sends file request ( as usual )
 2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars.
 3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ).
    If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar.
 4) Remote updates the data and adds new entries to default calendar. Readonly entries are not changed on remote.
    If the data which remote receives contains entries which are on disabled calendars on remote this entries are updated and not added as duplicates to the default calendar.
 
 Summary: 
 No new item ( new created after the last sync ) in a disabled calendar is propagated to the sync partner. Readonly items are synced and added/changed on the sync partner if it is not readonly on the sync partner.
 If you have different calendars on remote and local and some of them disabled you may get some "strange" bahaviour.
 Well, the syncing has become quite complicated ... you should have no problems if you enable all calendars. 
 
 ********** VERSION 2.1.13 ************
 
 Fixed a problem in KA/Pi search.
 Fixed some minor problems in KO/Pi.
 Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
 
 Fixed memory usage problems in KA/Pi:
 When loading data KA/Pi did load the file data twice.
 Example:
   A 600k file did consume 1200k memory during loading process.
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 3e28714..4794bc9 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -978,96 +978,99 @@ FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy)
   FreeBusy *freebusy = new FreeBusy;
 
   readIncidenceBase(vfreebusy,freebusy);
 
   icalproperty *p = icalcomponent_get_first_property(vfreebusy,ICAL_ANY_PROPERTY);
 
   icaltimetype icaltime;
   icalperiodtype icalperiod;
   QDateTime period_start, period_end;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DTSTART_PROPERTY:  // start date and time
         icaltime = icalproperty_get_dtstart(p);
         freebusy->setDtStart(readICalDateTime(icaltime));
         break;
 
       case ICAL_DTEND_PROPERTY:  // start End Date and Time
         icaltime = icalproperty_get_dtend(p);
         freebusy->setDtEnd(readICalDateTime(icaltime));
         break;
 
       case ICAL_FREEBUSY_PROPERTY:  //Any FreeBusy Times
         icalperiod = icalproperty_get_freebusy(p);
         period_start = readICalDateTime(icalperiod.start);
         period_end = readICalDateTime(icalperiod.end);
         freebusy->addPeriod(period_start, period_end);
         break;
 
       default:
         kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind
                   << endl;
       break;
     }
     p = icalcomponent_get_next_property(vfreebusy,ICAL_ANY_PROPERTY);
   }
 
   return freebusy;
 }
 
 Journal *ICalFormatImpl::readJournal(icalcomponent *vjournal)
 {
   Journal *journal = new Journal;
 
   readIncidence(vjournal,journal);
 
+  if ( !journal->dtStart().isValid() && journal->created().isValid() ) {
+      journal->setDtStart( journal->created() );
+  }
   return journal;
 }
 
 Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
 {
   icalparameter *p = 0;
 
   QString email = QString::fromUtf8(icalproperty_get_attendee(attendee));
 
   QString name;
   QString uid = QString::null;
   p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER);
   if (p) {
     name = QString::fromUtf8(icalparameter_get_cn(p));
   } else {
   }
 
   bool rsvp=false;
   p = icalproperty_get_first_parameter(attendee,ICAL_RSVP_PARAMETER);
   if (p) {
     icalparameter_rsvp rsvpParameter = icalparameter_get_rsvp(p);
     if (rsvpParameter == ICAL_RSVP_TRUE) rsvp = true;
   }
 
   Attendee::PartStat status = Attendee::NeedsAction;
   p = icalproperty_get_first_parameter(attendee,ICAL_PARTSTAT_PARAMETER);
   if (p) {
     icalparameter_partstat partStatParameter = icalparameter_get_partstat(p);
     switch(partStatParameter) {
       default:
       case ICAL_PARTSTAT_NEEDSACTION:
         status = Attendee::NeedsAction;
         break;
       case ICAL_PARTSTAT_ACCEPTED:
         status = Attendee::Accepted;
         break;
       case ICAL_PARTSTAT_DECLINED:
         status = Attendee::Declined;
         break;
       case ICAL_PARTSTAT_TENTATIVE:
         status = Attendee::Tentative;
         break;
       case ICAL_PARTSTAT_DELEGATED:
         status = Attendee::Delegated;
         break;
       case ICAL_PARTSTAT_COMPLETED:
         status = Attendee::Completed;
         break;