Merge lp:~victor-jon/indicator-datetime/drop-phone-code into lp:indicator-datetime

[Victor Jonathon]

    Drop phone code

    * Rebase on top of revision 297
    * Drop phone related code
    * Cherry-pick evolution-data-server >=3.16 fixes
    * Drop libnotify dependency, on desktop eds handles notifications
    * Drop geclue-1.0 integration. Geoclue 2.0 doesn't provide on same functionality as geoclue 1.0. On desktop it doesn't hamper functionality since indicator-datetime is already aware of org.freedesktop.timedate1
    * Backport systemd integration
    * Cherry pick support for MATE desktop

[Khurshid Alam (khurshid-alam)]

The diff has been truncated, so I am reviewing locally.

[Khurshid Alam (khurshid-alam)]

Ok, from quick overview,

1) In planner-eds.c, line 185

> /* Appointment has alarm ? */

Is this necessary ?

in line 176,

> /* Get source color */

We don't use source color anymore.

in 163,

> /* Get summary. We are using empty string,
             evolution uses "No_Summary" */
             text.value = "";

Wouldn't null check be better ? With new > libecal-1.2 we have to use null to prevent leak.

2) Also include the bug numbers in the commit message, it fixes like LP:#1633319

3) Why keep /data/com.canonical.indicator.datetime.AlarmProperties.xml ?

[Victor Jonathon (victor-jon)]

1.

> /* Appointment has alarm ? */
  >>Is this necessary ?

Yes, we add a alarm icon if a appointment has alarm.

> /* Get source color */
  >>We don't use source color anymore.

We don't. But we have a open bug about this. It comes down to alarm-icon vs color-code-block. icon was default in rev 297.

>text.value = "";
  >>Wouldn't null check be better ? With new > libecal-1.2 we have to use null to prevent leak.

If we set it to null then we also need to do this

if (appt->summary)
  g_free (appt->summary);

2. Ok, I will.

3. You said that you may implement notification in the datetime itself after libecal port. So I kept it thinking it may become useful. But I can remove it.

[Khurshid Alam (khurshid-alam)]

1)

>We don't. But we have a open bug about this. It comes down to alarm-icon vs color-code-block. icon was default in rev 297.

Can't we have them both ? But if not alarm-icon is ok.

>If we set it to null then we also need to do this

>if (appt->summary)
  >g_free (appt->summary);

g_free is null safe though. Just make sure you are not freeing it twice.

4. In planner-eds.c, line 556,

  >e_cal_client_view_stop (view, NULL);
  >g_object_unref (view);
  >p->views = g_slist_remove (p->views, view);

No. First remove the view from slist, then unref.

Unmerged revisions

499. By Victor Jonathon on 2019-08-18

Drop phone code

* Rebase on top of revision 297
* Drop phone related code
* Cherry-pick evolution-data-server >=3.16 fixes
* Drop libnotify dependency, on desktop eds handles notifications
* Drop geclue-1.0 integration. Geoclue 2.0 doesn't provide on same functionality as geoclue 1.0. On desktop it doesn't hamper functionality since indicator-datetime is already aware of org.freedesktop.timedate1
* Backport systemd integration
* Cherry pick support for MATE desktop

=== modified file '.bzrignore'
--- .bzrignore	2017-02-03 17:23:56 +0000
+++ .bzrignore	2019-08-18 14:27:47 +0000
@@ -1,16 +1,19 @@
+compile
+m4
+src/libdatetime.la
+src/libdatetime_la-indicator-datetime.lo
 src/indicator-datetime-service
+po/indicator-datetime.pot
+indicator-datetime-[0-9].[0-9].[0-9].tar.gz
+indicator-datetime-[0-9].[0-9].[0-9].tar.xz
+indicator-datetime-[0-9].[0-9].[0-9].tar.gz.asc
+indicator-datetime-[0-9].[0-9].[0-9].tar.xz.asc
 data/indicator-datetime.service
 data/org.ayatana.indicator.datetime.gschema.valid
 src/gen-datetime-service.xml.c
 src/gen-datetime-service.xml.h
+build-aux
 data/com.canonical.indicator.datetime.gschema.valid
+src/libdatetime_la-utils.lo
 data/indicator-datetime.conf
 data/indicator-datetime.desktop
-data/indicator-datetime.upstart.desktop
-
-build/
-po/Makevars
-po/Makefile.in.in
-po/POTFILES.in
-po/LINGUAS
-

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-08-04 13:56:13 +0000
+++ CMakeLists.txt	2019-08-18 14:27:47 +0000
@@ -9,20 +9,12 @@
 add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
                  -DGNOMELOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 
-set(ALARM_DEFAULT_SOUND    "/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg")
-set(CALENDAR_DEFAULT_SOUND "/usr/share/sounds/ubuntu/ringtones/Marimbach.ogg")
-add_definitions(-DALARM_DEFAULT_SOUND="${ALARM_DEFAULT_SOUND}"
-                -DCALENDAR_DEFAULT_SOUND="${CALENDAR_DEFAULT_SOUND}")
-
-
-##
-## Always Be Testing
-##
-enable_testing()
+option (enable_tests "Build the package's automatic tests." ON)
+option (enable_lcov "Generate lcov code coverage reports." ON)
 
 ##
 ##  GNU standard installation directories
-##
+## 
 
 include (GNUInstallDirs)
 if (EXISTS "/etc/debian_version") # Workaround for libexecdir on debian
@@ -37,23 +29,16 @@
 ##
 
 find_package (PkgConfig REQUIRED)
-include (CheckIncludeFile)
 include (FindPkgConfig)
 
 pkg_check_modules (SERVICE_DEPS REQUIRED
                    glib-2.0>=2.36
                    gio-unix-2.0>=2.36
                    libical>=0.48
-                   libecal-1.2>=3.5
+                   libecal-1.2>=3.16
                    libedataserver-1.2>=3.5
-                   gstreamer-1.0>=1.2
-                   libnotify>=0.7.6
-                   url-dispatcher-1>=1
-                   properties-cpp>=0.0.1
-                   libaccounts-glib>=1.18
-                   messaging-menu>=12.10
-                   uuid>=2.25)
-include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
+                   json-glib-1.0>=0.16.2)
+include_directories (${SERVICE_INCLUDE_DIRS})
 
 ##
 ##  custom targets
@@ -64,6 +49,9 @@
                    COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
+add_custom_target (clean-coverage
+                   COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' | xargs rm -f)
+
 add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr
                    ${CMAKE_SOURCE_DIR}/src
                    ${CMAKE_SOURCE_DIR}/tests)
@@ -73,22 +61,26 @@
 ##
 
 set (CC_WARNING_ARGS " -Wall -Wshadow -Wextra -Wunused -Wformat=2 -Wno-missing-field-initializers")
-set (CXX_WARNING_ARGS " -Wall -Wextra -pedantic -Wno-missing-field-initializers")
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
+
+# testing & coverage
+if (${enable_tests})
+  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
+  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
+  set (GTEST_LIBS -lpthread)
+  enable_testing ()
+  if (${enable_lcov})
+    include(GCov)
+  endif ()
+endif ()
 
 # actually build things
-add_subdirectory(include)
-add_subdirectory(src)
-add_subdirectory(data)
-add_subdirectory(po)
-add_subdirectory(tests)
+add_subdirectory (src)
+add_subdirectory (data)
+add_subdirectory (po)
+if (${enable_tests})
+  add_subdirectory (tests)
+endif ()
 
-# testing & coverage
-find_package(CoverageReport)
-ENABLE_COVERAGE_REPORT(
-  TARGETS indicatordatetimeservice indicator-datetime-service
-  TESTS ${COVERAGE_TEST_TARGETS}
-  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
-)

=== modified file 'README'
--- README	2014-03-22 07:25:50 +0000
+++ README	2019-08-18 14:27:47 +0000
@@ -1,26 +1,18 @@
 ACTIONS
 =======
 
- * "desktop.open-settings-app"
- * "phone.open-settings-app"
-   Description: open the settings application.
-   State: None
-   Parameter: None
-
- * "desktop.open-alarm-app"
- * "phone.open-alarm-app"
-   Description: open the application for creating new alarms.
-   State: None
-   Parameter: None
-
- * "desktop.open-calendar-app"
- * "phone.open-calendar-app"
+ * "activate-settings"
+   Description: opens a page for changing indicator-datetime's settings
+   State: None
+   Parameter: None
+
+ * "activate-planner"
+   Description: opens an appointment editor.
    State: None
    Parameter: int64, a time_t hinting which day/time to show in the planner,
                      or 0 for the current day
 
- * "desktop.open-appointment"
- * "phone.open-appointment"
+ * "activate-appointment"
    Description: opens an appointment editor to the specified appointment.
    State: None
    Parameter: string, an opaque uid to specify which appointment to use.
@@ -76,56 +68,3 @@
    - x-canonical-time-format  s strftime format string
 
 
-
-CODE
-====
-
-Model
-
-  The app's model is represented by the "State" class, and "Menu" objects
-  are the corresponding views. "State" is a simple container for various
-  properties, and menus connect to those properties' changed() signals to
-  know when the view needs to be refreshed.
-
-  As one can see in main.c, the app's very simple flow is to instantiate
-  a state and its properties, build menus that correspond to the state,
-  and export the menus on DBus.
-
-  Because State is a simple aggregate of its components (such as a "Clock"
-  or "Planner" object to get the current time and upcoming appointments,
-  respectively), one can plug in live components for production and mock
-  components for unit tests. The entire backend can be mix-and-matched by
-  adding the desired test-or-production components.
-
-  Start with:
-  include/datetime/state.h
-  include/datetime/clock.h
-  include/datetime/locations.h
-  include/datetime/planner.h
-  include/datetime/settings.h
-  include/datetime/timezones.h
-
-  Implementations:
-  include/datetime/settings-live.h
-  include/datetime/locations-settings.h
-  include/datetime/planner-eds.h
-  include/datetime/timezones-live.h
-
-View
-
-  Menu is a mostly-opaque class to wrap GMenu code. Its subclasses contain
-  the per-profile logic of which sections/menuitems to show and which to hide.
-  Menus are instantiated via the MenuFactory, which takes a state and profile.
-
-  Actions is a mostly-opaque class to wrap our GActionGroup. Its subclasses
-  contain the code that actually executed when an action is triggered (ie,
-  LiveActions for production and MockActions for testing).
-
-  Exporter exports the Actions and Menus onto the DBus, and also emits a
-  signal if/when the busname is lost so indicator-datetime-service knows
-  when to exit.
-
-  include/datetime/menu.h
-  include/datetime/actions.h
-  include/datetime/exporter.h
-  

=== added file 'cmake/FindIntltool.cmake'
--- cmake/FindIntltool.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindIntltool.cmake	2019-08-18 14:27:47 +0000
@@ -0,0 +1,23 @@
+# FindIntltool.cmake
+#
+# Jim Nelson <[e-mail]>
+# Copyright 2012 Yorba Foundation
+
+find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+
+if (INTLTOOL_MERGE_EXECUTABLE)
+    set (INTLTOOL_MERGE_FOUND TRUE)
+else (INTLTOOL_MERGE_EXECUTABLE)
+    set (INTLTOOL_MERGE_FOUND FALSE)
+endif (INTLTOOL_MERGE_EXECUTABLE)
+
+if (INTLTOOL_MERGE_FOUND)
+    macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+        add_custom_target (geary.desktop ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop
+        )
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION /usr/share/applications) 
+    endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+endif (INTLTOOL_MERGE_FOUND)
+

=== added file 'cmake/GCov.cmake'
--- cmake/GCov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GCov.cmake	2019-08-18 14:27:47 +0000
@@ -0,0 +1,50 @@
+if (CMAKE_BUILD_TYPE MATCHES coverage)
+  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
+  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
+  set(GCOV_LIBS ${GCOV_LIBS} gcov)
+
+  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+  if (NOT GCOVR_EXECUTABLE)
+    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
+  else ()
+    message(STATUS "Gcovr found, can generate XML coverage info.")
+    add_custom_target (coverage-xml
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
+      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
+  endif()
+
+  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
+  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
+  if (NOT LCOV_EXECUTABLE)
+    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
+  else ()
+    if(NOT GENHTML_EXECUTABLE)
+      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
+    else()
+      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
+      add_custom_target (coverage-html
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
+        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture | ${CMAKE_SOURCE_DIR}/trim-lcov.py > dconf-lcov.info
+        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details dconf-lcov.info
+        COMMAND ${CMAKE_COMMAND} -E echo ""
+        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
+        COMMAND ${CMAKE_COMMAND} -E echo "")
+        #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
+        #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+        #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" 
+        #)
+    endif()
+  endif()
+endif()
+
+
+	#$(MAKE) $(AM_MAKEFLAGS) check
+	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
+	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
+	#@echo
+	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
+	#@echo

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2019-08-18 14:27:47 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        )
+endmacro()

=== modified file 'data/com.canonical.indicator.datetime'
--- data/com.canonical.indicator.datetime	2014-03-21 19:02:46 +0000
+++ data/com.canonical.indicator.datetime	2019-08-18 14:27:47 +0000
@@ -9,12 +9,9 @@
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
 
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
-
 [phone]
 ObjectPath=/com/canonical/indicator/datetime/phone
 
 [phone_greeter]
-ObjectPath=/com/canonical/indicator/datetime/phone_greeter
+ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
 

=== modified file 'data/com.canonical.indicator.datetime.gschema.xml.in.in'
--- data/com.canonical.indicator.datetime.gschema.xml.in.in	2015-10-13 19:46:12 +0000
+++ data/com.canonical.indicator.datetime.gschema.xml.in.in	2019-08-18 14:27:47 +0000
@@ -123,51 +123,5 @@
 			  Some timezones can be known by many different cities or names.  This setting describes how the current zone prefers to be named.  Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston).
 			</_description>
 		</key>
-		<key name="alarm-haptic-feedback" type="s">
-			<default>'pulse'</default>
-			<_summary>What kind of haptic feedback, if any, to trigger with an alarm.</_summary>
-			<_description>
-                          What kind of haptic feedback, if any, to trigger with an alarm.
-                          Two modes are currently supported: 'pulse', 'none'.
-			</_description>
-		</key>
-		<key name="calendar-default-sound" type="s">
-			<default>'@CALENDAR_DEFAULT_SOUND@'</default>
-			<_summary>The calendar's default sound file.</_summary>
-			<_description>
-			  If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound.
-			</_description>
-		</key>
-		<key name="alarm-default-sound" type="s">
-			<default>'@ALARM_DEFAULT_SOUND@'</default>
-			<_summary>The alarm's default sound file.</_summary>
-			<_description>
-			  If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.
-			</_description>
-		</key>
-		<key name="alarm-default-volume" type="u">
-			<range min="1" max="100"/>
-			<default>50</default>
-			<_summary>The alarm's default volume level.</_summary>
-			<_description>
-			  The volume at which alarms will be played.
-			</_description>
-		</key>
-		<key name="alarm-duration-minutes" type="u">
-			<range min="1" max="60"/>
-			<default>10</default>
-			<_summary>The alarm's duration.</_summary>
-			<_description>
-			  How long the alarm's sound will be looped if its snap decision is not dismissed by the user.
-			</_description>
-		</key>
-		<key name="snooze-duration-minutes" type="u">
-			<range min="1" max="20"/>
-			<default>5</default>
-			<_summary>The snooze duration.</_summary>
-			<_description>
-			  How long to wait when the user hits the Snooze button.
-			</_description>
-		</key>
 	</schema>
 </schemalist>

=== modified file 'data/indicator-datetime.conf.in'
--- data/indicator-datetime.conf.in	2016-10-11 18:01:07 +0000
+++ data/indicator-datetime.conf.in	2019-08-18 14:27:47 +0000
@@ -1,9 +1,8 @@
 description "Indicator Date & Time Backend"
 
-start on indicator-services-start
+start on indicators-loaded or indicator-services-start
 stop on desktop-end or indicator-services-end
 
 respawn
-respawn limit 2 10
 
-exec $SNAP@pkglibexecdir@/indicator-datetime-service
+exec @pkglibexecdir@/indicator-datetime-service

=== modified file 'debian/control'
--- debian/control	2019-05-18 06:49:18 +0000
+++ debian/control	2019-08-18 14:27:47 +0000
@@ -2,63 +2,37 @@
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
+# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales
 Build-Depends: cmake,
-               cmake-extras (>= 1.1),
                dbus,
-               debhelper (>= 9),
+               debhelper (>= 9), 
                dh-translations,
-               gcovr,
-               intltool,
-               lcov,
+               intltool (>= 0.35.0), 
+               language-pack-en-base,
+               libgtest-dev,
                libglib2.0-dev (>= 2.35.4),
-               libnotify-dev (>= 0.7.6),
-               libgstreamer1.0-dev,
-               libecal1.2-dev (>= 3.5),
-               libical-dev,
+               libecal1.2-dev (>= 3.16),
+               libical-dev (>= 1.0),
+               libjson-glib-dev,
                libedataserver1.2-dev (>= 3.5),
-               liburl-dispatcher1-dev,
-               libproperties-cpp-dev,
-# for com.ubuntu.notifications.hub schema to pick up blacklist of apps that can't show notifications
-               gsettings-ubuntu-schemas (>= 0.0.7),
-# for the test harness:
-               googletest | google-mock,
-               libdbustest1-dev,
-               dbus-test-runner,
-               python3-dbusmock,
-# for 12h/24h locale unit tests:
                locales,
-               language-pack-en-base,
-# for running live EDS tests:
-               evolution-data-server,
-               gvfs-daemons,
-# for phone alarm/calendar notification sound tests:
-               ubuntu-touch-sounds,
-# for query user e-mails based on accounts
-               libaccounts-glib-dev,
-# messaging menu integration
-               libmessaging-menu-dev,
-               uuid-dev,
-# to locate the place to put systemd files
-               systemd,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-datetime
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead.  ~indicator-applet-developers will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.16.10
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.16.10/files
-X-Ubuntu-Use-Langpack: yes
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04/files
 
 Package: indicator-datetime
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, 
          ${misc:Depends},
-         gsettings-ubuntu-schemas (>= 0.0.7),
          indicator-common,
          systemd,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
-            unity-control-center (>= 14.04.3) | gnome-control-center | gnome-system-tools,
+            unity-control-center (>= 14.04.3) | gnome-control-center,
             ubuntu-touch-sounds,
 Description: Simple clock
  A simple clock appearing in the indicator bar

=== modified file 'debian/rules'
--- debian/rules	2015-07-15 18:24:13 +0000
+++ debian/rules	2019-08-18 14:27:47 +0000
@@ -8,4 +8,3 @@
 override_dh_install:
 	dh_install --fail-missing
 
-

=== removed directory 'include'
=== removed file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2014-07-27 04:35:38 +0000
+++ include/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-add_subdirectory(datetime)
-add_subdirectory(notifications)

=== removed directory 'include/datetime'
=== removed file 'include/datetime/CMakeLists.txt'
--- include/datetime/CMakeLists.txt	2013-12-18 04:08:08 +0000
+++ include/datetime/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-

=== removed file 'include/datetime/actions-live.h'
--- include/datetime/actions-live.h	2019-05-18 06:48:53 +0000
+++ include/datetime/actions-live.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ACTIONS_LIVE_H
-#define INDICATOR_DATETIME_ACTIONS_LIVE_H
-
-#include <datetime/actions.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Production implementation of the Actions interface.
- *
- * Delegates URLs, sets the timezone via org.freedesktop.timedate1, etc.
- *
- * @see MockActions
- */
-class LiveActions: public Actions
-{
-public:
-    enum Desktop {
-        OTHER = 0,
-        UNITY7,
-        UNITY8,
-        MATE,
-    };
-
-    explicit LiveActions(const std::shared_ptr<State>& state_in);
-    virtual ~LiveActions() =default;
-
-    bool desktop_has_calendar_app() const override;
-    void open_alarm_app() override;
-    void open_appointment(const Appointment&, const DateTime&) override;
-    void open_calendar_app(const DateTime&) override;
-    void open_settings_app() override;
-
-    void set_location(const std::string& zone, const std::string& name) override;
-
-protected:
-    virtual Desktop get_desktop();
-    virtual void execute_command(const std::string& command);
-    virtual void dispatch_url(const std::string& url);
-
-    void unity8_open_appointment(const Appointment& appt, const DateTime& date);
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ACTIONS_H

=== removed file 'include/datetime/actions.h'
--- include/datetime/actions.h	2016-05-14 02:07:10 +0000
+++ include/datetime/actions.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ACTIONS_H
-#define INDICATOR_DATETIME_ACTIONS_H
-
-#include <datetime/date-time.h>
-#include <datetime/state.h>
-
-#include <memory> // shared_ptr
-#include <string>
-
-#include <gio/gio.h> // GSimpleActionGroup
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Interface for all the actions that can be activated by users.
- *
- * This is a simple C++ wrapper around our GActionGroup that gets exported
- * onto the bus. Subclasses implement the actual code that should be run
- * when a particular action is triggered.
- */
-class Actions
-{
-public:
-
-    virtual bool desktop_has_calendar_app() const =0;
-
-    virtual void open_alarm_app() =0;
-    virtual void open_appointment(const Appointment&, const DateTime&) =0;
-    virtual void open_calendar_app(const DateTime&) =0;
-    virtual void open_settings_app() =0;
-
-    virtual void set_location(const std::string& zone, const std::string& name)=0;
-
-    void set_calendar_date(const DateTime&);
-    GActionGroup* action_group();
-    const std::shared_ptr<State> state() const;
-
-protected:
-    explicit Actions(const std::shared_ptr<State>& state);
-    virtual ~Actions();
-
-private:
-    std::shared_ptr<State> m_state;
-    GSimpleActionGroup* m_actions = nullptr;
-    void update_calendar_state();
-
-    // we've got raw pointers in here, so disable copying
-    Actions(const Actions&) =delete;
-    Actions& operator=(const Actions&) =delete;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ACTIONS_H

=== removed file 'include/datetime/alarm-queue-simple.h'
--- include/datetime/alarm-queue-simple.h	2015-04-03 18:11:39 +0000
+++ include/datetime/alarm-queue-simple.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ALARM_QUEUE_SIMPLE_H
-#define INDICATOR_DATETIME_ALARM_QUEUE_SIMPLE_H
-
-#include <memory> // std::shared_ptr
-
-#include <datetime/alarm-queue.h>
-#include <datetime/clock.h>
-#include <datetime/planner.h>
-#include <datetime/wakeup-timer.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #AlarmQueue implementation 
- */
-class SimpleAlarmQueue: public AlarmQueue
-{
-public:
-    SimpleAlarmQueue(const std::shared_ptr<Clock>& clock,
-                     const std::shared_ptr<Planner>& upcoming_planner,
-                     const std::shared_ptr<WakeupTimer>& timer);
-    ~SimpleAlarmQueue();
-    core::Signal<const Appointment&, const Alarm&>& alarm_reached() override;
-
-private:
-    class Impl;
-    friend class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ALARM_QUEUE_H

=== removed file 'include/datetime/alarm-queue.h'
--- include/datetime/alarm-queue.h	2015-04-03 18:11:39 +0000
+++ include/datetime/alarm-queue.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ALARM_QUEUE_H
-#define INDICATOR_DATETIME_ALARM_QUEUE_H
-
-#include <datetime/appointment.h>
-
-#include <core/signal.h>
-
-#include <memory>
-#include <set>
-#include <string>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-/**
- * \brief Watches the clock and appointments to notify when an
- *        appointment's time is reached.
- */
-class AlarmQueue
-{
-public:
-    AlarmQueue() =default;
-    virtual ~AlarmQueue() =default;
-    virtual core::Signal<const Appointment&, const Alarm&>& alarm_reached() =0;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ALARM_QUEUE_H

=== removed file 'include/datetime/appointment.h'
--- include/datetime/appointment.h	2016-05-14 02:07:10 +0000
+++ include/datetime/appointment.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_APPOINTMENT_H
-#define INDICATOR_DATETIME_APPOINTMENT_H
-
-#include <datetime/date-time.h>
-
-#include <string>
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Basic information required to raise a notification about some Appointment.
- */
-struct Alarm
-{
-    std::string text;
-    std::string audio_url;
-    DateTime time;
-
-    bool operator== (const Alarm& that) const;
-    bool has_sound() const;
-    bool has_text() const;
-};
-
-/**
- * \brief An instance of an appointment; e.g. a calendar event or clock-app alarm
- *
- * @see Planner
- */
-struct Appointment
-{
-public:
-    enum Type { EVENT, UBUNTU_ALARM };
-    Type type = EVENT;
-    bool is_ubuntu_alarm() const { return type == UBUNTU_ALARM; }
-
-    std::string uid;
-    std::string source_uid;
-    std::string color;
-    std::string summary;
-    std::string activation_url;
-    DateTime begin;
-    DateTime end;
-
-    std::vector<Alarm> alarms;
-
-    bool operator== (const Appointment& that) const;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_APPOINTMENT_H

=== removed file 'include/datetime/clock-mock.h'
--- include/datetime/clock-mock.h	2015-04-03 17:36:46 +0000
+++ include/datetime/clock-mock.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_CLOCK_MOCK_H
-#define INDICATOR_DATETIME_CLOCK_MOCK_H
-
-#include <datetime/clock.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-/**
- * \brief A clock that uses a client-provided time instead of the system time.
- */
-class MockClock: public Clock
-{
-public:
-    explicit MockClock(const DateTime& dt): m_localtime(dt) {}
-    ~MockClock() =default;
-
-    DateTime localtime() const override { return m_localtime; }
-
-    void set_localtime(const DateTime& dt)
-    {
-        const auto old = m_localtime;
-
-        set_localtime_quietly(dt);
-
-        if (!DateTime::is_same_minute(old, m_localtime))
-            minute_changed();
-        if (!DateTime::is_same_day(old, m_localtime))
-            date_changed();
-    }
-
-    void set_localtime_quietly(const DateTime& dt)
-    {
-        m_localtime = dt;
-    }
-
-private:
-    DateTime m_localtime;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_CLOCK_MOCK_H

=== removed file 'include/datetime/clock.h'
--- include/datetime/clock.h	2015-04-03 17:36:46 +0000
+++ include/datetime/clock.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_CLOCK_H
-#define INDICATOR_DATETIME_CLOCK_H
-
-#include <datetime/date-time.h>
-
-#include <core/property.h>
-#include <core/signal.h>
-
-#include <memory> // std::shared_ptr, std::unique_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A clock.
- */
-class Clock
-{
-public:
-    virtual ~Clock();
-    virtual DateTime localtime() const =0;
-
-    /** \brief A signal which fires when the clock's minute changes */
-    core::Signal<> minute_changed;
-
-    /** \brief A signal which fires when the clock's date changes */
-    core::Signal<> date_changed;
-
-protected:
-    Clock();
-
-    /** \brief Compares old and new times, emits minute_changed() or date_changed() signals if appropriate */
-    void maybe_emit (const DateTime& a, const DateTime& b);
-
-private:
-    class Impl;
-    friend class Impl;
-    std::unique_ptr<Impl> m_impl;
-
-    // we've got raw pointers and GSignal tags in here, so disable copying
-    Clock(const Clock&) =delete;
-    Clock& operator=(const Clock&) =delete;
-};
-
-/***
-****
-***/
-
-class Timezone;
-
-/**
- * \brief A live #Clock that provides the actual system time.
- */
-class LiveClock: public Clock
-{
-public:
-    LiveClock (const std::shared_ptr<const Timezone>& zones);
-    virtual ~LiveClock();
-    virtual DateTime localtime() const override;
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> p;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_CLOCK_H

=== removed file 'include/datetime/date-time.h'
--- include/datetime/date-time.h	2016-05-14 02:07:10 +0000
+++ include/datetime/date-time.h	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_DATETIME_H
-#define INDICATOR_DATETIME_DATETIME_H
-
-#include <glib.h> // GDateTime
-
-#include <chrono>
-#include <ctime> // time_t
-#include <memory> // std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A simple C++ wrapper for GDateTime to simplify ownership/refcounts
- */
-class DateTime
-{
-public:
-    static DateTime NowLocal();
-    static DateTime Local(time_t);
-    static DateTime Local(int year, int month, int day, int hour, int minute, double seconds);
-
-    DateTime();
-    DateTime(GTimeZone* tz, time_t t);
-    DateTime(GTimeZone* tz, GDateTime* dt);
-    DateTime(GTimeZone* tz, int year, int month, int day, int hour, int minute, double seconds);
-    DateTime& operator=(const DateTime& in);
-    DateTime& operator+=(const std::chrono::minutes&);
-    DateTime& operator+=(const std::chrono::seconds&);
-    DateTime to_timezone(const std::string& zone) const;
-    DateTime start_of_month() const;
-    DateTime start_of_day() const;
-    DateTime start_of_minute() const;
-    DateTime end_of_day() const;
-    DateTime end_of_month() const;
-    DateTime add_days(int days) const;
-    DateTime add_full(int year, int month, int day, int hour, int minute, double seconds) const;
-
-    GDateTime* get() const;
-    GDateTime* operator()() const {return get();}
-
-    std::string format(const std::string& fmt) const;
-    void ymd(int& year, int& month, int& day) const;
-    int day_of_month() const;
-    int hour() const;
-    int minute() const;
-    double seconds() const;
-    int64_t to_unix() const;
-
-    bool operator<(const DateTime& that) const;
-    bool operator>(const DateTime& that) const;
-    bool operator<=(const DateTime& that) const;
-    bool operator>=(const DateTime& that) const;
-    bool operator!=(const DateTime& that) const;
-    bool operator==(const DateTime& that) const;
-    int64_t operator- (const DateTime& that) const;
-
-    static bool is_same_day(const DateTime& a, const DateTime& b);
-    static bool is_same_minute(const DateTime& a, const DateTime& b);
-
-    bool is_set() const { return m_tz && m_dt; }
-
-private:
-    void reset(GTimeZone*, GDateTime*);
-    std::shared_ptr<GTimeZone> m_tz;
-    std::shared_ptr<GDateTime> m_dt;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_DATETIME_H

=== removed file 'include/datetime/dbus-shared.h'
--- include/datetime/dbus-shared.h	2016-04-10 00:07:04 +0000
+++ include/datetime/dbus-shared.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Ted Gould <[e-mail]>
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_DBUS_SHARED_H
-#define INDICATOR_DATETIME_DBUS_SHARED_H
-
-#define BUS_DATETIME_NAME    "com.canonical.indicator.datetime"
-#define BUS_DATETIME_PATH    "/com/canonical/indicator/datetime"
-
-#define BUS_POWERD_NAME      "com.canonical.powerd"
-#define BUS_POWERD_PATH      "/com/canonical/powerd"
-#define BUS_POWERD_INTERFACE "com.canonical.powerd"
-
-namespace Bus
-{
-    namespace Timedate1
-    {
-        static constexpr char const * BUSNAME {"org.freedesktop.timedate1"};
-        static constexpr char const * ADDR {"/org/freedesktop/timedate1"};
-        static constexpr char const * IFACE {"org.freedesktop.timedate1"};
-
-        namespace Properties
-        {
-            static constexpr char const * TIMEZONE {"Timezone"};
-        }
-
-        namespace Methods
-        {
-            static constexpr char const * SET_TIMEZONE {"SetTimezone"};
-        }
-    }
-
-    namespace Properties
-    {
-        static constexpr char const * IFACE {"org.freedesktop.DBus.Properties"};
-
-        namespace Methods
-        {
-            static constexpr char const * GET {"Get"};
-        }
-
-        namespace Signals
-        {
-            static constexpr char const * PROPERTIES_CHANGED {"PropertiesChanged"};
-        }
-    }
-}
-
-#endif /* INDICATOR_DATETIME_DBUS_SHARED_H */

=== removed file 'include/datetime/engine-eds.h'
--- include/datetime/engine-eds.h	2016-05-14 02:07:10 +0000
+++ include/datetime/engine-eds.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ENGINE_EDS_H
-#define INDICATOR_DATETIME_ENGINE_EDS_H
-
-#include <datetime/engine.h>
-
-#include <datetime/appointment.h>
-#include <datetime/date-time.h>
-#include <datetime/timezone.h>
-
-#include <functional>
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/****
-*****
-****/
-class Myself;
-
-/**
- * Class wrapper around EDS so multiple #EdsPlanners can share resources
- *
- * @see EdsPlanner
- */
-class EdsEngine: public Engine
-{
-public:
-    EdsEngine(const std::shared_ptr<Myself> &myself);
-    ~EdsEngine();
-
-    void get_appointments(const DateTime& begin,
-                          const DateTime& end,
-                          const Timezone& default_timezone,
-                          std::function<void(const std::vector<Appointment>&)> appointment_func) override;
-    void disable_ubuntu_alarm(const Appointment&) override;
-
-    core::Signal<>& changed() override;
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> p;
-
-    // we've got a unique_ptr here, disable copying...
-    EdsEngine(const EdsEngine&) =delete;
-    EdsEngine& operator=(const EdsEngine&) =delete;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ENGINE_EDS_H

=== removed file 'include/datetime/engine-mock.h'
--- include/datetime/engine-mock.h	2014-12-08 02:52:50 +0000
+++ include/datetime/engine-mock.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ENGINE_MOCK_H
-#define INDICATOR_DATETIME_ENGINE_MOCK_H
-
-#include <datetime/engine.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/****
-*****
-****/
-
-/**
- * A no-op #Engine
- * 
- * @see Engine
- */
-class MockEngine: public Engine
-{
-public:
-    MockEngine() =default;
-    ~MockEngine() =default;
-
-    void get_appointments(const DateTime& /*begin*/,
-                          const DateTime& /*end*/,
-                          const Timezone& /*default_timezone*/,
-                          std::function<void(const std::vector<Appointment>&)> appointment_func) override {
-        appointment_func(m_appointments);
-    }
-
-    core::Signal<>& changed() override {
-        return m_changed;
-    }
-
-    void disable_ubuntu_alarm(const Appointment&) override {
-    }
-
-private:
-    core::Signal<> m_changed;
-    std::vector<Appointment> m_appointments;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ENGINE_MOCK_H

=== removed file 'include/datetime/engine.h'
--- include/datetime/engine.h	2014-12-08 02:52:50 +0000
+++ include/datetime/engine.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_ENGINE_H
-#define INDICATOR_DATETIME_ENGINE_H
-
-#include <datetime/appointment.h>
-#include <datetime/date-time.h>
-#include <datetime/timezone.h>
-
-#include <functional>
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/****
-*****
-****/
-
-/**
- * Class wrapper around the backend that generates appointments
- * 
- * @see EdsEngine
- * @see EdsPlanner
- */
-class Engine
-{
-public:
-    virtual ~Engine() =default;
-
-    virtual void get_appointments(const DateTime& begin,
-                                  const DateTime& end,
-                                  const Timezone& default_timezone,
-                                  std::function<void(const std::vector<Appointment>&)> appointment_func) =0;
-    virtual void disable_ubuntu_alarm(const Appointment&) =0;
-
-    virtual core::Signal<>& changed() =0;
-
-protected:
-    Engine() =default;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_ENGINE_H

=== removed file 'include/datetime/exporter.h'
--- include/datetime/exporter.h	2014-09-17 16:51:51 +0000
+++ include/datetime/exporter.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_EXPORTER_H
-#define INDICATOR_DATETIME_EXPORTER_H
-
-#include <datetime/actions.h>
-#include <datetime/menu.h>
-#include <datetime/settings.h>
-
-#include <core/signal.h>
-
-#include <memory> // std::shared_ptr
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Exports actions and menus to DBus. 
- */
-class Exporter
-{
-public:
-    explicit Exporter(const std::shared_ptr<Settings>&);
-    ~Exporter();
-
-    core::Signal<>& name_lost();
-
-    void publish(const std::shared_ptr<Actions>& actions,
-                 const std::vector<std::shared_ptr<Menu>>& menus);
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> p;
-
-    // disable copying 
-    Exporter(const Exporter&) =delete; 
-    Exporter& operator=(const Exporter&) =delete; 
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_EXPORTER_H

=== removed file 'include/datetime/formatter.h'
--- include/datetime/formatter.h	2014-09-17 16:51:51 +0000
+++ include/datetime/formatter.h	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_FORMATTER_H
-#define INDICATOR_DATETIME_FORMATTER_H
-
-#include <core/property.h>
-#include <core/signal.h>
-
-#include <datetime/clock.h>
-#include <datetime/settings.h>
-#include <datetime/utils.h> // is_locale_12h()
-
-#include <glib.h>
-
-#include <string>
-#include <memory>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-class Clock;
-class DateTime;
-
-/***
-****
-***/
-
-/**
- * \brief Provide the strftime() format strings
- *
- * This is a simple goal, but getting there has a lot of options and edge cases:
- *
- *  - The default time format can change based on the locale.
- *
- *  - The user's settings can change or completely override the format string.
- *
- *  - The time formats are different on the Phone and Desktop profiles.
- *
- *  - The time format string in the Locations' menuitems uses (mostly)
- *    the same time format as the header, except for some changes.
- *
- *  - The 'current time' format string in the Locations' menuitems also
- *    prepends the string 'Yesterday' or 'Today' if it differs from the
- *    local time, so Formatter needs to have a Clock for its state.
- *
- * So the Formatter monitors system settings, the current timezone, etc.
- * and upate its time format properties appropriately.
- */
-class Formatter
-{
-public:
-
-    /** \brief The time format string for the menu header */
-    core::Property<std::string> header_format;
-
-    /** \brief The time string for the menu header. (eg, the header_format + the clock's time */
-    core::Property<std::string> header;
-
-    /** \brief Signal to denote when the relativeFormat has changed.
-               When this is emitted, clients will want to rebuild their
-               menuitems that contain relative time strings
-               (ie, the Appointments and Locations menuitems) */
-    core::Signal<> relative_format_changed;
-
-    /** \brief Generate a relative time format for some time (or time range)
-               from the current clock's value. For example, a full-day interval
-               starting at the end of the current clock's day yields "Tomorrow" */
-    std::string relative_format(GDateTime* then, GDateTime* then_end=nullptr) const;
-
-protected:
-    explicit Formatter(const std::shared_ptr<const Clock>&);
-    virtual ~Formatter();
-
-    static const char* default_header_time_format(bool twelvehour, bool show_seconds);
-
-private:
-
-    Formatter(const Formatter&) =delete;
-    Formatter& operator=(const Formatter&) =delete;
-
-    class Impl;
-    std::unique_ptr<Impl> p;
-};
-
-
-/**
- * \brief A Formatter for the Desktop and DesktopGreeter profiles.
- */
-class DesktopFormatter: public Formatter
-{
-public:
-    DesktopFormatter(const std::shared_ptr<const Clock>&, const std::shared_ptr<const Settings>&);
-
-private:
-    std::shared_ptr<const Settings> m_settings;
-
-    void rebuildHeaderFormat();
-    const gchar* getFullTimeFormatString() const;
-    std::string getHeaderLabelFormatString() const;
-    const gchar* getDateFormat(bool show_day, bool show_date, bool show_year) const;
-
-};
-
-
-/**
- * \brief A Formatter for Phone and PhoneGreeter profiles.
- */
-class PhoneFormatter: public Formatter
-{
-public:
-    explicit PhoneFormatter(const std::shared_ptr<const Clock>& clock): Formatter(clock) {
-        header_format.set(default_header_time_format(is_locale_12h(), false));
-    }
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_CLOCK_H

=== removed file 'include/datetime/locations-settings.h'
--- include/datetime/locations-settings.h	2014-01-30 19:44:12 +0000
+++ include/datetime/locations-settings.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_SETTINGS_LOCATIONS_H
-#define INDICATOR_DATETIME_SETTINGS_LOCATIONS_H
-
-#include <datetime/locations.h> // base class
-
-#include <datetime/settings.h>
-#include <datetime/timezones.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief #Locations implementation which builds its list from the #Settings.
- */
-class SettingsLocations: public Locations
-{
-public:
-    /**
-     * @param[in] settings the #Settings whose locations property is to be used
-     * @param[in] timezones the #Timezones to always show first in the list
-     */
-    SettingsLocations (const std::shared_ptr<const Settings>& settings,
-                       const std::shared_ptr<const Timezones>& timezones);
-
-private:
-    std::shared_ptr<const Settings> m_settings;
-    std::shared_ptr<const Timezones> m_timezones;
-    void reload();
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_SETTINGS_LOCATIONS_H

=== removed file 'include/datetime/locations.h'
--- include/datetime/locations.h	2014-01-30 19:00:22 +0000
+++ include/datetime/locations.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_LOCATIONS_H
-#define INDICATOR_DATETIME_LOCATIONS_H
-
-#include <datetime/date-time.h>
-
-#include <core/property.h>
-
-#include <string>
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A physical place and its timezone; eg, "America/Chicago" + "Oklahoma City"
- *
- * @see Locations
- */
-class Location
-{
-public:
-    Location (const std::string& zone, const std::string& name);
-    const std::string& zone() const;
-    const std::string& name() const;
-    bool operator== (const Location& that) const;
-
-private:
-
-    /** timezone; eg, "America/Chicago" */
-    std::string m_zone;
-
-    /* human-readable location name; eg, "Oklahoma City" */
-    std::string m_name;
-
-    /** offset from UTC in microseconds */
-    int64_t m_offset = 0;
-};
-
-/**
- * Container which holds an ordered list of Locations
- *
- * @see Location
- * @see State
- */
-class Locations
-{
-public:
-    Locations() =default;
-    virtual ~Locations() =default;
-
-    /** \brief an ordered list of Location items */
-    core::Property<std::vector<Location>> locations;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_LOCATIONS_H

=== removed file 'include/datetime/menu.h'
--- include/datetime/menu.h	2016-05-14 02:07:10 +0000
+++ include/datetime/menu.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_MENU_H
-#define INDICATOR_DATETIME_MENU_H
-
-#include <datetime/actions.h>
-#include <datetime/appointment.h>
-#include <datetime/state.h>
-
-#include <memory> // std::shared_ptr
-#include <vector>
-
-#include <gio/gio.h> // GMenuModel
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A menu for a specific profile; eg, Desktop or Phone.
- *
- * @see MenuFactory
- * @see Exporter
- */
-class Menu
-{
-public:
-    enum Profile { Desktop, DesktopGreeter, Phone, PhoneGreeter, NUM_PROFILES };
-    enum Section { Calendar, Appointments, Locations, Settings, NUM_SECTIONS };
-    const std::string& name() const;
-    Profile profile() const;
-    GMenuModel* menu_model();
-
-    static std::vector<Appointment> get_display_appointments(
-        const std::vector<Appointment>&,
-        const DateTime& start,
-        unsigned int max_items=5);
-
-protected:
-    Menu (Profile profile_in, const std::string& name_in);
-    virtual ~Menu() =default;
-    GMenu* m_menu = nullptr;
-
-private:
-    const Profile m_profile;
-    const std::string m_name;
-
-    // we've got raw pointers in here, so disable copying
-    Menu(const Menu&) =delete;
-    Menu& operator=(const Menu&) =delete;
-};
-
-/**
- * \brief Builds a Menu for a given state and profile
- *
- * @see Menu
- * @see Exporter
- */
-class MenuFactory
-{
-public:
-    MenuFactory (const std::shared_ptr<Actions>& actions, const std::shared_ptr<const State>& state);
-    std::shared_ptr<Menu> buildMenu(Menu::Profile profile);
-
-private:
-    std::shared_ptr<Actions> m_actions;
-    std::shared_ptr<const State> m_state;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_MENU_H

=== removed file 'include/datetime/myself.h'
--- include/datetime/myself.h	2016-05-14 12:09:01 +0000
+++ include/datetime/myself.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_MYSELF_H
-#define INDICATOR_DATETIME_MYSELF_H
-
-#include <core/property.h>
-
-#include <string>
-#include <set>
-#include <memory.h>
-#include <glib.h>
-
-typedef struct _AgManager AgManager;
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-class Myself
-{
-public:
-     Myself();
-
-     const core::Property<std::set<std::string>>& emails()
-     {
-         return m_emails;
-     }
-
-     bool isMyEmail(const std::string &email);
-
-private:
-     std::shared_ptr<AgManager> m_accounts_manager;
-     core::Property<std::set<std::string> > m_emails;
-
-     static void on_accounts_changed(AgManager*, guint, Myself*);
-     void reloadEmails();
-
-};
-
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_MYSELF_H

=== removed file 'include/datetime/planner-aggregate.h'
--- include/datetime/planner-aggregate.h	2014-09-03 04:37:02 +0000
+++ include/datetime/planner-aggregate.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_AGGREGATE_H
-#define INDICATOR_DATETIME_PLANNER_AGGREGATE_H
-
-#include <datetime/planner.h>
-
-#include <memory>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Aggregates one or more Planners
- */
-class AggregatePlanner: public Planner
-{
-public:
-    AggregatePlanner();
-    virtual ~AggregatePlanner();
-    void add(const std::shared_ptr<Planner>&);
-
-    core::Property<std::vector<Appointment>>& appointments() override;
-
-protected:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_AGGREGATE_H

=== removed file 'include/datetime/planner-month.h'
--- include/datetime/planner-month.h	2014-03-10 02:08:47 +0000
+++ include/datetime/planner-month.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_MONTH_H
-#define INDICATOR_DATETIME_PLANNER_MONTH_H
-
-#include <datetime/planner.h>
-
-#include <datetime/date-time.h>
-#include <datetime/planner-range.h>
-
-#include <memory> // std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #Planner that contains appointments for a specified calendar month
- */
-class MonthPlanner: public Planner
-{
-public:
-    MonthPlanner(const std::shared_ptr<RangePlanner>& range_planner,
-                 const DateTime& month_in);
-    ~MonthPlanner() =default;
-
-    core::Property<std::vector<Appointment>>& appointments();
-    core::Property<DateTime>& month();
-
-private:
-    std::shared_ptr<RangePlanner> m_range_planner;
-    core::Property<DateTime> m_month;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_MONTH_H

=== removed file 'include/datetime/planner-range.h'
--- include/datetime/planner-range.h	2014-09-17 16:51:51 +0000
+++ include/datetime/planner-range.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_RANGE_H
-#define INDICATOR_DATETIME_PLANNER_RANGE_H
-
-#include <datetime/planner.h>
-
-#include <datetime/date-time.h>
-#include <datetime/engine.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #Planner that contains appointments in a specified date range
- *
- * @see Planner
- */
-class RangePlanner: public Planner
-{
-public:
-    virtual ~RangePlanner() =default;
-    virtual core::Property<std::pair<DateTime,DateTime>>& range() =0;
-
-protected:
-    RangePlanner() =default;
-};
-
-/**
- * \brief A #RangePlanner that uses an #Engine to generate appointments
- *
- * @see Planner
- */
-class SimpleRangePlanner: public RangePlanner
-{
-public:
-    SimpleRangePlanner(const std::shared_ptr<Engine>& engine,
-                       const std::shared_ptr<Timezone>& timezone);
-    virtual ~SimpleRangePlanner();
-
-    core::Property<std::vector<Appointment>>& appointments();
-    core::Property<std::pair<DateTime,DateTime>>& range();
-
-private:
-    // rebuild scaffolding
-    void rebuild_soon();
-    virtual void rebuild_now();
-    static gboolean rebuild_now_static(gpointer);
-    guint m_rebuild_tag = 0;
-
-    std::shared_ptr<Engine> m_engine;
-    std::shared_ptr<Timezone> m_timezone;
-    core::Property<std::pair<DateTime,DateTime>> m_range;
-    core::Property<std::vector<Appointment>> m_appointments;
-
-    // we've got a GSignal tag here, so disable copying
-    explicit SimpleRangePlanner(const RangePlanner&) =delete;
-    SimpleRangePlanner& operator=(const RangePlanner&) =delete;
-};
-
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_RANGE_H

=== removed file 'include/datetime/planner-snooze.h'
--- include/datetime/planner-snooze.h	2015-04-03 18:11:39 +0000
+++ include/datetime/planner-snooze.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_SNOOZE_H
-#define INDICATOR_DATETIME_PLANNER_SNOOZE_H
-
-#include <datetime/clock.h>
-#include <datetime/planner.h>
-#include <datetime/settings.h>
-
-#include <memory>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * A planner to hold 'Snooze' copies of other appointments
- */
-class SnoozePlanner: public Planner
-{
-public:
-    SnoozePlanner(const std::shared_ptr<Settings>&,
-                  const std::shared_ptr<Clock>&);
-    ~SnoozePlanner();
-    core::Property<std::vector<Appointment>>& appointments() override;
-    void add(const Appointment&, const Alarm&);
-
-protected:
-    class Impl;
-    friend class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_H

=== removed file 'include/datetime/planner-upcoming.h'
--- include/datetime/planner-upcoming.h	2014-03-10 02:08:47 +0000
+++ include/datetime/planner-upcoming.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_UPCOMING_H
-#define INDICATOR_DATETIME_PLANNER_UPCOMING_H
-
-#include <datetime/planner.h>
-
-#include <datetime/date-time.h>
-#include <datetime/planner-range.h>
-
-#include <memory> // std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A collection of upcoming appointments starting from the specified date
- */
-class UpcomingPlanner: public Planner
-{
-public:
-    UpcomingPlanner(const std::shared_ptr<RangePlanner>& range_planner,
-                    const DateTime& date);
-    ~UpcomingPlanner() =default;
-
-    core::Property<std::vector<Appointment>>& appointments();
-    core::Property<DateTime>& date();
-
-private:
-    std::shared_ptr<RangePlanner> m_range_planner;
-    core::Property<DateTime> m_date;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_UPCOMING_H

=== removed file 'include/datetime/planner.h'
--- include/datetime/planner.h	2014-09-03 04:37:35 +0000
+++ include/datetime/planner.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_PLANNER_H
-#define INDICATOR_DATETIME_PLANNER_H
-
-#include <datetime/appointment.h>
-#include <datetime/date-time.h>
-
-#include <core/property.h>
-
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Simple collection of appointments
- */
-class Planner
-{
-public:
-    virtual ~Planner();
-    virtual core::Property<std::vector<Appointment>>& appointments() =0;
-
-protected:
-    Planner();
-    static void sort(std::vector<Appointment>&);
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_PLANNER_H

=== removed file 'include/datetime/settings-live.h'
--- include/datetime/settings-live.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings-live.h	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_SETTINGS_LIVE_H
-#define INDICATOR_DATETIME_SETTINGS_LIVE_H
-
-#include <datetime/settings.h> // parent class
-
-#include <gio/gio.h> // GSettings
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief #Settings implementation which uses GSettings.
- */
-class LiveSettings: public Settings
-{
-public:
-    LiveSettings();
-    virtual ~LiveSettings();
-
-private:
-    static void on_changed_ccid(GSettings*, gchar*, gpointer);
-    static void on_changed_cal_notification(GSettings*, gchar*, gpointer);
-    static void on_changed_general_notification(GSettings*, gchar*, gpointer);
-    void update_key_ccid(const std::string& key);
-    void update_key_cal_notification(const std::string& key);
-    void update_key_general_notification(const std::string& key);
-
-    void update_custom_time_format();
-    void update_locations();
-    void update_show_calendar();
-    void update_show_clock();
-    void update_show_date();
-    void update_show_day();
-    void update_show_detected_locations();
-    void update_show_events();
-    void update_show_locations();
-    void update_show_seconds();
-    void update_show_week_numbers();
-    void update_show_year();
-    void update_time_format_mode();
-    void update_timezone_name();
-    void update_calendar_sound();
-    void update_alarm_sound();
-    void update_alarm_volume();
-    void update_alarm_duration();
-    void update_alarm_haptic();
-    void update_snooze_duration();
-    void update_cal_notification_enabled();
-    void update_cal_notification_sounds();
-    void update_cal_notification_vibrations();
-    void update_cal_notification_bubbles();
-    void update_cal_notification_list();
-    void update_vibrate_silent_mode();
-
-    GSettings* m_settings;
-    GSettings* m_settings_cal_notification;
-    GSettings* m_settings_general_notification;
-
-    // we've got a raw pointer here, so disable copying
-    LiveSettings(const LiveSettings&) =delete;
-    LiveSettings& operator=(const LiveSettings&) =delete;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_SETTINGS_LIVE_H

=== removed file 'include/datetime/settings-shared.h'
--- include/datetime/settings-shared.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings-shared.h	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Ted Gould <[e-mail]>
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_SETTINGS_SHARED
-#define INDICATOR_DATETIME_SETTINGS_SHARED
-
-typedef enum
-{
-  TIME_FORMAT_MODE_LOCALE_DEFAULT,
-  TIME_FORMAT_MODE_12_HOUR,
-  TIME_FORMAT_MODE_24_HOUR,
-  TIME_FORMAT_MODE_CUSTOM
-}
-TimeFormatMode;
-
-#define SETTINGS_INTERFACE              "com.canonical.indicator.datetime"
-#define SETTINGS_SHOW_CLOCK_S           "show-clock"
-#define SETTINGS_TIME_FORMAT_S          "time-format"
-#define SETTINGS_SHOW_SECONDS_S         "show-seconds"
-#define SETTINGS_SHOW_DAY_S             "show-day"
-#define SETTINGS_SHOW_DATE_S            "show-date"
-#define SETTINGS_SHOW_YEAR_S            "show-year"
-#define SETTINGS_CUSTOM_TIME_FORMAT_S   "custom-time-format"
-#define SETTINGS_SHOW_CALENDAR_S        "show-calendar"
-#define SETTINGS_SHOW_WEEK_NUMBERS_S    "show-week-numbers"
-#define SETTINGS_SHOW_EVENTS_S          "show-events"
-#define SETTINGS_SHOW_LOCATIONS_S       "show-locations"
-#define SETTINGS_SHOW_DETECTED_S        "show-auto-detected-location"
-#define SETTINGS_LOCATIONS_S            "locations"
-#define SETTINGS_TIMEZONE_NAME_S        "timezone-name"
-#define SETTINGS_CALENDAR_SOUND_S       "calendar-default-sound"
-#define SETTINGS_ALARM_SOUND_S          "alarm-default-sound"
-#define SETTINGS_ALARM_VOLUME_S         "alarm-default-volume"
-#define SETTINGS_ALARM_DURATION_S       "alarm-duration-minutes"
-#define SETTINGS_ALARM_HAPTIC_S         "alarm-haptic-feedback"
-#define SETTINGS_SNOOZE_DURATION_S      "snooze-duration-minutes"
-
-#define SETTINGS_NOTIFY_APPS_SCHEMA_ID  "com.ubuntu.notifications.settings.applications"
-#define SETTINGS_VIBRATE_SILENT_KEY     "vibrate-silent-mode"
-#define SETTINGS_NOTIFY_SCHEMA_ID       "com.ubuntu.notifications.settings"
-#define SETTINGS_NOTIFY_CALENDAR_PATH   "/com/ubuntu/NotificationSettings/com.ubuntu.calendar/calendar/"
-#define SETTINGS_NOTIFY_ENABLED_KEY     "enable-notifications"
-#define SETTINGS_NOTIFY_SOUNDS_KEY      "use-sounds-notifications"
-#define SETTINGS_NOTIFY_VIBRATIONS_KEY  "use-vibrations-notifications"
-#define SETTINGS_NOTIFY_BUBBLES_KEY     "use-bubbles-notifications"
-#define SETTINGS_NOTIFY_LIST_KEY        "use-list-notifications"
-
-#endif // INDICATOR_DATETIME_SETTINGS_SHARED

=== removed file 'include/datetime/settings.h'
--- include/datetime/settings.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_SETTINGS_H
-#define INDICATOR_DATETIME_SETTINGS_H
-
-#include <datetime/settings-shared.h>
-
-#include <core/property.h>
-
-#include <vector>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Interface that represents user-configurable settings.
- *
- * See the descriptions in data/com.canonical.indicator.datetime.gschema.xml
- * for more information on specific properties.
- */
-class Settings 
-{
-public:
-    Settings() =default;
-    virtual ~Settings() =default;
-
-    core::Property<std::string> custom_time_format;
-    core::Property<std::vector<std::string>> locations;
-    core::Property<bool> show_calendar;
-    core::Property<bool> show_clock;
-    core::Property<bool> show_date;
-    core::Property<bool> show_day;
-    core::Property<bool> show_detected_location;
-    core::Property<bool> show_events;
-    core::Property<bool> show_locations;
-    core::Property<bool> show_seconds;
-    core::Property<bool> show_week_numbers;
-    core::Property<bool> show_year;
-    core::Property<TimeFormatMode> time_format_mode;
-    core::Property<std::string> timezone_name;
-    core::Property<std::string> calendar_sound;
-    core::Property<std::string> alarm_sound;
-    core::Property<std::string> alarm_haptic;
-    core::Property<unsigned int> alarm_volume;
-    core::Property<unsigned int> alarm_duration;
-    core::Property<unsigned int> snooze_duration;
-    core::Property<bool> cal_notification_enabled;
-    core::Property<bool> cal_notification_sounds;
-    core::Property<bool> cal_notification_vibrations;
-    core::Property<bool> cal_notification_bubbles;
-    core::Property<bool> cal_notification_list;
-    core::Property<bool> vibrate_silent_mode;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_SETTINGS_H

=== removed file 'include/datetime/snap.h'
--- include/datetime/snap.h	2016-10-06 17:08:29 +0000
+++ include/datetime/snap.h	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_SNAP_H
-#define INDICATOR_DATETIME_SNAP_H
-
-#include <datetime/appointment.h>
-#include <datetime/settings.h>
-
-#include <notifications/notifications.h>
-#include <notifications/sound.h>
-
-#include <gio/gio.h> // GDBusConnection
-
-#include <functional>
-#include <memory>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Pops up Snap Decisions for appointments
- */
-class Snap
-{
-public:
-    Snap(const std::shared_ptr<unity::indicator::notifications::Engine>& engine,
-         const std::shared_ptr<unity::indicator::notifications::SoundBuilder>& sound_builder,
-         const std::shared_ptr<const Settings>& settings,
-         GDBusConnection* system_bus);
-    virtual ~Snap();
-
-    enum class Response { None, Snooze, ShowApp };
-    typedef std::function<void(const Appointment&, const Alarm&, const Response&)> response_func;
-    void operator()(const Appointment& appointment,
-                    const Alarm& alarm,
-                    response_func on_response);
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_SNAP_H

=== removed file 'include/datetime/state.h'
--- include/datetime/state.h	2014-03-10 02:08:47 +0000
+++ include/datetime/state.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_STATE_H
-#define INDICATOR_DATETIME_STATE_H
-
-#include <datetime/clock.h>
-#include <datetime/locations.h>
-#include <datetime/planner-month.h>
-#include <datetime/planner-upcoming.h>
-#include <datetime/settings.h>
-#include <datetime/timezones.h>
-   
-#include <core/property.h>
-
-#include <memory> // std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Aggregates all the classes that represent the backend state.
- *
- * This is where the app comes together. It's a model that aggregates
- * all of the backend appointments/alarms, locations, timezones,
- * system time, and so on. The "view" code (ie, the Menus) need to
- * respond to Signals from the State and update themselves accordingly.
- *
- * @see Menu
- * @see MenuFactory
- * @see Timezones
- * @see Clock
- * @see Planner
- * @see Locations
- * @see Settings
- */
-struct State
-{
-    /** \brief The current time. Used by the header, by the date menuitem,
-               and by the locations for relative timestamp */
-    std::shared_ptr<Clock> clock;
-
-    /** \brief The locations to be displayed in the Locations
-               section of the #Menu */
-    std::shared_ptr<Locations> locations;
-
-    /** \brief Appointments in the month that's being displayed
-               in the calendar section of the #Menu */
-    std::shared_ptr<MonthPlanner> calendar_month;
-
-    /** \brief The next appointments that follow highlighed date
-               highlighted in the calendar section of the #Menu
-               (default date = today) */
-    std::shared_ptr<UpcomingPlanner> calendar_upcoming;
-
-    /** \brief Configuration options that modify the view */
-    std::shared_ptr<Settings> settings;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_STATE_H

=== removed file 'include/datetime/timezone-geoclue.h'
--- include/datetime/timezone-geoclue.h	2014-09-13 20:45:23 +0000
+++ include/datetime/timezone-geoclue.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H
-#define INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H
-
-#include <datetime/timezone.h> // base class
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #Timezone that gets its information from asking GeoClue
- */
-class GeoclueTimezone: public Timezone
-{
-public:
-    GeoclueTimezone();
-    ~GeoclueTimezone();
-
-private:
-    struct Impl;
-    std::unique_ptr<Impl> impl;
-
-    // we've got pointers in here, so don't allow copying
-    GeoclueTimezone(const GeoclueTimezone&) =delete;
-    GeoclueTimezone& operator=(const GeoclueTimezone&) =delete;
-};
-
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H
-

=== removed file 'include/datetime/timezone-timedated.h'
--- include/datetime/timezone-timedated.h	2016-04-12 17:03:36 +0000
+++ include/datetime/timezone-timedated.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
-#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H
-
-#include <datetime/timezone.h> // base class
-
-#include <gio/gio.h> // GDBusConnection*
-
-#include <string> // std::string
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief A #Timezone that gets its information from org.freedesktop.timedate1
- */
-class TimedatedTimezone: public Timezone
-{
-public:
-    TimedatedTimezone(GDBusConnection* connection);
-    ~TimedatedTimezone();
-
-private:
-    class Impl;
-    friend Impl;
-    std::unique_ptr<Impl> impl;
-
-    // we have pointers in here, so disable copying
-    TimedatedTimezone(const TimedatedTimezone&) =delete;
-    TimedatedTimezone& operator=(const TimedatedTimezone&) =delete;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H

=== removed file 'include/datetime/timezone.h'
--- include/datetime/timezone.h	2014-01-30 19:00:22 +0000
+++ include/datetime/timezone.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_TIMEZONE_H
-#define INDICATOR_DATETIME_TIMEZONE_H
-
-#include <core/property.h>
-
-#include <string>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/** \brief Base a timezone, such as "America/Chicago". */
-class Timezone
-{
-protected:
-    Timezone() =default;
-
-public:
-    core::Property<std::string> timezone;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_TIMEZONE_H

=== removed file 'include/datetime/timezones-live.h'
--- include/datetime/timezones-live.h	2016-04-12 17:05:11 +0000
+++ include/datetime/timezones-live.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_LIVE_TIMEZONES_H
-#define INDICATOR_DATETIME_LIVE_TIMEZONES_H
-
-#include <datetime/settings.h>
-#include <datetime/timezones.h>
-#include <datetime/timezone-geoclue.h>
-
-#include <memory> // shared_ptr<>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief #Timezones object that uses a #TimedatedTimezone and #GeoclueTimezone
- *        to detect what timezone we're in
- */
-class LiveTimezones: public Timezones
-{
-public:
-    LiveTimezones(const std::shared_ptr<const Settings>& settings, const std::shared_ptr<Timezone>& primary_timezone);
-
-private:
-    void update_geolocation();
-    void update_timezones();
-
-    std::shared_ptr<Timezone> m_primary_timezone;
-    std::shared_ptr<const Settings> m_settings;
-    std::shared_ptr<GeoclueTimezone> m_geo;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_LIVE_TIMEZONES_H

=== removed file 'include/datetime/timezones.h'
--- include/datetime/timezones.h	2014-01-22 17:29:10 +0000
+++ include/datetime/timezones.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_TIMEZONES_H
-#define INDICATOR_DATETIME_TIMEZONES_H
-
-#include <datetime/timezone.h>
-
-#include <core/property.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/**
- * \brief Helper class which aggregates one or more timezones
- *
- * @see LiveClock
- * @see SettingsLocations
- */
-class Timezones
-{
-public:
-    Timezones() =default;
-    virtual ~Timezones() =default;
-
-    /**
-     * \brief the current timezone
-     */
-    core::Property<std::string> timezone;
-
-    /**
-     * \brief all the detected timezones.
-     * The count is >1 iff the detection mechamisms disagree.
-     */
-    core::Property<std::set<std::string> > timezones;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_TIMEZONES_H

=== removed file 'include/datetime/utils.h'
--- include/datetime/utils.h	2014-01-28 22:26:45 +0000
+++ include/datetime/utils.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010, 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Michael Terry <[e-mail]>
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_UTILS_H
-#define INDICATOR_DATETIME_UTILS_H
-
-#include <glib.h>
-#include <gio/gio.h> /* GSettings */
-
-G_BEGIN_DECLS
-
-/** \brief Returns true if the current locale prefers 12h display instead of 24h */
-gboolean      is_locale_12h                        (void);
-
-void          split_settings_location              (const char  * location,
-                                                    char       ** zone,
-                                                    char       ** name);
-
-gchar *       get_timezone_name                    (const char  * timezone,
-                                                    GSettings   * settings);
-
-gchar *       get_beautified_timezone_name         (const char  * timezone,
-                                                    const char  * saved_location);
-
-gchar *       generate_full_format_string_at_time  (GDateTime   * now,
-                                                    GDateTime   * then_begin,
-                                                    GDateTime   * then_end);
-
-/** \brief Translate the string based on LC_TIME instead of LC_MESSAGES.
-           The intent of this is to let users set LC_TIME to override
-           their other locale settings when generating time format string */
-const char*   T_                                   (const char  * msg);
-
-  
-G_END_DECLS
-
-#endif /* INDICATOR_DATETIME_UTILS_H */

=== removed file 'include/datetime/wakeup-timer-mainloop.h'
--- include/datetime/wakeup-timer-mainloop.h	2015-04-03 17:31:36 +0000
+++ include/datetime/wakeup-timer-mainloop.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H
-#define INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H
-
-#include <datetime/clock.h>
-#include <datetime/wakeup-timer.h>
-
-#include <memory> // std::unique_ptr, std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-/**
- * \brief a WakeupTimer implemented with g_timeout_add() 
- */
-class MainloopWakeupTimer: public WakeupTimer
-{
-public:
-    explicit MainloopWakeupTimer(const std::shared_ptr<Clock>&);
-    ~MainloopWakeupTimer();
-    void set_wakeup_time (const DateTime&) override;
-    core::Signal<>& timeout() override;
-
-private:
-    MainloopWakeupTimer(const MainloopWakeupTimer&) =delete;
-    MainloopWakeupTimer& operator= (const MainloopWakeupTimer&) =delete;
-    class Impl;
-    std::unique_ptr<Impl> p;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H

=== removed file 'include/datetime/wakeup-timer-powerd.h'
--- include/datetime/wakeup-timer-powerd.h	2015-04-03 17:31:36 +0000
+++ include/datetime/wakeup-timer-powerd.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_WAKEUP_TIMER_POWERD_H
-#define INDICATOR_DATETIME_WAKEUP_TIMER_POWERD_H
-
-#include <datetime/clock.h>
-#include <datetime/wakeup-timer.h>
-
-#include <memory> // std::unique_ptr, std::shared_ptr
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-/**
- * \brief a WakeupTimer implemented with g_timeout_add() 
- */
-class PowerdWakeupTimer: public WakeupTimer
-{
-public:
-    explicit PowerdWakeupTimer(const std::shared_ptr<Clock>&);
-    ~PowerdWakeupTimer();
-    void set_wakeup_time(const DateTime&) override;
-    core::Signal<>& timeout() override;
-
-private:
-    PowerdWakeupTimer(const PowerdWakeupTimer&) =delete;
-    PowerdWakeupTimer& operator=(const PowerdWakeupTimer&) =delete;
-    class Impl;
-    std::unique_ptr<Impl> p;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H

=== removed file 'include/datetime/wakeup-timer.h'
--- include/datetime/wakeup-timer.h	2015-04-03 17:31:36 +0000
+++ include/datetime/wakeup-timer.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef INDICATOR_DATETIME_WAKEUP_TIMER_H
-#define INDICATOR_DATETIME_WAKEUP_TIMER_H
-
-#include <datetime/date-time.h>
-
-#include <core/signal.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-/**
- * \brief A one-shot timer that emits a signal when its timeout is reached.
- */
-class WakeupTimer
-{
-public:
-    WakeupTimer() =default;
-    virtual ~WakeupTimer() =default;
-    virtual void set_wakeup_time (const DateTime&) =0;
-    virtual core::Signal<>& timeout() =0;
-};
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_WAKEUP_TIMER_H

=== removed directory 'include/notifications'
=== removed file 'include/notifications/CMakeLists.txt'
=== removed file 'include/notifications/awake.h'
--- include/notifications/awake.h	2016-10-06 17:07:05 +0000
+++ include/notifications/awake.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H
-#define UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H
-
-#include <memory>
-
-#include <gio/gio.h>
-
-namespace unity {
-namespace indicator {
-namespace notifications {
-
-/***
-****
-***/
-
-/**
- * A class that forces the screen display on and inhibits sleep
- */
-class Awake
-{
-public:
-    explicit Awake(GDBusConnection* system_bus, const std::string& app_name);
-    ~Awake();
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-/***
-****
-***/
-
-} // namespace notifications
-} // namespace indicator
-} // namespace unity
-
-#endif // UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H

=== removed file 'include/notifications/dbus-shared.h'
--- include/notifications/dbus-shared.h	2014-07-31 20:22:47 +0000
+++ include/notifications/dbus-shared.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Ted Gould <[e-mail]>
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef UNITY_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H
-#define UNITY_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H
-
-#define BUS_SCREEN_NAME      "com.canonical.Unity.Screen"
-#define BUS_SCREEN_PATH      "/com/canonical/Unity/Screen"
-#define BUS_SCREEN_INTERFACE "com.canonical.Unity.Screen"
-
-#define BUS_POWERD_NAME      "com.canonical.powerd"
-#define BUS_POWERD_PATH      "/com/canonical/powerd"
-#define BUS_POWERD_INTERFACE "com.canonical.powerd"
-
-#define BUS_HAPTIC_NAME      "com.canonical.usensord"
-#define BUS_HAPTIC_PATH      "/com/canonical/usensord/haptic"
-#define BUS_HAPTIC_INTERFACE "com.canonical.usensord.haptic"
-
-#endif /* INDICATOR_NOTIFICATIONS_DBUS_SHARED_H */

=== removed file 'include/notifications/haptic.h'
--- include/notifications/haptic.h	2016-05-14 02:07:10 +0000
+++ include/notifications/haptic.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H
-#define UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H
-
-#include <memory>
-
-namespace unity {
-namespace indicator {
-namespace notifications {
-
-/***
-****
-***/
-
-/**
- * Tries to emit haptic feedback to match the user-specified mode.
- */
-class Haptic
-{
-public:
-    enum Mode
-    {
-      MODE_PULSE
-    };
-
-    explicit Haptic(const Mode& mode = MODE_PULSE, bool repeat = false);
-    ~Haptic();
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-/***
-****
-***/
-
-} // namespace notifications
-} // namespace indicator
-} // namespace unity
-
-#endif // UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H

=== removed file 'include/notifications/notifications.h'
--- include/notifications/notifications.h	2016-06-30 00:37:56 +0000
+++ include/notifications/notifications.h	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H
-#define UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H
-
-#include <chrono>
-#include <functional>
-#include <memory>
-#include <string>
-
-namespace unity {
-namespace indicator {
-namespace notifications {
-
-class Engine;
-
-/**
- * Helper class for showing notifications.
- *
- * Populate the builder, then pass it to Engine::show().
- * 
- * @see Engine::show(Builder)
- */
-class Builder
-{
-public:
-    Builder();
-    ~Builder();
-
-    void set_title (const std::string& title);
-
-    void set_body (const std::string& body);
-
-    void set_icon_name (const std::string& icon_name);
-
-    void set_start_time(uint64_t time);
-
-    /* Set an interval, after which the notification will automatically
-       be closed. If not set, the notification server's default timeout
-       is used. */
-    void set_timeout (const std::chrono::seconds& duration);
-
-    /* Add a notification hint.
-       These keys may be dependent on the notification server. */
-    void add_hint (const std::string& name);
-    static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"};
-    static constexpr char const * HINT_NONSHAPED_ICON {"x-canonical-non-shaped-icon"};
-    static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-canonical-private-affirmative-tint"};
-    static constexpr char const * HINT_REJECTION_TINT {"x-canonical-private-rejection-tint"};
-    static constexpr char const * HINT_INTERACTIVE {"x-canonical-switch-to-application"};
-
-    /* Add an action button.
-       This may fail if the Engine doesn't support actions.
-       @see Engine::supports_actions() */
-    void add_action (const std::string& action, const std::string& label);
-
-    /** Sets the closed callback. This will be called exactly once. After notification dissapear */
-    void set_closed_callback (std::function<void(const std::string& action)>);
-
-    /** Sets the time-out callback. This will be called exactly once. */
-    void set_timeout_callback (std::function<void()>);
-
-    /** Sets if a notification bubble should be displayed. */
-    void set_show_notification_bubble (bool show);
-
-    /** Sets if notification should be posted to messaging menu after it is closed. */
-    void set_post_to_messaging_menu (bool post);
-
-
-private:
-    friend class Engine;
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-/**
- * Manages Notifications and the connection to the notification server.
- *
- * When this class is destroyed, any remaining notifications it created
- * will be closed and their closed() callbacks will be invoked.
- */
-class Engine
-{
-public:
-    explicit Engine(const std::string& app_name);
-    ~Engine();
-
-    /** @see Builder::set_action() */
-    bool supports_actions() const;
-
-    /** Show a notification.
-        @return zero on failure, or a key that can be passed to close() */
-    int show(const Builder& builder);
-
-    /** Close a notification.
-        @param key the int returned by show() */
-    void close(int key);
-
-    /** Close all remaining notifications. */
-    void close_all();
-
-    const std::string& app_name() const;
-    
-private:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-} // namespace notifications
-} // namespace indicator
-} // namespace unity
-
-#endif // UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H

=== removed file 'include/notifications/sound.h'
--- include/notifications/sound.h	2015-10-13 16:06:35 +0000
+++ include/notifications/sound.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#ifndef UNITY_INDICATOR_NOTIFICATIONS_SOUND_H
-#define UNITY_INDICATOR_NOTIFICATIONS_SOUND_H
-
-#include <memory>
-#include <string>
-
-namespace unity {
-namespace indicator {
-namespace notifications {
-
-/***
-****
-***/
-
-/**
- * Plays a sound, possibly looping.
- *
- * @param uri the file to play
- * @param volume the volume at which to play the sound, [0..100]
- * @param loop if true, loop the sound for the lifespan of the object
- */
-class Sound
-{
-public:
-    Sound(const std::string& role, const std::string& uri, unsigned int volume, bool loop);
-    ~Sound();
-
-private:
-    class Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-/***
-****
-***/
-
-class SoundBuilder
-{
-public:
-    SoundBuilder() =default;
-    virtual ~SoundBuilder() =default;
-    virtual std::shared_ptr<Sound> create(const std::string& role, const std::string& uri, unsigned int volume, bool loop) =0;
-};
-
-class DefaultSoundBuilder: public SoundBuilder
-{
-public:
-    DefaultSoundBuilder() =default;
-    ~DefaultSoundBuilder() =default;
-    virtual std::shared_ptr<Sound> create(const std::string& role, const std::string& uri, unsigned int volume, bool loop) override {
-        return std::make_shared<Sound>(role, uri, volume, loop);
-    }
-};
-
-/***
-****
-***/
-
-} // namespace notifications
-} // namespace indicator
-} // namespace unity
-
-#endif // UNITY_INDICATOR_NOTIFICATIONS_SOUND_H

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2017-02-09 17:28:21 +0000
+++ po/CMakeLists.txt	2019-08-18 14:27:47 +0000
@@ -1,13 +1,3 @@
-find_package(Intltool REQUIRED)
-
-intltool_update_potfile(
-    KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
-    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-    COPYRIGHT_HOLDER "Canonical Ltd."
-    FILTER "test/*"
-)
-
-intltool_install_translations(
-    ALL
-    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-)
+include (Translations)
+add_translations_directory ("${GETTEXT_PACKAGE}")
+add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/)

=== added file 'po/LINGUAS'
--- po/LINGUAS	1970-01-01 00:00:00 +0000
+++ po/LINGUAS	2019-08-18 14:27:47 +0000
@@ -0,0 +1,31 @@
+ar
+bg
+cs
+da
+de
+el
+es
+fi
+fr
+he
+hi
+hr
+hu
+it
+ja
+ko
+nb
+nl
+pl
+pt
+pt_BR
+ro
+ru
+sk
+sl
+sr
+sv
+th
+tr
+zh_CN
+zh_TW

=== added file 'po/Makevars'
--- po/Makevars	1970-01-01 00:00:00 +0000
+++ po/Makevars	2019-08-18 14:27:47 +0000
@@ -0,0 +1,7 @@
+DOMAIN = $(PACKAGE)
+subdir = po
+top_builddir = ..
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=T_ --from-code=UTF-8
+COPYRIGHT_HOLDER = Canonical Ltd.
+MSGID_BUGS_ADDRESS = [e-mail]
+EXTRA_LOCALE_CATEGORIES =

=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2019-08-18 14:27:47 +0000
@@ -0,0 +1,3 @@
+src/service.c
+src/settings-shared.h
+src/utils.c

=== modified file 'po/indicator-datetime.pot'
--- po/indicator-datetime.pot	2017-12-09 16:19:06 +0000
+++ po/indicator-datetime.pot	2019-08-18 14:27:47 +0000
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-09 16:27+0000\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2019-06-11 19:11+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,67 +17,121 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
-#. Format string for the day on the first menuitem in the datetime indicator.
-#. This format string gives the full weekday, date, month, and year.
-#. en_US example: "%A, %B %e %Y" --> Saturday, October 31 2020"
-#. en_GB example: "%A, %e %B %Y" --> Saturday, 31 October 2020"
-#: ../src/menu.cpp:329
+#: ../src/service.c:493
+#, c-format
+msgid "Unsupported date format “%s”"
+msgstr ""
+
+#: ../src/service.c:501
+msgid "Date and Time"
+msgstr ""
+
+#: ../src/service.c:590
 msgid "%A, %e %B %Y"
 msgstr ""
 
+#: ../src/service.c:634
+msgid "Daily"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing full day events.
+#. * "%A" means a full text day (Wednesday), "%a" means abbreviated (Wed).
+#: ../src/service.c:640
+#, c-format
+msgid "%A"
+msgstr ""
+
 #. add the 'Add Event…' menuitem
-#: ../src/menu.cpp:429
+#: ../src/service.c:748
 msgid "Add Event…"
 msgstr ""
 
-#: ../src/menu.cpp:439
-msgid "Clock"
-msgstr ""
-
-#: ../src/menu.cpp:491
-msgid "Time & Date Settings…"
-msgstr ""
-
-#: ../src/menu.cpp:546
-msgid "Date and Time"
-msgstr ""
-
-#: ../src/menu.cpp:596
-msgid "Time & Date"
-msgstr ""
-
-#: ../src/menu.cpp:601
-#, c-format
-msgid "%s (has alarms)"
-msgstr ""
-
-#. * strftime(3) format for abbreviated weekday,
-#. hours, minutes in a 12h locale; e.g. Wed, 2:00 PM
-#: ../src/snap.cpp:144
-msgid "%a, %l:%M %p"
-msgstr ""
-
-#. * A strftime(3) format for abbreviated weekday,
-#. hours, minutes in a 24h locale; e.g. Wed, 14:00
-#: ../src/snap.cpp:148
-msgid "%a, %H:%M"
-msgstr ""
-
-#: ../src/snap.cpp:153
-#, c-format
-msgid "Alarm %s"
-msgstr ""
-
-#: ../src/snap.cpp:154
-#, c-format
-msgid "Event %s"
-msgstr ""
-
-#: ../src/snap.cpp:162 ../src/snap.cpp:166
-msgid "OK"
-msgstr ""
-
-#: ../src/snap.cpp:163
-msgid "Snooze"
+#: ../src/service.c:1079
+msgid "Date & Time Settings…"
+msgstr ""
+
+#. TRANSLATORS: This is a format string passed to strftime to combine the
+#. * date and the time.  The value of "%s\xE2\x80\x82%s" will result in a
+#. * string like this in US English 12-hour time: 'Fri Jul 16 11:50 AM'.
+#. * The space in between date and time is a Unicode en space
+#. * (E28082 in UTF-8 hex).
+#: ../src/utils.c:196
+#, c-format
+msgid "%s %s"
+msgstr ""
+
+#: ../src/utils.c:200 ../src/utils.c:204
+#, c-format
+msgid "%s"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
+#: ../src/utils.c:221
+msgid "%l:%M:%S %p"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format for 12hr time
+#: ../src/utils.c:224
+msgid "%l:%M %p"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
+#: ../src/utils.c:227
+msgid "%H:%M:%S"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format for 24hr time
+#: ../src/utils.c:230
+msgid "%H:%M"
+msgstr ""
+
+#: ../src/utils.c:324
+msgid "Tomorrow"
+msgstr ""
+
+#. a strftime(3) fmt string for abbreviated day of week
+#. TRANSLATORS: a strftime(3) format showing the weekday.
+#: ../src/utils.c:329 ../src/utils.c:397
+#, c-format
+msgid "%a"
+msgstr ""
+
+#. a strftime(3) fmt string for day-of-month and abbreviated month
+#: ../src/utils.c:334
+msgid "%d %b"
+msgstr ""
+
+#. a strftime(3) fmt string for a 12 hour on-the-hour time, eg "7 PM"
+#: ../src/utils.c:362
+msgid "%l %p"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the weekday, date, and year
+#: ../src/utils.c:388
+msgid "%a %b %e %Y"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the weekday and date
+#: ../src/utils.c:391
+msgid "%a %b %e"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the weekday and year.
+#: ../src/utils.c:394
+msgid "%a %Y"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the date and year
+#: ../src/utils.c:400
+msgid "%b %e %Y"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the date
+#: ../src/utils.c:403
+msgid "%b %e"
+msgstr ""
+
+#. TRANSLATORS: a strftime(3) format showing the year
+#: ../src/utils.c:406
+msgid "%Y"
 msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-10 16:15:07 +0000
+++ src/CMakeLists.txt	2019-08-18 14:27:47 +0000
@@ -1,72 +1,38 @@
 set (SERVICE_LIB "indicatordatetimeservice")
 set (SERVICE_EXEC "indicator-datetime-service")
 
-add_definitions (-DG_LOG_DOMAIN="Indicator-Datetime")
-
-# handwritten sources
-set (SERVICE_C_SOURCES
-     utils.c)
-set (SERVICE_CXX_SOURCES
-     actions.cpp
-     actions-live.cpp
-     alarm-queue-simple.cpp
-     awake.cpp
-     appointment.cpp
-     clock.cpp
-     clock-live.cpp
-     date-time.cpp
-     engine-eds.cpp
-     exporter.cpp
-     formatter.cpp
-     formatter-desktop.cpp
-     haptic.cpp
-     locations.cpp
-     locations-settings.cpp
-     menu.cpp
-     myself.cpp
-     notifications.cpp
-     planner.cpp
-     planner-aggregate.cpp
-     planner-snooze.cpp
-     planner-month.cpp
-     planner-range.cpp
-     planner-upcoming.cpp
-     settings-live.cpp
-     snap.cpp
-     sound.cpp
-     timezone-geoclue.cpp
-     timezones-live.cpp
-     timezone-timedated.cpp
-     utils.c
-     wakeup-timer-mainloop.cpp
-     wakeup-timer-powerd.cpp)
-
-# generated sources
-include (GdbusCodegen)
-set(SERVICE_GENERATED_SOURCES)
-add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties
-                  com.canonical.indicator
-                  ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.datetime.AlarmProperties.xml)
-add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound
-                  com.ubuntu.touch
-                  ${CMAKE_SOURCE_DIR}/src/com.ubuntu.touch.AccountsService.Sound.xml)
-
-# add warnings/coverage info on handwritten files
-# but not the autogenerated ones...
-set_source_files_properties(${SERVICE_CXX_SOURCES}
-                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c++11")
-set_source_files_properties(${SERVICE_C_SOURCES}
-                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c99")
-
-# add the bin dir to our include path so our code can find the generated header files
-include_directories (${CMAKE_CURRENT_BINARY_DIR})
-
-add_library (${SERVICE_LIB} STATIC ${SERVICE_C_SOURCES} ${SERVICE_CXX_SOURCES} ${SERVICE_GENERATED_SOURCES})
-include_directories (${CMAKE_SOURCE_DIR})
+add_definitions (-DTIMEZONE_FILE="/etc/timezone"
+                 -DG_LOG_DOMAIN="Indicator-Datetime")
+
+add_library (${SERVICE_LIB} STATIC
+             clock.c
+             clock.h
+             clock-live.c
+             clock-live.h
+             planner.c
+             planner.h
+             planner-eds.c
+             planner-eds.h
+             service.c
+             service.h
+             timezone.c
+             timezone.h
+             timezone-file.c
+             timezone-file.h
+             utils.c
+             utils.h
+             dbus-shared.h
+             settings-shared.h)
+include_directories (${SERVICE_DEPS_INCLUDE_DIRS})
 link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 
-add_executable (${SERVICE_EXEC} main.cpp)
-set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c++11")
-target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
+add_executable (${SERVICE_EXEC} main.c)
+target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
 install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
 
+# common properties
+set_property (TARGET ${SERVICE_LIB} ${SERVICE_EXEC}
+              APPEND_STRING PROPERTY COMPILE_FLAGS
+              " -g ${CC_WARNING_ARGS} ${GCOV_FLAGS}")
+
+

=== removed file 'src/actions-live.cpp'
--- src/actions-live.cpp	2019-05-18 06:48:53 +0000
+++ src/actions-live.cpp	1970-01-01 00:00:00 +0000
@@ -1,312 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#include <datetime/dbus-shared.h>
-#include <datetime/actions-live.h>
-
-#include <url-dispatcher.h>
-
-#include <glib.h>
-
-#include <sstream>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-LiveActions::LiveActions(const std::shared_ptr<State>& state_in):
-    Actions(state_in)
-{
-}
-
-void LiveActions::execute_command(const std::string& cmdstr)
-{
-    const auto cmd = cmdstr.c_str();
-    g_debug("Issuing command '%s'", cmd);
-
-    GError* error = nullptr;
-    if (!g_spawn_command_line_async(cmd, &error))
-    {
-        g_warning("Unable to start \"%s\": %s", cmd, error->message);
-        g_error_free(error);
-    }
-}
-
-void LiveActions::dispatch_url(const std::string& url)
-{
-    g_debug("Dispatching url '%s'", url.c_str());
-    url_dispatch_send(url.c_str(), nullptr, nullptr);
-}
-
-/***
-****
-***/
-
-LiveActions::Desktop LiveActions::get_desktop()
-{
-    static bool cached = false;
-    static LiveActions::Desktop result = LiveActions::OTHER;
-
-    if (cached) {
-        return result;
-    }
-
-    // check for unity8
-    if (g_getenv ("MIR_SOCKET") != nullptr) {
-        result = LiveActions::UNITY8;
-     } else {
-        const gchar *xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-        if (xdg_current_desktop != NULL) {
-            gchar **desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
-            for (size_t i = 0; desktop_names[i]; ++i) {
-                if (!g_strcmp0 (desktop_names[i], "Unity")) {
-                    result = LiveActions::UNITY7;
-                    break;
-                } else if (!g_strcmp0 (desktop_names[i], "MATE")) {
-                    result = LiveActions::MATE;
-                    break;
-                }
-            }
-            g_strfreev (desktop_names);
-        }
-    }
-    cached = true;
-    return result;
-}
-
-void LiveActions::open_alarm_app()
-{
-    switch(get_desktop()) {
-        case LiveActions::UNITY8:
-            dispatch_url("appid://ubuntu-clock-app/ubuntu-clock-app/current-user-version");
-            break;
-        case LiveActions::UNITY7:
-        default:
-            execute_command("evolution -c calendar");
-    }
-}
-
-void LiveActions::open_appointment(const Appointment& appt, const DateTime& date)
-{
-    switch(get_desktop()) {
-        case LiveActions::UNITY8:
-            unity8_open_appointment(appt, date);
-            break;
-        case LiveActions::UNITY7:
-        default:
-            open_calendar_app(date);
-    }
-}
-
-void LiveActions::open_calendar_app(const DateTime& dt)
-{
-    switch(get_desktop()) {
-        case LiveActions::UNITY8:
-        {
-            const auto utc = dt.to_timezone("UTC");
-            auto cmd = utc.format("calendar://startdate=%Y-%m-%dT%H:%M:%S+00:00");
-            dispatch_url(cmd);
-            break;
-        }
-        case LiveActions::UNITY7:
-        default:
-        {
-            const auto utc = dt.start_of_day().to_timezone("UTC");
-            auto cmd = utc.format("evolution \"calendar:///?startdate=%Y%m%dT%H%M%SZ\"");
-            execute_command(cmd.c_str());
-        }
-    }
-}
-
-void LiveActions::open_settings_app()
-{
-    switch(get_desktop()) {
-    case LiveActions::UNITY8:
-        dispatch_url("settings:///system/time-date");
-        break;
-    case LiveActions::UNITY7:
-        execute_command("unity-control-center datetime");
-        break;
-    case LiveActions::MATE:
-        execute_command("time-admin");
-        break;
-    default:
-        execute_command("gnome-control-center datetime");
-    }
-}
-
-
-bool LiveActions::desktop_has_calendar_app() const
-{
-    static bool inited = false;
-    static bool have_calendar = false;
-
-    if (G_UNLIKELY(!inited))
-    {
-        inited = true;
-
-#if 0
-        auto all = g_app_info_get_all_for_type ("text/calendar");
-        for(auto l=all; !have_calendar && l!=nullptr; l=l->next)
-        {
-            auto app_info = static_cast<GAppInfo*>(l->data);
-
-            if (!g_strcmp0("evolution.desktop", g_app_info_get_id(app_info)))
-                have_calendar = true;
-        }
-
-        g_list_free_full(all, (GDestroyNotify)g_object_unref);
-#else
-        /* Work around http://pad.lv/1296233 for Trusty...
-           let's revert this when the GIO bug is fixed. */
-        auto executable = g_find_program_in_path("evolution");
-        have_calendar = executable != nullptr;
-        g_free(executable);
-#endif
-    }
-
-    return have_calendar;
-}
-
-void LiveActions::unity8_open_appointment(const Appointment& appt, const DateTime& date)
-{
-    if (!appt.activation_url.empty())
-    {
-        dispatch_url(appt.activation_url);
-    }
-    else switch (appt.type)
-    {
-        case Appointment::UBUNTU_ALARM:
-            open_alarm_app();
-            break;
-
-        case Appointment::EVENT:
-        default:
-            open_calendar_app(date);
-            break;
-    }
-}
-
-/***
-****
-***/
-
-namespace
-{
-
-struct setlocation_data
-{
-  std::string tzid;
-  std::string name;
-  std::shared_ptr<Settings> settings;
-};
-
-static void
-on_datetime1_set_timezone_response(GObject       * object,
-                                   GAsyncResult  * res,
-                                   gpointer        gdata)
-{
-  GError* err = nullptr;
-  auto response = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), res, &err);
-  auto data = static_cast<struct setlocation_data*>(gdata);
-
-  if (err != nullptr)
-    {
-      if (!g_error_matches(err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning("Could not set new timezone: %s", err->message);
-
-      g_error_free(err);
-    }
-  else
-    {
-      data->settings->timezone_name.set(data->tzid + " " + data->name);
-      g_variant_unref(response);
-    }
-
-  delete data;
-}
-
-static void
-on_datetime1_proxy_ready (GObject      * object G_GNUC_UNUSED,
-                          GAsyncResult * res,
-                          gpointer       gdata)
-{
-  auto data = static_cast<struct setlocation_data*>(gdata);
-
-  GError * err = nullptr;
-  auto proxy = g_dbus_proxy_new_for_bus_finish(res, &err);
-  if (err != nullptr)
-    {
-      if (!g_error_matches(err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning("Could not grab DBus proxy for timedated: %s", err->message);
-
-      g_error_free(err);
-
-      delete data;
-    }
-  else
-    {
-      g_dbus_proxy_call(proxy,
-                        Bus::Timedate1::Methods::SET_TIMEZONE,
-                        g_variant_new ("(sb)", data->tzid.c_str(), TRUE),
-                        G_DBUS_CALL_FLAGS_NONE,
-                        -1,
-                        nullptr,
-                        on_datetime1_set_timezone_response,
-                        data);
-
-      g_object_unref (proxy);
-    }
-}
-
-} // unnamed namespace
-
-
-void LiveActions::set_location(const std::string& tzid, const std::string& name)
-{
-    g_return_if_fail(!tzid.empty());
-    g_return_if_fail(!name.empty());
-
-    auto data = new struct setlocation_data;
-    data->tzid = tzid;
-    data->name = name;
-    data->settings = state()->settings;
-
-    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                              G_DBUS_PROXY_FLAGS_NONE,
-                              nullptr,
-                              Bus::Timedate1::BUSNAME,
-                              Bus::Timedate1::ADDR,
-                              Bus::Timedate1::IFACE,
-                              nullptr,
-                              on_datetime1_proxy_ready,
-                              data);
-}
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity

=== removed file 'src/actions.cpp'
--- src/actions.cpp	2016-05-14 02:07:10 +0000
+++ src/actions.cpp	1970-01-01 00:00:00 +0000
@@ -1,273 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#include <datetime/actions.h>
-#include <datetime/utils.h> // split_settings_location()
-
-#include <glib.h>
-#include <gio/gio.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-namespace
-{
-
-DateTime datetime_from_timet_variant(GVariant* v)
-{
-    int64_t t = 0;
-
-    if (v != nullptr)
-        if (g_variant_type_equal(G_VARIANT_TYPE_INT64,g_variant_get_type(v)))
-            t = g_variant_get_int64(v);
-
-    if (t != 0)
-        return DateTime::Local(t);
-    else
-        return DateTime::NowLocal();
-}
-
-bool lookup_appointment_by_uid(const std::shared_ptr<State>& state, const gchar* uid, Appointment& setme)
-{
-    for(const auto& appt : state->calendar_upcoming->appointments().get())
-    {
-        if (appt.uid == uid)
-        {
-            setme = appt;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void on_appointment_activated (GSimpleAction*, GVariant *vdata, gpointer gself)
-{
-    auto self = static_cast<Actions*>(gself);
-    Appointment appt;
-    const gchar* uid = nullptr;
-    gint64 time = 0;
-    g_variant_get(vdata, "(&sx)", &uid, &time);
-    if (lookup_appointment_by_uid(self->state(), uid, appt))
-        self->open_appointment(appt, DateTime::Local(time));
-}
-void on_alarm_activated (GSimpleAction*, GVariant*, gpointer gself)
-{
-    static_cast<Actions*>(gself)->open_alarm_app();
-}
-void on_calendar_activated (GSimpleAction*, GVariant* vt, gpointer gself)
-{
-    const auto dt = datetime_from_timet_variant(vt);
-    static_cast<Actions*>(gself)->open_calendar_app(dt);
-}
-void on_settings_activated (GSimpleAction*, GVariant*, gpointer gself)
-{
-    static_cast<Actions*>(gself)->open_settings_app();
-}
-
-
-void on_set_location(GSimpleAction * /*action*/,
-                     GVariant      * param,
-                     gpointer        gself)
-{
-    char * zone;
-    char * name;
-    split_settings_location(g_variant_get_string(param, nullptr), &zone, &name);
-    static_cast<Actions*>(gself)->set_location(zone, name);
-    g_free(name);
-    g_free(zone);
-}
-
-void on_calendar_active_changed(GSimpleAction * /*action*/,
-                                GVariant      * state,
-                                gpointer        gself)
-{
-    // reset the date when the menu is shown
-    if (g_variant_get_boolean(state))
-    {
-        auto self = static_cast<Actions*>(gself);
-
-        self->set_calendar_date(self->state()->clock->localtime());
-    }
-}
-
-void on_calendar_date_activated(GSimpleAction * /*action*/,
-                                GVariant      * state,
-                                gpointer        gself)
-{
-    const time_t t = g_variant_get_int64(state);
-
-    g_return_if_fail(t != 0);
-
-    auto dt = DateTime::Local(t).start_of_day();
-    static_cast<Actions*>(gself)->set_calendar_date(dt);
-}
-
-GVariant* create_default_header_state()
-{
-    GVariantBuilder b;
-    g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
-    g_variant_builder_add(&b, "{sv}", "accessible-desc", g_variant_new_string("accessible-desc"));
-    g_variant_builder_add(&b, "{sv}", "label", g_variant_new_string("label"));
-    g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string("title"));
-    g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(true));
-    return g_variant_builder_end(&b);
-}
-
-GVariant* create_calendar_state(const std::shared_ptr<State>& state)
-{
-    gboolean days[32] = { 0 };
-    for (const auto& appt : state->calendar_month->appointments().get())
-        days[appt.begin.day_of_month()] = true;
-
-    GVariantBuilder day_builder;
-    g_variant_builder_init(&day_builder, G_VARIANT_TYPE("ai"));
-    for (guint i=0; i<G_N_ELEMENTS(days); i++)
-        if (days[i])
-            g_variant_builder_add(&day_builder, "i", i);
-
-    GVariantBuilder dict_builder;
-    g_variant_builder_init(&dict_builder, G_VARIANT_TYPE_DICTIONARY);
-
-    auto key = "appointment-days";
-    auto v = g_variant_builder_end(&day_builder);
-    g_variant_builder_add(&dict_builder, "{sv}", key, v);
-
-    key = "calendar-day";
-    v = g_variant_new_int64(state->calendar_month->month().get().to_unix());
-    g_variant_builder_add(&dict_builder, "{sv}", key, v);
-
-    key = "show-week-numbers";
-    v = g_variant_new_boolean(state->settings->show_week_numbers.get());
-    g_variant_builder_add(&dict_builder, "{sv}", key, v);
-
-    return g_variant_builder_end(&dict_builder);
-}
-} // unnamed namespace
-
-/***
-****
-***/
-
-Actions::Actions(const std::shared_ptr<State>& state):
-    m_state(state),
-    m_actions(g_simple_action_group_new())
-{
-    GActionEntry entries[] = {
-
-        { "desktop.open-appointment",  on_appointment_activated, "(sx)", nullptr },
-        { "desktop.open-alarm-app",    on_alarm_activated },
-        { "desktop.open-calendar-app", on_calendar_activated, "x", nullptr },
-        { "desktop.open-settings-app", on_settings_activated },
-
-        { "phone.open-appointment",    on_appointment_activated, "(sx)", nullptr },
-        { "phone.open-alarm-app",      on_alarm_activated },
-        { "phone.open-calendar-app",   on_calendar_activated, "x", nullptr },
-        { "phone.open-settings-app",   on_settings_activated },
-
-        { "calendar-active", nullptr, nullptr, "false", on_calendar_active_changed },
-        { "set-location", on_set_location, "s" }
-    };
-
-    g_action_map_add_action_entries(G_ACTION_MAP(m_actions),
-                                    entries,
-                                    G_N_ELEMENTS(entries),
-                                    this);
-
-    // add the header actions
-    auto gam = G_ACTION_MAP(m_actions);
-    auto v = create_default_header_state();
-    auto a = g_simple_action_new_stateful("desktop-header", nullptr, v);
-    g_action_map_add_action(gam, G_ACTION(a));
-    g_object_unref(a);
-
-    a = g_simple_action_new_stateful("desktop_greeter-header", nullptr, v);
-    g_action_map_add_action(gam, G_ACTION(a));
-    g_object_unref(a);
-
-    a = g_simple_action_new_stateful("phone-header", nullptr, v);
-    g_action_map_add_action(gam, G_ACTION(a));
-    g_object_unref(a);
-
-    a = g_simple_action_new_stateful("phone_greeter-header", nullptr, v);
-    g_action_map_add_action(gam, G_ACTION(a));
-    g_object_unref(a);
-
-    // add the calendar action
-    v = create_calendar_state(state);
-    a = g_simple_action_new_stateful("calendar", G_VARIANT_TYPE_INT64, v);
-    g_action_map_add_action(gam, G_ACTION(a));
-    g_signal_connect(a, "activate", G_CALLBACK(on_calendar_date_activated), this);
-    g_object_unref(a);
-
-    ///
-    ///  Keep our GActionGroup's action's states in sync with m_state
-    ///
-
-    m_state->calendar_month->month().changed().connect([this](const DateTime&){
-        update_calendar_state();
-    });
-    m_state->calendar_month->appointments().changed().connect([this](const std::vector<Appointment>&){
-        update_calendar_state();
-    });
-    m_state->settings->show_week_numbers.changed().connect([this](bool){
-        update_calendar_state();
-    });
-
-    // FIXME: rebuild the calendar state when show-week-number changes
-}
-
-Actions::~Actions()
-{
-    g_clear_object(&m_actions);
-}
-
-void Actions::update_calendar_state()
-{
-    g_action_group_change_action_state(action_group(),
-                                       "calendar",
-                                       create_calendar_state(m_state));
-}
-
-void Actions::set_calendar_date(const DateTime& date)
-{
-    m_state->calendar_month->month().set(date);
-    m_state->calendar_upcoming->date().set(date);
-}
-
-GActionGroup* Actions::action_group()
-{
-    return G_ACTION_GROUP(m_actions);
-}
-
-const std::shared_ptr<State> Actions::state() const
-{
-    return m_state;
-}
-
-
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity

=== removed file 'src/alarm-queue-simple.cpp'
--- src/alarm-queue-simple.cpp	2015-04-06 19:26:24 +0000
+++ src/alarm-queue-simple.cpp	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#include <datetime/alarm-queue-simple.h>
-
-#include <cmath>
-#include <set>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/***
-****
-***/
-
-class SimpleAlarmQueue::Impl
-{
-public:
-
-    Impl(const std::shared_ptr<Clock>& clock,
-         const std::shared_ptr<Planner>& planner,
-         const std::shared_ptr<WakeupTimer>& timer):
-      m_clock{clock},
-      m_planner{planner},
-      m_timer{timer},
-      m_datetime{clock->localtime()}
-    {
-        m_planner->appointments().changed().connect([this](const std::vector<Appointment>&){
-            g_debug("AlarmQueue %p calling requeue() due to appointments changed", this);
-            requeue();
-        });
-
-        m_clock->minute_changed.connect([this]{
-            const auto now = m_clock->localtime();
-            constexpr auto skew_threshold_usec = int64_t{90} * G_USEC_PER_SEC;
-            const bool clock_jumped = std::abs(now - m_datetime) > skew_threshold_usec;
-            m_datetime = now;
-            if (clock_jumped) {
-                g_debug("AlarmQueue %p calling requeue() due to clock skew", this);
-                requeue();
-            }
-        });
-
-        m_timer->timeout().connect([this](){
-            g_debug("AlarmQueue %p calling requeue() due to timeout", this);
-            requeue();
-        });
-
-        requeue();
-    }
-
-    ~Impl()
-    {
-    }
-
-    core::Signal<const Appointment&, const Alarm&>& alarm_reached()
-    {
-        return m_alarm_reached;
-    }
-
-private:
-
-    void requeue()
-    {
-        const auto appointments = m_planner->appointments().get();
-        const Alarm* alarm;
-
-        // kick any current alarms
-        for (const auto& appointment : appointments)
-        {
-            if ((alarm = appointment_get_current_alarm(appointment)))
-            {
-                m_triggered.insert(std::make_pair(appointment.uid, alarm->time));
-                m_alarm_reached(appointment, *alarm);
-            }
-        }
-
-        // idle until the next alarm
-        if ((alarm = find_next_alarm(appointments)))
-        {
-            g_debug ("setting timer to wake up for next appointment '%s' at %s", 
-                     alarm->text.c_str(),
-                     alarm->time.format("%F %T").c_str());
-
-            m_timer->set_wakeup_time(alarm->time);
-        }
-    }
-
-    bool already_triggered (const Appointment& appt, const Alarm& alarm) const
-    {
-        const std::pair<const std::string&,const DateTime&> key{appt.uid, alarm.time};
-        return m_triggered.count(key) != 0;
-    }
-
-    // return the next Alarm (if any) that will kick now or in the future
-    const Alarm* find_next_alarm(const std::vector<Appointment>& appointments) const
-    {
-        const Alarm* best {};
-        const auto now = m_clock->localtime();
-        const auto beginning_of_minute = now.start_of_minute();
-
-        g_debug ("planner has %zu appointments in it", (size_t)appointments.size());
-
-        for(const auto& appointment : appointments)
-        {
-            for(const auto& alarm : appointment.alarms)
-            {
-                if (already_triggered(appointment, alarm))
-                    continue;
-
-                if (alarm.time < beginning_of_minute) // has this one already passed?
-                    continue;
-
-                if (best && (best->time < alarm.time)) // do we already have a better match?
-                    continue;
-
-                best = &alarm;
-            }
-        }
-
-        return best;
-    }
-
-    // return the Appointment's current Alarm (if any)
-    const Alarm* appointment_get_current_alarm(const Appointment& appointment) const
-    {
-        const auto now = m_clock->localtime();
-
-        for (const auto& alarm : appointment.alarms)
-            if (!already_triggered(appointment, alarm) && DateTime::is_same_minute(now, alarm.time))
-                return &alarm;
-
-        return nullptr;
-    }
-
-
-    std::set<std::pair<std::string,DateTime>> m_triggered;
-    const std::shared_ptr<Clock> m_clock;
-    const std::shared_ptr<Planner> m_planner;
-    const std::shared_ptr<WakeupTimer> m_timer;
-    core::Signal<const Appointment&, const Alarm&> m_alarm_reached;
-    DateTime m_datetime;
-};
-
-/***
-****  Public API
-***/
-
-
-SimpleAlarmQueue::SimpleAlarmQueue(const std::shared_ptr<Clock>& clock,
-                                   const std::shared_ptr<Planner>& planner,
-                                   const std::shared_ptr<WakeupTimer>& timer):
-    impl{new Impl{clock, planner, timer}}
-{
-}
-
-SimpleAlarmQueue::~SimpleAlarmQueue()
-{
-}
-
-core::Signal<const Appointment&, const Alarm&>&
-SimpleAlarmQueue::alarm_reached()
-{
-    return impl->alarm_reached();
-}
-
-/***
-****
-***/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity

=== removed file 'src/appointment.cpp'
--- src/appointment.cpp	2016-05-14 02:07:10 +0000
+++ src/appointment.cpp	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <[e-mail]>
- */
-
-#include <datetime/appointment.h>
-
-namespace unity {
-namespace indicator {
-namespace datetime {
-
-/****
-*****
-****/
-
-bool Alarm::operator==(const Alarm& that) const
-{
-  return (text==that.text)
-      && (audio_url==that.audio_url)
-          && (this->time==that.time);
-}
-
-bool Alarm::has_sound() const
-{
-    return !audio_url.empty();
-}
-
-bool Alarm::has_text() const
-{
-    return !text.empty();
-}
-
-bool Appointment::operator==(const Appointment& that) const
-{
-    return (type==that.type)
-        && (uid==that.uid)
-        && (color==that.color)
-        && (summary==that.summary)
-        && (begin==that.begin)
-        && (end==that.end)
-        && (alarms==that.alarms);
-}
-
-/****
-*****
-****/
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity

=== removed file 'src/awake.cpp'
--- src/awake.cpp	2016-11-04 16:00:24 +0000
+++ src/awake.cpp	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.