Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-27 10:00:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

resolve URL for correct favicon downloading, fixes #240 #238

Browse source
This commit is contained in:
thez3ro 2017-06-29 19:54:49 +02:00 • committed by Janek Bevendorff
parent 98c812a297
commit 35c6df2535
6 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gui/EditWidgetIcons.cpp
View file

@ -223,8 +223,15 @@ void EditWidgetIcons::fetchFavicon(const QUrl& url)
}
m_httpClient->setConnectingTimeOut(5000, [this]() {
resetFaviconDownload();
MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
QUrl tempurl = QUrl(m_url);
if (tempurl.scheme() == "http") {
resetFaviconDownload();
MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
} else {
tempurl.setScheme("http");
tempurl.setPath("/favicon.ico");
fetchFavicon(tempurl);
}
});
m_ui->faviconButton->setDisabled(true);

2
src/gui/entry/EditEntryWidget.cpp
View file

@ -363,7 +363,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
IconStruct iconStruct;
iconStruct.uuid = entry->iconUuid();
iconStruct.number = entry->iconNumber();
m_iconsWidget->load(entry->uuid(), m_database, iconStruct, entry->url());
m_iconsWidget->load(entry->uuid(), m_database, iconStruct, entry->webUrl());
connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), m_iconsWidget, SLOT(setUrl(QString)));
m_autoTypeUi->enableButton->setChecked(entry->autoTypeEnabled());