FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:martinrotter/rssguard

This commit is contained in:
Martin Rotter 2023-03-16 07:37:58 +01:00
parent 932222bf58 f0b6fa09f0
commit 40d3189088
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librssguard/gui/reusable/locationlineedit.cpp
View File

@ -7,7 +7,7 @@
#include <QMouseEvent>
LocationLineEdit::LocationLineEdit(QWidget* parent)
: BaseLineEdit(parent), m_mouseSelectsAllText(true), m_googleSuggest(new GoogleSuggest(this)) {
: BaseLineEdit(parent), m_mouseSelectsAllText(true), m_googleSuggest(new GoogleSuggest(this, this)) {
setPlaceholderText(tr("Website address goes here"));
connect(this, &LocationLineEdit::submitted, m_googleSuggest, &GoogleSuggest::preventSuggest);
}

2
src/librssguard/services/abstract/accountcheckmodel.cpp
View File

@ -4,8 +4,6 @@
#include "3rd-party/boolinq/boolinq.h"
#include "definitions/definitions.h"
#include "miscellaneous/application.h"
#include "miscellaneous/iconfactory.h"
AccountCheckModel::AccountCheckModel(QObject* parent)
: QAbstractItemModel(parent), m_rootItem(nullptr), m_recursiveChange(false) {}

11
src/librssguard/services/gmail/gmailnetworkfactory.cpp
View File

@ -684,9 +684,9 @@ QList<Message> GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis
}
do {
auto* multi = new QHttpMultiPart();
QHttpMultiPart multi;
multi->setContentType(QHttpMultiPart::ContentType::MixedType);
multi.setContentType(QHttpMultiPart::ContentType::MixedType);
for (int window = next_message + 100; next_message < window && next_message < message_ids.size(); next_message++) {
QString msg_id = message_ids[next_message];
@ -699,7 +699,7 @@ QList<Message> GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis
QString full_msg_endpoint = QSL("GET /gmail/v1/users/me/messages/%1\r\n").arg(msg_id);
part.setBody(full_msg_endpoint.toUtf8());
multi->append(part);
multi.append(part);
msgs.insert(msg_id, msg);
}
@ -711,7 +711,7 @@ QList<Message> GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis
NetworkResult res = NetworkFactory::performNetworkOperation(GMAIL_API_BATCH,
timeout,
multi,
&multi,
output,
QNetworkAccessManager::Operation::PostOperation,
headers,
@ -737,11 +737,8 @@ QList<Message> GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis
}
}
}
multi->deleteLater();
}
else {
multi->deleteLater();
return {};
}
}