Merge lp:~boiko/history-service/fix_telepathy_init_on_qml into lp:history-service
Proposed by
Gustavo Pichorim Boiko
Status: | Merged |
---|---|
Approved by: | Tiago Salem Herrmann |
Approved revision: | 227 |
Merged at revision: | 226 |
Proposed branch: | lp:~boiko/history-service/fix_telepathy_init_on_qml |
Merge into: | lp:history-service |
Diff against target: |
207 lines (+112/-10) 6 files modified
daemon/main.cpp (+0/-5) src/telepathyhelper.cpp (+6/-0) tests/Ubuntu.History/CMakeLists.txt (+8/-0) tests/Ubuntu.History/HistoryEventModelTest.cpp (+95/-0) tests/common/telepathytest.cpp (+2/-4) tests/common/telepathytest.h (+1/-1) |
To merge this branch: | bzr merge lp:~boiko/history-service/fix_telepathy_init_on_qml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tiago Salem Herrmann (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+292843@code.launchpad.net |
Commit message
Make sure Telepathy types are always initialized.
Description of the change
Make sure Telepathy types are always initialized.
To post a comment you must log in.
FAILED: Continuous integration, rev:227 jenkins. qa.ubuntu. com/job/ history- service- ci/332/ jenkins. qa.ubuntu. com/job/ history- service- vivid-amd64- ci/170 jenkins. qa.ubuntu. com/job/ history- service- vivid-armhf- ci/171/ console jenkins. qa.ubuntu. com/job/ history- service- vivid-i386- ci/170
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/history- service- ci/332/ rebuild
http://