1 files changed, 17 insertions, 7 deletions
diff --git a/Swift/QtUI/EventViewer/QtEvent.cpp b/Swift/QtUI/EventViewer/QtEvent.cpp
index a84a440..4d90bd9 100644
--- a/Swift/QtUI/EventViewer/QtEvent.cpp
+++ b/Swift/QtUI/EventViewer/QtEvent.cpp
@@ -1,20 +1,21 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
-#include "Swift/QtUI/EventViewer/QtEvent.h"
+#include <Swift/QtUI/EventViewer/QtEvent.h>
-#include <QDateTime>
 #include <QColor>
+#include <QDateTime>
-#include "Swift/Controllers/XMPPEvents/MessageEvent.h"
+#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
-#include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
+#include <Swift/Controllers/XMPPEvents/IncomingFileTransferEvent.h>
-#include "Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h"
+#include <Swift/Controllers/XMPPEvents/MUCInviteEvent.h>
-#include "Swift/Controllers/XMPPEvents/MUCInviteEvent.h"
+#include <Swift/Controllers/XMPPEvents/MessageEvent.h>
+#include <Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h>
 #include "Swift/QtUI/QtSwiftUtil.h"
 namespace Swift {
@@ -51,10 +52,14 @@ QString QtEvent::sender() {
        }
        boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event_);
        if (mucInviteEvent) {
                return P2QSTRING(mucInviteEvent->getInviter().toString());
        }
+        boost::shared_ptr<IncomingFileTransferEvent> incomingFTEvent = boost::dynamic_pointer_cast<IncomingFileTransferEvent>(event_);
+        if (incomingFTEvent) {
+                return P2QSTRING(incomingFTEvent->getSender().toString());
+        }
        return "";
 }
 QString QtEvent::text() {
        boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event_);
@@ -80,9 +85,14 @@ QString QtEvent::text() {
        boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event_);
        if (mucInviteEvent) {
                QString message = QString(QObject::tr("%1 has invited you to enter the %2 room.")).arg(P2QSTRING(mucInviteEvent->getInviter().toBare().toString())).arg(P2QSTRING(mucInviteEvent->getRoomJID().toString()));
                return message;
        }
+        boost::shared_ptr<IncomingFileTransferEvent> incomingFTEvent = boost::dynamic_pointer_cast<IncomingFileTransferEvent>(event_);
+        if (incomingFTEvent) {
+                QString message = QString(QObject::tr("%1 would like to send a file to you.")).arg(P2QSTRING(incomingFTEvent->getSender().toBare().toString()));
+                return message;
+        }
        return "";
 }
 }