Merge remote-tracking branch 'upstream/master' into screenshare-x11

1 files changed, 0 insertions, 9 deletions

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp

index ab3c2cf2..ae532ef3 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -51,7 +51,6 @@
 #include "dialogs/Logout.h"
 #include "dialogs/MemberList.h"
 #include "dialogs/ReadReceipts.h"
-#include "dialogs/RoomSettings.h"
 
 MainWindow *MainWindow::instance_ = nullptr;
 
@@ -364,14 +363,6 @@ MainWindow::hasActiveUser()
 }
 
 void
-MainWindow::openRoomSettings(const QString &room_id)
-{
-        auto dialog = new dialogs::RoomSettings(room_id, this);
-
-        showDialog(dialog);
-}
-
-void
 MainWindow::openMemberListDialog(const QString &room_id)
 {
         auto dialog = new dialogs::MemberList(room_id, this);