1 files changed, 8 insertions, 1 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index a6ae1bc..df93209 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -64,2 +64,3 @@ bool VCalFormat::load(Calendar *calendar, const QString &fileName)
   clearException();
+  if ( ! useLocalTime )
   useLocalTime = mCalendar->isLocalTime();
@@ -92,2 +93,3 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
   mCalendar = calendar;
+  if ( ! useLocalTime )
   useLocalTime = mCalendar->isLocalTime();
@@ -1174,2 +1176,4 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     else if (tmpStr.left(2) == "YM") {
+        // we have to set this such that recurrence accepts addYearlyNum(tmpDay);
+        anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, 1, -1);
       int index = tmpStr.find(' ');
@@ -1208,2 +1212,4 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     else if (tmpStr.left(2) == "YD") {
+        // we have to set this such that recurrence accepts addYearlyNum(tmpDay);
+        anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, 1, -1);
       int index = tmpStr.find(' ');
@@ -1538,2 +1544,3 @@ void VCalFormat::populate(VObject *vcal)
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
+      if ( vObjectUStringZValue(curVO) != 0 ) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
@@ -1542,3 +1549,3 @@ void VCalFormat::populate(VObject *vcal)
   }
-
+  }