Philipp Hörist pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/gtk/dialogs.py
    ... ... @@ -901,21 +901,23 @@ class CertificateDialog(Gtk.ApplicationWindow):
    901 901
             self._ui.label_cert_for_account.set_text(
    
    902 902
                 _('Certificate for account\n%s') % account)
    
    903 903
     
    
    904
    -        self._ui.data_it_common_name.set_text(subject.commonName)
    
    905
    -        self._ui.data_it_organization.set_text(subject.organizationName)
    
    904
    +        self._ui.data_it_common_name.set_text(subject.commonName or '')
    
    905
    +        self._ui.data_it_organization.set_text(subject.organizationName or '')
    
    906 906
             self._ui.data_it_organizational_unit.set_text(
    
    907
    -            subject.organizationalUnitName)
    
    907
    +            subject.organizationalUnitName or '')
    
    908 908
             self._ui.data_it_serial_number.set_text(str(cert.get_serial_number()))
    
    909 909
     
    
    910
    -        self._ui.data_ib_common_name.set_text(issuer.commonName)
    
    911
    -        self._ui.data_ib_organization.set_text(issuer.organizationName)
    
    910
    +        self._ui.data_ib_common_name.set_text(issuer.commonName or '')
    
    911
    +        self._ui.data_ib_organization.set_text(issuer.organizationName or '')
    
    912 912
             self._ui.data_ib_organizational_unit.set_text(
    
    913
    -            issuer.organizationalUnitName)
    
    913
    +            issuer.organizationalUnitName or '')
    
    914 914
     
    
    915
    -        issued = datetime.strptime(cert.get_notBefore().decode('ascii'), '%Y%m%d%H%M%SZ')
    
    915
    +        issued = datetime.strptime(cert.get_notBefore().decode('ascii'),
    
    916
    +                                   '%Y%m%d%H%M%SZ')
    
    916 917
             issued = issued.strftime('%B %d, %Y, %H:%M:%S %z')
    
    917 918
             self._ui.data_issued_on.set_text(issued)
    
    918
    -        expires = datetime.strptime(cert.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ')
    
    919
    +        expires = datetime.strptime(cert.get_notAfter().decode('ascii'),
    
    920
    +                                    '%Y%m%d%H%M%SZ')
    
    919 921
             expires = expires.strftime('%B %d, %Y, %H:%M:%S %z')
    
    920 922
             self._ui.data_expires_on.set_text(expires)
    
    921 923