Browse Source

Fix regression showing is typing too often

pull/1232/head
TheLastProject 11 years ago
parent
commit
48c58322f3
  1. 5
      src/widget/form/chatform.cpp
  2. 1
      src/widget/form/chatform.h
  3. 4
      src/widget/widget.cpp

5
src/widget/form/chatform.cpp

@ -901,11 +901,6 @@ QString ChatForm::secondsToDHMS(quint32 duration) @@ -901,11 +901,6 @@ QString ChatForm::secondsToDHMS(quint32 duration)
return cD + res.sprintf("%dd%02dh %02dm %02ds", days, hours, minutes, seconds);
}
bool ChatForm::getIsTyping()
{
return isTyping;
}
void ChatForm::setFriendTyping(bool isTyping)
{
chatWidget->setTypingNotificationVisible(isTyping);

1
src/widget/form/chatform.h

@ -44,7 +44,6 @@ public: @@ -44,7 +44,6 @@ public:
void loadHistory(QDateTime since, bool processUndelivered = false);
void dischargeReceipt(int receipt);
bool getIsTyping();
void setFriendTyping(bool isTyping);
OfflineMsgEngine* getOfflineMsgEngine();

4
src/widget/widget.cpp

@ -694,10 +694,6 @@ void Widget::onFriendStatusChanged(int friendId, Status status) @@ -694,10 +694,6 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
if (isActualChange && status != Status::Offline)
{ // wait a little
QTimer::singleShot(250, f->getChatForm()->getOfflineMsgEngine(), SLOT(deliverOfflineMsgs()));
// Send another typing notification if the contact comes back online
if (f->getChatForm()->getIsTyping() && Settings::getInstance().isTypingNotificationEnabled())
Core::getInstance()->sendTyping(f->getFriendID(), true);
}
}

Loading…
Cancel
Save