4 files changed, 14 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 39c63dd..52efe0e 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -40,12 +40,13 @@
 #include "Swiften/Disco/CapsInfoGenerator.h"
 #include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
 #include "Swiften/Queries/Requests/GetVCardRequest.h"
 #include "Swiften/Avatars/AvatarFileStorage.h"
 #include "Swiften/Avatars/AvatarManager.h"
 #include "Swiften/StringCodecs/SHA1.h"
+#include "Swiften/StringCodecs/Hexify.h"
 
 namespace {
 	void printIncomingData(const Swift::String& data) {
 		std::cout << "<- " << data << std::endl;
 	}
 
@@ -427,13 +428,13 @@ void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo>
 bool MainController::isMUC(const JID& jid) const {
 	return mucControllers_.find(jid.toBare()) != mucControllers_.end();
 }
 
 void MainController::handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {
 	if (!error && !vCard->getPhoto().isEmpty()) {
-		vCardPhotoHash_ = SHA1::getHexHash(vCard->getPhoto());
+		vCardPhotoHash_ = Hexify::hexify(SHA1::getHash(vCard->getPhoto()));
 		if (lastSentPresence_) {
 			sendPresence(lastSentPresence_);
 		}
 		avatarManager_->setAvatar(jid_, vCard->getPhoto());
 	}
 }
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 6c9b049..79357b5 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -16,13 +16,14 @@ myenv.StaticLibrary("SwiftControllers", [
 		"XMPPRosterController.cpp",
 		"MUCController.cpp",
 		"EventController.cpp",
 		"SoundEventController.cpp",
 		"SystemTrayController.cpp",
 		"XMLConsoleController.cpp",
-		"UIEvents/UIEvent.cpp"
+		"UIEvents/UIEvent.cpp",
+		"UIInterfaces/XMLConsoleWidget.cpp",
 	])
 
 env.Append(UNITTEST_SOURCES = [
 		File("UnitTest/NickResolverTest.cpp"),
 		File("UnitTest/RosterControllerTest.cpp"),
 		File("UnitTest/XMPPRosterControllerTest.cpp")
diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp
new file mode 100644
index 0000000..32e3065
--- /dev/null
+++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp
@@ -0,0 +1,8 @@
+#include "Swift/Controllers/UIInterfaces/XMLConsoleWidget.h"
+
+namespace Swift {
+
+XMLConsoleWidget::~XMLConsoleWidget() {
+}
+
+}
diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
index efde1a2..9098fbc 100644
--- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
+++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
@@ -1,8 +1,10 @@
 #pragma once
 
 namespace Swift {
 	class XMLConsoleWidget {
 		public:
+			virtual ~XMLConsoleWidget();
+
 			virtual void show() = 0;
 	};
 }