diff --git a/src/core/core.cpp b/src/core/core.cpp index 88c4f7cc8..db474435f 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -560,7 +560,6 @@ void Core::acceptFriendRequest(const ToxPk& friendPk) } else { profile.saveToxSave(); emit friendAdded(friendId, friendPk); - emit friendshipChanged(friendId); } } @@ -612,7 +611,6 @@ void Core::requestFriendship(const ToxId& friendId, const QString& message) Settings::getInstance().updateFriendAddress(friendId.toString()); emit friendAdded(friendNumber, friendPk); - emit friendshipChanged(friendNumber); emit requestSent(friendPk, message); } diff --git a/src/core/core.h b/src/core/core.h index 5e0ed6145..510c07726 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -122,7 +122,6 @@ signals: void friendMessageReceived(uint32_t friendId, const QString& message, bool isAction); void friendAdded(uint32_t friendId, const ToxPk& friendPk); - void friendshipChanged(uint32_t friendId); void requestSent(const ToxPk& friendPk, const QString& message); void friendStatusChanged(uint32_t friendId, Status status); diff --git a/src/nexus.cpp b/src/nexus.cpp index 14dbdf154..6530c63b1 100644 --- a/src/nexus.cpp +++ b/src/nexus.cpp @@ -211,7 +211,6 @@ void Nexus::showMainGUI() connect(core, &Core::statusMessageSet, widget, &Widget::setStatusMessage); connect(core, &Core::selfAvatarChanged, widget, &Widget::onSelfAvatarLoaded); connect(core, &Core::friendAdded, widget, &Widget::addFriend); - connect(core, &Core::friendshipChanged, widget, &Widget::onFriendshipChanged); connect(core, &Core::failedToAddFriend, widget, &Widget::addFriendFailed); connect(core, &Core::friendUsernameChanged, widget, &Widget::onFriendUsernameChanged); connect(core, &Core::friendStatusChanged, widget, &Widget::onFriendStatusChanged); diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 8cd989fe9..760f8b449 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -996,6 +996,8 @@ void Widget::addFriend(int friendId, const ToxPk& friendPk) FilterCriteria filter = getFilterCriteria(); widget->search(ui->searchContactText->text(), filterOffline(filter)); + + updateFriendActivity(newfriend); } void Widget::addFriendFailed(const ToxPk&, const QString& errorInfo) @@ -1008,12 +1010,6 @@ void Widget::addFriendFailed(const ToxPk&, const QString& errorInfo) QMessageBox::critical(0, "Error", info); } -void Widget::onFriendshipChanged(int friendId) -{ - Friend* who = FriendList::findFriend(friendId); - updateFriendActivity(who); -} - void Widget::onFriendStatusChanged(int friendId, Status status) { Friend* f = FriendList::findFriend(friendId); diff --git a/src/widget/widget.h b/src/widget/widget.h index 49d4e8cd0..dd82fca12 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -149,7 +149,6 @@ public slots: void setStatusMessage(const QString& statusMessage); void addFriend(int friendId, const ToxPk& friendPk); void addFriendFailed(const ToxPk& userId, const QString& errorInfo = QString()); - void onFriendshipChanged(int friendId); void onFriendStatusChanged(int friendId, Status status); void onFriendStatusMessageChanged(int friendId, const QString& message); void onFriendUsernameChanged(int friendId, const QString& username);