Skip to content

Commit

Permalink
Closed alpha version 2.1.13.1: Multiaccount.
Browse files Browse the repository at this point in the history
  • Loading branch information
@john-preston
john-preston committed Jun 26, 2020
1 parent f8dca0a commit b6ac4a0
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Telegram/Resources/uwp/AppX/AppxManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="2.1.13.0" />
Version="2.1.13.1" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Telegram.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,13,0
PRODUCTVERSION 2,1,13,0
FILEVERSION 2,1,13,1
PRODUCTVERSION 2,1,13,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "2.1.13.0"
VALUE "FileVersion", "2.1.13.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.1.13.0"
VALUE "ProductVersion", "2.1.13.1"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Updater.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,13,0
PRODUCTVERSION 2,1,13,0
FILEVERSION 2,1,13,1
PRODUCTVERSION 2,1,13,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "2.1.13.0"
VALUE "FileVersion", "2.1.13.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.1.13.0"
VALUE "ProductVersion", "2.1.13.1"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion Telegram/SourceFiles/core/version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ For license and copyright information please follow this link:

#include "base/const_string.h"

#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
#define TDESKTOP_REQUESTED_ALPHA_VERSION (2001013001ULL)

#ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
#define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
Expand Down
10 changes: 3 additions & 7 deletions Telegram/SourceFiles/platform/mac/mac_touchbar.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ QImage ArchiveUserpic(not_null<Data::Folder*> folder) {
return result;
}

QImage UnreadBadge(PeerData *peer) {
QImage UnreadBadge(not_null<PeerData*> peer) {
const auto history = peer->owner().history(peer->id);
const auto count = history->unreadCountForBadge();
if (!count) {
Expand Down Expand Up @@ -261,10 +261,6 @@ TimeId CalculateOnlineTill(not_null<PeerData*> peer) {
return 0;
};

inline auto RplToEmpty() {
return rpl::map([=] { return rpl::empty_value(); });
}

int WidthFromString(NSString *s) {
return (int)ceil(
[[NSTextField labelWithString:s] frame].size.width) * 1.2;
Expand Down Expand Up @@ -933,11 +929,11 @@ - (id)init:(not_null<Main::Session*>)session {
_session->changes().historyUpdates(
_session->data().history(peer),
Data::HistoryUpdate::Flag::UnreadView
) | RplToEmpty(),
) | rpl::to_empty,
_session->changes().peerFlagsValue(
peer,
UpdateFlag::Notifications
) | RplToEmpty()
) | rpl::to_empty
) | rpl::start_with_next([=] {
updateBadge(pin);
}, *peerChangedLifetime);
Expand Down
4 changes: 2 additions & 2 deletions Telegram/build/version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ AppVersionStrMajor 2.1
AppVersionStrSmall 2.1.13
AppVersionStr 2.1.13
BetaChannel 0
AlphaVersion 0
AppVersionOriginal 2.1.13
AlphaVersion 2001013001
AppVersionOriginal 2.1.13.1

1 comment on commit b6ac4a0

@zarEclEC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Folks at #4261 are going to be happy :D

Please sign in to comment.