Post-merge fixes

This commit is contained in:
Eric Kotato 2019-09-21 19:10:46 +03:00
parent 76eb907aba
commit b19ea0c1e8
4 changed files with 6 additions and 10 deletions

View file

@ -39,11 +39,11 @@ rpl::producer<TextWithEntities> Text2() {
lt_gpl_link, lt_gpl_link,
rpl::single(Ui::Text::Link( rpl::single(Ui::Text::Link(
"GNU GPL", "GNU GPL",
"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE")), "https://github.com/kotatogram/kotatogram-desktop/blob/master/LICENSE")),
lt_github_link, lt_github_link,
rpl::single(Ui::Text::Link( rpl::single(Ui::Text::Link(
"GitHub", "GitHub",
"https://github.com/telegramdesktop/tdesktop")), "https://github.com/kotatogram/kotatogram-desktop")),
Ui::Text::WithEntities); Ui::Text::WithEntities);
} }

View file

@ -9,10 +9,10 @@ using "basic.style";
using "dialogs/dialogs.style"; using "dialogs/dialogs.style";
using "ui/widgets/widgets.style"; using "ui/widgets/widgets.style";
minPhotoSize: 100px; minPhotoSize: 200px;
minVideoSize: 160px; minVideoSize: 160px;
maxMediaSize: 430px; maxMediaSize: 430px;
maxStickerSize: 256px; maxStickerSize: 128px;
maxGifSize: 320px; maxGifSize: 320px;
maxVideoMessageSize: 240px; maxVideoMessageSize: 240px;
maxSignatureSize: 144px; maxSignatureSize: 144px;

View file

@ -49,10 +49,7 @@ constexpr auto kUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
const auto &DnsDomains() { const auto &DnsDomains() {
static auto result = std::vector<QString>{ static auto result = std::vector<QString>{
qsl("google.com"), qsl("dns.google.com"),
qsl("www.google.com"),
qsl("google.ru"),
qsl("www.google.ru"),
}; };
return result; return result;
} }
@ -327,7 +324,6 @@ void SpecialConfigRequest::performRequest(const Attempt &attempt) {
url.setQuery(qsl("name=%1&type=ANY&random_padding=%2" url.setQuery(qsl("name=%1&type=ANY&random_padding=%2"
).arg(Global::TxtDomainString() ).arg(Global::TxtDomainString()
).arg(GenerateRandomPadding())); ).arg(GenerateRandomPadding()));
request.setRawHeader("Host", "dns.google.com");
} break; } break;
default: Unexpected("Type in SpecialConfigRequest::performRequest."); default: Unexpected("Type in SpecialConfigRequest::performRequest.");
} }