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

Merge branch 'docs' into bots

This commit is contained in:
John Preston 2015-12-28 13:28:15 +03:00
parent 4f6c8f8008 b33323b62d
commit 4c13b5dbee
7 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/app.cpp
View File

@ -1920,6 +1920,8 @@ namespace App {
}
void historyClearMsgs() {
::repliesTo.clear();
QVector<HistoryItem*> toDelete;
for (MsgsData::const_iterator i = msgsData.cbegin(), e = msgsData.cend(); i != e; ++i) {
if ((*i)->detached()) {
@ -1945,7 +1947,6 @@ namespace App {
}
void historyClearItems() {
historyClearMsgs();
randomData.clear();
sentData.clear();
mutedPeers.clear();
@ -1991,7 +1992,6 @@ namespace App {
::webPageItems.clear();
::sharedContactItems.clear();
::gifItems.clear();
::repliesTo.clear();
lastPhotos.clear();
lastPhotosMap.clear();
::self = 0;

2
Telegram/SourceFiles/config.h
View File

@ -23,7 +23,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
static const int32 AppVersion = 9015;
static const wchar_t *AppVersionStr = L"0.9.15";
static const bool DevVersion = false;
#define BETA_VERSION (9015003ULL) // just comment this line to build public version
#define BETA_VERSION (9015004ULL) // just comment this line to build public version
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";

1
Telegram/SourceFiles/dropdown.cpp
View File

@ -2694,6 +2694,7 @@ void EmojiPan::updateSelected() {
if (y >= _iconsTop && y < _iconsTop + st::rbEmoji.height && x >= 0 && x < 7 * st::rbEmoji.width && x < _icons.size() * st::rbEmoji.width) {
int32 skip = 0;
for (int32 i = 0, l = _icons.size(); i < l; ++i) {
if (_icons.at(i).sticker) break;
if (x < st::rbEmoji.width) {
newOver = i;
break;

2
Telegram/SourceFiles/history.cpp
View File

@ -2286,7 +2286,7 @@ void History::setUnreadCount(int32 newUnreadCount, bool psUpdate) {
App::histories().unreadFull += newUnreadCount - unreadCount;
if (mute) App::histories().unreadMuted += newUnreadCount - unreadCount;
unreadCount = newUnreadCount;
if (psUpdate && (!mute || cIncludeMuted())) App::wnd()->updateCounter();
if (psUpdate && (!mute || cIncludeMuted()) && App::wnd()) App::wnd()->updateCounter();
if (unreadBar) {
int32 count = unreadCount;
if (peer->migrateTo()) {

1
Telegram/SourceFiles/history.h
View File

@ -52,7 +52,6 @@ public:
void clear();
void remove(const PeerId &peer);
~Histories() {
clear();
unreadFull = unreadMuted = 0;
}

40
Telegram/Telegram.rc
View File

@ -1,40 +1,16 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
// Russian (Russia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#ifdef APSTUDIO_INVOKED
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
@ -58,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,15,3
PRODUCTVERSION 0,9,15,3
FILEVERSION 0,9,15,4
PRODUCTVERSION 0,9,15,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -75,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.15.3"
VALUE "FileVersion", "0.9.15.4"
VALUE "LegalCopyright", "Copyright (C) 2013"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.15.3"
VALUE "ProductVersion", "0.9.15.4"
END
END
BLOCK "VarFileInfo"

2
Telegram/Version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.15
AppVersionStr 0.9.15
DevChannel 0
BetaVersion 9015003
BetaVersion 9015004