diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index ae04a57e9..3da1f9c1f 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
@echo OFF
-set "AppVersionStrSmall=0.6.20"
-set "AppVersionStr=0.6.20"
-set "AppVersionStrFull=0.6.20.0"
+set "AppVersionStrSmall=0.6.21"
+set "AppVersionStr=0.6.21"
+set "AppVersionStrFull=0.6.21.0"
echo.
echo Preparing version %AppVersionStr%..
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index bb23a6469..721c14393 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 = 6020;
-static const wchar_t *AppVersionStr = L"0.6.20";
+static const int32 AppVersion = 6021;
+static const wchar_t *AppVersionStr = L"0.6.21";
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";
@@ -26,7 +26,7 @@ static const wchar_t *AppName = L"Telegram Desktop";
static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used in updater.cpp and Setup.iss for Windows
static const wchar_t *AppFile = L"Telegram";
-static const int32 FeaturesNotifyVersion = 6020;
+static const int32 FeaturesNotifyVersion = 6021;
static const int32 FeaturesNotifyVersionFrom = 6017;
extern const char *FeaturesNotify;
@@ -160,7 +160,9 @@ static const BuiltInDc _builtInDcs[] = {
};
static const BuiltInDc _builtInTestDcs[] = {
- { 1, "173.240.5.253", 443 }
+ { 1, "173.240.5.253", 443 },
+ { 2, "149.154.167.40", 443 },
+ { 3, "174.140.142.5", 443 }
};
inline const BuiltInDc *builtInDcs() {
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 3705456f1..8f24af298 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -298,7 +298,7 @@ const ChatData *PeerData::asChat() const {
}
void PeerData::updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) {
- if (name == newName && nameOrPhone == newNameOrPhone && (chat || asUser()->username == newUsername)) return;
+ if (name == newName && nameOrPhone == newNameOrPhone && (chat || asUser()->username == newUsername) && nameVersion > 0) return;
++nameVersion;
name = newName;
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index 45f57f64d..d9287d352 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -20,7 +20,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "pspecific.h"
const char *FeaturesNotify = "\
-Telegram Desktop was updated to version 0.6.20\n\
+Telegram Desktop was updated to version 0.6.21\n\
\n\
\xe2\x80\x94 Single column layout for smaller window sizes.\n\
\xe2\x80\x94 Photos are sent up to 1280x1280 size.\n\
diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp
index c6e4451d3..82e95b966 100644
--- a/Telegram/SourceFiles/pspecific_wnd.cpp
+++ b/Telegram/SourceFiles/pspecific_wnd.cpp
@@ -1047,8 +1047,8 @@ void PsMainWindow::psInitSize() {
TWindowPos pos(cWindowPos());
if (cDebug()) { // temp while design
- pos.w = 800;
- pos.h = 600;
+ pos.w = st::wndDefWidth;
+ pos.h = st::wndDefHeight;
}
QRect avail(QDesktopWidget().availableGeometry());
bool maximized = false;
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 5a8081b15..0d7390442 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.6.20
+ 0.6.21
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index e0ce2af05..ab9f49945 100644
Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index c6a9075dc..6e7c16947 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.6.20;
+ CURRENT_PROJECT_VERSION = 0.6.21;
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.6.20;
+ CURRENT_PROJECT_VERSION = 0.6.21;
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.6.20;
+ CURRENT_PROJECT_VERSION = 0.6.21;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
- DYLIB_CURRENT_VERSION = 0.6.20;
+ DYLIB_CURRENT_VERSION = 0.6.21;
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.6.20;
+ CURRENT_PROJECT_VERSION = 0.6.21;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
- DYLIB_CURRENT_VERSION = 0.6.20;
+ DYLIB_CURRENT_VERSION = 0.6.21;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index bbfd154ad..86fa237c6 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 6020 0.6.20
+echo 6021 0.6.21