Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: * added some NS_* in xmpp/protocol.py (for XEP-0136)
by Anaël Verrier 15 Jul '09

15 Jul '09

changeset 8dca9165c064 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8dca9165c064 description: * added some NS_* in xmpp/protocol.py (for XEP-0136) diffstat: src/common/xmpp/protocol.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 87644975736c -r 8dca9165c064 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun Jul 12 16:32:01 2009 +0200 +++ b/src/common/xmpp/protocol.py Mon Jul 13 01:03:43 2009 +0200 @@ -27,6 +27,11 @@ NS_AGENTS ='jabber:iq:agents' NS_AMP ='http://jabber.org/protocol/amp' NS_AMP_ERRORS =NS_AMP+'#errors' +NS_ARCHIVE ='urn:xmpp:archive' +NS_ARCHIVE_AUTO =NS_ARCHIVE+':auto' +NS_ARCHIVE_MANAGE =NS_ARCHIVE+':manage' +NS_ARCHIVE_MANUAL =NS_ARCHIVE+':manual' +NS_ARCHIVE_PREF =NS_ARCHIVE+':pref' NS_AUTH ='jabber:iq:auth' NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind'

1 0

gajim: * first draft of ArchivingPreferences (for XEP-0136)
by Anaël Verrier 15 Jul '09

15 Jul '09

changeset 87644975736c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=87644975736c description: * first draft of ArchivingPreferences (for XEP-0136) diffstat: src/common/message_archiving.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diffs (49 lines): diff -r 3727538c28b3 -r 87644975736c src/common/message_archiving.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/message_archiving.py Sun Jul 12 16:32:01 2009 +0200 @@ -0,0 +1,45 @@ +# -*- coding:utf-8 -*- +## src/common/message_archiving.py +## +## Copyright (C) 2009 Anaël Verrier <elghinn AT free.fr> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + + +class ArchivingPreferences: + def __init__(self): + self.auto = None + self.method_auto = None + self.method_local = None + self.method_manual = None + self.default = None + self.items = {} + + def set(self, auto, method_auto, method_local, method_manual, default): + self.auto = auto + self.method_auto = method_auto + self.method_local = method_local + self.method_manual = method_manual + self.default = default + + def set_default(self, expire, otr, save): + self.default = {'expire': expire, 'otr': otr, 'save': save} + + def append_or_update_item(self, jid, expire, otr, save): + self.items[jid] = {'expire': expire, 'otr': otr, 'save': save} + + def remove_item(self, jid): + del self.items[jid]

1 0

gajim: * do not stock anymore groupchat presence into NonBlockin...
by Anaël Verrier 14 Jul '09

14 Jul '09

changeset 130d308b573a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=130d308b573a description: * do not stock anymore groupchat presence into NonBlockingRoster. Fixes #5160 diffstat: src/common/xmpp/roster_nb.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r b8669b70b3f9 -r 130d308b573a src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Tue Jul 14 16:41:25 2009 +0200 +++ b/src/common/xmpp/roster_nb.py Tue Jul 14 18:48:24 2009 +0200 @@ -21,7 +21,7 @@ mass-renaming of contacts. ''' -from protocol import JID, Iq, Presence, Node, NodeProcessed, NS_ROSTER +from protocol import JID, Iq, Presence, Node, NodeProcessed, NS_MUC_USER, NS_ROSTER from plugin import PlugIn import logging @@ -94,6 +94,8 @@ def PresenceHandler(self,dis,pres): ''' Presence tracker. Used internally for setting items' resources state in internal roster representation. ''' + if pres.getTag('x', namespace=NS_MUC_USER): + return jid=pres.getFrom() if not jid: # If no from attribue, it's from server

1 0

gajim: don't send a new presence when we only want to change pep...
by Yann Leboulanger 14 Jul '09

14 Jul '09

changeset b8669b70b3f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8669b70b3f9 description: don't send a new presence when we only want to change pep info diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r b82239489a5d -r b8669b70b3f9 src/roster_window.py --- a/src/roster_window.py Tue Jul 14 10:48:02 2009 +0200 +++ b/src/roster_window.py Tue Jul 14 16:41:25 2009 +0200 @@ -1941,6 +1941,9 @@ child_iterA = self._get_account_iter(account, self.model) if status != 'offline': if to is None: + if status == gajim.connections[account].get_status() and \ + txt == gajim.connections[account].status: + return gajim.config.set_per('accounts', account, 'last_status', status) gajim.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt))

1 0

gajim: [Sergiy Yegorov] updated ukrainian translation
by Yann Leboulanger 14 Jul '09

14 Jul '09

changeset b82239489a5d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b82239489a5d description: [Sergiy Yegorov] updated ukrainian translation diffstat: po/uk.po | 2813 +++++++++++++++++++++++++++++++++++------------------------------- 1 files changed, 1482 insertions(+), 1331 deletions(-) diffs (truncated from 7462 to 300 lines): diff -r 11ab55f309b5 -r b82239489a5d po/uk.po --- a/po/uk.po Mon Jul 13 22:23:14 2009 +0200 +++ b/po/uk.po Tue Jul 14 10:48:02 2009 +0200 @@ -4,26 +4,21 @@ # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. # # Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2009. -# Yuri Chornoivan <yurchor(a)ukr.net>, 2008 -#. app_name (string) -#. replaces_id (uint) -#. event_id (string) -#. app_icon (string) -#: ../src/notify.py:563 +# Yuri Chornoivan <yurchor(a)ukr.net>, 2008. msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-08 11:18+0200\n" -"PO-Revision-Date: 2009-04-08 11:50+0300\n" +"POT-Creation-Date: 2009-07-14 10:39+0200\n" +"PO-Revision-Date: 2009-07-14 01:40+0300\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" -"Language-Team: Ukrainian\n" +"Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 0.3\n" #: ../data/gajim.desktop.in.in.h:1 msgid "A GTK+ Jabber client" @@ -101,7 +96,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "@" -msgstr "" +msgstr "@" #: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "" @@ -286,9 +281,9 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1143 -#: ../src/common/helpers.py:1155 ../src/notify.py:559 ../src/notify.py:580 -#: ../src/notify.py:619 ../src/notify.py:631 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212 +#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568 +#: ../src/notify.py:607 ../src/notify.py:619 msgid "Gajim" msgstr "Gajim" @@ -298,8 +293,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:21 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2645 -#: ../src/roster_window.py:5196 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2710 +#: ../src/roster_window.py:5268 msgid "General" msgstr "Загальне" @@ -360,8 +355,8 @@ msgstr "Відомості про вас, які зберігаються на сервері" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1570 -#: ../src/config.py:2073 +#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1559 +#: ../src/config.py:2066 msgid "No key selected" msgstr "Не обрано жодного ключа" @@ -372,12 +367,13 @@ #. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:36 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1118 -#: ../src/config.py:1207 ../src/config.py:1475 ../src/config.py:1480 -#: ../src/config.py:1981 ../src/config.py:2059 ../src/config.py:2072 -#: ../src/config.py:3161 ../src/config.py:3229 ../src/dialogs.py:293 -#: ../src/dialogs.py:295 ../src/dialogs.py:523 ../src/roster_window.py:2715 -#: ../src/roster_window.py:2721 ../src/roster_window.py:2726 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1107 +#: ../src/config.py:1196 ../src/config.py:1464 ../src/config.py:1469 +#: ../src/config.py:1972 ../src/config.py:2052 ../src/config.py:2065 +#: ../src/config.py:3155 ../src/config.py:3223 ../src/dialogs.py:293 +#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 +#: ../src/roster_window.py:2780 ../src/roster_window.py:2786 +#: ../src/roster_window.py:2791 msgid "None" msgstr "Немає" @@ -456,7 +452,6 @@ #: ../data/glade/account_modification_window.glade.h:43 #: ../data/glade/accounts_window.glade.h:49 -#: ../data/glade/synchronise_contacts_dialog.glade.h:2 #: ../data/glade/synchronise_select_account_dialog.glade.h:2 msgid "Synchronise contacts" msgstr "Синхронізувати контакти" @@ -530,7 +525,7 @@ "Можливо, вам також доведеться змінити параметри брандмауера." #: ../data/glade/accounts_window.glade.h:31 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:680 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:784 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -544,7 +539,7 @@ msgstr "Об’є_днати облікові записи" #. Rename -#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5147 +#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5219 msgid "Re_name" msgstr "Пере_йменувати" @@ -795,7 +790,7 @@ msgstr "Усі стани" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:215 +#: ../src/common/commands.py:101 ../src/common/helpers.py:214 msgid "Away" msgstr "Далеко" @@ -812,7 +807,7 @@ msgstr "Має " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:225 +#: ../src/common/helpers.py:224 msgid "Invisible" msgstr "Невидимка" @@ -821,7 +816,7 @@ msgstr "Запустити команду" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:198 +#: ../src/common/helpers.py:197 msgid "Not Available" msgstr "Дуже далеко" @@ -986,11 +981,19 @@ msgid "Type your new status message" msgstr "Вкажіть ваше нове повідомлення стану" -#: ../data/glade/change_status_message_dialog.glade.h:2 +#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601 +msgid "Activity:" +msgstr "Заняття:" + +#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586 +msgid "Mood:" +msgstr "Настрій:" + +#: ../data/glade/change_status_message_dialog.glade.h:4 msgid "Preset messages:" msgstr "Зразки повідомлень:" -#: ../data/glade/change_status_message_dialog.glade.h:3 +#: ../data/glade/change_status_message_dialog.glade.h:5 msgid "Save as Preset..." msgstr "Зберегти як зразок..." @@ -1050,11 +1053,11 @@ #: ../data/glade/chat_control_popup_menu.glade.h:6 #: ../data/glade/gc_control_popup_menu.glade.h:6 -#: ../data/glade/gc_occupants_menu.glade.h:7 +#: ../data/glade/gc_occupants_menu.glade.h:8 #: ../data/glade/roster_contact_context_menu.glade.h:17 #: ../data/glade/roster_window.glade.h:21 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5843 +#: ../src/roster_window.py:5915 msgid "_History" msgstr "_Журнал" @@ -1198,7 +1201,7 @@ "Рядок контакту\n" "Заголовок балачки" -#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749 +#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768 msgid "Bold" msgstr "Жирний" @@ -1218,11 +1221,11 @@ msgid "Gone" msgstr "Пішов" -#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152 +#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153 msgid "Inactive" msgstr "Неактивний" -#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750 +#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769 msgid "Italic" msgstr "Курсив" @@ -1270,7 +1273,7 @@ msgid "Configure _Room..." msgstr "Налаштувати _кімнату..." -#: ../data/glade/gc_control_popup_menu.glade.h:4 +#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624 msgid "_Bookmark" msgstr "_Закладка" @@ -1302,23 +1305,37 @@ msgid "_Ban" msgstr "_Заблокувати" -#: ../data/glade/gc_occupants_menu.glade.h:8 +#: ../data/glade/gc_occupants_menu.glade.h:7 +#: ../data/glade/roster_contact_context_menu.glade.h:15 +#: ../src/roster_window.py:5247 ../src/roster_window.py:5724 +#: ../src/roster_window.py:5853 +msgid "_Block" +msgstr "_Заблокувати" + +#: ../data/glade/gc_occupants_menu.glade.h:9 msgid "_Kick" msgstr "_Викинути" -#: ../data/glade/gc_occupants_menu.glade.h:9 +#: ../data/glade/gc_occupants_menu.glade.h:10 msgid "_Member" msgstr "_Учасник" -#: ../data/glade/gc_occupants_menu.glade.h:10 +#: ../data/glade/gc_occupants_menu.glade.h:11 msgid "_Owner" msgstr "_Власник" -#: ../data/glade/gc_occupants_menu.glade.h:11 +#: ../data/glade/gc_occupants_menu.glade.h:12 msgid "_Send Private Message" msgstr "_Надіслати конфіденційне повідомлення" -#: ../data/glade/gc_occupants_menu.glade.h:12 +#: ../data/glade/gc_occupants_menu.glade.h:13 +#: ../data/glade/roster_contact_context_menu.glade.h:22 +#: ../src/roster_window.py:5241 ../src/roster_window.py:5718 +#: ../src/roster_window.py:5850 +msgid "_Unblock" +msgstr "_Розблокувати" + +#: ../data/glade/gc_occupants_menu.glade.h:14 msgid "_Voice" msgstr "_Голос" @@ -1326,13 +1343,13 @@ msgid "Create new post" msgstr "Створити нове повідомлення" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:240 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239 msgid "From" msgstr "Від" #. holds subject -#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170 -#: ../src/history_manager.py:201 +#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195 +#: ../src/history_manager.py:226 msgid "Subject" msgstr "Тема" @@ -1352,7 +1369,7 @@ msgstr "" "<big>Ласкаво просимо до інструменту керування журналами Gajim</big>" -#: ../data/glade/history_manager.glade.h:4 +#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2775 msgid "Delete" msgstr "Вилучити" @@ -1406,7 +1423,7 @@ msgid "_Log conversation history" msgstr "_Зберігати журнал спілкування" -#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1702 +#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1807 msgid "Join Group Chat" msgstr "Приєднатись до групової балачки" @@ -1433,8 +1450,8 @@ msgid "Room:"

1 0

gajim: fix error with bosh
by Yann Leboulanger 13 Jul '09

13 Jul '09

changeset 11ab55f309b5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11ab55f309b5 description: fix error with bosh diffstat: src/common/xmpp/auth_nb.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r b0b3e1e406f3 -r 11ab55f309b5 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Mon Jul 13 22:14:24 2009 +0200 +++ b/src/common/xmpp/auth_nb.py Mon Jul 13 22:23:14 2009 +0200 @@ -504,7 +504,8 @@ jid = JID(resp.getTag('bind').getTagData('jid')) self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() - if self.session == -1: #Server don't want us to initialize a session + if hasattr(self, 'session') and self.session == -1: + # Server don't want us to initialize a session log.info('No session required.') self.on_bound('ok') else:

1 0

gajim: add another way to get errno from exception
by Yann Leboulanger 13 Jul '09

13 Jul '09

changeset b0b3e1e406f3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0b3e1e406f3 description: add another way to get errno from exception diffstat: src/common/xmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b88076c46bb2 -r b0b3e1e406f3 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Jul 13 18:32:16 2009 +0200 +++ b/src/common/xmpp/tls_nb.py Mon Jul 13 22:14:24 2009 +0200 @@ -63,7 +63,7 @@ peer=None): self.parent = IOError - errno = errno or gattr(exc, 'errno') + errno = errno or gattr(exc, 'errno') or exc[0] strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args') if not isinstance(strerror, basestring): strerror = repr(strerror)

1 0

gajim: session packet are not mendatory during login. Send it on...
by Yann Leboulanger 13 Jul '09

13 Jul '09

changeset b88076c46bb2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b88076c46bb2 description: session packet are not mendatory during login. Send it only when requested by server. Fixes #5088 diffstat: src/common/xmpp/auth_nb.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (20 lines): diff -r c48c0a7b61cb -r b88076c46bb2 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Mon Jul 13 17:47:20 2009 +0200 +++ b/src/common/xmpp/auth_nb.py Mon Jul 13 18:32:16 2009 +0200 @@ -504,9 +504,13 @@ jid = JID(resp.getTag('bind').getTagData('jid')) self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() - self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', - payload=[Node('session', attrs={'xmlns':NS_SESSION})]), - func=self._on_session) + if self.session == -1: #Server don't want us to initialize a session + log.info('No session required.') + self.on_bound('ok') + else: + self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', + payload=[Node('session', attrs={'xmlns':NS_SESSION})]), + func=self._on_session) return if resp: log.error('Binding failed: %s.' % resp.getTag('error'))

1 0

gajim: handle ZeroReturnError raised by PyOpenSSL
by Yann Leboulanger 13 Jul '09

13 Jul '09

changeset c48c0a7b61cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c48c0a7b61cb description: handle ZeroReturnError raised by PyOpenSSL diffstat: src/common/xmpp/tls_nb.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r f2d2c515dc4b -r c48c0a7b61cb src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Jul 13 17:44:47 2009 +0200 +++ b/src/common/xmpp/tls_nb.py Mon Jul 13 17:47:20 2009 +0200 @@ -165,6 +165,10 @@ log.debug("Recv: Got OpenSSL.SSL.SysCallError: " + repr(e), exc_info=True) raise SSLWrapper.Error(self.sock or self.sslobj, e) + except OpenSSL.SSL.ZeroReturnError, e: + # end-of-connection raises ZeroReturnError instead of having the + # connection's .recv() method return a zero-sized result. + raise SSLWrapper.Error(self.sock or self.sslobj, e, -1) except OpenSSL.SSL.Error, e: if self.is_numtoolarge(e): # warn, but ignore this exception

1 0

gajim: get errornum correctly in SSLWrapperError exceptions
by Yann Leboulanger 13 Jul '09

13 Jul '09

changeset f2d2c515dc4b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2d2c515dc4b description: get errornum correctly in SSLWrapperError exceptions diffstat: src/common/xmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d40c9754b473 -r f2d2c515dc4b src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Mon Jul 13 17:44:12 2009 +0200 +++ b/src/common/xmpp/transports_nb.py Mon Jul 13 17:44:47 2009 +0200 @@ -535,7 +535,7 @@ except tls_nb.SSLWrapper.Error, e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.exc + errnum, errstr = e.errno, e.strerror if received == '': errstr = 'zero bytes on recv'

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009