Skip to content

Commit

Permalink
version 0.6.10 prepared
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Nov 18, 2014
1 parent 28c8d12 commit 85ca7e0
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Telegram/DeployLinux.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then
echo "tlinuxupd$AppVersion not found!";
Expand Down
4 changes: 2 additions & 2 deletions Telegram/DeployLinux32.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then
echo "tlinux32upd$AppVersion not found!"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/DeployMacWin.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then
echo "tmacupd$AppVersion not found!"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/DeployWin.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then
echo "tupdate$AppVersion not found!"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/PrepareLinux.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/PrepareLinux32.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/PrepareMac.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AppVersionStr=0.6.9
AppVersion=6009
AppVersionStr=0.6.10
AppVersion=6010

echo ""
echo "Preparing version $AppVersionStr.."
Expand Down
2 changes: 1 addition & 1 deletion Telegram/PrepareWin.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo OFF

set "AppVersionStr=0.6.9"
set "AppVersionStr=0.6.10"
echo.
echo Preparing version %AppVersionStr%..
echo.
Expand Down
2 changes: 1 addition & 1 deletion Telegram/Resources/style.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,7 @@ mediaviewLoaderSkip: 9px;

minPhotoWidth: 90px;
minPhotoHeight: 90px;
maxMediaSize: 400px;
maxMediaSize: 420px;

usernameFont: font(14px);
usernameColor: #777;
Expand Down
6 changes: 3 additions & 3 deletions Telegram/Setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#define MyAppShortName "Telegram"
#define MyAppName "Telegram Desktop"
#define MyAppVersion "0.6.9"
#define MyAppVersionZero "0.6.9"
#define MyAppFullVersion "0.6.9.0"
#define MyAppVersion "0.6.10"
#define MyAppVersionZero "0.6.10"
#define MyAppFullVersion "0.6.10.0"
#define MyAppPublisher "Telegram Messenger LLP"
#define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe"
Expand Down
4 changes: 2 additions & 2 deletions Telegram/SourceFiles/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
*/
#pragma once

static const int32 AppVersion = 6009;
static const wchar_t *AppVersionStr = L"0.6.9";
static const int32 AppVersion = 6010;
static const wchar_t *AppVersionStr = L"0.6.10";

static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";
Expand Down
4 changes: 4 additions & 0 deletions Telegram/SourceFiles/history.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,10 @@ int32 HistoryPhoto::resize(int32 width, bool dontRecountText, const HistoryItem
th = (st::maxMediaSize * th) / tw;
tw = st::maxMediaSize;
}
if (th > st::maxMediaSize) {
tw = (st::maxMediaSize * tw) / th;
th = st::maxMediaSize;
}
_height = th;
if (tw > w) {
_height = (w * _height / tw);
Expand Down
2 changes: 1 addition & 1 deletion Telegram/Telegram.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.9</string>
<string>0.6.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NOTE</key>
Expand Down
Binary file modified Telegram/Telegram.rc
Binary file not shown.
12 changes: 6 additions & 6 deletions Telegram/Telegram.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.9;
CURRENT_PROJECT_VERSION = 0.6.10;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand All @@ -1539,7 +1539,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.6.9;
CURRENT_PROJECT_VERSION = 0.6.10;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
Expand All @@ -1565,10 +1565,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.9;
CURRENT_PROJECT_VERSION = 0.6.10;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
DYLIB_CURRENT_VERSION = 0.6.9;
DYLIB_CURRENT_VERSION = 0.6.10;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
Expand Down Expand Up @@ -1708,10 +1708,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.6.9;
CURRENT_PROJECT_VERSION = 0.6.10;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
DYLIB_CURRENT_VERSION = 0.6.9;
DYLIB_CURRENT_VERSION = 0.6.10;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
Expand Down

0 comments on commit 85ca7e0

Please sign in to comment.