commit 9036e0315cd388468747c2fee74ff874760285d9
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Thu Sep 27 20:59:33 2012 -0700
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Thu Sep 27 20:59:33 2012 -0700
tree 23faa05759daff6d76e8a3955af9970afd107d04
parent 6082ede0d7652ea9b6bbb6a1ce4d0cefe957e661

roster done

chatdialog.h

diff --git a/chatdialog.h b/chatdialog.h
index dc7b390..902316f 100644
--- a/chatdialog.h
+++ b/chatdialog.h
@@ -1,7 +1,7 @@
 #ifndef CHATDIALOG_H
 #define CHATDIALOG_H
 #include <boost/function.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 #include <vector>
 #include "digesttreescene.h"
 #include "ui_chatdialog.h"
@@ -80,8 +80,8 @@
   Sync::SyncAppSocket *m_sock;
   uint32_t m_session;
   DigestTreeScene *m_scene;
-  boost::mutex m_msgMutex;
-  boost::mutex m_sceneMutex;
+  boost::recursive_mutex m_msgMutex;
+  boost::recursive_mutex m_sceneMutex;
   time_t m_lastMsgTime;
   int m_randomizedInterval;
   QTimer *m_timer;