← Back to branch summary

~larsu/indicator-datetime/remove-test-warnings

« back to all changes in this revision

Viewing changes to src/main.cpp

  • Committer: Iain Lane
  • Date: 2015-08-31 21:08:36 UTC
  • Revision ID: iain.lane@canonical.com-20150831210836-n140zamabay2e8wk
Use timedated's Timezone property instead of watching /etc/timezone

Still need to rename everything to not use "timezone-file"

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.cpp
68
68
    {
69
69
        // create the live objects
70
70
        auto live_settings = std::make_shared<LiveSettings>();
71
 
        auto live_timezones = std::make_shared<LiveTimezones>(live_settings, TIMEZONE_FILE);
 
71
        auto live_timezones = std::make_shared<LiveTimezones>(live_settings);
72
72
        auto live_clock = std::make_shared<LiveClock>(timezone_);
73
73
 
74
74
        // create a full-month planner currently pointing to the current month
128
128
    textdomain(GETTEXT_PACKAGE);
129
129
 
130
130
    auto engine = create_engine();
131
 
    auto timezone_ = std::make_shared<FileTimezone>(TIMEZONE_FILE);
 
131
    auto timezone_ = std::make_shared<FileTimezone>();
132
132
    auto state = create_state(engine, timezone_);
133
133
    auto actions = std::make_shared<LiveActions>(state);
134
134
    MenuFactory factory(actions, state);