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

Fix build on Xcode.

This commit is contained in:
John Preston 2019-04-23 19:23:13 +04:00
parent 5ab1cd405a
commit 6dd8f32f66
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Telegram/SourceFiles/apiwrap.cpp
View File

@ -921,7 +921,7 @@ void ApiWrap::requestMoreBlockedByDateDialogs() {
_dialogsLoadTill = _dialogsLoadState->offsetDate _dialogsLoadTill = _dialogsLoadState->offsetDate
? (_dialogsLoadState->offsetDate - max) ? (_dialogsLoadState->offsetDate - max)
: (unixtime() - max); : (unixtime() - max);
requestDialogs(FolderId(0)); requestDialogs();
} }
rpl::producer<bool> ApiWrap::dialogsLoadMayBlockByDate() const { rpl::producer<bool> ApiWrap::dialogsLoadMayBlockByDate() const {
@ -1038,10 +1038,7 @@ void ApiWrap::applyPeerDialogs(const MTPmessages_PeerDialogs &dialogs) {
for (const auto &dialog : data.vdialogs.v) { for (const auto &dialog : data.vdialogs.v) {
dialog.match([&](const MTPDdialog &data) { dialog.match([&](const MTPDdialog &data) {
if (const auto peerId = peerFromMTP(data.vpeer)) { if (const auto peerId = peerFromMTP(data.vpeer)) {
const auto requestFolderId = FolderId(0); _session->data().history(peerId)->applyDialog(nullptr, data);
_session->data().history(peerId)->applyDialog(
requestFolderId,
data);
} }
}, [&](const MTPDdialogFolder &data) { }, [&](const MTPDdialogFolder &data) {
const auto folder = _session->data().processFolder(data.vfolder); const auto folder = _session->data().processFolder(data.vfolder);

2
Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
View File

@ -58,7 +58,7 @@ void PinnedList::setPinned(const Key &key, bool pinned) {
} }
} }
} else if (const auto it = ranges::find(_data, key); it != end(_data)) { } else if (const auto it = ranges::find(_data, key); it != end(_data)) {
const auto index = (it - begin(_data)); const auto index = int(it - begin(_data));
_data.erase(it); _data.erase(it);
key.entry()->cachePinnedIndex(0); key.entry()->cachePinnedIndex(0);
for (auto i = index, count = int(size(_data)); i != count; ++i) { for (auto i = index, count = int(size(_data)); i != count; ++i) {

2
Telegram/SourceFiles/mainwidget.cpp
View File

@ -2931,7 +2931,7 @@ void MainWidget::gotState(const MTPupdates_State &state) {
_noUpdatesTimer.callOnce(kNoUpdatesTimeout); _noUpdatesTimer.callOnce(kNoUpdatesTimeout);
_ptsWaiter.setRequesting(false); _ptsWaiter.setRequesting(false);
session().api().requestDialogs(FolderId(0)); session().api().requestDialogs();
updateOnline(); updateOnline();
} }

18
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -87,10 +87,10 @@ private:
//void addNotifications(); //void addNotifications();
//void addUngroup(); //void addUngroup();
not_null<Controller*> _controller; //not_null<Controller*> _controller;
not_null<Data::Folder*> _folder; //not_null<Data::Folder*> _folder;
const PeerMenuCallback &_addAction; //const PeerMenuCallback &_addAction;
PeerMenuSource _source; //PeerMenuSource _source;
}; };
@ -509,11 +509,11 @@ FolderFiller::FolderFiller(
not_null<Controller*> controller, not_null<Controller*> controller,
not_null<Data::Folder*> folder, not_null<Data::Folder*> folder,
const PeerMenuCallback &addAction, const PeerMenuCallback &addAction,
PeerMenuSource source) PeerMenuSource source) {
: _controller(controller) //: _controller(controller)
, _folder(folder) //, _folder(folder)
, _addAction(addAction) //, _addAction(addAction)
, _source(source) { //, _source(source) {
} }
void FolderFiller::fill() { // #TODO archive void FolderFiller::fill() { // #TODO archive