From 89d68cab3e3cf4ca05091ab7158568cde8075a96 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 1 Jul 2015 00:27:56 +0300 Subject: [PATCH] version 0.8.36 prepared --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/history.cpp | 3 +++ Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 0be6ea4da0..9b272df836 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,11 +1,11 @@ @echo OFF set "AppVersionStrMajor=0.8" -set "AppVersion=8035" -set "AppVersionStrSmall=0.8.35" -set "AppVersionStr=0.8.35" -set "AppVersionStrFull=0.8.35.0" -set "DevChannel=1" +set "AppVersion=8036" +set "AppVersionStrSmall=0.8.36" +set "AppVersionStr=0.8.36" +set "AppVersionStrFull=0.8.36.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 8f0f6eee8e..abc5ee6d5f 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -642,7 +642,7 @@ void Application::checkMapVersion() { QString versionFeatures; if (DevChannel && Local::oldMapVersion() < 8035) { versionFeatures = lang(lng_new_version_minor);// QString::fromUtf8("\xe2\x80\x94 Forward photos, media and stickers with drag-n-drop\n\xe2\x80\x94 Drag-n-drop text messages by timestamp to forward them\n\xe2\x80\x94 Larger stickers panel");// .replace('@', qsl("@") + QChar(0x200D)); - } else if (!DevChannel && Local::oldMapVersion() < 8030) { + } else if (!DevChannel && Local::oldMapVersion() < 8036) { versionFeatures = lang(lng_new_version_text).trimmed(); } if (!versionFeatures.isEmpty()) { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index eff06ad20e..4b8d9c2650 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 8035; -static const wchar_t *AppVersionStr = L"0.8.35"; -static const bool DevChannel = true; +static const int32 AppVersion = 8036; +static const wchar_t *AppVersionStr = L"0.8.36"; +static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 8de3a9841a..570554f2c7 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3094,6 +3094,9 @@ HistorySticker::HistorySticker(DocumentData *document) : HistoryMedia() , pixw(1), pixh(1), data(document), lastw(0) { data->thumb->load(); + if (!data->sticker->alt.isEmpty()) { + _emoji = data->sticker->alt; + } } void HistorySticker::initDimensions(const HistoryItem *parent) { diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 1184d694eb..276ee3becb 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.35 + 0.8.36 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) CFBundleSignature diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 2f8225ec377b75cdf9533565a69e8819d0e5fd5c..680f5d589c084e081694578a78a1f6d853116923 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_J