Merge lp://staging/~phablet-team/history-service/wait_for_self_not_pending into lp://staging/history-service/staging
Proposed by
Gustavo Pichorim Boiko
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~phablet-team/history-service/wait_for_self_not_pending |
| Merge into: | lp://staging/history-service/staging |
| Diff against target: |
903 lines (+294/-55) 23 files modified
Ubuntu/History/historythreadmodel.cpp (+18/-0) Ubuntu/History/historythreadmodel.h (+1/-0) daemon/HistoryService.xml (+13/-0) daemon/historydaemon.cpp (+107/-43) daemon/historydaemon.h (+12/-7) daemon/historyservicedbus.cpp (+8/-0) daemon/historyservicedbus.h (+8/-0) plugins/sqlite/sqlitehistoryplugin.cpp (+27/-5) plugins/sqlite/sqlitehistoryplugin.h (+4/-0) src/manager.cpp (+3/-0) src/manager.h (+1/-0) src/managerdbus.cpp (+17/-0) src/managerdbus_p.h (+8/-0) src/participant.cpp (+9/-0) src/participant.h (+1/-0) src/plugin.h (+4/-0) src/thread.cpp (+16/-0) src/thread.h (+2/-0) src/threadview.cpp (+15/-0) src/threadview.h (+8/-0) src/threadview_p.h (+4/-0) src/utils.cpp (+7/-0) src/utils_p.h (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/history-service/wait_for_self_not_pending |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2017-01-26.
This proposal has been superseded by a proposal from 2017-02-01.
Commit message
Only start saving information events about contacts joining and leaving after the self contact is in the local list of participants.
Description of the change
Only start saving information events about contacts joining and leaving after the self contact is in the local list of participants.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
