1 files changed, 41 insertions, 41 deletions
diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp
index 626fd40..6ea2ea5 100644
--- a/Swift/Controllers/EventNotifier.cpp
+++ b/Swift/Controllers/EventNotifier.cpp
@@ -10,71 +10,71 @@
 #include <boost/bind.hpp>
 
 #include <Swiften/Avatars/AvatarManager.h>
-#include <Swiften/Client/NickResolver.h>
-#include <Swiften/JID/JID.h>
 #include <Swiften/Base/String.h>
 #include <Swiften/Base/format.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/JID/JID.h>
 
+#include <Swift/Controllers/Intl.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
 #include <Swift/Controllers/XMPPEvents/EventController.h>
 #include <Swift/Controllers/XMPPEvents/MUCInviteEvent.h>
 #include <Swift/Controllers/XMPPEvents/MessageEvent.h>
 #include <Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h>
-#include <Swift/Controllers/Intl.h>
 
 #include <SwifTools/Notifier/Notifier.h>
 
 namespace Swift {
 
 EventNotifier::EventNotifier(EventController* eventController, Notifier* notifier, AvatarManager* avatarManager, NickResolver* nickResolver) : eventController(eventController), notifier(notifier), avatarManager(avatarManager), nickResolver(nickResolver) {
-	eventController->onEventQueueEventAdded.connect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
+    eventController->onEventQueueEventAdded.connect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
 }
 
 EventNotifier::~EventNotifier() {
-	notifier->purgeCallbacks();
-	eventController->onEventQueueEventAdded.disconnect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
+    notifier->purgeCallbacks();
+    eventController->onEventQueueEventAdded.disconnect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
 }
 
-void EventNotifier::handleEventAdded(boost::shared_ptr<StanzaEvent> event) {
-	if (event->getConcluded()) {
-		return;
-	}
-	if (boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event)) {
-		JID jid = messageEvent->getStanza()->getFrom();
-		std::string title = nickResolver->jidToNick(jid);
-		if (!messageEvent->getStanza()->isError() && !messageEvent->getStanza()->getBody().get_value_or("").empty()) {
-			JID activationJID = jid;
-			if (messageEvent->getStanza()->getType() == Message::Groupchat) {
-				activationJID = jid.toBare();
-			}
-			std::string messageText = messageEvent->getStanza()->getBody().get_value_or("");
-			if (boost::starts_with(messageText, "/me ")) {
-				messageText = "*" + String::getSplittedAtFirst(messageText, ' ').second + "*";
-			}
-			notifier->showMessage(Notifier::IncomingMessage, title, messageText, avatarManager->getAvatarPath(jid), boost::bind(&EventNotifier::handleNotificationActivated, this, activationJID));
-		}
-	}
-	else if(boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event)) {
-		JID jid = subscriptionEvent->getJID();
-		std::string title = jid;
-		std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% wants to add you to his/her contact list")) % nickResolver->jidToNick(jid));
-		notifier->showMessage(Notifier::SystemMessage, title, message, boost::filesystem::path(), boost::function<void()>());
-	}
-	else if(boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event)) {
-		notifier->showMessage(Notifier::SystemMessage, QT_TRANSLATE_NOOP("", "Error"), errorEvent->getText(), boost::filesystem::path(), boost::function<void()>());
-	}
-	else if (boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event)) {
-		std::string title = mucInviteEvent->getInviter();
-		std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% has invited you to enter the %2% room")) % nickResolver->jidToNick(mucInviteEvent->getInviter()) % mucInviteEvent->getRoomJID());
-		// FIXME: not show avatar or greyed out avatar for mediated invites
-		notifier->showMessage(Notifier::SystemMessage, title, message, avatarManager->getAvatarPath(mucInviteEvent->getInviter()), boost::bind(&EventNotifier::handleNotificationActivated, this, mucInviteEvent->getInviter()));
-	}
+void EventNotifier::handleEventAdded(std::shared_ptr<StanzaEvent> event) {
+    if (event->getConcluded()) {
+        return;
+    }
+    if (std::shared_ptr<MessageEvent> messageEvent = std::dynamic_pointer_cast<MessageEvent>(event)) {
+        JID jid = messageEvent->getStanza()->getFrom();
+        std::string title = nickResolver->jidToNick(jid);
+        if (!messageEvent->getStanza()->isError() && !messageEvent->getStanza()->getBody().get_value_or("").empty()) {
+            JID activationJID = jid;
+            if (messageEvent->getStanza()->getType() == Message::Groupchat) {
+                activationJID = jid.toBare();
+            }
+            std::string messageText = messageEvent->getStanza()->getBody().get_value_or("");
+            if (boost::starts_with(messageText, "/me ")) {
+                messageText = "*" + String::getSplittedAtFirst(messageText, ' ').second + "*";
+            }
+            notifier->showMessage(Notifier::IncomingMessage, title, messageText, avatarManager->getAvatarPath(jid), boost::bind(&EventNotifier::handleNotificationActivated, this, activationJID));
+        }
+    }
+    else if(std::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = std::dynamic_pointer_cast<SubscriptionRequestEvent>(event)) {
+        JID jid = subscriptionEvent->getJID();
+        std::string title = jid;
+        std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% wants to add you to his/her contact list")) % nickResolver->jidToNick(jid));
+        notifier->showMessage(Notifier::SystemMessage, title, message, boost::filesystem::path(), boost::function<void()>());
+    }
+    else if(std::shared_ptr<ErrorEvent> errorEvent = std::dynamic_pointer_cast<ErrorEvent>(event)) {
+        notifier->showMessage(Notifier::SystemMessage, QT_TRANSLATE_NOOP("", "Error"), errorEvent->getText(), boost::filesystem::path(), boost::function<void()>());
+    }
+    else if (std::shared_ptr<MUCInviteEvent> mucInviteEvent = std::dynamic_pointer_cast<MUCInviteEvent>(event)) {
+        std::string title = mucInviteEvent->getInviter();
+        std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% has invited you to enter the %2% room")) % nickResolver->jidToNick(mucInviteEvent->getInviter()) % mucInviteEvent->getRoomJID());
+        // FIXME: not show avatar or greyed out avatar for mediated invites
+        notifier->showMessage(Notifier::SystemMessage, title, message, avatarManager->getAvatarPath(mucInviteEvent->getInviter()), boost::bind(&EventNotifier::handleNotificationActivated, this, mucInviteEvent->getInviter()));
+    }
 }
 
 
 void EventNotifier::handleNotificationActivated(JID jid) {
-	onNotificationActivated(jid);
+    onNotificationActivated(jid);
 }
 
 }