mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into settings

Browse Source 
Conflicts:
	Telegram/SourceFiles/boxes/addcontactbox.h
	Telegram/SourceFiles/boxes/confirmbox.h
This commit is contained in:
John Preston
2016-08-16 20:19:57 +03:00
parent 392984f276 362b942a22
commit 4a6e669a53
23 changed files with 1071 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -444,8 +444,8 @@ void MainWidget::notify_inlineKeyboardMoved(const HistoryItem *item, int oldKeyb
_history->notify_inlineKeyboardMoved(item, oldKeyboardTop, newKeyboardTop);
}
bool MainWidget::notify_switchInlineBotButtonReceived(const QString &query) {
return _history->notify_switchInlineBotButtonReceived(query);
bool MainWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
return _history->notify_switchInlineBotButtonReceived(query, samePeerBot, samePeerReplyTo);
}
void MainWidget::notify_userIsBotChanged(UserData *bot) {