mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

some fixes for mac build, 0.8.58.dev version

Browse Source
This commit is contained in:
John Preston
2015-09-22 13:19:57 +03:00
parent 776688383c
commit b3cb6fc317
10 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history.cpp
View File

@@ -7384,7 +7384,7 @@ QString HistoryServiceMsg::inReplyText() const {
return result.trimmed().startsWith(from()->name) ? result.trimmed().mid(from()->name.size()).trimmed() : result;
}
void HistoryServiceMsg::setText(const QString &text) {
void HistoryServiceMsg::setServiceText(const QString &text) {
_text.setText(st::msgServiceFont, text, _historySrvOptions);
initDimensions();
}
@@ -7600,7 +7600,7 @@ bool HistoryGroup::decrementCount() {
}
void HistoryGroup::updateText() {
setText(lng_channel_comments_count(lt_count, _count)/* + qsl(" (%1 .. %2)").arg(_minId).arg(_maxId)*/);
setServiceText(lng_channel_comments_count(lt_count, _count)/* + qsl(" (%1 .. %2)").arg(_minId).arg(_maxId)*/);
}
HistoryCollapse::HistoryCollapse(History *history, HistoryBlock *block, MsgId wasMinId, const QDateTime &date) :
@@ -7618,7 +7618,7 @@ void HistoryCollapse::getState(TextLinkPtr &lnk, HistoryCursorState &state, int3
HistoryJoined::HistoryJoined(History *history, HistoryBlock *block, const QDateTime &inviteDate, UserData *inviter, int32 flags) :
HistoryServiceMsg(history, block, clientMsgId(), inviteDate, QString(), flags) {
if (inviter->id == MTP::authedId()) {
if (peerToUser(inviter->id) == MTP::authedId()) {
_text.setText(st::msgServiceFont, lang(lng_action_you_joined), _historySrvOptions);
} else {
_text.setText(st::msgServiceFont, lng_action_add_you(lt_from, textcmdLink(1, inviter->name)), _historySrvOptions);