hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 10:11:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed crash on contacts without names

Browse source
This commit is contained in:
John Preston 2014-12-13 17:26:08 +03:00
parent 20e04d4535
commit 2a50004add
9 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/PrepareWin.bat
View file

@ -1,8 +1,8 @@
@echo OFF @echo OFF
set "AppVersionStrSmall=0.6.20" set "AppVersionStrSmall=0.6.21"
set "AppVersionStr=0.6.20" set "AppVersionStr=0.6.21"
set "AppVersionStrFull=0.6.20.0" set "AppVersionStrFull=0.6.21.0"
echo. echo.
echo Preparing version %AppVersionStr%.. echo Preparing version %AppVersionStr%..

10
Telegram/SourceFiles/config.h
View file

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 6020; static const int32 AppVersion = 6021;
static const wchar_t *AppVersionStr = L"0.6.20"; static const wchar_t *AppVersionStr = L"0.6.21";
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop"; 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 *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 wchar_t *AppFile = L"Telegram";
static const int32 FeaturesNotifyVersion = 6020; static const int32 FeaturesNotifyVersion = 6021;
static const int32 FeaturesNotifyVersionFrom = 6017; static const int32 FeaturesNotifyVersionFrom = 6017;
extern const char *FeaturesNotify; extern const char *FeaturesNotify;
@ -160,7 +160,9 @@ static const BuiltInDc _builtInDcs[] = {
}; };
static const BuiltInDc _builtInTestDcs[] = { 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() { inline const BuiltInDc *builtInDcs() {

2
Telegram/SourceFiles/history.cpp
View file

@ -298,7 +298,7 @@ const ChatData *PeerData::asChat() const {
} }
void PeerData::updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) { 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; ++nameVersion;
name = newName; name = newName;

2
Telegram/SourceFiles/main.cpp
View file

@ -20,7 +20,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "pspecific.h" #include "pspecific.h"
const char *FeaturesNotify = "\ const char *FeaturesNotify = "\
Telegram Desktop was updated to version 0.6.20\n\ Telegram Desktop was updated to version 0.6.21\n\
\n\ \n\
\xe2\x80\x94 Single column layout for smaller window sizes.\n\ \xe2\x80\x94 Single column layout for smaller window sizes.\n\
\xe2\x80\x94 Photos are sent up to 1280x1280 size.\n\ \xe2\x80\x94 Photos are sent up to 1280x1280 size.\n\

4
Telegram/SourceFiles/pspecific_wnd.cpp
View file

@ -1047,8 +1047,8 @@ void PsMainWindow::psInitSize() {
TWindowPos pos(cWindowPos()); TWindowPos pos(cWindowPos());
if (cDebug()) { // temp while design if (cDebug()) { // temp while design
pos.w = 800; pos.w = st::wndDefWidth;
pos.h = 600; pos.h = st::wndDefHeight;
} }
QRect avail(QDesktopWidget().availableGeometry()); QRect avail(QDesktopWidget().availableGeometry());
bool maximized = false; bool maximized = false;

2
Telegram/Telegram.plist
View file

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.6.20</string> <string>0.6.21</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>

BIN
Telegram/Telegram.rc
View file

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View file

@ -1577,7 +1577,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.20; CURRENT_PROJECT_VERSION = 0.6.21;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1595,7 +1595,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.6.20; CURRENT_PROJECT_VERSION = 0.6.21;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1621,10 +1621,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.20; CURRENT_PROJECT_VERSION = 0.6.21;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6; DYLIB_COMPATIBILITY_VERSION = 0.6;
DYLIB_CURRENT_VERSION = 0.6.20; DYLIB_CURRENT_VERSION = 0.6.21;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1764,10 +1764,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.20; CURRENT_PROJECT_VERSION = 0.6.21;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6; DYLIB_COMPATIBILITY_VERSION = 0.6;
DYLIB_CURRENT_VERSION = 0.6.20; DYLIB_CURRENT_VERSION = 0.6.21;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

2
Telegram/Version.sh
View file

@ -1,2 +1,2 @@
echo 6020 0.6.20 echo 6021 0.6.21