aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-16 15:25:52 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-09-16 15:25:52 -0500
commit8da361db324d454ee9910ea3e169f428d32a925a (patch)
tree86ecb9508b3e3f32b5e5c727b2bcbf8a3840d243
parentb455f23b6f9e76aaf5e7ac2eeea4f555ba7177f2 (diff)
downloadayatana-indicator-datetime-8da361db324d454ee9910ea3e169f428d32a925a.tar.gz
ayatana-indicator-datetime-8da361db324d454ee9910ea3e169f428d32a925a.tar.bz2
ayatana-indicator-datetime-8da361db324d454ee9910ea3e169f428d32a925a.zip
copyediting: move line to remove unnecessary diff from trunk
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c16cb20..aa8f829 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,6 +67,7 @@ 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>(timezone_);
// create a full-month planner currently pointing to the current month
@@ -79,7 +80,6 @@ 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;