From 6c96dc57eff3f64155c913e1b011da5f5a6887fb Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 12 Apr 2016 12:05:11 -0500
Subject: in LiveTimezones, pass the primary timezone to it on construction. We
 used to create it implicitly but can't do that anymore now that
 TimedatedTimezone takes its own ctor argument.

---
 include/datetime/timezones-live.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h
index e722576..8b8b5fa 100644
--- a/include/datetime/timezones-live.h
+++ b/include/datetime/timezones-live.h
@@ -23,7 +23,6 @@
 #include <datetime/settings.h>
 #include <datetime/timezones.h>
 #include <datetime/timezone-geoclue.h>
-#include <datetime/timezone-timedated.h>
 
 #include <memory> // shared_ptr<>
 
@@ -38,13 +37,13 @@ namespace datetime {
 class LiveTimezones: public Timezones
 {
 public:
-    LiveTimezones(const std::shared_ptr<const Settings>& settings);
+    LiveTimezones(const std::shared_ptr<const Settings>& settings, const std::shared_ptr<Timezone>& primary_timezone);
 
 private:
     void update_geolocation();
     void update_timezones();
 
-    TimedatedTimezone m_file;
+    std::shared_ptr<Timezone> m_primary_timezone;
     std::shared_ptr<const Settings> m_settings;
     std::shared_ptr<GeoclueTimezone> m_geo;
 };
-- 
cgit v1.2.3