Don't show the "Add Event..." button if the calendar app can't be found. Fixes: 1250632

2 files changed, 35 insertions, 8 deletions

diff --git a/src/actions-live.cpp b/src/actions-live.cpp
index c179274..97b12db 100644
--- a/src/actions-live.cpp
+++ b/src/actions-live.cpp
@@ -74,6 +74,30 @@ void LiveActions::open_desktop_settings()
     g_free (path);
 }
 
+bool LiveActions::can_open_planner() const
+{
+    static bool inited = false;
+    static bool have_calendar = false;
+
+    if (G_UNLIKELY(!inited))
+    {
+        inited = true;
+
+        auto all = g_app_info_get_all_for_type ("text/calendar");
+        for(auto l=all; !have_calendar && l!=nullptr; l=l->next)
+        {
+            auto app_info = static_cast<GAppInfo*>(l->data);
+
+            if (!g_strcmp0("evolution.desktop", g_app_info_get_id(app_info)))
+                have_calendar = true;
+        }
+
+        g_list_free_full(all, (GDestroyNotify)g_object_unref);
+    }
+
+    return have_calendar;
+}
+
 void LiveActions::open_planner()
 {
     execute_command("evolution -c calendar");
diff --git a/src/menu.cpp b/src/menu.cpp
index d6abd27..90ef41f 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -308,7 +308,7 @@ private:
                 g_menu_item_set_action_and_target_value (menu_item,
                                                      "indicator.activate-appointment",
                                                      g_variant_new_string (appt.uid.c_str()));
-            else
+            else if (m_actions->can_open_planner())
                 g_menu_item_set_action_and_target_value (menu_item,
                                                          "indicator.activate-planner",
                                                          g_variant_new_int64 (unix_time));
@@ -325,13 +325,16 @@ private:
         {
             add_appointments (menu, profile);
 
-            // add the 'Add Event…' menuitem
-            auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
-            const gchar* action_name = "indicator.activate-planner";
-            auto v = g_variant_new_int64(0);
-            g_menu_item_set_action_and_target_value(menu_item, action_name, v);
-            g_menu_append_item(menu, menu_item);
-            g_object_unref(menu_item);
+            if (m_actions->can_open_planner())
+            {
+                // add the 'Add Event…' menuitem
+                auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
+                const gchar* action_name = "indicator.activate-planner";
+                auto v = g_variant_new_int64(0);
+                g_menu_item_set_action_and_target_value(menu_item, action_name, v);
+                g_menu_append_item(menu, menu_item);
+                g_object_unref(menu_item);
+            }
         }
         else if (profile==Phone)
         {