aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-12-19 16:52:54 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-12-19 16:52:54 +0100
commitecaacccacf853059ea4588c44bd13035faaba6af (patch)
tree1c24cf2d4695dff1584bcedee3913da6391b178e /src
parent2aace1535ca5dd971b2ac7b796b8eaa03c11bd96 (diff)
parent4d984d26c3bd930eac72f27aa3fb9165eaef056d (diff)
downloadayatana-indicator-datetime-ecaacccacf853059ea4588c44bd13035faaba6af.tar.gz
ayatana-indicator-datetime-ecaacccacf853059ea4588c44bd13035faaba6af.tar.bz2
ayatana-indicator-datetime-ecaacccacf853059ea4588c44bd13035faaba6af.zip
Merge branch 'luigi311-toggle_events'
Attributes GH PR #117: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/117
Diffstat (limited to 'src')
-rw-r--r--src/menu.cpp41
1 files changed, 22 insertions, 19 deletions
diff --git a/src/menu.cpp b/src/menu.cpp
index e2c32dc..0ee9242 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -428,29 +428,32 @@ private:
{
auto menu = g_menu_new();
- if ((profile==Desktop) && m_state->settings->show_events.get())
+ if (m_state->settings->show_events.get())
{
- add_appointments (menu, profile);
-
- if (m_actions->desktop_has_calendar_app())
+ if (profile==Desktop)
{
- // add the 'Add Event…' menuitem
- auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
- const gchar* action_name = "indicator.desktop.open-calendar-app";
- 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);
+ add_appointments (menu, profile);
+
+ if (m_actions->desktop_has_calendar_app())
+ {
+ // add the 'Add Event…' menuitem
+ auto menu_item = g_menu_item_new(_("Add Event…"), nullptr);
+ const gchar* action_name = "indicator.desktop.open-calendar-app";
+ 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)
- {
- auto menu_item = g_menu_item_new (_("Clock"), "indicator.phone.open-alarm-app");
- g_menu_item_set_attribute_value (menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon());
- g_menu_append_item (menu, menu_item);
- g_object_unref (menu_item);
+ else if (profile==Phone)
+ {
+ auto menu_item = g_menu_item_new (_("Clock"), "indicator.phone.open-alarm-app");
+ g_menu_item_set_attribute_value (menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon());
+ g_menu_append_item (menu, menu_item);
+ g_object_unref (menu_item);
- add_appointments (menu, profile);
+ add_appointments (menu, profile);
+ }
}
return G_MENU_MODEL(menu);