diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-08 10:40:44 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-08 10:40:44 +0000 |
| commit | f54505942ce2dcc73fcbad79d4f5cdce991bf8cb (patch) | |
| tree | 9aab8e9b612adfff946a93365cd0d2fea9aeb74c /include | |
| parent | 4a6ec712275b179decd1844232dce44bc9f9dc19 (diff) | |
| download | ayatana-indicator-datetime-f54505942ce2dcc73fcbad79d4f5cdce991bf8cb.tar.gz ayatana-indicator-datetime-f54505942ce2dcc73fcbad79d4f5cdce991bf8cb.tar.bz2 ayatana-indicator-datetime-f54505942ce2dcc73fcbad79d4f5cdce991bf8cb.zip | |
Make the datetime indicator build on non-Ubuntu systems (which mostly lack url-dispatcher and Ubuntu Touch sound schema files.
Diffstat (limited to 'include')
| -rw-r--r-- | include/datetime/actions-live.h | 4 | ||||
| -rw-r--r-- | include/datetime/actions.h | 2 | ||||
| -rw-r--r-- | include/datetime/menu.h | 6 | ||||
| -rw-r--r-- | include/datetime/snap.h | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/include/datetime/actions-live.h b/include/datetime/actions-live.h index 2c348c6..1dcb122 100644 --- a/include/datetime/actions-live.h +++ b/include/datetime/actions-live.h @@ -45,16 +45,20 @@ public: void desktop_open_calendar_app(const DateTime&) override; void desktop_open_settings_app() override; +#ifdef HAS_URLDISPATCHER void phone_open_alarm_app() override; void phone_open_appointment(const Appointment&) override; void phone_open_calendar_app(const DateTime&) override; void phone_open_settings_app() override; +#endif void set_location(const std::string& zone, const std::string& name) override; protected: virtual void execute_command(const std::string& command); +#ifdef HAS_URLDISPATCHER virtual void dispatch_url(const std::string& url); +#endif }; } // namespace datetime diff --git a/include/datetime/actions.h b/include/datetime/actions.h index 4780990..1a47adb 100644 --- a/include/datetime/actions.h +++ b/include/datetime/actions.h @@ -49,10 +49,12 @@ public: virtual void desktop_open_calendar_app(const DateTime&) =0; virtual void desktop_open_settings_app() =0; +#ifdef HAS_URLDISPATCHER virtual void phone_open_alarm_app() =0; virtual void phone_open_appointment(const Appointment&) =0; virtual void phone_open_calendar_app(const DateTime&) =0; virtual void phone_open_settings_app() =0; +#endif virtual void set_location(const std::string& zone, const std::string& name)=0; diff --git a/include/datetime/menu.h b/include/datetime/menu.h index 39ecc68..acb0c89 100644 --- a/include/datetime/menu.h +++ b/include/datetime/menu.h @@ -41,7 +41,11 @@ namespace datetime { class Menu { public: - enum Profile { Desktop, DesktopGreeter, Phone, PhoneGreeter, NUM_PROFILES }; + enum Profile { Desktop, DesktopGreeter, +#ifdef HAS_URLDISPATCHER + Phone, PhoneGreeter, +#endif + NUM_PROFILES }; enum Section { Calendar, Appointments, Locations, Settings, NUM_SECTIONS }; const std::string& name() const; Profile profile() const; diff --git a/include/datetime/snap.h b/include/datetime/snap.h index a34f0fa..549e0e7 100644 --- a/include/datetime/snap.h +++ b/include/datetime/snap.h @@ -20,6 +20,8 @@ #ifndef INDICATOR_DATETIME_SNAP_H #define INDICATOR_DATETIME_SNAP_H +#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #include <datetime/appointment.h> #include <datetime/settings.h> @@ -57,4 +59,6 @@ private: } // namespace indicator } // namespace ayatana +#endif // HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #endif // INDICATOR_DATETIME_SNAP_H |