diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 0318c74bd..7b1bbb799 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.10.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 5cf4fdcb7..bfe8187b3 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,9,0 - PRODUCTVERSION 2,4,9,0 + FILEVERSION 2,4,10,0 + PRODUCTVERSION 2,4,10,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.4.9.0" + VALUE "FileVersion", "2.4.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.9.0" + VALUE "ProductVersion", "2.4.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 8be2c6186..095ec4ddd 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,9,0 - PRODUCTVERSION 2,4,9,0 + FILEVERSION 2,4,10,0 + PRODUCTVERSION 2,4,10,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.4.9.0" + VALUE "FileVersion", "2.4.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.9.0" + VALUE "ProductVersion", "2.4.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index aa9457047..5bdf0176d 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -89,6 +89,12 @@ std::map BetaLogs() { 2004008, "- Upgrade several third party libraries to latest versions.\n" }, + { + 2004010, + "- Use inline bots and sticker by emoji suggestions in channel comments.\n" + + "- Lock voice message recording, listen to your voice message before sending.\n" + }, }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 4d81de3c5..d51fc19bf 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2004009; -constexpr auto AppVersionStr = "2.4.9"; +constexpr auto AppVersion = 2004010; +constexpr auto AppVersionStr = "2.4.10"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h index 7b0360b1a..ffed002f9 100644 --- a/Telegram/SourceFiles/data/data_types.h +++ b/Telegram/SourceFiles/data/data_types.h @@ -434,6 +434,12 @@ inline bool operator==( && (a.scroll == b.scroll); } +inline bool operator!=( + const MessageCursor &a, + const MessageCursor &b) { + return !(a == b); +} + class FileClickHandler : public LeftButtonClickHandler { public: FileClickHandler( diff --git a/Telegram/build/version b/Telegram/build/version index ad3eafa56..36009be61 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2004009 +AppVersion 2004010 AppVersionStrMajor 2.4 -AppVersionStrSmall 2.4.9 -AppVersionStr 2.4.9 +AppVersionStrSmall 2.4.10 +AppVersionStr 2.4.10 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 2.4.9.beta +AppVersionOriginal 2.4.10.beta diff --git a/changelog.txt b/changelog.txt index f6702ef31..c0249e7a5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +2.4.10 beta (17.11.20) + +- Use inline bots and sticker by emoji suggestions in channel comments. +- Lock voice message recording, listen to your voice message before sending. + 2.4.9 beta (06.11.20) - Fix crash in tray icon removing. (macOS only)