From df650bec0f1c634ee773c150b451c3bdd8ed4e65 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 6 Mar 2014 17:54:57 -0600 Subject: =?UTF-8?q?In=20the=20Desktop=20profile,=20don't=20show=20the=20'A?= =?UTF-8?q?dd=20Event=E2=80=A6'=20button=20if=20evolution=20can't=20be=20l?= =?UTF-8?q?aunched.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/actions-live.cpp | 24 ++++++++++++++++++++++++ src/menu.cpp | 19 +++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/actions-live.cpp b/src/actions-live.cpp index ccc7fcf..8fce6ad 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 +{ + bool inited = false; + bool have_evolution = false; + + if (G_UNLIKELY(!inited)) + { + inited = true; + + auto all = g_app_info_get_all_for_type ("text/calendar"); + for(auto l=all; !have_evolution && l!=nullptr; l=l->next) + { + auto app_info = static_cast(l->data); + + if (!g_strcmp0("evolution", g_app_info_get_executable(app_info))) + have_evolution = true; + } + + g_list_free_full(all, (GDestroyNotify)g_object_unref); + } + + return have_evolution; +} + void LiveActions::open_planner() { execute_command("evolution -c calendar"); diff --git a/src/menu.cpp b/src/menu.cpp index 797757f..f88c290 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -302,7 +302,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)); @@ -319,13 +319,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) { -- cgit v1.2.3