fix for filewatch and vcal timezone

2 files changed, 3 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 687943e..b1da144 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1516,3 +1516,3 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         updateView();
-        loadedFileVersion = QDateTime::currentDateTime();
+        setLoadedFileVersion( QDateTime::currentDateTime().addSecs( -1 ));
         if (  filename != MainWindow::defaultFileName() ) {
@@ -1569,2 +1569,3 @@ void CalendarView::watchSavedFile()
   if ( dt < loadedFileVersion ) {
+      //qDebug("watch %s %s ",  dt.toString().latin1(), loadedFileVersion.toString().latin1());
     QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 4727a7a..309c699 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -1486,3 +1486,3 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
   if (dtStr.at(dtStr.length()-1) == 'Z')
-    tmpDT = tmpDT.addSecs(60*mCalendar->getTimeZone());
+    tmpDT = tmpDT.addSecs (KGlobal::locale()->localTimeOffset( tmpDT )*60);
   return tmpDT;