From d10715a96c1b83070583950aa0b8d9c5b6c54bb4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Dec 2014 20:39:02 +0300
Subject: [PATCH] version 0.7.1 - bugfixes, korean font in linux, exec-by-link
 fixed in linux

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

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 4c798bf89..7c2241ac4 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
 @echo OFF
 
-set "AppVersionStrSmall=0.7"
-set "AppVersionStr=0.7.0"
-set "AppVersionStrFull=0.7.0.0"
+set "AppVersionStrSmall=0.7.1"
+set "AppVersionStr=0.7.1"
+set "AppVersionStrFull=0.7.1.0"
 
 echo.
 echo Preparing version %AppVersionStr%..
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index 078f89f65..4174616b3 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -682,7 +682,7 @@ void Application::startApp() {
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
 	if (Local::oldMapVersion() < AppVersion) {
 		psRegisterCustomScheme();
-		if (Local::oldMapVersion() && Local::oldMapVersion() <= FeaturesNotifyVersionFrom && AppVersion == FeaturesNotifyVersion) {
+		if (Local::oldMapVersion() && Local::oldMapVersion() < FeaturesNotifyVersion) {
 			QString versionFeatures(QString::fromUtf8(FeaturesNotify).arg(QString::fromStdWString(AppVersionStr)));
 			if (!versionFeatures.isEmpty()) {
 				window->serviceNotification(versionFeatures);
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 9cea74027..6952c2d99 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 = 7000;
-static const wchar_t *AppVersionStr = L"0.7";
+static const int32 AppVersion = 7001;
+static const wchar_t *AppVersionStr = L"0.7.1";
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
@@ -27,7 +27,6 @@ static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used
 static const wchar_t *AppFile = L"Telegram";
 
 static const int32 FeaturesNotifyVersion = 7000;
-static const int32 FeaturesNotifyVersionFrom = 6021;
 extern const char *FeaturesNotify;
 
 #include "settings.h"
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index e943df346..004ab1a0d 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</string>
+	<string>0.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 5ba327ded3b558119fd42d65001421a344f04d61..c920a590579729fbf1944857fd5dd680194aa6dd 100644
GIT binary patch
delta 50
zcmbQEJx6;(0WYKB<U(FURzn6I27}2Tc_lX=;4NYT3g!z+Pj28B+ngf6#mH#5IbTqh
F1ps!V4Zr{Z

delta 50
zcmbQEJx6;(0WYJ$<U(FURs#kd27}2Tc_lX=;4NYT3g!z+Pj28B+ngf6#mH!|IbTqh
F1pszB4ZHvV

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index e957e9218..a6fce3b3f 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1577,7 +1577,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7;
+				CURRENT_PROJECT_VERSION = 0.7.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1595,7 +1595,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.7;
+				CURRENT_PROJECT_VERSION = 0.7.1;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1621,10 +1621,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7;
+				CURRENT_PROJECT_VERSION = 0.7.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.7;
+				DYLIB_COMPATIBILITY_VERSION = 0.7;
+				DYLIB_CURRENT_VERSION = 0.7.1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1764,10 +1764,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.7;
+				CURRENT_PROJECT_VERSION = 0.7.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.7;
+				DYLIB_COMPATIBILITY_VERSION = 0.7;
+				DYLIB_CURRENT_VERSION = 0.7.1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 0061b825c..4e8cf234b 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 7000 0.7.0
+echo 7001 0.7.1