telephony-service

Merge lp:~boiko/telephony-service/fix_1470938 into lp:telephony-service

  1. fix_1470938
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 1102
Merged at revision: 1102
Proposed branch: lp:~boiko/telephony-service/fix_1470938
Merge into: lp:telephony-service
Diff against target: 29 lines (+2/-5)
2 files modified
Ubuntu/Telephony/contactwatcher.cpp (+2/-2)
tests/common/mock/callchannel.cpp (+0/-3)
To merge this branch: bzr merge lp:~boiko/telephony-service/fix_1470938
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+264907@code.launchpad.net

Commit message

Specify the domain when translating unknown and private number strings.

Description of the change

Specify the domain when translating unknown and private number strings.

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

FAILED: Continuous integration, rev:1101
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/498/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/166/console

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

review: Needs Fixing (continuous-integration)
lp:~boiko/telephony-service/fix_1470938 updated
1102. By Gustavo Pichorim Boiko

Do not unregister the channel to prevent crashes if the connection is not available.

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

PASSED: Continuous integration, rev:1102
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/501/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/169

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

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

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu/Telephony/contactwatcher.cpp'
2--- Ubuntu/Telephony/contactwatcher.cpp 2015-03-27 02:47:52 +0000
3+++ Ubuntu/Telephony/contactwatcher.cpp 2015-07-17 18:19:41 +0000
4@@ -176,9 +176,9 @@
5 mDetailProperties.clear();
6
7 if (isPrivate) {
8- mAlias = C::gettext("Private Number");
9+ mAlias = C::dgettext("telephony-service", "Private Number");
10 } else if (isUnknown) {
11- mAlias = C::gettext("Unknown Number");
12+ mAlias = C::dgettext("telephony-service", "Unknown Number");
13 }
14
15 Q_EMIT contactIdChanged();
16
17=== modified file 'tests/common/mock/callchannel.cpp'
18--- tests/common/mock/callchannel.cpp 2015-07-08 19:21:44 +0000
19+++ tests/common/mock/callchannel.cpp 2015-07-17 18:19:41 +0000
20@@ -178,9 +178,6 @@
21
22 MockCallChannel::~MockCallChannel()
23 {
24- qDebug() << "call channel closed";
25- // TODO - for some reason the object is not being removed
26- mConnection->dbusConnection().unregisterObject(mBaseChannel->objectPath(), QDBusConnection::UnregisterTree);
27 }
28
29 Tp::BaseChannelPtr MockCallChannel::baseChannel()

Subscribers

People subscribed via source and target branches