diff options
| author | Robert Tari <robert@tari.in> | 2021-08-30 01:26:19 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-08-30 01:26:19 +0200 |
| commit | 22e66866c7b17fc655479ca911269b86cb80a744 (patch) | |
| tree | e0aa6e6a8f50fd8451e03efc17b89d8c8c3de781 /src/timezones-live.cpp | |
| parent | 1f8263dedf9b7e6f9e06492bd69f2436e36171a2 (diff) | |
| parent | 38e5efecbb3154a83a70c1c762802ec7927b3caa (diff) | |
| download | ayatana-indicator-datetime-22e66866c7b17fc655479ca911269b86cb80a744.tar.gz ayatana-indicator-datetime-22e66866c7b17fc655479ca911269b86cb80a744.tar.bz2 ayatana-indicator-datetime-22e66866c7b17fc655479ca911269b86cb80a744.zip | |
Merge branch 'tari01-pr/ubports-patches'
Attributes GH PR #46: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/46
Diffstat (limited to 'src/timezones-live.cpp')
| -rw-r--r-- | src/timezones-live.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/timezones-live.cpp b/src/timezones-live.cpp index 2979036..f3bd02d 100644 --- a/src/timezones-live.cpp +++ b/src/timezones-live.cpp @@ -25,11 +25,14 @@ namespace ayatana { namespace indicator { namespace datetime { -LiveTimezones::LiveTimezones(const std::shared_ptr<const Settings>& settings): - m_file(), +LiveTimezones::LiveTimezones( + const std::shared_ptr<const Settings>& settings, + const std::shared_ptr<Timezone>& primary_timezone +): + m_primary_timezone(primary_timezone), m_settings(settings) { - m_file.timezone.changed().connect([this](const std::string&){update_timezones();}); + m_primary_timezone->timezone.changed().connect([this](const std::string&){update_timezones();}); m_settings->show_detected_location.changed().connect([this](bool){update_geolocation();}); update_geolocation(); @@ -53,7 +56,7 @@ void LiveTimezones::update_geolocation() void LiveTimezones::update_timezones() { - const auto a = m_file.timezone.get(); + const auto a = m_primary_timezone->timezone.get(); const auto b = m_geo ? m_geo->timezone.get() : ""; timezone.set(a.empty() ? b : a); |