From 5c8721c429868a9bcbdeff7ad0a32124ae4cf89d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Feb 2015 10:57:13 +0000
Subject: [PATCH] 0.7.12 dev version prepared

---
 Telegram/PrepareWin.bat                     |   6 +++---
 Telegram/SourceFiles/application.cpp        |  14 +++++++++++---
 Telegram/SourceFiles/config.h               |   4 ++--
 Telegram/Telegram.plist                     |   2 +-
 Telegram/Telegram.rc                        | Bin 5540 -> 5540 bytes
 Telegram/Telegram.xcodeproj/project.pbxproj |  12 ++++++------
 Telegram/Version.sh                         |   2 +-
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 12cd0abc8..8ac8fb365 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
 @echo OFF
 
-set "AppVersionStrSmall=0.7.11"
-set "AppVersionStr=0.7.11"
-set "AppVersionStrFull=0.7.11.0"
+set "AppVersionStrSmall=0.7.12"
+set "AppVersionStr=0.7.12"
+set "AppVersionStrFull=0.7.12.0"
 set "DevChannel=1"
 
 if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index 34951a0cb..2c8d8c118 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -705,10 +705,18 @@ void Application::startApp() {
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
 	if (Local::oldMapVersion() < AppVersion) {
 		psRegisterCustomScheme();
-		if (Local::oldMapVersion() && Local::oldMapVersion() < 7010) {
-			QString versionFeatures(lng_new_version_minor(lt_version, QString::fromStdWString(AppVersionStr), lt_link, qsl("https://desktop.telegram.org/#changelog")));
-			if (!versionFeatures.isEmpty()) {
+		if (Local::oldMapVersion()) {
+			if (DevChannel && Local::oldMapVersion() < 7012) {
+				QString versionFeatures(qsl("Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}"));
+				versionFeatures = versionFeatures.replace(qsl("{changes}"), QString::fromUtf8(" \xe2\x80\x94 Chat background settings translated"));
+				versionFeatures = versionFeatures.replace(qsl("{version}"), QString::fromStdWString(AppVersionStr) + qsl(" dev"));
+				versionFeatures = versionFeatures.replace(qsl("{link}"), qsl("https://desktop.telegram.org/#changelog"));
 				window->serviceNotification(versionFeatures);
+			} else if (!DevChannel && Local::oldMapVersion() < 7010) {
+				QString versionFeatures(lng_new_version_minor(lt_version, QString::fromStdWString(AppVersionStr), lt_link, qsl("https://desktop.telegram.org/#changelog")));
+				if (!versionFeatures.isEmpty()) {
+					window->serviceNotification(versionFeatures);
+				}
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index efad94986..ece2255cc 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-static const int32 AppVersion = 7011;
-static const wchar_t *AppVersionStr = L"0.7.11";
+static const int32 AppVersion = 7012;
+static const wchar_t *AppVersionStr = L"0.7.12";
 static const bool DevChannel = true;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 27ba6bc3e..4e908471b 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.11</string>
+	<string>0.7.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 7317f5e9ea49c7371673e5b68d6fd56dc0c2e18c..7276603a096df370237752f66fc2f95280bc60fa 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_B<YHc9Mx)Kkc_%Wl8ZqcG7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CHx7CL

delta 53
zcmZ3Yy+nIM5ig_R<YHc9M#Ig^c_%Wl8ZziH7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d*
CvJQ3t

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 2d5de1ca9..f66c9b6c7 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1637,7 +1637,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7.11;
+				CURRENT_PROJECT_VERSION = 0.7.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1655,7 +1655,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.7.11;
+				CURRENT_PROJECT_VERSION = 0.7.12;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1681,10 +1681,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7.11;
+				CURRENT_PROJECT_VERSION = 0.7.12;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.7;
-				DYLIB_CURRENT_VERSION = 0.7.11;
+				DYLIB_CURRENT_VERSION = 0.7.12;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1824,10 +1824,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7.11;
+				CURRENT_PROJECT_VERSION = 0.7.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.7;
-				DYLIB_CURRENT_VERSION = 0.7.11;
+				DYLIB_CURRENT_VERSION = 0.7.12;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 664d7294a..b0cc67a9b 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 7011 0.7.11 1
+echo 7012 0.7.12 1
 # AppVersion AppVersionStr DevChannel