From 7814654d380736d2537d92179e635d554638a4d1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 26 Mar 2015 13:45:47 +0300 Subject: [PATCH] stable version 0.8 prepared --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/historywidget.cpp | 1 + Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5532 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 16 ++++++++-------- Telegram/Version.sh | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index c957b283c..7b6dd7b09 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,10 +1,10 @@ @echo OFF -set "AppVersion=7026" -set "AppVersionStrSmall=0.7.26" -set "AppVersionStr=0.7.26" -set "AppVersionStrFull=0.7.26.0" -set "DevChannel=1" +set "AppVersion=8000" +set "AppVersionStrSmall=0.8" +set "AppVersionStr=0.8.0" +set "AppVersionStrFull=0.8.0.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 4dcd0220c..e17df605f 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 = 7026; -static const wchar_t *AppVersionStr = L"0.7.26"; -static const bool DevChannel = true; +static const int32 AppVersion = 8000; +static const wchar_t *AppVersionStr = L"0.8"; +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/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index ccd08290c..f4d5ff9d0 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3424,6 +3424,7 @@ void HistoryWidget::updateListSize(int32 addToY, bool initial, bool loadedDown, if (toY < _scroll.scrollTopMax() + st::unreadBarHeight) { hist->addUnreadBar(); if (hist->unreadBar) { + hist->activeMsgId = 0; return updateListSize(0, true); } } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index e0fd88f9a..be6e2c594 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.26 + 0.8 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 227cc5d614ad14f11c0be1ad9b47f445ad9ab6df..7ddd7879beaa4d84297ae93d6c3e9205c60707a1 100644 GIT binary patch delta 69 zcmZ3YJx6;(4lk<(gARkimxDY%5 diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index d66c7afb5..552eae3b1 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1667,7 +1667,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.26; + CURRENT_PROJECT_VERSION = 0.8; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1685,7 +1685,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.7.26; + CURRENT_PROJECT_VERSION = 0.8; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1711,10 +1711,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.26; + CURRENT_PROJECT_VERSION = 0.8; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.26; + DYLIB_COMPATIBILITY_VERSION = 0.8; + DYLIB_CURRENT_VERSION = 0.8; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1852,10 +1852,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.26; + CURRENT_PROJECT_VERSION = 0.8; DEBUG_INFORMATION_FORMAT = dwarf; - DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.26; + DYLIB_COMPATIBILITY_VERSION = 0.8; + DYLIB_CURRENT_VERSION = 0.8; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Version.sh b/Telegram/Version.sh index fa0846443..569341ee0 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 7026 0.7.26 1 +echo 8000 0.8.0 0 # AppVersion AppVersionStr DevChannel