From 01ad967640f7f94c58f74b5d573f8e25a70be276 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Mar 2015 09:41:11 +0300
Subject: [PATCH] version 0.7.23 stable is ready

---
 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, 17 insertions(+), 20 deletions(-)

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index c69285256..e4a03bb3b 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,10 +1,10 @@
 @echo OFF
 
-set "AppVersion=7022"
-set "AppVersionStrSmall=0.7.22"
-set "AppVersionStr=0.7.22"
-set "AppVersionStrFull=0.7.22.0"
-set "DevChannel=1"
+set "AppVersion=7023"
+set "AppVersionStrSmall=0.7.23"
+set "AppVersionStr=0.7.23"
+set "AppVersionStrFull=0.7.23.0"
+set "DevChannel=0"
 
 if %DevChannel% neq 0 goto preparedev
 
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index c06eefd0e..394ab2536 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -655,7 +655,7 @@ void Application::checkMapVersion() {
 			QString versionFeatures;
 			if (DevChannel && Local::oldMapVersion() < 7022) {
 				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Critical bug with messages delivery fixed");
-			} else if (!DevChannel && Local::oldMapVersion() < 7020) {
+			} else if (!DevChannel && Local::oldMapVersion() < 7023) {
 				versionFeatures = lang(lng_new_version7022).trimmed();
 			}
 			if (!versionFeatures.isEmpty()) {
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 84f5ac67d..3a3e69351 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 = 7022;
-static const wchar_t *AppVersionStr = L"0.7.22";
-static const bool DevChannel = true;
+static const int32 AppVersion = 7023;
+static const wchar_t *AppVersionStr = L"0.7.23";
+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 704c1c360..504774e4f 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -4557,9 +4557,6 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const {
 		width = _maxw;
 	}
 	if (_media) {
-		if (st::msgMargin.top() + _media->height() + st::msgMargin.bottom() != _height) {
-			int a = 0;
-		}
 		p.save();
 		p.translate(left, st::msgMargin.top());
 		_media->draw(p, this, selected);
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 6a068fc85..cdf8334be 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.22</string>
+	<string>0.7.23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 144453eb7098a89420b3b830925b26d3c7179f9a..50a6995d351df0a1e6f90e6b9c18bfb373b83afe 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_h<YHc9M&r%Pc_%Wl8Z+oI7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CybgW<

delta 53
zcmZ3Yy+nIM5ig_B<YHc9Mx)Kkc_%Wl8ZqcG7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CHx7CL

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 72e5b3638..e0451266b 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.22;
+				CURRENT_PROJECT_VERSION = 0.7.23;
 				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.22;
+				CURRENT_PROJECT_VERSION = 0.7.23;
 				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.22;
+				CURRENT_PROJECT_VERSION = 0.7.23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.7;
-				DYLIB_CURRENT_VERSION = 0.7.22;
+				DYLIB_CURRENT_VERSION = 0.7.23;
 				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.22;
+				CURRENT_PROJECT_VERSION = 0.7.23;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.7;
-				DYLIB_CURRENT_VERSION = 0.7.22;
+				DYLIB_CURRENT_VERSION = 0.7.23;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index be36d47da..3ba57c771 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 7022 0.7.22 1
+echo 7023 0.7.23 0
 # AppVersion AppVersionStr DevChannel