diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-26 19:55:23 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-26 19:55:23 +0000 |
| commit | b39526c27c44302c34fce26163919a0c4c7aecd3 (patch) | |
| tree | be0d3759a081f90b73aa90e0cf1b5a2a6a9783f3 /src/menu.cpp | |
| parent | 8dbc66cab4eadfdde3809340d03c4cc10b2032eb (diff) | |
| download | ayatana-indicator-datetime-b39526c27c44302c34fce26163919a0c4c7aecd3.tar.gz ayatana-indicator-datetime-b39526c27c44302c34fce26163919a0c4c7aecd3.tar.bz2 ayatana-indicator-datetime-b39526c27c44302c34fce26163919a0c4c7aecd3.zip | |
URL dispatcher support: Build phone code, even if URL dispatcher is unavailable.
Diffstat (limited to 'src/menu.cpp')
| -rw-r--r-- | src/menu.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/menu.cpp b/src/menu.cpp index c778963..1bf8111 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -240,12 +240,9 @@ private: const char * action_name; -#ifdef HAS_URLDISPATCHER if (profile == Phone) action_name = "indicator.phone.open-calendar-app"; - else -#endif - if (profile == Desktop) + else if (profile == Desktop) action_name = "indicator.desktop.open-calendar-app"; else action_name = nullptr; @@ -291,12 +288,9 @@ private: const char * action_name; -#ifdef HAS_URLDISPATCHER if (profile == Phone) action_name = "indicator.phone.open-appointment"; - else -#endif - if ((profile == Desktop) && m_actions->desktop_has_calendar_app()) + else if ((profile == Desktop) && m_actions->desktop_has_calendar_app()) action_name = "indicator.desktop.open-appointment"; else action_name = nullptr; @@ -363,7 +357,6 @@ private: g_object_unref(menu_item); } } -#ifdef HAS_URLDISPATCHER else if (profile==Phone) { auto menu_item = g_menu_item_new (_("Clock"), "indicator.phone.open-alarm-app"); @@ -373,7 +366,6 @@ private: add_appointments (menu, profile); } -#endif return G_MENU_MODEL(menu); } @@ -413,10 +405,8 @@ private: if (profile == Desktop) action_name = "indicator.desktop.open-settings-app"; -#ifdef HAS_URLDISPATCHER else if (profile == Phone) action_name = "indicator.phone.open-settings-app"; -#endif else action_name = nullptr; @@ -504,7 +494,6 @@ public: }; -#ifdef HAS_URLDISPATCHER class PhoneBaseMenu: public MenuImpl { protected: @@ -563,7 +552,6 @@ public: std::shared_ptr<Actions>& actions_): PhoneBaseMenu(PhoneGreeter, "phone_greeter", state_, actions_) {} }; -#endif /**** ***** @@ -591,7 +579,6 @@ MenuFactory::buildMenu(Menu::Profile profile) menu.reset(new DesktopGreeterMenu(m_state, m_actions)); break; -#ifdef HAS_URLDISPATCHER case Menu::Phone: menu.reset(new PhoneMenu(m_state, m_actions)); break; @@ -599,7 +586,6 @@ MenuFactory::buildMenu(Menu::Profile profile) case Menu::PhoneGreeter: menu.reset(new PhoneGreeterMenu(m_state, m_actions)); break; -#endif default: g_warn_if_reached(); |