From 132ac93bbd4141824cfa22f6516366f953fce9a0 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 31 Aug 2015 22:08:36 +0100 Subject: Use timedated's Timezone property instead of watching /etc/timezone Still need to rename everything to not use "timezone-file" --- include/datetime/timezone-file.h | 2 +- include/datetime/timezones-live.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/datetime/timezone-file.h b/include/datetime/timezone-file.h index eca9c29..05dc7b0 100644 --- a/include/datetime/timezone-file.h +++ b/include/datetime/timezone-file.h @@ -34,7 +34,7 @@ namespace datetime { class FileTimezone: public Timezone { public: - FileTimezone(const std::string& filename); + FileTimezone(); ~FileTimezone(); private: diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index ca4ef31..49d9120 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -38,7 +38,7 @@ namespace datetime { class LiveTimezones: public Timezones { public: - LiveTimezones(const std::shared_ptr& settings, const std::string& filename); + LiveTimezones(const std::shared_ptr& settings); private: void update_geolocation(); -- cgit v1.2.3 From a3937830bf656d5a8e2f368757b947cef0c8b1de Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 1 Sep 2015 10:52:13 +0100 Subject: Rename FileTimezone to TimedatedTimezone --- include/datetime/timezone-file.h | 54 ----------------------------------- include/datetime/timezone-timedated.h | 54 +++++++++++++++++++++++++++++++++++ include/datetime/timezones-live.h | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 include/datetime/timezone-file.h create mode 100644 include/datetime/timezone-timedated.h (limited to 'include') diff --git a/include/datetime/timezone-file.h b/include/datetime/timezone-file.h deleted file mode 100644 index 05dc7b0..0000000 --- a/include/datetime/timezone-file.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2013 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Charles Kerr - */ - -#ifndef INDICATOR_DATETIME_FILE_TIMEZONE_H -#define INDICATOR_DATETIME_FILE_TIMEZONE_H - -#include // base class - -#include // std::string - -namespace unity { -namespace indicator { -namespace datetime { - -/** - * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone - */ -class FileTimezone: public Timezone -{ -public: - FileTimezone(); - ~FileTimezone(); - -private: - class Impl; - friend Impl; - std::unique_ptr impl; - - // we have pointers in here, so disable copying - FileTimezone(const FileTimezone&) =delete; - FileTimezone& operator=(const FileTimezone&) =delete; -}; - -} // namespace datetime -} // namespace indicator -} // namespace unity - -#endif // INDICATOR_DATETIME_FILE_TIMEZONE_H diff --git a/include/datetime/timezone-timedated.h b/include/datetime/timezone-timedated.h new file mode 100644 index 0000000..3df9a3e --- /dev/null +++ b/include/datetime/timezone-timedated.h @@ -0,0 +1,54 @@ +/* + * Copyright 2013 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Charles Kerr + */ + +#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H +#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H + +#include // base class + +#include // std::string + +namespace unity { +namespace indicator { +namespace datetime { + +/** + * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone + */ +class TimedatedTimezone: public Timezone +{ +public: + TimedatedTimezone(); + ~TimedatedTimezone(); + +private: + class Impl; + friend Impl; + std::unique_ptr impl; + + // we have pointers in here, so disable copying + TimedatedTimezone(const TimedatedTimezone&) =delete; + TimedatedTimezone& operator=(const TimedatedTimezone&) =delete; +}; + +} // namespace datetime +} // namespace indicator +} // namespace unity + +#endif // INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index 49d9120..b9d78a5 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include // shared_ptr<> @@ -32,7 +32,7 @@ namespace indicator { namespace datetime { /** - * \brief #Timezones object that uses a #FileTimezone and #GeoclueTimezone + * \brief #Timezones object that uses a #TimedatedTimezone and #GeoclueTimezone * to detect what timezone we're in */ class LiveTimezones: public Timezones @@ -44,7 +44,7 @@ private: void update_geolocation(); void update_timezones(); - FileTimezone m_file; + TimedatedTimezone m_file; std::shared_ptr m_settings; std::shared_ptr m_geo; }; -- cgit v1.2.3 From 29b5c4da1e44534352d29536bb6ad1c721406b8a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 3 Sep 2015 10:54:20 +0100 Subject: Avoid nested GMainLoops by reading from the file on startup Restore some tests for this functionality. --- include/datetime/timezone-timedated.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/datetime/timezone-timedated.h b/include/datetime/timezone-timedated.h index 3df9a3e..5978e3e 100644 --- a/include/datetime/timezone-timedated.h +++ b/include/datetime/timezone-timedated.h @@ -20,6 +20,8 @@ #ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H #define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H +#define DEFAULT_FILENAME "/etc/timezone" + #include // base class #include // std::string @@ -34,7 +36,7 @@ namespace datetime { class TimedatedTimezone: public Timezone { public: - TimedatedTimezone(); + TimedatedTimezone(std::string filename = DEFAULT_FILENAME); ~TimedatedTimezone(); private: -- cgit v1.2.3