procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix build with TDESKTOP_DISABLE_AUTOUPDATE. 

Fixes #4655.
This commit is contained in:
John Preston 2018-05-07 00:34:58 +03:00
parent 48c1576d7f
commit cc2c13d018
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/settings/settings_widget.cpp
View File

@ -48,9 +48,11 @@ void fillCodes() {
Messenger::Instance().onSwitchTestMode(); Messenger::Instance().onSwitchTestMode();
})); }));
}); });
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
Codes.insert(qsl("testupdate"), [] { Codes.insert(qsl("testupdate"), [] {
Core::UpdateChecker().test(); Core::UpdateChecker().test();
}); });
#endif // TDESKTOP_DISABLE_AUTOUPDATE
Codes.insert(qsl("loadlang"), [] { Codes.insert(qsl("loadlang"), [] {
Lang::CurrentCloudManager().switchToLanguage(qsl("custom")); Lang::CurrentCloudManager().switchToLanguage(qsl("custom"));
}); });

6
Telegram/SourceFiles/storage/localstorage.cpp
View File

@ -2526,6 +2526,7 @@ void writeMtpData() {
_writeMtpData(); _writeMtpData();
} }
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
const QString &AutoupdatePrefix(const QString &replaceWith = {}) { const QString &AutoupdatePrefix(const QString &replaceWith = {}) {
static auto value = QString(); static auto value = QString();
if (!replaceWith.isEmpty()) { if (!replaceWith.isEmpty()) {
@ -2552,8 +2553,10 @@ const QString &readAutoupdatePrefixRaw() {
} }
return AutoupdatePrefix("http://updates.tdesktop.com"); return AutoupdatePrefix("http://updates.tdesktop.com");
} }
#endif // TDESKTOP_DISABLE_AUTOUPDATE
void writeAutoupdatePrefix(const QString &prefix) { void writeAutoupdatePrefix(const QString &prefix) {
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
const auto current = readAutoupdatePrefixRaw(); const auto current = readAutoupdatePrefixRaw();
if (current != prefix) { if (current != prefix) {
AutoupdatePrefix(prefix); AutoupdatePrefix(prefix);
@ -2567,12 +2570,15 @@ void writeAutoupdatePrefix(const QString &prefix) {
checker.start(); checker.start();
} }
} }
#endif // TDESKTOP_DISABLE_AUTOUPDATE
} }
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
QString readAutoupdatePrefix() { QString readAutoupdatePrefix() {
auto result = readAutoupdatePrefixRaw(); auto result = readAutoupdatePrefixRaw();
return result.replace(QRegularExpression("/+$"), QString()); return result.replace(QRegularExpression("/+$"), QString());
} }
#endif // TDESKTOP_DISABLE_AUTOUPDATE
void reset() { void reset() {
if (_localLoader) { if (_localLoader) {

2
Telegram/SourceFiles/storage/localstorage.h
View File

@ -28,7 +28,9 @@ void writeUserSettings();
void writeMtpData(); void writeMtpData();
void writeAutoupdatePrefix(const QString &prefix); void writeAutoupdatePrefix(const QString &prefix);
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
QString readAutoupdatePrefix(); QString readAutoupdatePrefix();
#endif // TDESKTOP_DISABLE_AUTOUPDATE
void reset(); void reset();