diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-07-30 10:54:56 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-07-30 10:54:56 +0000 |
| commit | a2f643c295b666f9913a01a43592ce61fbb023ee (patch) | |
| tree | 5399ee6853f1fba884c3f303be473d58cf6ae7a9 /include | |
| parent | 18c9f881e5eb01b157048d083515e59ebdd08afa (diff) | |
| parent | a7e8b219e8a9301249301cff6fbe989670d4e312 (diff) | |
| download | ayatana-indicator-datetime-a2f643c295b666f9913a01a43592ce61fbb023ee.tar.gz ayatana-indicator-datetime-a2f643c295b666f9913a01a43592ce61fbb023ee.tar.bz2 ayatana-indicator-datetime-a2f643c295b666f9913a01a43592ce61fbb023ee.zip | |
Activate the phone's screen when an alarm is displayed. Fixes: 1340329
Approved by: Jussi Pakkanen, PS Jenkins bot
Diffstat (limited to 'include')
| -rw-r--r-- | include/datetime/dbus-shared.h | 14 | ||||
| -rw-r--r-- | include/datetime/snap.h | 7 |
2 files changed, 18 insertions, 3 deletions
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_ */ 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 |