aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-03-09 12:41:45 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-03-09 12:41:45 -0500
commited9d932ef17fd55d8858a9391ab81d237a6be5ad (patch)
tree999018bd06bc73ac89b4f41054b43f856e731ac7 /src/main.cpp
parent422401c1b00f0dfa8926acba116e33b29f2ad7d7 (diff)
downloadayatana-indicator-datetime-ed9d932ef17fd55d8858a9391ab81d237a6be5ad.tar.gz
ayatana-indicator-datetime-ed9d932ef17fd55d8858a9391ab81d237a6be5ad.tar.bz2
ayatana-indicator-datetime-ed9d932ef17fd55d8858a9391ab81d237a6be5ad.zip
in EdsPlanner, use a Timezone instead of Timezones object
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 762795f..24a9409 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,6 +27,7 @@
#include <datetime/settings-live.h>
#include <datetime/snap.h>
#include <datetime/state.h>
+#include <datetime/timezone-file.h>
#include <datetime/timezones-live.h>
#include <glib/gi18n.h> // bindtextdomain()
@@ -56,10 +57,11 @@ main(int /*argc*/, char** /*argv*/)
std::shared_ptr<Settings> live_settings(new LiveSettings);
std::shared_ptr<Timezones> live_timezones(new LiveTimezones(live_settings, TIMEZONE_FILE));
std::shared_ptr<Clock> live_clock(new LiveClock(live_timezones));
+ std::shared_ptr<Timezone> file_timezone(new FileTimezone(TIMEZONE_FILE));
state->settings = live_settings;
state->clock = live_clock;
state->locations.reset(new SettingsLocations(live_settings, live_timezones));
- state->planner.reset(new PlannerEds(live_clock, live_timezones));
+ state->planner.reset(new PlannerEds(live_clock, file_timezone));
state->planner->time = live_clock->localtime();
std::shared_ptr<Actions> actions(new LiveActions(state));
MenuFactory factory(actions, state);