aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-15 21:02:48 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-09-15 21:02:48 +0000
commit851e7e1493ad8268ccef813cb1cc0f7597ee3560 (patch)
tree47c0598e5ac78fd037fe12f010f56948c984a1f3 /include
parentf337a0fd3b8040d83b2433a8076f70fea345edad (diff)
parentc0055ef9118a7a284b26d164617985236a2d432a (diff)
downloadayatana-indicator-datetime-851e7e1493ad8268ccef813cb1cc0f7597ee3560.tar.gz
ayatana-indicator-datetime-851e7e1493ad8268ccef813cb1cc0f7597ee3560.tar.bz2
ayatana-indicator-datetime-851e7e1493ad8268ccef813cb1cc0f7597ee3560.zip
Update the time strings when a powerd Wakeup signal is detected. Fixes: 1359802
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'include')
-rw-r--r--include/datetime/clock-mock.h12
-rw-r--r--include/datetime/clock.h9
-rw-r--r--include/datetime/dbus-shared.h5
3 files changed, 18 insertions, 8 deletions
diff --git a/include/datetime/clock-mock.h b/include/datetime/clock-mock.h
index fb9b52f..0e24377 100644
--- a/include/datetime/clock-mock.h
+++ b/include/datetime/clock-mock.h
@@ -41,15 +41,23 @@ public:
DateTime localtime() const { return m_localtime; }
- void set_localtime(const DateTime& dt) {
+ void set_localtime(const DateTime& dt)
+ {
const auto old = m_localtime;
- m_localtime = dt;
+
+ set_localtime_quietly(dt);
+
if (!DateTime::is_same_minute(old, m_localtime))
minute_changed();
if (!DateTime::is_same_day(old, m_localtime))
date_changed();
}
+ void set_localtime_quietly(const DateTime& dt)
+ {
+ m_localtime = dt;
+ }
+
private:
DateTime m_localtime;
};
diff --git a/include/datetime/clock.h b/include/datetime/clock.h
index 1d488d1..0b2a543 100644
--- a/include/datetime/clock.h
+++ b/include/datetime/clock.h
@@ -55,12 +55,9 @@ protected:
void maybe_emit (const DateTime& a, const DateTime& b);
private:
- static void on_system_bus_ready(GObject*, GAsyncResult*, gpointer);
- static void on_prepare_for_sleep(GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer);
-
- GCancellable * m_cancellable = nullptr;
- GDBusConnection * m_system_bus = nullptr;
- unsigned int m_sleep_subscription_id = 0;
+ class Impl;
+ friend class Impl;
+ std::unique_ptr<Impl> m_impl;
// we've got raw pointers and GSignal tags in here, so disable copying
Clock(const Clock&) =delete;
diff --git a/include/datetime/dbus-shared.h b/include/datetime/dbus-shared.h
index db10c1d..c09caa2 100644
--- a/include/datetime/dbus-shared.h
+++ b/include/datetime/dbus-shared.h
@@ -24,4 +24,9 @@
#define BUS_DATETIME_NAME "com.canonical.indicator.datetime"
#define BUS_DATETIME_PATH "/com/canonical/indicator/datetime"
+#define BUS_POWERD_NAME "com.canonical.powerd"
+#define BUS_POWERD_PATH "/com/canonical/powerd"
+#define BUS_POWERD_INTERFACE "com.canonical.powerd"
+
+
#endif /* _INDICATOR_DATETIME_DBUS_SHARED_H_ */