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

3 files changed, 10 insertions, 8 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);
diff --git a/rockworkd/platformintegration/ubuntu/callchannelobserver.h b/rockworkd/platformintegration/ubuntu/callchannelobserver.h
index cc2b7aa..16616c9 100644
--- a/rockworkd/platformintegration/ubuntu/callchannelobserver.h
+++ b/rockworkd/platformintegration/ubuntu/callchannelobserver.h
@@ -18,7 +18,7 @@ class TelepathyCallMonitor : public QObject
 public:
     TelepathyCallMonitor(const Tp::AccountPtr& account):
         mAccount(account),
-        mCallObserver(Tp::SimpleCallObserver::create(mAccount)) {
+        mCallObserver(Tp::SimpleCallObserver::create(mAccount, Tp::SimpleCallObserver::CallDirectionIncoming)) {
         connect(mCallObserver.data(), SIGNAL(callStarted(Tp::CallChannelPtr)), SIGNAL(callStarted(Tp::CallChannelPtr)));
 //        connect(mCallObserver.data(), SIGNAL(callEnded(Tp::CallChannelPtr,QString,QString)), SIGNAL(callEnded()));
 //        connect(mCallObserver.data(), SIGNAL(streamedMediaCallStarted(Tp::StreamedMediaChannelPtr)), SIGNAL(offHook()));
diff --git a/rockworkd/platformintegration/ubuntu/organizeradapter.cpp b/rockworkd/platformintegration/ubuntu/organizeradapter.cpp
index 853403a..9d697ca 100644
--- a/rockworkd/platformintegration/ubuntu/organizeradapter.cpp
+++ b/rockworkd/platformintegration/ubuntu/organizeradapter.cpp
@@ -39,6 +39,15 @@ void OrganizerAdapter::refresh()
         event.setEndTime(organizerEvent.endDateTime());
         event.setLocation(organizerEvent.location());
         event.setComment(organizerEvent.comments().join(";"));
+        event.setIsAllDay(organizerEvent.isAllDay());
+        // on allDay events, the time portion of QDateTime is not valid. let's fix that
+        if (organizerEvent.isAllDay() && !organizerEvent.startDateTime().isValid() && organizerEvent.startDateTime().date().isValid()) {
+            QDateTime fixedStartTime;
+            fixedStartTime.setTime(QTime(12, 0));
+            fixedStartTime.setDate(organizerEvent.startDateTime().date());
+            event.setStartTime(fixedStartTime);
+        }
+
         QStringList attendees;
         foreach (const QOrganizerItemDetail &attendeeDetail, organizerEvent.details(QOrganizerItemDetail::TypeEventAttendee)) {
             attendees.append(attendeeDetail.value(QOrganizerItemDetail::TypeEventAttendee + 1).toString());