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, 9 insertions, 0 deletions

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());