Changeset 9156 for branches/one_window/src/common/xmpp/transports_nb.py

Timestamp:

12/16/07 01:04:45 (11 months ago)

Author:

nicfit

Message:

Merged revisions 9142-9155 via svnmerge from
svn://88.191.11.156/gajim/trunk

........

r9143 | nicfit | 2007-12-13 20:32:59 -0700 (Thu, 13 Dec 2007) | 2 lines

svnmerge.py init one_window branch

........

r9146 | asterix | 2007-12-15 01:31:42 -0700 (Sat, 15 Dec 2007) | 2 lines

[shprotx] fix loading of multiple SSL certificates and better error message. fixes #3619

........

r9147 | asterix | 2007-12-15 02:04:10 -0700 (Sat, 15 Dec 2007) | 2 lines

[shprotx] save config when gnome sessions ends. fixes #3618

........

r9148 | asterix | 2007-12-15 05:10:25 -0700 (Sat, 15 Dec 2007) | 2 lines

get SSL error message where it is in Error instance

........

r9149 | asterix | 2007-12-15 05:15:10 -0700 (Sat, 15 Dec 2007) | 2 lines

don't crash when dbus is not supported

........

r9150 | asterix | 2007-12-15 05:33:21 -0700 (Sat, 15 Dec 2007) | 2 lines

fix showing of systray popup menu under Windows. fixes #3611

........

r9151 | asterix | 2007-12-15 05:41:39 -0700 (Sat, 15 Dec 2007) | 2 lines

fix creation of account on server that supports dataforms

........

Location:

branches/one_window

Files:

• . (modified) (1 prop)
• src/common/xmpp/transports_nb.py (modified) (2 diffs)

branches/one_window/src/common/xmpp/transports_nb.py

@@ -762 +762 @@
                                 if 'BEGIN CERTIFICATE' in line:
                                         begin = i
-                                        continue
                                 elif 'END CERTIFICATE' in line and begin > -1:
                                         cert = ''.join(lines[begin:i+2])
@@ -769 +768 @@
                                                         OpenSSL.crypto.FILETYPE_PEM, cert)
                                                 store.add_cert(X509cert)
+                                        except OpenSSL.crypto.Error, exception_obj:
+                                                log.warning('Unable to load a certificate from file %s: %s' %\
+                                                        (gajim.MY_CACERTS, exception_obj.args[0][0][2]))
                                         except:
-                                                log.warning('Unable to load a certificate from file %s' % \
+                                                log.warning(
+                                                        'Unknown error while loading certificate from file %s' % \
                                                         gajim.MY_CACERTS)
                                         begin = -1