From a3937830bf656d5a8e2f368757b947cef0c8b1de Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 1 Sep 2015 10:52:13 +0100
Subject: Rename FileTimezone to TimedatedTimezone

---
 include/datetime/timezone-timedated.h | 54 +++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 include/datetime/timezone-timedated.h

(limited to 'include/datetime/timezone-timedated.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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
+#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
+
+#include <datetime/timezone.h> // base class
+
+#include <string> // 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> 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
-- 
cgit v1.2.3


From 29b5c4da1e44534352d29536bb6ad1c721406b8a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
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/datetime/timezone-timedated.h')

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 <datetime/timezone.h> // base class
 
 #include <string> // 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