RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2024-12-28 09:32:56 +00:00
Code Issues Projects Releases Wiki Activity

Version 0.9.42: critical bug fix in contacts box, message edit fix.

Browse Source
This commit is contained in:
John Preston 2016-04-12 11:13:03 +03:00
parent af014b3c14
commit b07cd1264c
8 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/boxes/contactsbox.cpp
View File

@ -1095,7 +1095,7 @@ void ContactsInner::selectSkip(int32 dir) {
for (auto i = _contacts->cfind(_sel), end = _contacts->cend(); i != end && contactData(*i)->inchat; ++i) { for (auto i = _contacts->cfind(_sel), end = _contacts->cend(); i != end && contactData(*i)->inchat; ++i) {
_sel = *i; _sel = *i;
} }
if (contactData(_sel)->inchat) { if (_sel && contactData(_sel)->inchat) {
_sel = nullptr; _sel = nullptr;
} }
if (!_sel) { if (!_sel) {
@ -1114,11 +1114,13 @@ void ContactsInner::selectSkip(int32 dir) {
if (_byUsernameSel < 0) { if (_byUsernameSel < 0) {
if (!_contacts->isEmpty()) { if (!_contacts->isEmpty()) {
if (!_newItemSel && !_sel) _sel = *(_contacts->cend() - 1); if (!_newItemSel && !_sel) _sel = *(_contacts->cend() - 1);
for (auto i = _contacts->cfind(_sel), b = _contacts->cbegin(); i != b && contactData(*i)->inchat; --i) { if (_sel) {
_sel = *i; for (auto i = _contacts->cfind(_sel), b = _contacts->cbegin(); i != b && contactData(*i)->inchat; --i) {
} _sel = *i;
if (contactData(_sel)->inchat) { }
_sel = nullptr; if (contactData(_sel)->inchat) {
_sel = nullptr;
}
} }
} }
} }

2
Telegram/SourceFiles/boxes/photosendbox.cpp
View File

@ -648,7 +648,7 @@ void EditCaptionBox::onSave(bool ctrlShiftEnter) {
return; return;
} }
MTPmessages_EditMessage::Flags flags = 0; MTPmessages_EditMessage::Flags flags = MTPmessages_EditMessage::Flag::f_message;
if (_previewCancelled) { if (_previewCancelled) {
flags |= MTPmessages_EditMessage::Flag::f_no_webpage; flags |= MTPmessages_EditMessage::Flag::f_no_webpage;
} }

4
Telegram/SourceFiles/config.h
View File

@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 9041; static const int32 AppVersion = 9042;
static const wchar_t *AppVersionStr = L"0.9.41"; static const wchar_t *AppVersionStr = L"0.9.42";
static const bool DevVersion = false; static const bool DevVersion = false;
//#define BETA_VERSION (9040128ULL) // just comment this line to build public version //#define BETA_VERSION (9040128ULL) // just comment this line to build public version

2
Telegram/SourceFiles/historywidget.cpp
View File

@ -4713,7 +4713,7 @@ void HistoryWidget::saveEditMsg() {
return; return;
} }
MTPmessages_EditMessage::Flags sendFlags = 0; MTPmessages_EditMessage::Flags sendFlags = MTPmessages_EditMessage::Flag::f_message;
if (webPageId == CancelledWebPageId) { if (webPageId == CancelledWebPageId) {
sendFlags |= MTPmessages_EditMessage::Flag::f_no_webpage; sendFlags |= MTPmessages_EditMessage::Flag::f_no_webpage;
} }

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.9.41</string> <string>0.9.42</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>

8
Telegram/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "Resources\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,41,0 FILEVERSION 0,9,42,0
PRODUCTVERSION 0,9,41,0 PRODUCTVERSION 0,9,42,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.41.0" VALUE "FileVersion", "0.9.42.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.41.0" VALUE "ProductVersion", "0.9.42.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

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

@ -1898,7 +1898,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.9.41; CURRENT_PROJECT_VERSION = 0.9.42;
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;
@ -1917,7 +1917,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.9.41; CURRENT_PROJECT_VERSION = 0.9.42;
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;
@ -1946,10 +1946,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.9.41; CURRENT_PROJECT_VERSION = 0.9.42;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.41; DYLIB_CURRENT_VERSION = 0.9.42;
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;
@ -2087,10 +2087,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.9.41; CURRENT_PROJECT_VERSION = 0.9.42;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.41; DYLIB_CURRENT_VERSION = 0.9.42;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";

6
Telegram/Version
View File

@ -1,6 +1,6 @@
AppVersion 9041 AppVersion 9042
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.41 AppVersionStrSmall 0.9.42
AppVersionStr 0.9.41 AppVersionStr 0.9.42
DevChannel 0 DevChannel 0
BetaVersion 0 BetaVersion 0