diff options
| author | Lukáš Tinkl <lukas.tinkl@canonical.com> | 2016-06-16 18:55:27 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-07-07 02:45:26 +0200 |
| commit | 2098623e0db448eed4801acc05a54d17734e2cf8 (patch) | |
| tree | 7ac7eeac3f7a3d3f0f2cc651c530e8fcf7590f7a | |
| parent | 7561972627510db400ecbbad86e9737065bd1b76 (diff) | |
| download | ayatana-indicator-datetime-2098623e0db448eed4801acc05a54d17734e2cf8.tar.gz ayatana-indicator-datetime-2098623e0db448eed4801acc05a54d17734e2cf8.tar.bz2 ayatana-indicator-datetime-2098623e0db448eed4801acc05a54d17734e2cf8.zip | |
re-enable the calendar component in phone mode too
| -rw-r--r-- | src/menu.cpp | 4 | ||||
| -rw-r--r-- | tests/test-menus.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/menu.cpp b/src/menu.cpp index f9b6485..b1ac75c 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -319,7 +319,7 @@ private: GMenuModel* create_calendar_section(Profile profile) { const bool show_calendar = m_state->settings->show_calendar.get() && - ((profile == Desktop) || (profile == DesktopGreeter)); + ((profile == Desktop) || (profile == DesktopGreeter) || (profile == Phone)); auto menu = g_menu_new(); const char * action_name; @@ -464,7 +464,7 @@ private: const auto now = m_state->clock->localtime(); - if (profile == Desktop) + if (profile == Desktop || profile == Phone) { for(const auto& location : m_state->locations->locations.get()) { diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index 73592d0..8650201 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -102,7 +102,7 @@ protected: else expected_action = nullptr; - const auto calendar_expected = ((profile == Menu::Desktop) || (profile == Menu::DesktopGreeter)) + const auto calendar_expected = ((profile == Menu::Desktop) || (profile == Menu::DesktopGreeter) || (profile == Menu::Phone)) && (m_state->settings->show_calendar.get()); // get the calendar section @@ -420,7 +420,7 @@ protected: void InspectLocations(GMenuModel* menu_model, Menu::Profile profile) { - const bool locations_expected = profile == Menu::Desktop; + const bool locations_expected = (profile == Menu::Desktop) || (profile == Menu::Phone); // when there aren't any locations, confirm the menu is empty const std::vector<Location> empty; |