From 31954f5266a43f1fd49b4041a2dbd5dfe4dc69eb Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 2 Jun 2015 17:31:25 +0300 Subject: [PATCH] stable version 0.8.21 --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/historywidget.cpp | 1 + Telegram/SourceFiles/logs.cpp | 2 ++ Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 2d845698b7..24f3392500 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,10 +1,10 @@ @echo OFF -set "AppVersion=8020" -set "AppVersionStrSmall=0.8.20" -set "AppVersionStr=0.8.20" -set "AppVersionStrFull=0.8.20.0" -set "DevChannel=1" +set "AppVersion=8021" +set "AppVersionStrSmall=0.8.21" +set "AppVersionStr=0.8.21" +set "AppVersionStrFull=0.8.21.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index d8af9b7b7e..cd977f0753 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 8020; -static const wchar_t *AppVersionStr = L"0.8.20"; -static const bool DevChannel = true; +static const int32 AppVersion = 8021; +static const wchar_t *AppVersionStr = L"0.8.21"; +static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index ecfd1b1c7f..55ac7471da 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -524,6 +524,7 @@ void HistoryList::dragActionFinish(const QPoint &screenPos, Qt::MouseButton butt App::pressedItem(0); } if (needClick) { + DEBUG_LOG(("Clicked link: %1 (%2) %3").arg(needClick->text()).arg(needClick->readable()).arg(needClick->encoded())); needClick->onClick(button); dragActionCancel(); return; diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index 3018c26523..60e6ee8f8a 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -232,6 +232,8 @@ void logsInit() { logsInitDebug(); cSetDebug(true); } + + QDir().setCurrent(cWorkingDir()); } void logsInitDebug() { diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index ef9d47b7bb..2f82bdeb68 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.20 + 0.8.21 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 420d738757552b29694c7df152aacbd7f0d0807b..c94a30ea42b1a405f75480e0426b2647319a77dc 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_R)3 diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 022162ac90..8b1ba61879 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1693,7 +1693,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.20; + CURRENT_PROJECT_VERSION = 0.8.21; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1711,7 +1711,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.8.20; + CURRENT_PROJECT_VERSION = 0.8.21; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1737,10 +1737,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.20; + CURRENT_PROJECT_VERSION = 0.8.21; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.20; + DYLIB_CURRENT_VERSION = 0.8.21; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1880,10 +1880,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.20; + CURRENT_PROJECT_VERSION = 0.8.21; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.20; + DYLIB_CURRENT_VERSION = 0.8.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 034409dbc3..20044b630b 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 8020 0.8.20 1 +echo 8021 0.8.21 0 # AppVersion AppVersionStr DevChannel