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

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2016-01-11 13:22:52 +08:00
parent 77eab809da b9bed419aa
commit f6eae71397
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/autoupdater.cpp
View File

@ -569,6 +569,8 @@ bool checkReadyUpdate() {
return true;
}
#endif
QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp
if (cBetaPrivateKey().isEmpty()) {
LOG(("Error: Trying to count beta version signature without beta private key!"));
@ -613,4 +615,3 @@ QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp
return QString::fromUtf8(signature.mid(19, 32));
}
#endif

7
Telegram/SourceFiles/autoupdater.h
View File

@ -66,6 +66,11 @@ private:
bool checkReadyUpdate();
QString countBetaVersionSignature(uint64 version);
#else
class UpdateDownloader : public QObject {
Q_OBJECT
};
#endif
QString countBetaVersionSignature(uint64 version);

7
Telegram/SourceFiles/historywidget.cpp
View File

@ -4575,6 +4575,8 @@ void HistoryWidget::onDocumentSelect() {
void HistoryWidget::dragEnterEvent(QDragEnterEvent *e) {
if (!_history) return;
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
_attachDrag = getDragState(e->mimeData());
updateDragAreas();
@ -4876,6 +4878,8 @@ void HistoryWidget::onPhotoDrop(const QMimeData *data) {
void HistoryWidget::onDocumentDrop(const QMimeData *data) {
if (!_history) return;
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
QStringList files = getMediasFromMime(data);
if (files.isEmpty()) return;
@ -4883,6 +4887,9 @@ void HistoryWidget::onDocumentDrop(const QMimeData *data) {
}
void HistoryWidget::onFilesDrop(const QMimeData *data) {
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
QStringList files = getMediasFromMime(data);
if (files.isEmpty()) {
if (data->hasImage()) {

3
Telegram/Telegram.pro
View File

@ -89,6 +89,7 @@ SOURCES += \
./SourceFiles/autoupdater.cpp \
./SourceFiles/dialogswidget.cpp \
./SourceFiles/dropdown.cpp \
./SourceFiles/facades.cpp \
./SourceFiles/fileuploader.cpp \
./SourceFiles/history.cpp \
./SourceFiles/historywidget.cpp \
@ -112,6 +113,7 @@ SOURCES += \
./SourceFiles/types.cpp \
./SourceFiles/window.cpp \
./SourceFiles/mtproto/mtp.cpp \
./SourceFiles/mtproto/mtpAuthKey.cpp \
./SourceFiles/mtproto/mtpConnection.cpp \
./SourceFiles/mtproto/mtpCoreTypes.cpp \
./SourceFiles/mtproto/mtpDC.cpp \
@ -175,6 +177,7 @@ HEADERS += \
./SourceFiles/countries.h \
./SourceFiles/dialogswidget.h \
./SourceFiles/dropdown.h \
./SourceFiles/facades.h \
./SourceFiles/fileuploader.h \
./SourceFiles/history.h \
./SourceFiles/historywidget.h \