From b39526c27c44302c34fce26163919a0c4c7aecd3 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 26 Mar 2018 19:55:23 +0000
Subject: URL dispatcher support: Build phone code, even if URL dispatcher is
 unavailable.

---
 src/menu.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/menu.cpp')

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();
-- 
cgit v1.2.3