From 909ccbc93d9fa21075cf5001887e69159e621f5d Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 23 Jul 2014 22:56:36 -0500
Subject: move the powerd and screen bus name, path, and interface strings into
 dbus-shared

---
 include/datetime/dbus-shared.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'include/datetime')

diff --git a/include/datetime/dbus-shared.h b/include/datetime/dbus-shared.h
index c5ff6ab..4b71ce5 100644
--- a/include/datetime/dbus-shared.h
+++ b/include/datetime/dbus-shared.h
@@ -18,8 +18,18 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  */
 
+#ifndef _DBUS_SHARED_H_
+#define _DBUS_SHARED_H_
 
-#define BUS_NAME "com.canonical.indicator.datetime"
+#define BUS_DATETIME_NAME    "com.canonical.indicator.datetime"
+#define BUS_DATETIME_PATH    "/com/canonical/indicator/datetime"
 
-#define BUS_PATH "/com/canonical/indicator/datetime"
+#define BUS_SCREEN_NAME      "com.canonical.Unity.Screen"
+#define BUS_SCREEN_PATH      "/com/canonical/Unity/Screen"
+#define BUS_SCREEN_INTERFACE "com.canonical.Unity.Screen"
 
+#define BUS_POWERD_NAME      "com.canonical.powerd"
+#define BUS_POWERD_PATH      "/com/canonical/powerd"
+#define BUS_POWERD_INTERFACE "com.canonical.powerd"
+
+#endif /* _DBUS_SHARED_H_ */
-- 
cgit v1.2.3


From b9b3cfea551b5c7e12e6bb9904cffe2873b328c7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 24 Jul 2014 01:18:10 -0500
Subject: when a Snap object is destructed, delete any active Popups that it
 owns. This cleaner shutdown doesn't have any effect in production, but is
 needed to shut down the bus cleanly in the tests.

---
 include/datetime/snap.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/datetime')

diff --git a/include/datetime/snap.h b/include/datetime/snap.h
index 9b45b3f..1c90496 100644
--- a/include/datetime/snap.h
+++ b/include/datetime/snap.h
@@ -24,8 +24,9 @@
 #include <datetime/clock.h>
 #include <datetime/settings.h>
 
-#include <memory>
 #include <functional>
+#include <memory>
+#include <set>
 
 namespace unity {
 namespace indicator {
@@ -49,6 +50,10 @@ public:
 private:
     const std::shared_ptr<Clock> m_clock;
     const std::shared_ptr<const Settings> m_settings;
+
+    class Popup;
+    friend class Popup;
+    std::set<Popup*> m_pending;
 };
 
 } // namespace datetime
-- 
cgit v1.2.3