From 2364dec9dd0b08af466e00f66e8c2d2fce9b7e5e Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 8 Dec 2014 18:25:20 +0300 Subject: [PATCH] 0.6.17 telegram.me links fixed in Windows --- Telegram/PrepareWin.bat | 6 +++--- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/pspecific_wnd.cpp | 2 +- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 842b5f1b74..b5f8e3fd95 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,8 +1,8 @@ @echo OFF -set "AppVersionStrSmall=0.6.16" -set "AppVersionStr=0.6.16" -set "AppVersionStrFull=0.6.16.0" +set "AppVersionStrSmall=0.6.17" +set "AppVersionStr=0.6.17" +set "AppVersionStrFull=0.6.17.0" echo. echo Preparing version %AppVersionStr%.. diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 1c8176e27f..46dbebe857 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 6016; -static const wchar_t *AppVersionStr = L"0.6.16"; +static const int32 AppVersion = 6017; +static const wchar_t *AppVersionStr = L"0.6.17"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp index c82af253cb..e5aa2c7a07 100644 --- a/Telegram/SourceFiles/pspecific_wnd.cpp +++ b/Telegram/SourceFiles/pspecific_wnd.cpp @@ -2209,7 +2209,7 @@ namespace { if (RegQueryValueEx(rkey, value, 0, &defaultType, (BYTE*)defaultStr, &defaultSize) != ERROR_SUCCESS || defaultType != REG_SZ || defaultSize != (v.size() + 1) * 2 || QString::fromStdWString(defaultStr) != v) { WCHAR tmp[bufSize] = { 0 }; if (!v.isEmpty()) wsprintf(tmp, v.replace(QChar('%'), qsl("%%")).toStdWString().c_str()); - LSTATUS status = RegSetValueEx(rkey, 0, 0, REG_SZ, (BYTE*)tmp, (wcslen(tmp) + 1) * sizeof(WCHAR)); + LSTATUS status = RegSetValueEx(rkey, value, 0, REG_SZ, (BYTE*)tmp, (wcslen(tmp) + 1) * sizeof(WCHAR)); if (status != ERROR_SUCCESS) { QString msg = qsl("App Error: could not set %1, error %2").arg(value ? ('\'' + QString::fromStdWString(value) + '\'') : qsl("(Default)")).arg("%1: %2"); _psLogError(msg.toUtf8().constData(), status); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 680cd29c25..5fdec5450d 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.16 + 0.6.17 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 2d9f34278c757f0145baa3bc4be8185cb4439aca..08e08a47a0840dec26eae5d6575bf62fbe802bf1 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_p6O delta 53 zcmZ3Yy+nIM5ig_J