Fix the bug of pressing cancel button in invitation dialog

named-data · May 9, 2014 · e9195fd · e9195fd
1 parent 503917a
commit e9195fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/chatdialog.cpp b/src/chatdialog.cpp
@@ -277,7 +277,7 @@ void
 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);

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

diff --git a/src/invitationdialog.cpp b/src/invitationdialog.cpp
@@ -61,11 +61,12 @@ InvitationDialog::onCancelClicked()
   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();
 }