Mercurial Repositories > eric / file comparison
comparison: Network/IRC/IrcWidget.py
Network/IRC/IrcWidget.py
- changeset 2360
- b6bf3925e3e1
- parent 2354
- c63de4af553d
- child 2404
- cba0ff902c2b
equal
deleted
inserted
replaced
| 2359:ef81d2d0a031 | 2360:b6bf3925e3e1 |
|---|---|
| 731 """ | 731 """ |
| 732 Private slot to handle SSL errors. | 732 Private slot to handle SSL errors. |
| 733 | 733 |
| 734 @param errors list of SSL errors (list of QSslError) | 734 @param errors list of SSL errors (list of QSslError) |
| 735 """ | 735 """ |
| 736 ignore, defaultChanged = self.__sslErrorHandler.sslErrors( | 736 ignored, defaultChanged = self.__sslErrorHandler.sslErrors( |
| 737 errors, self.__server.getName(), self.__server.getPort()) | 737 errors, self.__server.getName(), self.__server.getPort()) |
| 738 if ignore: | 738 if ignored == E5SslErrorHandler.NotIgnored: |
| 739 if defaultChanged: | |
| 740 self.__socket.setSslConfiguration( | |
| 741 QSslConfiguration.defaultConfiguration()) | |
| 742 self.networkWidget.addErrorMessage(self.trUtf8("SSL Error"), | |
| 743 self.trUtf8("""The SSL certificate for the server {0} (port {1})""" | |
| 744 """ failed the authenticity check.""").format( | |
| 745 self.__server.getName(), self.__server.getPort())) | |
| 746 if self.__connectionState == IrcWidget.ServerConnecting: | |
| 747 self.__socket.ignoreSslErrors() | |
| 748 else: | |
| 749 self.networkWidget.addErrorMessage(self.trUtf8("SSL Error"), | 739 self.networkWidget.addErrorMessage(self.trUtf8("SSL Error"), |
| 750 self.trUtf8("""Could not connect to {0} (port {1}) using an SSL""" | 740 self.trUtf8("""Could not connect to {0} (port {1}) using an SSL""" |
| 751 """ encrypted connection. Either the server does not""" | 741 """ encrypted connection. Either the server does not""" |
| 752 """ support SSL (did you use the correct port?) or""" | 742 """ support SSL (did you use the correct port?) or""" |
| 753 """ you rejected the certificate.""").format( | 743 """ you rejected the certificate.""").format( |
| 754 self.__server.getName(), self.__server.getPort())) | 744 self.__server.getName(), self.__server.getPort())) |
| 755 self.__socket.close() | 745 self.__socket.close() |
| 746 else: | |
| 747 if defaultChanged: | |
| 748 self.__socket.setSslConfiguration( | |
| 749 QSslConfiguration.defaultConfiguration()) | |
| 750 if ignored == E5SslErrorHandler.UserIgnored: | |
| 751 self.networkWidget.addErrorMessage(self.trUtf8("SSL Error"), | |
| 752 self.trUtf8("""The SSL certificate for the server {0} (port {1})""" | |
| 753 """ failed the authenticity check. SSL errors""" | |
| 754 """ were accepted by you.""").format( | |
| 755 self.__server.getName(), self.__server.getPort())) | |
| 756 if self.__connectionState == IrcWidget.ServerConnecting: | |
| 757 self.__socket.ignoreSslErrors() | |
| 756 | 758 |
| 757 def __setUserPrivilegePrefix(self, prefix1, prefix2): | 759 def __setUserPrivilegePrefix(self, prefix1, prefix2): |
| 758 """ | 760 """ |
| 759 Private method to set the user privilege prefix. | 761 Private method to set the user privilege prefix. |
| 760 | 762 |
