From caaeff32c5136ab297aa44a7e0b389d6616a826b Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 2 Dec 2021 13:35:38 +0400 Subject: [PATCH] Move global privacy setting down. --- Telegram/SourceFiles/data/data_session.h | 4 ---- Telegram/SourceFiles/settings/settings_privacy_security.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h index f35c1dbcf2..27bd7cb9f1 100644 --- a/Telegram/SourceFiles/data/data_session.h +++ b/Telegram/SourceFiles/data/data_session.h @@ -782,10 +782,6 @@ private: PhotoData *photo, DocumentData *document); - void folderApplyFields( - not_null folder, - const MTPDfolder &data); - void setPinnedFromDialog(const Dialogs::Key &key, bool pinned); NotifySettings &defaultNotifySettings(not_null peer); diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp index bf6340dfde..dd19125426 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp @@ -945,7 +945,6 @@ void PrivacySecurity::setupContent( }; SetupPrivacy(controller, content, trigger()); - SetupArchiveAndMute(controller, content); SetupSessionsList(controller, content, trigger(), [=](Type type) { _showOther.fire_copy(type); }); @@ -956,6 +955,7 @@ void PrivacySecurity::setupContent( #else // !OS_MAC_STORE && !OS_WIN_STORE AddDivider(content); #endif // !OS_MAC_STORE && !OS_WIN_STORE + SetupArchiveAndMute(controller, content); SetupSelfDestruction(controller, content, trigger()); AddDivider(content); SetupBotsAndWebsites(controller, content);