Merge lp://qastaging/~renatofilho/sync-monitor/remove-addressbook into lp://qastaging/sync-monitor
Proposed by
Renato Araujo Oliveira Filho
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~renatofilho/sync-monitor/remove-addressbook |
Merge into: | lp://qastaging/sync-monitor |
Diff against target: |
71567 lines (+69517/-538) 204 files modified
.bzr-builddeb/default.conf (+2/-0) .bzrignore (+2/-0) 3rd_party/CMakeLists.txt (+1/-0) 3rd_party/gmock/CMakeLists.txt (+171/-0) 3rd_party/gmock/gtest/CHANGES (+153/-0) 3rd_party/gmock/gtest/CMakeLists.txt (+250/-0) 3rd_party/gmock/gtest/CONTRIBUTORS (+37/-0) 3rd_party/gmock/gtest/Makefile.am (+305/-0) 3rd_party/gmock/gtest/README (+435/-0) 3rd_party/gmock/gtest/cmake/internal_utils.cmake (+227/-0) 3rd_party/gmock/gtest/codegear/gtest_all.cc (+38/-0) 3rd_party/gmock/gtest/codegear/gtest_link.cc (+40/-0) 3rd_party/gmock/gtest/configure.ac (+68/-0) 3rd_party/gmock/gtest/include/gtest/gtest-death-test.h (+294/-0) 3rd_party/gmock/gtest/include/gtest/gtest-message.h (+250/-0) 3rd_party/gmock/gtest/include/gtest/gtest-param-test.h (+1421/-0) 3rd_party/gmock/gtest/include/gtest/gtest-param-test.h.pump (+487/-0) 3rd_party/gmock/gtest/include/gtest/gtest-printers.h (+855/-0) 3rd_party/gmock/gtest/include/gtest/gtest-spi.h (+232/-0) 3rd_party/gmock/gtest/include/gtest/gtest-test-part.h (+179/-0) 3rd_party/gmock/gtest/include/gtest/gtest-typed-test.h (+259/-0) 3rd_party/gmock/gtest/include/gtest/gtest.h (+2291/-0) 3rd_party/gmock/gtest/include/gtest/gtest_pred_impl.h (+358/-0) 3rd_party/gmock/gtest/include/gtest/gtest_prod.h (+58/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h (+319/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-filepath.h (+206/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-internal.h (+1147/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h (+233/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h (+5143/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump (+301/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util.h (+619/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-port.h (+1947/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-string.h (+167/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-tuple.h (+1012/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump (+339/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-type-util.h (+3331/-0) 3rd_party/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump (+297/-0) 3rd_party/gmock/gtest/m4/acx_pthread.m4 (+363/-0) 3rd_party/gmock/gtest/m4/gtest.m4 (+74/-0) 3rd_party/gmock/gtest/make/Makefile (+82/-0) 3rd_party/gmock/gtest/samples/prime_tables.h (+123/-0) 3rd_party/gmock/gtest/samples/sample1.cc (+68/-0) 3rd_party/gmock/gtest/samples/sample1.h (+43/-0) 3rd_party/gmock/gtest/samples/sample10_unittest.cc (+144/-0) 3rd_party/gmock/gtest/samples/sample1_unittest.cc (+153/-0) 3rd_party/gmock/gtest/samples/sample2.cc (+56/-0) 3rd_party/gmock/gtest/samples/sample2.h (+85/-0) 3rd_party/gmock/gtest/samples/sample2_unittest.cc (+109/-0) 3rd_party/gmock/gtest/samples/sample3-inl.h (+172/-0) 3rd_party/gmock/gtest/samples/sample3_unittest.cc (+151/-0) 3rd_party/gmock/gtest/samples/sample4.cc (+46/-0) 3rd_party/gmock/gtest/samples/sample4.h (+53/-0) 3rd_party/gmock/gtest/samples/sample4_unittest.cc (+45/-0) 3rd_party/gmock/gtest/samples/sample5_unittest.cc (+199/-0) 3rd_party/gmock/gtest/samples/sample6_unittest.cc (+224/-0) 3rd_party/gmock/gtest/samples/sample7_unittest.cc (+130/-0) 3rd_party/gmock/gtest/samples/sample8_unittest.cc (+173/-0) 3rd_party/gmock/gtest/samples/sample9_unittest.cc (+160/-0) 3rd_party/gmock/gtest/scripts/fuse_gtest_files.py (+250/-0) 3rd_party/gmock/gtest/scripts/gen_gtest_pred_impl.py (+730/-0) 3rd_party/gmock/gtest/scripts/gtest-config.in (+274/-0) 3rd_party/gmock/gtest/scripts/pump.py (+855/-0) 3rd_party/gmock/gtest/scripts/test/Makefile (+59/-0) 3rd_party/gmock/gtest/scripts/upload.py (+1387/-0) 3rd_party/gmock/gtest/scripts/upload_gtest.py (+78/-0) 3rd_party/gmock/gtest/src/gtest-all.cc (+48/-0) 3rd_party/gmock/gtest/src/gtest-death-test.cc (+1344/-0) 3rd_party/gmock/gtest/src/gtest-filepath.cc (+382/-0) 3rd_party/gmock/gtest/src/gtest-internal-inl.h (+1218/-0) 3rd_party/gmock/gtest/src/gtest-port.cc (+805/-0) 3rd_party/gmock/gtest/src/gtest-printers.cc (+363/-0) 3rd_party/gmock/gtest/src/gtest-test-part.cc (+110/-0) 3rd_party/gmock/gtest/src/gtest-typed-test.cc (+110/-0) 3rd_party/gmock/gtest/src/gtest.cc (+4961/-0) 3rd_party/gmock/gtest/src/gtest_main.cc (+38/-0) 3rd_party/gmock/gtest/test/gtest-death-test_ex_test.cc (+93/-0) 3rd_party/gmock/gtest/test/gtest-death-test_test.cc (+1368/-0) 3rd_party/gmock/gtest/test/gtest-filepath_test.cc (+680/-0) 3rd_party/gmock/gtest/test/gtest-linked_ptr_test.cc (+154/-0) 3rd_party/gmock/gtest/test/gtest-listener_test.cc (+310/-0) 3rd_party/gmock/gtest/test/gtest-message_test.cc (+159/-0) 3rd_party/gmock/gtest/test/gtest-options_test.cc (+215/-0) 3rd_party/gmock/gtest/test/gtest-param-test2_test.cc (+65/-0) 3rd_party/gmock/gtest/test/gtest-param-test_test.cc (+904/-0) 3rd_party/gmock/gtest/test/gtest-param-test_test.h (+57/-0) 3rd_party/gmock/gtest/test/gtest-port_test.cc (+1253/-0) 3rd_party/gmock/gtest/test/gtest-printers_test.cc (+1566/-0) 3rd_party/gmock/gtest/test/gtest-test-part_test.cc (+208/-0) 3rd_party/gmock/gtest/test/gtest-tuple_test.cc (+320/-0) 3rd_party/gmock/gtest/test/gtest-typed-test2_test.cc (+45/-0) 3rd_party/gmock/gtest/test/gtest-typed-test_test.cc (+360/-0) 3rd_party/gmock/gtest/test/gtest-typed-test_test.h (+66/-0) 3rd_party/gmock/gtest/test/gtest-unittest-api_test.cc (+341/-0) 3rd_party/gmock/gtest/test/gtest_all_test.cc (+47/-0) 3rd_party/gmock/gtest/test/gtest_break_on_failure_unittest.py (+218/-0) 3rd_party/gmock/gtest/test/gtest_break_on_failure_unittest_.cc (+88/-0) 3rd_party/gmock/gtest/test/gtest_catch_exceptions_test.py (+223/-0) 3rd_party/gmock/gtest/test/gtest_catch_exceptions_test_.cc (+311/-0) 3rd_party/gmock/gtest/test/gtest_color_test.py (+130/-0) 3rd_party/gmock/gtest/test/gtest_color_test_.cc (+71/-0) 3rd_party/gmock/gtest/test/gtest_env_var_test.py (+103/-0) 3rd_party/gmock/gtest/test/gtest_env_var_test_.cc (+126/-0) 3rd_party/gmock/gtest/test/gtest_environment_test.cc (+192/-0) 3rd_party/gmock/gtest/test/gtest_filter_unittest.py (+633/-0) 3rd_party/gmock/gtest/test/gtest_filter_unittest_.cc (+140/-0) 3rd_party/gmock/gtest/test/gtest_help_test.py (+172/-0) 3rd_party/gmock/gtest/test/gtest_help_test_.cc (+46/-0) 3rd_party/gmock/gtest/test/gtest_list_tests_unittest.py (+207/-0) 3rd_party/gmock/gtest/test/gtest_list_tests_unittest_.cc (+157/-0) 3rd_party/gmock/gtest/test/gtest_main_unittest.cc (+45/-0) 3rd_party/gmock/gtest/test/gtest_no_test_unittest.cc (+56/-0) 3rd_party/gmock/gtest/test/gtest_output_test.py (+335/-0) 3rd_party/gmock/gtest/test/gtest_output_test_.cc (+1034/-0) 3rd_party/gmock/gtest/test/gtest_output_test_golden_lin.txt (+720/-0) 3rd_party/gmock/gtest/test/gtest_pred_impl_unittest.cc (+2427/-0) 3rd_party/gmock/gtest/test/gtest_prod_test.cc (+57/-0) 3rd_party/gmock/gtest/test/gtest_repeat_test.cc (+253/-0) 3rd_party/gmock/gtest/test/gtest_shuffle_test.py (+325/-0) 3rd_party/gmock/gtest/test/gtest_shuffle_test_.cc (+103/-0) 3rd_party/gmock/gtest/test/gtest_sole_header_test.cc (+57/-0) 3rd_party/gmock/gtest/test/gtest_stress_test.cc (+256/-0) 3rd_party/gmock/gtest/test/gtest_test_utils.py (+305/-0) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_ex_test.cc (+92/-0) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_test.py (+171/-0) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_test_.cc (+72/-0) 3rd_party/gmock/gtest/test/gtest_uninitialized_test.py (+70/-0) 3rd_party/gmock/gtest/test/gtest_uninitialized_test_.cc (+43/-0) 3rd_party/gmock/gtest/test/gtest_unittest.cc (+7415/-0) 3rd_party/gmock/gtest/test/gtest_xml_outfile1_test_.cc (+49/-0) 3rd_party/gmock/gtest/test/gtest_xml_outfile2_test_.cc (+49/-0) 3rd_party/gmock/gtest/test/gtest_xml_outfiles_test.py (+132/-0) 3rd_party/gmock/gtest/test/gtest_xml_output_unittest.py (+307/-0) 3rd_party/gmock/gtest/test/gtest_xml_output_unittest_.cc (+181/-0) 3rd_party/gmock/gtest/test/gtest_xml_test_utils.py (+194/-0) 3rd_party/gmock/gtest/test/production.cc (+36/-0) 3rd_party/gmock/gtest/test/production.h (+55/-0) 3rd_party/gmock/gtest/xcode/Config/DebugProject.xcconfig (+30/-0) 3rd_party/gmock/gtest/xcode/Config/FrameworkTarget.xcconfig (+17/-0) 3rd_party/gmock/gtest/xcode/Config/General.xcconfig (+41/-0) 3rd_party/gmock/gtest/xcode/Config/ReleaseProject.xcconfig (+32/-0) 3rd_party/gmock/gtest/xcode/Config/StaticLibraryTarget.xcconfig (+18/-0) 3rd_party/gmock/gtest/xcode/Config/TestTarget.xcconfig (+8/-0) 3rd_party/gmock/gtest/xcode/Resources/Info.plist (+30/-0) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/Info.plist (+28/-0) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/runtests.sh (+62/-0) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget.cc (+63/-0) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget.h (+59/-0) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget_test.cc (+68/-0) 3rd_party/gmock/gtest/xcode/Scripts/runtests.sh (+65/-0) 3rd_party/gmock/gtest/xcode/Scripts/versiongenerate.py (+100/-0) 3rd_party/gmock/src/gmock-all.cc (+47/-0) 3rd_party/gmock/src/gmock-cardinalities.cc (+156/-0) 3rd_party/gmock/src/gmock-internal-utils.cc (+174/-0) 3rd_party/gmock/src/gmock-matchers.cc (+137/-0) 3rd_party/gmock/src/gmock-spec-builders.cc (+813/-0) 3rd_party/gmock/src/gmock.cc (+182/-0) 3rd_party/gmock/src/gmock_main.cc (+54/-0) CMakeLists.txt (+4/-0) accounts/applications/CMakeLists.txt (+4/-4) accounts/applications/calendar-sync.application.in (+7/-6) accounts/applications/contacts-sync.application.in (+7/-6) accounts/services/CMakeLists.txt (+4/-0) accounts/services/google-caldav.service.in (+2/-1) accounts/services/google-carddav.service.in (+2/-1) accounts/services/yahoo-caldav.service.in (+15/-0) accounts/services/yahoo-carddav.service.in (+15/-0) config.h.in (+4/-0) data/CMakeLists.txt (+8/-0) data/com.canonical.SyncMonitor.service.in (+3/-0) debian/changelog (+1/-1) debian/control (+6/-1) debian/copyright (+1/-5) debian/sync-monitor.install (+2/-0) src/CMakeLists.txt (+31/-16) src/address-book-trigger.cpp (+0/-71) src/address-book-trigger.h (+0/-45) src/eds-helper.cpp (+223/-0) src/eds-helper.h (+63/-0) src/main.cpp (+2/-0) src/notify-message-mock.cpp (+2/-1) src/notify-message-notify.cpp (+0/-53) src/notify-message.cpp (+90/-16) src/notify-message.h (+30/-10) src/provider-template.cpp (+78/-0) src/provider-template.h (+42/-0) src/sync-account.cpp (+369/-176) src/sync-account.h (+44/-23) src/sync-configure.cpp (+241/-0) src/sync-configure.h (+65/-0) src/sync-daemon.cpp (+264/-78) src/sync-daemon.h (+36/-13) src/sync-dbus.cpp (+100/-0) src/sync-dbus.h (+101/-0) src/sync-queue.cpp (+105/-0) src/sync-queue.h (+47/-0) src/syncevolution-session-proxy.cpp (+17/-10) src/syncevolution-session-proxy.h (+1/-1) templates/CMakeLists.txt (+8/-0) templates/google.conf (+13/-0) templates/yahoo.conf (+5/-0) tests/CMakeLists.txt (+1/-0) tests/unittest/CMakeLists.txt (+26/-0) tests/unittest/sync-account-mock.h (+37/-0) tests/unittest/sync-queue-test.cpp (+201/-0) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/sync-monitor/remove-addressbook |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
*Make sure that the first online account created is set as default account
*After removing a online account ask the user if he wants to keep the contacts or remove it.
To post a comment you must log in.
Unmerged revisions
- 62. By Renato Araujo Oliveira Filho
-
Updated pot file.