diff -r b639b17375b7 -r 7626b3605b2d Helpviewer/UrlBar/UrlBar.py
--- a/Helpviewer/UrlBar/UrlBar.py Sat Apr 09 15:08:10 2011 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py Wed Apr 13 19:53:11 2011 +0200
@@ -130,35 +130,38 @@
@param ok flag indicating a successful load (boolean)
"""
- if self.__browser.url().scheme() in ["pyrc", "about"]:
- self.__bookmarkButton.setVisible(False)
- else:
- if Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\
- .bookmarkForUrl(self.__browser.url()) is None:
- self.__bookmarkButton.setIcon(self.__bmInactiveIcon)
+ try:
+ if self.__browser.url().scheme() in ["pyrc", "about"]:
+ self.__bookmarkButton.setVisible(False)
else:
- self.__bookmarkButton.setIcon(self.__bmActiveIcon)
- self.__bookmarkButton.setVisible(True)
-
- if ok and \
- self.__browser.url().scheme() == "https" and \
- QSslCertificate is not None:
- sslInfo = self.__browser.page().getSslInfo()
- if sslInfo is not None:
- org = Utilities.decodeString(
- sslInfo.subjectInfo(QSslCertificate.Organization))
- if org == "":
- cn = Utilities.decodeString(
- sslInfo.subjectInfo(QSslCertificate.CommonName))
- if cn != "":
- org = cn.split(".", 1)[1]
+ if Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\
+ .bookmarkForUrl(self.__browser.url()) is None:
+ self.__bookmarkButton.setIcon(self.__bmInactiveIcon)
+ else:
+ self.__bookmarkButton.setIcon(self.__bmActiveIcon)
+ self.__bookmarkButton.setVisible(True)
+
+ if ok and \
+ self.__browser.url().scheme() == "https" and \
+ QSslCertificate is not None:
+ sslInfo = self.__browser.page().getSslInfo()
+ if sslInfo is not None:
+ org = Utilities.decodeString(
+ sslInfo.subjectInfo(QSslCertificate.Organization))
if org == "":
- org = self.trUtf8("Unknown")
- self.__sslLabel.setText(" {0} ".format(org))
- self.__sslLabel.setVisible(True)
- return
-
- self.__sslLabel.setVisible(False)
+ cn = Utilities.decodeString(
+ sslInfo.subjectInfo(QSslCertificate.CommonName))
+ if cn != "":
+ org = cn.split(".", 1)[1]
+ if org == "":
+ org = self.trUtf8("Unknown")
+ self.__sslLabel.setText(" {0} ".format(org))
+ self.__sslLabel.setVisible(True)
+ return
+
+ self.__sslLabel.setVisible(False)
+ except RuntimeError:
+ pass
def setPrivateMode(self, on):
"""
