procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

version 0.8.32 crashfix + ipv6 disabled because of KIS

This commit is contained in:
John Preston 2015-06-25 13:12:38 +03:00
parent 88c44caf9d
commit 890352ef97
10 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/PrepareWin.bat
View File

@ -1,10 +1,10 @@
@echo OFF @echo OFF
set "AppVersion=8031" set "AppVersion=8032"
set "AppVersionStrSmall=0.8.31" set "AppVersionStrSmall=0.8.32"
set "AppVersionStr=0.8.31" set "AppVersionStr=0.8.32"
set "AppVersionStrFull=0.8.31.0" set "AppVersionStrFull=0.8.32.0"
set "DevChannel=1" set "DevChannel=0"
if %DevChannel% neq 0 goto preparedev if %DevChannel% neq 0 goto preparedev

6
Telegram/SourceFiles/config.h
View File

@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 8031; static const int32 AppVersion = 8032;
static const wchar_t *AppVersionStr = L"0.8.31"; static const wchar_t *AppVersionStr = L"0.8.32";
static const bool DevChannel = true; static const bool DevChannel = false;
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";

11
Telegram/SourceFiles/gui/text.cpp
View File

@ -863,7 +863,7 @@ public:
} }
void draw(int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, uint16 selectedFrom = 0, uint16 selectedTo = 0) { void draw(int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, uint16 selectedFrom = 0, uint16 selectedTo = 0) {
if (_t->_blocks.isEmpty()) return; if (_t->isEmpty()) return;
_blocksSize = _t->_blocks.size(); _blocksSize = _t->_blocks.size();
if (!_textStyle) _initDefault(); if (!_textStyle) _initDefault();
@ -1043,7 +1043,7 @@ public:
} }
void drawElided(int32 left, int32 top, int32 w, style::align align, int32 lines, int32 yFrom, int32 yTo, int32 removeFromEnd) { void drawElided(int32 left, int32 top, int32 w, style::align align, int32 lines, int32 yFrom, int32 yTo, int32 removeFromEnd) {
if (lines <= 0) return; if (lines <= 0 || _t->isNull()) return;
if (yTo < 0 || (lines - 1) * _t->_font->height < yTo) { if (yTo < 0 || (lines - 1) * _t->_font->height < yTo) {
yTo = lines * _t->_font->height; yTo = lines * _t->_font->height;
@ -1057,7 +1057,7 @@ public:
_lnkX = x; _lnkX = x;
_lnkY = y; _lnkY = y;
_lnkResult = &_zeroLnk; _lnkResult = &_zeroLnk;
if (_lnkX >= 0 && _lnkX < w && _lnkY >= 0) { if (!_t->isNull() && _lnkX >= 0 && _lnkX < w && _lnkY >= 0) {
draw(0, 0, w, align, _lnkY, _lnkY + 1); draw(0, 0, w, align, _lnkY, _lnkY + 1);
} }
return *_lnkResult; return *_lnkResult;
@ -1067,7 +1067,7 @@ public:
lnk = TextLinkPtr(); lnk = TextLinkPtr();
inText = false; inText = false;
if (x >= 0 && x < w && y >= 0) { if (!_t->isNull() && x >= 0 && x < w && y >= 0) {
_lnkX = x; _lnkX = x;
_lnkY = y; _lnkY = y;
_lnkResult = &lnk; _lnkResult = &lnk;
@ -1081,8 +1081,7 @@ public:
symbol = 0; symbol = 0;
after = false; after = false;
upon = false; upon = false;
if (!_t->isNull() && y >= 0) {
if (y >= 0) {
_lnkX = x; _lnkX = x;
_lnkY = y; _lnkY = y;
_getSymbol = &symbol; _getSymbol = &symbol;

3
Telegram/SourceFiles/gui/text.h
View File

@ -485,6 +485,9 @@ public:
bool isEmpty() const { bool isEmpty() const {
return _text.isEmpty(); return _text.isEmpty();
} }
bool isNull() const {
return !_font;
}
QString original(uint16 selectedFrom = 0, uint16 selectedTo = 0xFFFF, bool expandLinks = true) const; QString original(uint16 selectedFrom = 0, uint16 selectedTo = 0xFFFF, bool expandLinks = true) const;
bool lastDots(int32 dots, int32 maxdots = 3) { // hack for typing animation bool lastDots(int32 dots, int32 maxdots = 3) { // hack for typing animation

2
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View File

@ -1800,7 +1800,7 @@ void MTProtoConnectionPrivate::socketStart(bool afterConfig) {
if (afterConfig && (_conn4 || _conn6)) return; if (afterConfig && (_conn4 || _conn6)) return;
createConn(!noIPv4, !noIPv6); createConn(!noIPv4, false/*!noIPv6*/);
retryTimer.stop(); retryTimer.stop();
_waitForConnectedTimer.stop(); _waitForConnectedTimer.stop();

3
Telegram/SourceFiles/structs.cpp
View File

@ -126,10 +126,10 @@ void PeerData::updateName(const QString &newName, const QString &newNameOrPhone,
NameFirstChars oldChars = chars; NameFirstChars oldChars = chars;
fillNames(); fillNames();
App::history(id)->updateNameText(); App::history(id)->updateNameText();
nameUpdated();
if (App::main()) { if (App::main()) {
emit App::main()->peerNameChanged(this, oldNames, oldChars); emit App::main()->peerNameChanged(this, oldNames, oldChars);
} }
nameUpdated();
} }
void UserData::setPhoto(const MTPUserProfilePhoto &p) { void UserData::setPhoto(const MTPUserProfilePhoto &p) {
@ -198,7 +198,6 @@ void UserData::setName(const QString &first, const QString &last, const QString
void UserData::setPhone(const QString &newPhone) { void UserData::setPhone(const QString &newPhone) {
phone = newPhone; phone = newPhone;
++nameVersion;
} }
void UserData::setBotInfoVersion(int32 version) { void UserData::setBotInfoVersion(int32 version) {

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.8.31</string> <string>0.8.32</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string> <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

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

@ -1701,7 +1701,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.8.31; CURRENT_PROJECT_VERSION = 0.8.32;
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;
@ -1719,7 +1719,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.8.31; CURRENT_PROJECT_VERSION = 0.8.32;
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;
@ -1745,10 +1745,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.8.31; CURRENT_PROJECT_VERSION = 0.8.32;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.31; DYLIB_CURRENT_VERSION = 0.8.32;
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;
@ -1888,10 +1888,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.8.31; CURRENT_PROJECT_VERSION = 0.8.32;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.31; DYLIB_CURRENT_VERSION = 0.8.32;
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 8031 0.8.31 1 echo 8032 0.8.32 0
# AppVersion AppVersionStr DevChannel # AppVersion AppVersionStr DevChannel