commit 1c929c1f73068a27375b1cf54fb8adbad18eb977
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Tue Oct 09 12:32:25 2012 -0700
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Tue Oct 09 12:32:25 2012 -0700
tree 5e7dbac9ee587318ad45535da88c9b68eba7955d
parent 22c7d4d4f6458205269c7c01740faeb94b20ac1b
parent 400cc893b3894e4292edd0f8290a0c1b7113da91

Merge branch 'master' into summon

chatdialog.cpp

diff --git a/chatdialog.cpp b/chatdialog.cpp
index 0f5b062..b66a596 100644
--- a/chatdialog.cpp
+++ b/chatdialog.cpp
@@ -79,6 +79,7 @@
       Sync::CcnxWrapperPtr handle = Sync::CcnxWrapper::Create();
       handle->setInterestFilter(m_user.getPrefix().toStdString(), bind(&ChatDialog::respondHistoryRequest, this, _1));
       //QTimer::singleShot(100, this, SLOT(getLocalPrefix()));
+      usleep(100000);
       if (!getLocalPrefix())
       {
         // if getLocalPrefix indicates no prefix change