diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-22 17:29:04 -0500 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-29 14:37:39 +0200 |
| commit | b704508b415ec9400e38f6a47b109e0ae3b2d1fd (patch) | |
| tree | 91569ceded2a2fefb36102f0c552a56b7910024e | |
| parent | a37bed4661cf57a21ebf237d255957854d9603c2 (diff) | |
| download | ayatana-indicator-datetime-b704508b415ec9400e38f6a47b109e0ae3b2d1fd.tar.gz ayatana-indicator-datetime-b704508b415ec9400e38f6a47b109e0ae3b2d1fd.tar.bz2 ayatana-indicator-datetime-b704508b415ec9400e38f6a47b109e0ae3b2d1fd.zip | |
revert r426 & r427 to remove the calendar from the phone profile
| -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 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; |