From c8c97ab483cfbf1bb3d0788cf729be92091ba2fc Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 30 May 2011 23:16:00 +0300
Subject: [PATCH] Flip the sign of TimeZone offset so it makes more sense

---
 source/time/datetime.cpp |  4 ++--
 source/time/timezone.cpp | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 415ce40..7fa8cee 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -186,7 +186,7 @@ void DateTime::set_timezone(const TimeZone &tz)
 
 void DateTime::convert_timezone(const TimeZone &tz)
 {
-	add_raw((zone.get_offset()-tz.get_offset()).raw());
+	add_raw((tz.get_offset()-zone.get_offset()).raw());
 	zone = tz;
 }
 
@@ -296,7 +296,7 @@ string DateTime::format_rfc3339() const
 	if(const TimeDelta &offs = zone.get_offset())
 	{
 		int m = abs(static_cast<int>(offs/Time::min));
-		result += Msp::format("%c%02d:%02d", (offs<zero ? '+' : '-'), m/60, m%60);
+		result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
 	}
 	else
 		result += 'Z';
diff --git a/source/time/timezone.cpp b/source/time/timezone.cpp
index 9c14624..a96e1b5 100644
--- a/source/time/timezone.cpp
+++ b/source/time/timezone.cpp
@@ -102,7 +102,7 @@ TimeZone get_local_timezone()
 		close(fd);
 
 		if(gmtoff!=-1)
-			return TimeZone(-gmtoff/60, name);
+			return TimeZone(gmtoff/60, name);
 	}
 	return TimeZone();
 #endif
@@ -117,15 +117,15 @@ TimeZone::TimeZone():
 	name("UTC")
 { }
 
-TimeZone::TimeZone(int minutes_west):
-	offset(minutes_west*min)
+TimeZone::TimeZone(int minutes):
+	offset(minutes*min)
 {
-	if(minutes_west)
+	if(minutes)
 	{
 		ostringstream ss;
 		ss.fill('0');
-		int m = abs(minutes_west);
-		ss<<"UTC"<<(minutes_west<0 ? '-' : '+')<<m/60;
+		int m = abs(minutes);
+		ss<<"UTC"<<(minutes<0 ? '-' : '+')<<m/60;
 		if(m%60)
 			ss<<':'<<setw(2)<<m%60;
 	}
@@ -133,9 +133,9 @@ TimeZone::TimeZone(int minutes_west):
 		name = "UTC";
 }
 
-TimeZone::TimeZone(int minutes_west, const string &n):
+TimeZone::TimeZone(int minutes, const string &n):
 	name(n),
-	offset(minutes_west*min)
+	offset(minutes*min)
 { }
 
 const TimeZone &TimeZone::utc()
-- 
2.43.0