history-service

Merge lp://staging/~tiagosh/history-service/manually_add_self_contact_to_participants into lp://staging/history-service

  1. manually_add_self_contact_to_participants
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Superseded
Proposed branch: lp://staging/~tiagosh/history-service/manually_add_self_contact_to_participants
Merge into: lp://staging/history-service
Diff against target: 278 lines (+111/-25)
4 files modified
daemon/historydaemon.cpp (+57/-24)
daemon/historydaemon.h (+1/-0)
tests/common/mock/textchannel.cpp (+4/-1)
tests/daemon/DaemonTest.cpp (+49/-0)
To merge this branch: bzr merge lp://staging/~tiagosh/history-service/manually_add_self_contact_to_participants
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Gustavo Pichorim Boiko (community) Needs Fixing
Review via email: mp+264656@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-07-16.

Commit message

Manually add self id to participants list if needed.

Description of the change

Manually add self id to participants list if needed.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/history-service-ci/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/39/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/201/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

73 + QStringList participantsFromChannel(const Tp::TextChannelPtr &textChannel);

Can you make it either const or static? I think static would be better for this case

review: Needs Fixing
lp://staging/~tiagosh/history-service/manually_add_self_contact_to_participants updated
199. By Tiago Salem Herrmann

make method static

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/history-service-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/202/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

> 73 + QStringList participantsFromChannel(const Tp::TextChannelPtr
> &textChannel);
>
> Can you make it either const or static? I think static would be better for
> this case

Done

lp://staging/~tiagosh/history-service/manually_add_self_contact_to_participants updated
200. By Tiago Salem Herrmann

merge generate-eventId branch

Unmerged revisions

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