mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 22:55:11 +00:00
Code Issues Releases Wiki Activity

Fixed travis build for TDESKTOP_DISABLE_AUTOUPDATE case.

Browse Source
This commit is contained in:
John Preston
2016-10-18 10:56:38 +03:00
parent 086f754a96
commit fc7c5d0ab3
31 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/settings/settings_general_widget.cpp
View File

@@ -165,7 +165,7 @@ void UpdateStateRow::onReady() {
void UpdateStateRow::onFailed() {
setState(State::Fail);
}
#endif // TDESKTOP_DISABLE_AUTOUPDATE
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
GeneralWidget::GeneralWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_general))
, _changeLanguage(this, lang(lng_settings_change_lang), st::defaultBoxLinkButton) {
@@ -196,7 +196,7 @@ void GeneralWidget::refreshControls() {
if (!cAutoUpdate()) {
_updateRow->hideFast();
}
#endif // TDESKTOP_DISABLE_AUTOUPDATE
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
if (cPlatform() == dbipWindows || cSupportTray()) {
addChildRow(_enableTrayIcon, marginSmall, lang(lng_settings_workmode_tray), SLOT(onEnableTrayIcon()), (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray));
@@ -269,10 +269,10 @@ void GeneralWidget::onRestart() {
cSetRestarting(true);
cSetRestartingToSettings(true);
}
#else
#else // !TDESKTOP_DISABLE_AUTOUPDATE
cSetRestarting(true);
cSetRestartingToSettings(true);
#endif
#endif // else for !TDESKTOP_DISABLE_AUTOUPDATE
App::quit();
}
@@ -288,7 +288,7 @@ void GeneralWidget::onUpdateAutomatically() {
Sandbox::stopUpdate();
}
}
#endif // TDESKTOP_DISABLE_AUTOUPDATE
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
void GeneralWidget::onEnableTrayIcon() {
if ((!_enableTrayIcon->checked() || cPlatform() != dbipWindows) && _enableTaskbarIcon && !_enableTaskbarIcon->checked()) {