diff --git a/src/core/core.cpp b/src/core/core.cpp index d8d4ba950..783c9b1c9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -677,10 +677,9 @@ void Core::sendGroupMessageWithType(int groupId, const QString& message, TOX_MES TOX_ERR_CONFERENCE_SEND_MESSAGE error; bool ok = tox_conference_send_message(tox, groupId, type, cMsg.data(), cMsg.size(), &error); if (!ok || !parseConferenceSendMessageError(error)) { - emit groupSentResult(groupId, message, -1); + emit groupSentFailed(groupId); return; } - } } diff --git a/src/core/core.h b/src/core/core.h index fedb44cce..8ecc9dfb9 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -156,7 +156,7 @@ signals: void idSet(const ToxId& id); void messageSentResult(uint32_t friendId, const QString& message, int messageId); - void groupSentResult(int groupId, const QString& message, int result); + void groupSentFailed(int groupId); void actionSentResult(uint32_t friendId, const QString& action, int success); void receiptRecieved(int friedId, int receipt); diff --git a/src/nexus.cpp b/src/nexus.cpp index 86e938d83..544809333 100644 --- a/src/nexus.cpp +++ b/src/nexus.cpp @@ -228,7 +228,7 @@ void Nexus::showMainGUI() connect(core, &Core::emptyGroupCreated, widget, &Widget::onEmptyGroupCreated); connect(core, &Core::friendTypingChanged, widget, &Widget::onFriendTypingChanged); connect(core, &Core::messageSentResult, widget, &Widget::onMessageSendResult); - connect(core, &Core::groupSentResult, widget, &Widget::onGroupSendResult); + connect(core, &Core::groupSentFailed, widget, &Widget::onGroupSendFailed); connect(widget, &Widget::statusSet, core, &Core::setStatus); connect(widget, &Widget::friendRequested, core, &Core::requestFriendship); diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 033ea68ed..d0e02b7b7 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -2040,19 +2040,16 @@ void Widget::onMessageSendResult(uint32_t friendId, const QString& message, int } } -void Widget::onGroupSendResult(int groupId, const QString& message, int result) +void Widget::onGroupSendFailed(int groupId) { - Q_UNUSED(message) Group* g = GroupList::findGroup(groupId); if (!g) { return; } - if (result == -1) { - QString message = tr("Message failed to send"); - QDateTime curTime = QDateTime::currentDateTime(); - g->getChatForm()->addSystemInfoMessage(message, ChatMessage::INFO, curTime); - } + QString message = tr("Message failed to send"); + QDateTime curTime = QDateTime::currentDateTime(); + g->getChatForm()->addSystemInfoMessage(message, ChatMessage::INFO, curTime); } void Widget::onFriendTypingChanged(int friendId, bool isTyping) diff --git a/src/widget/widget.h b/src/widget/widget.h index 6a20d6bb2..d3d75f262 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -170,7 +170,7 @@ public slots: void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change); void onGroupTitleChanged(int groupnumber, const QString& author, const QString& title); void onGroupPeerAudioPlaying(int groupnumber, int peernumber); - void onGroupSendResult(int groupId, const QString& message, int result); + void onGroupSendFailed(int groupId); void onFriendTypingChanged(int friendId, bool isTyping); void nextContact(); void previousContact();