Merge lp://staging/~victor-jon/indicator-datetime/drop-phone-code into lp://staging/indicator-datetime
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~victor-jon/indicator-datetime/drop-phone-code |
Merge into: | lp://staging/indicator-datetime |
Diff against target: |
27216 lines (+6098/-19975) 180 files modified
.bzrignore (+11/-8) CMakeLists.txt (+29/-37) README (+8/-69) cmake/FindIntltool.cmake (+23/-0) cmake/GCov.cmake (+50/-0) cmake/Translations.cmake (+41/-0) data/com.canonical.indicator.datetime (+1/-4) data/com.canonical.indicator.datetime.gschema.xml.in.in (+0/-46) data/indicator-datetime.conf.in (+2/-3) debian/control (+12/-38) debian/rules (+0/-1) include/CMakeLists.txt (+0/-2) include/datetime/CMakeLists.txt (+0/-2) include/datetime/actions-live.h (+0/-69) include/datetime/actions.h (+0/-77) include/datetime/alarm-queue-simple.h (+0/-57) include/datetime/alarm-queue.h (+0/-59) include/datetime/appointment.h (+0/-75) include/datetime/clock-mock.h (+0/-69) include/datetime/clock.h (+0/-94) include/datetime/date-time.h (+0/-93) include/datetime/dbus-shared.h (+0/-66) include/datetime/engine-eds.h (+0/-77) include/datetime/engine-mock.h (+0/-71) include/datetime/engine.h (+0/-69) include/datetime/exporter.h (+0/-63) include/datetime/formatter.h (+0/-138) include/datetime/locations-settings.h (+0/-55) include/datetime/locations.h (+0/-79) include/datetime/menu.h (+0/-91) include/datetime/myself.h (+0/-62) include/datetime/planner-aggregate.h (+0/-52) include/datetime/planner-month.h (+0/-56) include/datetime/planner-range.h (+0/-84) include/datetime/planner-snooze.h (+0/-55) include/datetime/planner-upcoming.h (+0/-56) include/datetime/planner.h (+0/-52) include/datetime/settings-live.h (+0/-88) include/datetime/settings-shared.h (+0/-65) include/datetime/settings.h (+0/-77) include/datetime/snap.h (+0/-65) include/datetime/state.h (+0/-81) include/datetime/timezone-geoclue.h (+0/-53) include/datetime/timezone-timedated.h (+0/-56) include/datetime/timezone.h (+0/-45) include/datetime/timezones-live.h (+0/-55) include/datetime/timezones.h (+0/-59) include/datetime/utils.h (+0/-54) include/datetime/wakeup-timer-mainloop.h (+0/-62) include/datetime/wakeup-timer-powerd.h (+0/-62) include/datetime/wakeup-timer.h (+0/-55) include/notifications/awake.h (+0/-57) include/notifications/dbus-shared.h (+0/-36) include/notifications/haptic.h (+0/-60) include/notifications/notifications.h (+0/-130) include/notifications/sound.h (+0/-82) po/CMakeLists.txt (+3/-13) po/LINGUAS (+31/-0) po/Makevars (+7/-0) po/POTFILES.in (+3/-0) po/indicator-datetime.pot (+113/-59) src/CMakeLists.txt (+31/-65) src/actions-live.cpp (+0/-312) src/actions.cpp (+0/-273) src/alarm-queue-simple.cpp (+0/-190) src/appointment.cpp (+0/-64) src/awake.cpp (+0/-151) src/clock-live.c (+273/-0) src/clock-live.cpp (+0/-216) src/clock-live.h (+73/-0) src/clock.c (+110/-0) src/clock.cpp (+0/-232) src/clock.h (+76/-0) src/com.ubuntu.touch.AccountsService.Sound.xml (+0/-47) src/date-time.cpp (+0/-302) src/dbus-shared.h (+24/-0) src/engine-eds.cpp (+0/-1238) src/exporter.cpp (+0/-264) src/formatter-desktop.cpp (+0/-190) src/formatter.cpp (+0/-267) src/haptic.cpp (+0/-176) src/locations-settings.cpp (+0/-92) src/locations.cpp (+0/-59) src/main.c (+78/-0) src/main.cpp (+0/-188) src/menu.cpp (+0/-680) src/myself.cpp (+0/-76) src/notifications.cpp (+0/-549) src/planner-aggregate.cpp (+0/-106) src/planner-eds.c (+728/-0) src/planner-eds.h (+58/-0) src/planner-month.cpp (+0/-61) src/planner-range.cpp (+0/-110) src/planner-snooze.cpp (+0/-119) src/planner-upcoming.cpp (+0/-61) src/planner.c (+288/-0) src/planner.cpp (+0/-54) src/planner.h (+177/-0) src/service.c (+2067/-0) src/service.h (+84/-0) src/settings-live.cpp (+0/-445) src/settings-shared.h (+50/-0) src/snap.cpp (+0/-341) src/sound.cpp (+0/-167) src/timezone-file.c (+208/-0) src/timezone-file.h (+58/-0) src/timezone-geoclue.cpp (+0/-291) src/timezone-timedated.cpp (+0/-216) src/timezone.c (+130/-0) src/timezone.h (+72/-0) src/timezones-live.cpp (+0/-74) src/utils.c (+467/-366) src/utils.h (+68/-0) src/wakeup-timer-mainloop.cpp (+0/-138) src/wakeup-timer-powerd.cpp (+0/-311) tests/CMakeLists.txt (+19/-102) tests/Makefile.am.strings (+38/-0) tests/actions-mock.h (+0/-92) tests/data/applications/org.gnome.Calendar.desktop (+0/-13) tests/geoclue-fixture.h (+0/-154) tests/glib-fixture.h (+72/-180) tests/libdbusmock-fixture.h (+0/-148) tests/manual (+0/-149) tests/manual-test-snap.cpp (+0/-106) tests/notification-fixture.h (+0/-342) tests/planner-mock.c (+174/-0) tests/planner-mock.h (+39/-37) tests/print-to.h (+0/-88) tests/run-eds-ics-test.sh (+0/-76) tests/state-fixture.h (+0/-82) tests/state-mock.h (+0/-67) tests/test-actions.cpp (+0/-331) tests/test-alarm-queue.cpp (+0/-168) tests/test-clock.cpp (+0/-216) tests/test-datetime.cpp (+0/-143) tests/test-dbus-fixture.h (+0/-108) tests/test-eds-ics-all-day-events.cpp (+0/-92) tests/test-eds-ics-all-day-events.ics.in (+0/-19) tests/test-eds-ics-config-files/.config/evolution/sources/system-proxy.source (+0/-21) tests/test-eds-ics-missing-trigger.cpp (+0/-116) tests/test-eds-ics-missing-trigger.ics.in (+0/-45) tests/test-eds-ics-non-attending-alarms.cpp (+0/-79) tests/test-eds-ics-non-attending-alarms.ics.in (+0/-53) tests/test-eds-ics-non-selected-source.cpp (+0/-94) tests/test-eds-ics-non-selected-source.ics.in (+0/-28) tests/test-eds-ics-nonrepeating-events.cpp (+0/-94) tests/test-eds-ics-nonrepeating-events.ics.in (+0/-27) tests/test-eds-ics-repeating-events-with-individual-change.cpp (+0/-101) tests/test-eds-ics-repeating-events-with-individual-change.ics.in (+0/-969) tests/test-eds-ics-repeating-events.cpp (+0/-101) tests/test-eds-ics-repeating-events.ics.in (+0/-28) tests/test-eds-ics-repeating-valarms.cpp (+0/-102) tests/test-eds-ics-repeating-valarms.ics.in (+0/-47) tests/test-eds-ics-tzids-2.cpp (+0/-89) tests/test-eds-ics-tzids-2.ics.in (+0/-38) tests/test-eds-ics-tzids-utc.cpp (+0/-88) tests/test-eds-ics-tzids-utc.ics.in (+0/-15) tests/test-eds-ics-tzids.cpp (+0/-88) tests/test-eds-ics-tzids.ics.in (+0/-56) tests/test-exporter.cpp (+0/-249) tests/test-formatter.cc (+98/-0) tests/test-formatter.cpp (+0/-238) tests/test-indicator.cc (+92/-0) tests/test-live-actions.cpp (+0/-319) tests/test-locations.cpp (+0/-168) tests/test-menu-appointments.cpp (+0/-263) tests/test-menus.cpp (+0/-545) tests/test-notification-response.cpp (+0/-144) tests/test-notification.cpp (+0/-198) tests/test-planner.cpp (+0/-68) tests/test-settings.cpp (+0/-241) tests/test-sound.cpp (+0/-182) tests/test-timezone-geoclue.cpp (+0/-48) tests/test-timezone-timedated.cpp (+0/-87) tests/test-timezones.cpp (+0/-124) tests/test-utils.cc (+112/-0) tests/test-utils.cpp (+0/-98) tests/timedated-fixture.h (+0/-158) tests/timezone-mock.h (+0/-41) tests/wakeup-timer-mock.h (+0/-78) |
To merge this branch: | bzr merge lp://staging/~victor-jon/indicator-datetime/drop-phone-code |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Khurshid Alam | Pending | ||
Review via email: mp+371427@code.staging.launchpad.net |
Commit message
Drop phone code
* Rebase on top of revision 297
* Drop phone related code
* Cherry-pick evolution-
* 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
* Backport systemd integration
* Cherry pick support for MATE desktop
Unmerged revisions
- 499. By 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
The diff has been truncated, so I am reviewing locally.