Sync fixes and fix of config loading bug

1 files changed, 14 insertions, 5 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 9307f12..0ebd7d1 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -31,2 +31,3 @@
 #include <kdebug.h>
+#include <kglobal.h>
 #include <kmessagebox.h>
@@ -48,2 +49,3 @@ VCalFormat::VCalFormat()
     mCalendar = 0;
+    useLocalTime = false;
 }
@@ -168,5 +170,8 @@ bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 
-QString VCalFormat::eventToString( Event * event, Calendar *calendar)
+QString VCalFormat::eventToString( Event * event, Calendar *calendar, bool useLocal)
 {
+ 
   if ( !event ) return QString::null;
+  bool useL = useLocalTime;
+  useLocalTime = useLocal;
   mCalendar = calendar;
@@ -176,7 +181,11 @@ QString VCalFormat::eventToString( Event * event, Calendar *calendar)
   cleanVObject( vevent );
+  useLocalTime =  useL;
   return result;
 }
-QString VCalFormat::todoToString( Todo * todo, Calendar *calendar )
+QString VCalFormat::todoToString( Todo * todo, Calendar *calendar, bool useLocal )
 {
+ 
  if ( !todo ) return QString::null;
+  bool useL = useLocalTime;
+  useLocalTime = useLocal;
   mCalendar = calendar;
@@ -186,2 +195,3 @@ QString VCalFormat::todoToString( Todo * todo, Calendar *calendar )
   cleanVObject( vevent );
+  useLocalTime =  useL;
   return result;
@@ -1436,5 +1446,4 @@ QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu)
   ASSERT(qdt.time().isValid());
-  if (zulu) {
-    QDateTime tmpDT(qdt);
-    tmpDT = tmpDT.addSecs(60*(-mCalendar->getTimeZone())); // correct to GMT.
+  if (zulu && !useLocalTime ) {
+    QDateTime tmpDT = qdt.addSecs ( -KGlobal::locale()->localTimeOffset( qdt )*60);
     tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2dZ",