Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

1 files changed, 0 insertions, 7 deletions

diff --git a/rockworkd/platformintegration/ubuntu/callchannelobserver.cpp b/rockworkd/platformintegration/ubuntu/callchannelobserver.cpp
index e3d852c..4e53645 100644
--- a/rockworkd/platformintegration/ubuntu/callchannelobserver.cpp
+++ b/rockworkd/platformintegration/ubuntu/callchannelobserver.cpp
@@ -80,12 +80,6 @@ void TelepathyMonitor::accountReady(Tp::PendingOperation* operation)
 
 void TelepathyMonitor::onCallStarted(Tp::CallChannelPtr callChannel)
 {
-    // Haven't figured how to send outgoing calls to pebble yet... discard it
-    if (callChannel->initiatorContact()->id().isEmpty()) {
-        qWarning() << "ignoring phone call. looks like it's an outgoing one";
-        return;
-    }
-
     m_cookie++;
     m_currentCalls.insert(m_cookie, callChannel.data());
     m_currentCallStates.insert(m_cookie, Tp::CallStateInitialising);
@@ -95,7 +89,6 @@ void TelepathyMonitor::onCallStarted(Tp::CallChannelPtr callChannel)
     connect(callChannel.data(), &Tp::CallChannel::callStateChanged, this, &TelepathyMonitor::callStateChanged);
 
     QString number = callChannel->initiatorContact()->id();
-    qDebug() << "call started" << number;
 
     // try to match the contact info
     QContactFetchRequest *request = new QContactFetchRequest(this);