aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-03-22 17:29:04 -0500
committerRobert Tari <robert@tari.in>2021-07-05 00:44:12 +0200
commitaf623be7fec87a2fc720fed8a0daa7a4b3984573 (patch)
tree05876e828456df5afc87eb9fa38da5cdd7eeccf2
parent512726f12c6d165b4e601892c5207fa6dce774ea (diff)
downloadayatana-indicator-datetime-af623be7fec87a2fc720fed8a0daa7a4b3984573.tar.gz
ayatana-indicator-datetime-af623be7fec87a2fc720fed8a0daa7a4b3984573.tar.bz2
ayatana-indicator-datetime-af623be7fec87a2fc720fed8a0daa7a4b3984573.zip
revert r426 & r427 to remove the calendar from the phone profile
-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 b1ac75c..f9b6485 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 == Phone));
+ ((profile == Desktop) || (profile == DesktopGreeter));
auto menu = g_menu_new();
const char * action_name;
@@ -464,7 +464,7 @@ private:
const auto now = m_state->clock->localtime();
- if (profile == Desktop || profile == Phone)
+ if (profile == Desktop)
{
for(const auto& location : m_state->locations->locations.get())
{
diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp
index 8650201..73592d0 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) || (profile == Menu::Phone))
+ const auto calendar_expected = ((profile == Menu::Desktop) || (profile == Menu::DesktopGreeter))
&& (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) || (profile == Menu::Phone);
+ const bool locations_expected = profile == Menu::Desktop;
// when there aren't any locations, confirm the menu is empty
const std::vector<Location> empty;