procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Get rid of redudant cmake options

Browse source
This commit is contained in:
Ilya Fedin 2020-08-31 12:26:16 +04:00 committed by John Preston
parent f128665f6b
commit 70c993774a
9 changed files with 6 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/core/sandbox.cpp
View file

@ -446,7 +446,6 @@ void Sandbox::checkForQuit() {
}
void Sandbox::refreshGlobalProxy() {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
const auto proxy = !Global::started()
? _sandboxProxy
: (Global::ProxySettings() == MTP::ProxyData::Settings::Enabled)
@ -462,7 +461,6 @@ void Sandbox::refreshGlobalProxy() {
} else {
QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
}
#endif // TDESKTOP_DISABLE_NETWORK_PROXY
}
uint64 Sandbox::installationTag() const {

2
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -1461,7 +1461,6 @@ void InstallMainDesktopFile() {
}
void RegisterCustomScheme(bool force) {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
if (cExeName().isEmpty()) {
return;
}
@ -1510,7 +1509,6 @@ void RegisterCustomScheme(bool force) {
LOG(("App Error: %1").arg(error->message));
g_error_free(error);
}
#endif // !TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
}
PermissionStatus GetPermissionStatus(PermissionType type) {

2
Telegram/SourceFiles/platform/mac/specific_mac.mm
View file

@ -158,10 +158,8 @@ std::optional<bool> IsDarkMode() {
}
void RegisterCustomScheme(bool force) {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
OSStatus result = LSSetDefaultHandlerForURLScheme(CFSTR("tg"), (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]);
DEBUG_LOG(("App Info: set default handler for 'tg' scheme result: %1").arg(result));
#endif // !TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
}
// I do check for availability, just not in the exact way clang is content with

2
Telegram/SourceFiles/platform/win/specific_win.cpp
View file

@ -509,7 +509,6 @@ void RegisterCustomScheme(bool force) {
if (cExeName().isEmpty()) {
return;
}
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
DEBUG_LOG(("App Info: Checking custom scheme 'tg'..."));
HKEY rkey;
@ -547,7 +546,6 @@ void RegisterCustomScheme(bool force) {
if (!_psOpenRegKey(L"Software\\RegisteredApplications", &rkey)) return;
if (!_psSetKeyValue(rkey, L"Telegram Desktop", qsl("SOFTWARE\\TelegramDesktop\\Capabilities"))) return;
#endif // !TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
}
PermissionStatus GetPermissionStatus(PermissionType type) {

24
Telegram/SourceFiles/settings/settings_advanced.cpp
View file

@ -43,20 +43,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Settings {
bool HasConnectionType() {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
return true;
#endif // TDESKTOP_DISABLE_NETWORK_PROXY
return false;
}
void SetupConnectionType(
not_null<Main::Account*> account,
not_null<Ui::VerticalLayout*> container) {
if (!HasConnectionType()) {
return;
}
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
const auto connectionType = [=] {
const auto transport = account->mtp().dctransport();
if (Global::ProxySettings() != MTP::ProxyData::Settings::Enabled) {
@ -81,7 +70,6 @@ void SetupConnectionType(
button->addClickHandler([=] {
Ui::show(ProxiesBoxController::CreateOwningBox(account));
});
#endif // TDESKTOP_DISABLE_NETWORK_PROXY
}
bool HasUpdate() {
@ -571,13 +559,11 @@ void Advanced::setupContent(not_null<Window::SessionController*> controller) {
if (!cAutoUpdate()) {
addUpdate();
}
if (HasConnectionType()) {
addDivider();
AddSkip(content);
AddSubsectionTitle(content, tr::lng_settings_network_proxy());
SetupConnectionType(&controller->session().account(), content);
AddSkip(content);
}
addDivider();
AddSkip(content);
AddSubsectionTitle(content, tr::lng_settings_network_proxy());
SetupConnectionType(&controller->session().account(), content);
AddSkip(content);
SetupDataStorage(controller, content);
SetupAutoDownload(controller, content);
SetupSystemIntegration(content, [=](Type type) {

1
Telegram/SourceFiles/settings/settings_advanced.h
View file

@ -15,7 +15,6 @@ class Account;
namespace Settings {
bool HasConnectionType();
void SetupConnectionType(
not_null<Main::Account*> account,
not_null<Ui::VerticalLayout*> container);

3
Telegram/SourceFiles/settings/settings_codes.cpp
View file

@ -128,13 +128,10 @@ auto GenerateCodes() {
Ui::hideLayer();
}));
});
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
codes.emplace(qsl("registertg"), [](SessionController *window) {
Platform::RegisterCustomScheme(true);
Ui::Toast::Show("Forced custom scheme register.");
});
#endif // !TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
#if defined Q_OS_WIN || defined Q_OS_MAC
codes.emplace(qsl("freetype"), [](SessionController *window) {

4
Telegram/SourceFiles/settings/settings_intro.cpp
View file

@ -65,9 +65,7 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
AddDivider(result);
AddSkip(result);
SetupLanguageButton(result, false);
if (HasConnectionType()) {
SetupConnectionType(&window->account(), result);
}
SetupConnectionType(&window->account(), result);
AddSkip(result);
if (HasUpdate()) {
AddDivider(result);

10
Telegram/cmake/telegram_options.cmake
View file

@ -4,8 +4,6 @@
# For license and copyright information please follow this link:
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
option(TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME "Disable automatic 'tg://' URL scheme handler registration." OFF)
option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF)
option(TDESKTOP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF)
option(TDESKTOP_API_TEST "Use test API credentials." OFF)
set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.")
@ -54,14 +52,6 @@ if (DESKTOP_APP_SPECIAL_TARGET)
target_compile_definitions(Telegram PRIVATE TDESKTOP_ALLOW_CLOSED_ALPHA)
endif()
if (TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME)
endif()
if (TDESKTOP_DISABLE_NETWORK_PROXY)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_NETWORK_PROXY)
endif()
if (TDESKTOP_DISABLE_GTK_INTEGRATION)
target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_GTK_INTEGRATION)
endif()