1 files changed, 14 insertions, 4 deletions
diff --git a/Swift/QtUI/EventViewer/QtEvent.cpp b/Swift/QtUI/EventViewer/QtEvent.cpp
index 2dc1fb0..3aae213 100644
--- a/Swift/QtUI/EventViewer/QtEvent.cpp
+++ b/Swift/QtUI/EventViewer/QtEvent.cpp
@@ -1,22 +1,23 @@
 #include "Swift/QtUI/EventViewer/QtEvent.h"
 
 #include "Swiften/Events/MessageEvent.h"
+#include "Swiften/Events/SubscriptionRequestEvent.h"
 
 #include "Swift/QtUI/QtSwiftUtil.h"
 
 namespace Swift {
 
-QtEvent::QtEvent(boost::shared_ptr<Event> event, bool active) : event_(event) {
+QtEvent::QtEvent(boost::shared_ptr<StanzaEvent> event, bool active) : event_(event) {
 	active_ = active;
 }
 
 QVariant QtEvent::data(int role) {
  	switch (role) {
+		case Qt::ToolTipRole:
 		case Qt::DisplayRole: return QVariant(text());
 		case Qt::TextColorRole: return active_ ? Qt::black : Qt::darkGray;
 		case Qt::BackgroundColorRole: return active_ ? Qt::white : Qt::lightGray;
-			/*case Qt::ToolTipRole: return isContact() ? toolTipString() : QVariant();
-	 	case StatusTextRole: return statusText_;
+			/*case StatusTextRole: return statusText_;
 		case AvatarRole: return avatar_;
 		case PresenceIconRole: return getPresenceIcon();*/
 	 	default: return QVariant();
@@ -25,7 +26,16 @@ QVariant QtEvent::data(int role) {
 
 QString QtEvent::text() {
 	boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event_);
-	return messageEvent ? P2QSTRING(messageEvent->getStanza()->getBody()) :  "Bob: ";
+	if (messageEvent) {
+		return P2QSTRING(messageEvent->getStanza()->getBody());
+	}
+	boost::shared_ptr<SubscriptionRequestEvent> subscriptionRequestEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event_);
+	if (subscriptionRequestEvent) {
+		String reason = subscriptionRequestEvent->getReason();
+		String message = subscriptionRequestEvent->getJID().toBare().toString() + " would like to add you to their roster" + (reason.isEmpty() ? "." : ", saying '" + reason + "'.");
+		return P2QSTRING(message);
+	}
+	return "";
 }
 
 }