aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-16 14:55:30 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-09-16 14:55:30 -0500
commitdc501b4b28452b097da0703cc77867377340ed13 (patch)
tree3ae5a01cd394c030465b42c5d71efdda500f83cf /src/main.cpp
parentf337a0fd3b8040d83b2433a8076f70fea345edad (diff)
downloadayatana-indicator-datetime-dc501b4b28452b097da0703cc77867377340ed13.tar.gz
ayatana-indicator-datetime-dc501b4b28452b097da0703cc77867377340ed13.tar.bz2
ayatana-indicator-datetime-dc501b4b28452b097da0703cc77867377340ed13.zip
LiveClock only needs one Timezone, so give it that instead of a Timezones object
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 54517c9..08d6dc1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,8 +67,8 @@ namespace
{
// create the live objects
auto live_settings = std::make_shared<LiveSettings>();
- auto live_timezones = std::make_shared<LiveTimezones>(live_settings, TIMEZONE_FILE);
- auto live_clock = std::make_shared<LiveClock>(live_timezones);
+ auto timezone_ = std::make_shared<FileTimezone>(TIMEZONE_FILE);
+ auto live_clock = std::make_shared<LiveClock>(timezone_);
// create a full-month planner currently pointing to the current month
const auto now = live_clock->localtime();
@@ -80,6 +80,7 @@ namespace
auto calendar_upcoming = std::make_shared<UpcomingPlanner>(range_planner, now);
// create the state
+ auto live_timezones = std::make_shared<LiveTimezones>(live_settings, TIMEZONE_FILE);
auto state = std::make_shared<State>();
state->settings = live_settings;
state->clock = live_clock;