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

[Gustavo Pichorim Boiko]

Specify the domain when translating unknown and private number strings.

Specify the domain when translating unknown and private number strings.

[PS Jenkins bot (ps-jenkins)]

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]

1102. By Gustavo Pichorim Boiko on 2015-07-17

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

[PS Jenkins bot (ps-jenkins)]

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)

[Tiago Salem Herrmann (tiagosh)]

Looks good!

review: Approve

=== modified file 'Ubuntu/Telephony/contactwatcher.cpp'
--- Ubuntu/Telephony/contactwatcher.cpp	2015-03-27 02:47:52 +0000
+++ Ubuntu/Telephony/contactwatcher.cpp	2015-07-17 18:19:41 +0000
@@ -176,9 +176,9 @@
         mDetailProperties.clear();
 
         if (isPrivate) {
-            mAlias = C::gettext("Private Number");
+            mAlias = C::dgettext("telephony-service", "Private Number");
         } else if (isUnknown) {
-            mAlias = C::gettext("Unknown Number");
+            mAlias = C::dgettext("telephony-service", "Unknown Number");
         }
 
         Q_EMIT contactIdChanged();
 
=== modified file 'tests/common/mock/callchannel.cpp'
--- tests/common/mock/callchannel.cpp	2015-07-08 19:21:44 +0000
+++ tests/common/mock/callchannel.cpp	2015-07-17 18:19:41 +0000
@@ -178,9 +178,6 @@
 
 MockCallChannel::~MockCallChannel()
 {
-    qDebug() << "call channel closed";
-    // TODO - for some reason the object is not being removed
-    mConnection->dbusConnection().unregisterObject(mBaseChannel->objectPath(), QDBusConnection::UnregisterTree);
 }
 
 Tp::BaseChannelPtr MockCallChannel::baseChannel()