Merge lp:~lukas-kde/indicator-datetime/reenable-calendar-component-phone-profile into lp:indicator-datetime

[Lukáš Tinkl]

Re-introduce the calendar component for the phone profile.

Re-introduce the calendar component for the phone profile.

Now that the lockup/freeze has been fixed by https://code.launchpad.net/~nick-dedekind/ubuntu-settings-components/calendar-freeze/+merge/296297

[Charles Kerr (charlesk)]

LGTM. Lukáš, feel free to land this / silo along with u-s-s at will

review: Approve

=== modified file 'src/menu.cpp'
--- src/menu.cpp	2016-05-14 02:07:10 +0000
+++ src/menu.cpp	2016-06-16 17:24:42 +0000
@@ -309,7 +309,7 @@
     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;
@@ -451,7 +451,7 @@
     {
         GMenu* menu = g_menu_new();
 
-        if (profile == Desktop)
+        if (profile == Desktop || profile == Phone)
         {
             const auto now = m_state->clock->localtime();
 

=== modified file 'tests/test-menus.cpp'
--- tests/test-menus.cpp	2016-03-22 22:29:04 +0000
+++ tests/test-menus.cpp	2016-06-16 17:24:42 +0000
@@ -102,7 +102,7 @@
         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 @@
 
     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;