commit e9195fd252711fb565a356be6cfd012536743383
author Yingdi Yu <yuyingdi@gmail.com> Fri Nov 08 14:13:42 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:08 2014 -0700
tree 4fb7b81d28435b1993f1fb36910f20646dcdc369
parent 503917a10e46cffb20abb807d3f5f1eeef12aebd

Fix the bug of pressing cancel button in invitation dialog

src/chatdialog.cpp

diff --git a/src/chatdialog.cpp b/src/chatdialog.cpp
index 6aa1349..9046f2c 100644
--- a/src/chatdialog.cpp
+++ b/src/chatdialog.cpp
@@ -277,7 +277,7 @@
 ChatDialog::onInviteReplyVerified(ndn::Ptr<ndn::Data> data, const ndn::Name& identity, bool isIntroducer)
 {
   string content(data->content().buf(), data->content().size());
-  if(content.empty())
+  if(content == string("nack"))
     invitationRejected(identity);
   else
     invitationAccepted(identity, data, content, isIntroducer);

src/contactpanel.cpp

diff --git a/src/contactpanel.cpp b/src/contactpanel.cpp
index 57d8c80..4d281d6 100644
--- a/src/contactpanel.cpp
+++ b/src/contactpanel.cpp
@@ -623,7 +623,7 @@
 void
 ContactPanel::rejectInvitation(const ChronosInvitation& invitation)
 {
-  string empty;
+  string empty("nack");
   m_handler->publishDataByIdentity (invitation.getInterestName(), empty);
 }
 

src/invitationdialog.cpp

diff --git a/src/invitationdialog.cpp b/src/invitationdialog.cpp
index 1522314..4129ba0 100644
--- a/src/invitationdialog.cpp
+++ b/src/invitationdialog.cpp
@@ -61,11 +61,12 @@
   ui->msgLabel->clear();
   ui->chatroomLine->clear();
 
+  emit invitationRejected(*m_invitation); 
+
   m_invitation = NULL;
   m_identityCertificate = NULL;
   m_inviterAlias.clear();
 
-  emit invitationRejected(*m_invitation); 
   this->close();
 }