1 files changed, 14 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 654f735..1698b4a 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -12,4 +12,5 @@
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
+#include <boost/serialization/optional.hpp>
 #include <boost/serialization/vector.hpp>
 #include <boost/serialization/map.hpp>
@@ -63,4 +64,6 @@
 #include <Swiften/Base/Log.h>
 
+BOOST_CLASS_VERSION(Swift::ChatListWindow::Chat, 1)
+
 namespace boost {
 namespace serialization {
@@ -80,5 +83,5 @@ namespace serialization {
 	}
 
-	template<class Archive> void serialize(Archive& ar, Swift::ChatListWindow::Chat& chat, const unsigned int /*version*/) {
+	template<class Archive> void serialize(Archive& ar, Swift::ChatListWindow::Chat& chat, const unsigned int version) {
 		ar & chat.jid;
 		ar & chat.chatName;
@@ -87,4 +90,7 @@ namespace serialization {
 		ar & chat.nick;
 		ar & chat.impromptuJIDs;
+		if (version > 0) {
+			ar & chat.password;
+		}
 	}
 }
@@ -370,4 +376,5 @@ ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const
 		StatusShow::Type type = StatusShow::None;
 		std::string nick = "";
+		std::string password = "";
 		if (controller) {
 			unreadCount = controller->getUnreadCount();
@@ -377,6 +384,10 @@ ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const
 			nick = controller->getNick();
 
+			if (controller->getPassword()) {
+				password = *controller->getPassword();
+			}
+
 			if (controller->isImpromptu()) {
-				ChatListWindow::Chat chat = ChatListWindow::Chat(jid, jid.toString(), activity, unreadCount, type, boost::filesystem::path(), true, nick);
+				ChatListWindow::Chat chat = ChatListWindow::Chat(jid, jid.toString(), activity, unreadCount, type, boost::filesystem::path(), true, nick, password);
 				typedef std::pair<std::string, JID> StringJIDPair;
 				std::map<std::string, JID> participants = controller->getParticipantJIDs();
@@ -385,5 +396,5 @@ ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const
 			}
 		}
-		return ChatListWindow::Chat(jid, jid.toString(), activity, unreadCount, type, boost::filesystem::path(), true, nick);
+		return ChatListWindow::Chat(jid, jid.toString(), activity, unreadCount, type, boost::filesystem::path(), true, nick, password);
 	} else {
 		ChatController* controller = getChatControllerIfExists(jid, false);