aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Tinkl <lukas.tinkl@canonical.com>2016-06-16 18:55:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-29 14:37:39 +0200
commit63e38ce5a62731310013918a3ef16b1c81a68dd0 (patch)
tree442f78745e475561f4fd042126d3fdcdfa77d909
parent7946051c0be6255ed755b9c7996566720db5889c (diff)
downloadayatana-indicator-datetime-63e38ce5a62731310013918a3ef16b1c81a68dd0.tar.gz
ayatana-indicator-datetime-63e38ce5a62731310013918a3ef16b1c81a68dd0.tar.bz2
ayatana-indicator-datetime-63e38ce5a62731310013918a3ef16b1c81a68dd0.zip
re-enable the calendar component in phone mode too
-rw-r--r--src/menu.cpp4
-rw-r--r--tests/test-menus.cpp4
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;