diff -r f79dc58bdf62 -r 68b03f6ebed5 eric6/WebBrowser/Tools/WebIconProvider.py
--- a/eric6/WebBrowser/Tools/WebIconProvider.py Mon May 11 18:30:25 2020 +0200
+++ b/eric6/WebBrowser/Tools/WebIconProvider.py Tue May 12 17:22:50 2020 +0200
@@ -80,7 +80,7 @@
def load(self):
"""
- Public method to load the bookmarks.
+ Public method to load the web site icons.
"""
if self.__loaded:
return
@@ -105,7 +105,7 @@
def save(self):
"""
- Public method to save the zoom values.
+ Public method to save the web site icons.
"""
if not self.__loaded:
return
@@ -161,7 +161,7 @@
@rtype str
"""
return url.toString(QUrl.PrettyDecoded | QUrl.RemoveUserInfo |
- QUrl.RemoveFragment)
+ QUrl.RemoveFragment| QUrl.RemovePath)
def iconForUrl(self, url):
"""
@@ -187,18 +187,24 @@
self.load()
urlStr = self.__urlToString(url)
- for iconUrlStr in self.__iconsDB:
- if iconUrlStr.startswith(urlStr):
- return self.__iconsDB[iconUrlStr]
+ if urlStr in self.__iconsDB:
+ return self.__iconsDB[urlStr]
+ else:
+ for iconUrlStr in self.__iconsDB:
+ if iconUrlStr.startswith(urlStr):
+ return self.__iconsDB[iconUrlStr]
# try replacing http scheme with https scheme
url = QUrl(url)
if url.scheme() == "http":
url.setScheme("https")
- urlStr = self.__urlToString(url)
- for iconUrlStr in self.__iconsDB:
- if iconUrlStr.startswith(urlStr):
- return self.__iconsDB[iconUrlStr]
+ urlStr = self.__urlToString(url)
+ if urlStr in self.__iconsDB:
+ return self.__iconsDB[urlStr]
+ else:
+ for iconUrlStr in self.__iconsDB:
+ if iconUrlStr.startswith(urlStr):
+ return self.__iconsDB[iconUrlStr]
if scheme == "https":
return UI.PixmapCache.getIcon("securityHigh32")
