From b17c277a6252a96913d4e54d3377e0b1101c52d9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 6 Dec 2015 20:45:04 +0300 Subject: [PATCH] new beta 9014003 ready - info about last 200 members in channel added, no key destroy after 404 error immidiate after connection --- Telegram/Resources/lang.strings | 2 +- Telegram/SourceFiles/boxes/contactsbox.cpp | 4 ++-- Telegram/SourceFiles/mtproto/mtpConnection.cpp | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings index f9877845b..28928e798 100644 --- a/Telegram/Resources/lang.strings +++ b/Telegram/Resources/lang.strings @@ -431,7 +431,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org "lng_channel_add_admins" = "New administrator"; "lng_channel_add_members" = "Add members"; "lng_channel_members" = "Members"; -"lng_channel_only_last_shown" = "Only last {count:_not_used_|# member|# members} are shown here"; +"lng_channel_only_last_shown" = "Only the last {count:_not_used_|# member|# members} are shown here"; "lng_channel_admins" = "Administrators"; "lng_channel_add_admin" = "Add Administrator"; "lng_channel_admin_sure" = "Add {user} to administrators?"; diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index e438ec678..4e6056ed3 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -1773,7 +1773,7 @@ MembersInner::MembersInner(ChannelData *channel, MembersFilter filter) : TWidget , _kickBox(0) , _loading(true) , _loadingRequestId(0) -, _aboutWidth(st::boxWideWidth - st::contactsPadding.left() - st::contactsPhotoSize - st::contactsPadding.left() - st::contactsPadding.right()) +, _aboutWidth(st::boxWideWidth - st::contactsPadding.left() - st::contactsPadding.right()) , _about(_aboutWidth) , _aboutHeight(0) { connect(App::wnd(), SIGNAL(imageLoaded()), this, SLOT(update())); @@ -1828,7 +1828,7 @@ void MembersInner::paintEvent(QPaintEvent *e) { } if (to == _rows.size() && (_rows.size() < _channel->count || _rows.size() >= cMaxGroupCount())) { p.setPen(st::stickersReorderFg); - _about.drawLeft(p, st::contactsPadding.left() + st::contactsPhotoSize + st::contactsPadding.left(), st::stickersReorderPadding.top(), _aboutWidth, width()); + _about.draw(p, st::contactsPadding.left(), st::stickersReorderPadding.top(), _aboutWidth, style::al_center); } } } diff --git a/Telegram/SourceFiles/mtproto/mtpConnection.cpp b/Telegram/SourceFiles/mtproto/mtpConnection.cpp index 26f957960..c9627c9bc 100644 --- a/Telegram/SourceFiles/mtproto/mtpConnection.cpp +++ b/Telegram/SourceFiles/mtproto/mtpConnection.cpp @@ -1964,12 +1964,12 @@ void MTProtoConnectionPrivate::restart(bool maybeBadKey) { mtpAuthKeyPtr key(sessionData->getKey()); if (key) { if (!sessionData->isCheckedKey()) { - if (maybeBadKey) { - clearMessages(); - keyId = mtpAuthKey::RecreateKeyId; -// retryTimeout = 1; // no ddos please - LOG(("MTP Info: key may be bad and was not checked - will be destroyed")); - } +// if (maybeBadKey) { +// clearMessages(); +// keyId = mtpAuthKey::RecreateKeyId; +//// retryTimeout = 1; // no ddos please + LOG(("MTP Info: key may be bad and was not checked - but won't be destroyed, no log outs because of bad server right now..")); +// } } else { sessionData->setCheckedKey(false); }