From af623be7fec87a2fc720fed8a0daa7a4b3984573 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 22 Mar 2016 17:29:04 -0500 Subject: revert r426 & r427 to remove the calendar from the phone profile --- tests/test-menus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') 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 empty; -- cgit v1.2.3