mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bots' of https://bitbucket.org/johnprestonmail/telegram-desktop into bots

Browse Source
This commit is contained in:
John Preston
2015-12-31 23:29:06 +08:00
parent 58da5c5c3b 35d4754380
commit 9d22ec4900
26 changed files with 1143 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/structs.h
View File

@@ -1273,7 +1273,7 @@ inline WebPageType toWebPageType(const QString &type) {
struct WebPageData {
WebPageData(const WebPageId &id, WebPageType type = WebPageArticle, const QString &url = QString(), const QString &displayUrl = QString(), const QString &siteName = QString(), const QString &title = QString(), const QString &description = QString(), PhotoData *photo = 0, DocumentData *doc = 0, int32 duration = 0, const QString &author = QString(), int32 pendingTill = -1);
void forget() {
if (photo) photo->forget();
}
@@ -1317,6 +1317,7 @@ public:
ImagePtr thumb;
void automaticLoadGif();
void automaticLoadSettingsChangedGif();
void saveFile(const QString &toFile, LoadFromCloudSetting fromCloud, bool autoLoading);
void cancelFile();