From e9dda05a3fde5c66f79b573a978fe613b58f39f7 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Sat, 14 Mar 2020 23:34:50 +0300 Subject: [PATCH] Control check --- Telegram/SourceFiles/core/kotato_settings.cpp | 2 +- Telegram/SourceFiles/data/data_channel.h | 2 +- .../SourceFiles/platform/linux/notifications_manager_linux.cpp | 2 +- lib/xdg/kotatogramdesktop.appdata.xml.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/core/kotato_settings.cpp b/Telegram/SourceFiles/core/kotato_settings.cpp index a8dfacc9e..64f517cff 100644 --- a/Telegram/SourceFiles/core/kotato_settings.cpp +++ b/Telegram/SourceFiles/core/kotato_settings.cpp @@ -285,7 +285,7 @@ bool Manager::readCustomFile() { cSetDisableUpEdit(v); }); - ReadArrayOption(settings, "scales", [&](auto v) { + ReadArrayOption(settings, "replaces", [&](auto v) { for (auto i = v.constBegin(), e = v.constEnd(); i != e; ++i) { if (!(*i).isArray()) { continue; diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h index 7e1995ed4..33a8a2d44 100644 --- a/Telegram/SourceFiles/data/data_channel.h +++ b/Telegram/SourceFiles/data/data_channel.h @@ -220,8 +220,8 @@ public: void markForbidden(); [[nodiscard]] bool isGroupAdmin(not_null user) const; - [[nodiscard]] bool lastParticipantsRequestNeeded() const; [[nodiscard]] QString adminRank(not_null user) const; + [[nodiscard]] bool lastParticipantsRequestNeeded() const; [[nodiscard]] bool isMegagroup() const { return flags() & MTPDchannel::Flag::f_megagroup; } diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index d6ef3efbc..49db68c5b 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -6,12 +6,12 @@ For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "platform/linux/notifications_manager_linux.h" +#include "mainwindow.h" #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #include "platform/linux/specific_linux.h" #include "history/history.h" #include "lang/lang_keys.h" -#include "mainwindow.h" #include "facades.h" #include diff --git a/lib/xdg/kotatogramdesktop.appdata.xml.in b/lib/xdg/kotatogramdesktop.appdata.xml.in index 53f502004..000ebae8b 100644 --- a/lib/xdg/kotatogramdesktop.appdata.xml.in +++ b/lib/xdg/kotatogramdesktop.appdata.xml.in @@ -20,7 +20,7 @@ https://github.com/kotatogram/kotatogram-desktop/issues - https://github.com/kotatogram/kotatogram-desktop/blob/dev/docs/assets/ktg_preview.png + https://raw.githubusercontent.com/kotatogram/kotatogram-desktop/dev/docs/assets/ktg_preview.png