Merge lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync into lp://qastaging/sync-monitor

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Sheldon
Approved revision: 56
Merged at revision: 50
Proposed branch: lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync
Merge into: lp://qastaging/sync-monitor
Diff against target: 452 lines (+93/-165)
15 files modified
CMakeLists.txt (+1/-0)
accounts/CMakeLists.txt (+0/-1)
accounts/applications/CMakeLists.txt (+0/-14)
accounts/applications/contacts-sync.application.in (+0/-12)
accounts/desktop/CMakeLists.txt (+0/-2)
accounts/desktop/sync-monitor-contacts.desktop.in (+0/-9)
accounts/services/CMakeLists.txt (+0/-6)
accounts/services/google-carddav.service.in (+0/-24)
accounts/services/yahoo-caldav.service.in (+0/-15)
accounts/services/yahoo-carddav.service.in (+0/-15)
debian/sync-monitor-uoa.install (+0/-5)
src/eds-helper.cpp (+90/-34)
src/sync-daemon.cpp (+2/-20)
src/sync-daemon.h (+0/-1)
templates/google.conf (+0/-7)
To merge this branch: bzr merge lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
Ken VanDine Approve
Review via email: mp+264436@code.qastaging.launchpad.net

Commit message

Do not sync contacts.
Contacts sync will be handled by buteo.

To post a comment you must log in.
51. By Renato Araujo Oliveira Filho

Remove account data without ask the user.

52. By Renato Araujo Oliveira Filho

Use source id to remove source.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGED

If you changed UI labels, did you update the pot file?
NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
YES

53. By Renato Araujo Oliveira Filho

Revert changes on changelog.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

See question inline

review: Approve (package)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Needs Information (package)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

See question inline

review: Needs Information
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Packaging looks good

review: Approve
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Rather than commenting out the installation of contact sync service files in cmake, perhaps it'd be better to make them a compile to configuration option (or alternatively remove them altogether if they really don't have any potential future use)?

review: Needs Fixing
54. By Renato Araujo Oliveira Filho

Removed contacts application files.

55. By Renato Araujo Oliveira Filho

Removed any related contact config file.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> Rather than commenting out the installation of contact sync service files in
> cmake, perhaps it'd be better to make them a compile to configuration option
> (or alternatively remove them altogether if they really don't have any
> potential future use)?

fixed

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good

review: Approve
56. By Renato Araujo Oliveira Filho

Trunk merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches