Commits

commits@gajim.org

17632 discussions

python-nbxmpp: don't crash when cacerts is an empty string
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset 675173fbd348 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=675173fbd348 description: don't crash when cacerts is an empty string diffstat: nbxmpp/tls_nb.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (19 lines): diff -r 59d5ea67c78f -r 675173fbd348 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Feb 09 21:44:15 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Feb 10 11:28:44 2013 +0100 @@ -399,13 +399,9 @@ tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, - self._ssl_verify_callback) - try: - tcpsock._sslContext.load_verify_locations(self.cacerts) - except: - log.warning('Unable to load SSL certificates from file %s' % \ - os.path.abspath(self.cacerts)) + self._ssl_verify_callback) store = tcpsock._sslContext.get_cert_store() + self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) if os.path.isdir('/etc/ssl/certs'): for f in os.listdir('/etc/ssl/certs'):

1 0

python-nbxmpp: fix traceback
by Yann Leboulanger 09 Feb '13

09 Feb '13

changeset 59d5ea67c78f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=59d5ea67c78f description: fix traceback diffstat: nbxmpp/idlequeue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 562d1f70f8d9 -r 59d5ea67c78f nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sat Feb 09 21:43:30 2013 +0100 +++ b/nbxmpp/idlequeue.py Sat Feb 09 21:44:15 2013 +0100 @@ -311,7 +311,7 @@ if fd not in self.queue: self.remove_timeout(fd) continue - for timeout, func in timeouts.items(): + for timeout, func in list(timeouts.items()): if timeout > current_time: continue if func:

1 0

python-nbxmpp: fix handling traceback. Fixes #3
by Yann Leboulanger 09 Feb '13

09 Feb '13

changeset 562d1f70f8d9 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=562d1f70f8d9 description: fix handling traceback. Fixes #3 diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 515773a7d189 -r 562d1f70f8d9 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Fri Feb 08 08:47:31 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 09 21:43:30 2013 +0100 @@ -361,7 +361,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.args + errnum, errstr = e.errno, e.strerror if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress

1 0

python-nbxmpp: basestring -> str
by Yann Leboulanger 08 Feb '13

08 Feb '13

changeset 515773a7d189 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=515773a7d189 description: basestring -> str diffstat: nbxmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 49651c7be6d7 -r 515773a7d189 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Feb 08 08:45:22 2013 +0100 +++ b/nbxmpp/tls_nb.py Fri Feb 08 08:47:31 2013 +0100 @@ -70,7 +70,7 @@ errno = errno or gattr(exc, 'errno') or exc.args[0] strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args') - if not isinstance(strerror, basestring): + if not isinstance(strerror, str): strerror = repr(strerror) self.sock = sock @@ -99,7 +99,7 @@ if self.peer is None and sock is not None: try: ppeer = self.sock.getpeername() - if len(ppeer) == 2 and isinstance(ppeer[0], basestring) \ + if len(ppeer) == 2 and isinstance(ppeer[0], str) \ and isinstance(ppeer[1], int): self.peer = ppeer except:

1 0

python-nbxmpp: fix error handling. Fixes #1
by Yann Leboulanger 08 Feb '13

08 Feb '13

changeset 49651c7be6d7 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=49651c7be6d7 description: fix error handling. Fixes #1 diffstat: nbxmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7afc8a41b96b -r 49651c7be6d7 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Jan 20 19:52:22 2013 +0100 +++ b/nbxmpp/tls_nb.py Fri Feb 08 08:45:22 2013 +0100 @@ -68,7 +68,7 @@ peer=None): self.parent = IOError - errno = errno or gattr(exc, 'errno') or exc[0] + errno = errno or gattr(exc, 'errno') or exc.args[0] strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args') if not isinstance(strerror, basestring): strerror = repr(strerror)

1 0

gajim: prevent tb.
by Denis Fomin 05 Feb '13

05 Feb '13

changeset 3f8001c9d5c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3f8001c9d5c1 description: prevent tb. diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d5098768ad37 -r 3f8001c9d5c1 src/roster_window.py --- a/src/roster_window.py Thu Jan 31 14:05:51 2013 +0400 +++ b/src/roster_window.py Tue Feb 05 13:22:03 2013 +0400 @@ -2640,6 +2640,8 @@ contact = \ gajim.contacts.get_contact_with_highest_priority( account, jid) + if not contact: + continue gajim.interface.on_open_chat_window(None, contact, account) gajim.config.set_per('accounts', account,

1 0

gajim: fix AcronymsExpanderPlugin
by Denis Fomin 31 Jan '13

31 Jan '13

changeset d5098768ad37 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5098768ad37 description: fix AcronymsExpanderPlugin diffstat: plugins/acronyms_expander/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (6 lines): diff -r 23e84c33ab1c -r d5098768ad37 plugins/acronyms_expander/__init__.py --- a/plugins/acronyms_expander/__init__.py Tue Jan 29 23:59:21 2013 +0400 +++ b/plugins/acronyms_expander/__init__.py Thu Jan 31 14:05:51 2013 +0400 @@ -1,1 +1,1 @@ -from acronyms_expander import AcronymsExpanderPlugin +from .acronyms_expander import AcronymsExpanderPlugin

1 0

gajim: fix ellipsize in plugin_homepage_linkbutton
by Denis Fomin 29 Jan '13

29 Jan '13

changeset 23e84c33ab1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=23e84c33ab1c description: fix ellipsize in plugin_homepage_linkbutton diffstat: src/plugins/gui.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 0d8cbcb2d64e -r 23e84c33ab1c src/plugins/gui.py --- a/src/plugins/gui.py Tue Jan 29 23:07:25 2013 +0400 +++ b/src/plugins/gui.py Tue Jan 29 23:59:21 2013 +0400 @@ -134,10 +134,10 @@ self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) self.plugin_authors_label.set_text(plugin.authors) + self.plugin_homepage_linkbutton.set_uri(plugin.homepage) + self.plugin_homepage_linkbutton.set_label(plugin.homepage) label = self.plugin_homepage_linkbutton.get_children()[0] label.set_ellipsize(Pango.EllipsizeMode.END) - self.plugin_homepage_linkbutton.set_uri(plugin.homepage) - self.plugin_homepage_linkbutton.set_label(plugin.homepage) self.plugin_homepage_linkbutton.set_property('sensitive', True) desc_textbuffer = self.plugin_description_textview.get_buffer()

1 0

gajim: cleaning
by Denis Fomin 29 Jan '13

29 Jan '13

changeset 0d8cbcb2d64e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d8cbcb2d64e description: cleaning diffstat: src/common/helpers.py | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diffs (48 lines): diff -r d65211386b14 -r 0d8cbcb2d64e src/common/helpers.py --- a/src/common/helpers.py Tue Jan 29 01:11:25 2013 +0400 +++ b/src/common/helpers.py Tue Jan 29 23:07:25 2013 +0400 @@ -448,44 +448,6 @@ return output -#def decode_string(string): - #""" - #Try to decode (to make it Unicode instance) given string - #""" - #if isinstance(string, unicode): - #return string - ## by the time we go to iso15 it better be the one else we show bad characters - #encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15') - #for encoding in encodings: - #try: - #string = string.decode(encoding) - #except UnicodeError: - #continue - #break - - #return string - -#def ensure_utf8_string(string): - #""" - #Make sure string is in UTF-8 - #""" - #try: - #string = decode_string(string).encode('utf-8') - #except Exception: - #pass - #return string - -#def wrapped_ensure_utf8_string(fn): - #def wrapped(n): - #return ensure_utf8_string(n) - #return wrapped - -#@wrapped_ensure_utf8_string -#def escape_text(text): - #return GObject.markup_escape_text(text) - -#GObject.markup_escape_text = escape_text - def get_windows_reg_env(varname, default=''): """ Ask for paths commonly used but not exposed as ENVs in english Windows 2003

1 0

gajim: [themazay] update Gajim.nsi to stop using deprecated mess...
by Yann Leboulanger 29 Jan '13

29 Jan '13

changeset a8ab5806dbf4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8ab5806dbf4 description: [themazay] update Gajim.nsi to stop using deprecated messagebox plugin. Fixes #7292 diffstat: gajim.nsi | 36 ++++++++---------------------------- 1 files changed, 8 insertions(+), 28 deletions(-) diffs (88 lines): diff -r 1cf7d602453e -r a8ab5806dbf4 gajim.nsi --- a/gajim.nsi Thu Jan 24 20:26:18 2013 +0100 +++ b/gajim.nsi Tue Jan 29 10:27:51 2013 +0100 @@ -58,9 +58,7 @@ LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed." -LangString STR_Uninstall ${LANG_ENGLISH} "Launch Uninstaller" -LangString STR_Cancel ${LANG_ENGLISH} "Cancel" +LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ Please quit Gajim and restart the uninstaller." @@ -76,9 +74,7 @@ LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déja installé." -LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Désinstallation" -LangString STR_Cancel ${LANG_FRENCH} "Annuler" +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur." @@ -94,9 +90,7 @@ LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." -LangString STR_Installed ${LANG_GERMAN} "Gajim scheint bereits installiert zu sein." -LangString STR_Uninstall ${LANG_GERMAN} "Deinstallations-Programm starten" -LangString STR_Cancel ${LANG_GERMAN} "Abbrechen" +LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.." @@ -112,9 +106,7 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_ITALIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_ITALIAN} "Cancel" +LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." @@ -130,11 +122,8 @@ LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." -LangString STR_Installed ${LANG_RUSSIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_RUSSIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_RUSSIAN} "Cancel" -LangString STR_Running ${LANG_RUSSIAN} "It appears that Gajim is currently running.$\n\ - Close it and restart uninstaller." +LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" +LangString STR_Running ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå çàïóùåí.$\nÇàêðîéòå åãî è çàïóñòèòå äåèíñòàëëÿòîð ñíîâà." Section "Gajim" SecGajim SectionIn RO @@ -678,11 +667,7 @@ IntOp $0 $0 - 2 strcpy $1 $R0 $0 1 IfFileExists $1 +1 NotInstalled - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R1 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R1 2 Quit +1 ExecWait '$R0 _?=$INSTDIR' $R2 StrCmp $R2 0 +1 Quit @@ -691,12 +676,7 @@ ; Check to see if new installer (NSIS)already installed ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" IfFileExists $R3 +1 ReallyNotInstalled - - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R4 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R4 2 Quit +1 ExecWait '$R3 _?=$INSTDIR' $R5 StrCmp $R5 0 ReallyNotInstalled Quit

1 0

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