commit 45da92a3119447a887c1bec1238f320a24f17471
author Yingdi Yu <yuyingdi@gmail.com> Mon Feb 02 13:17:03 2015 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Wed Mar 04 16:09:47 2015 -0800
tree 005ed3ef424743b24dea67a46f9998a35fb728fe
parent 1fd4e4a89721fd599f6558e04647f86ccdd38f35

security: Introduce hierarchical validator

Change-Id: Ie99abc2b8de4ff227c21e34fef19544c01a9f5dd

src/chat-dialog.cpp

diff --git a/src/chat-dialog.cpp b/src/chat-dialog.cpp
index 9c74715..776e076 100644
--- a/src/chat-dialog.cpp
+++ b/src/chat-dialog.cpp
@@ -32,10 +32,11 @@
                        const std::string& chatroomName,
                        const std::string& nick,
                        bool isSecured,
+                       const Name& signingId,
                        QWidget* parent)
   : QDialog(parent)
   , ui(new Ui::ChatDialog)
-  , m_backend(chatroomPrefix, userChatPrefix, routingPrefix, chatroomName, nick)
+  , m_backend(chatroomPrefix, userChatPrefix, routingPrefix, chatroomName, nick, signingId)
   , m_chatroomName(chatroomName)
   , m_nick(nick.c_str())
   , m_isSecured(isSecured)
@@ -186,7 +187,7 @@
   }
 
   if (m_isSecured)
-    chatroomInfo->setTrustModel(ChatroomInfo::TRUST_MODEL_WEBOFTRUST);
+    chatroomInfo->setTrustModel(ChatroomInfo::TRUST_MODEL_HIERARCHICAL);
   else
     chatroomInfo->setTrustModel(ChatroomInfo::TRUST_MODEL_NONE);
   return chatroomInfo;