Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: better var name.
by Yann Leboulanger 24 Apr '10

24 Apr '10

changeset a6b9472faa92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6b9472faa92 description: better var name. diffstat: src/common/xmpp/tls_nb.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 2e312d7abd40 -r a6b9472faa92 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Fri Apr 23 21:13:41 2010 +0300 +++ b/src/common/xmpp/tls_nb.py Sat Apr 24 09:06:07 2010 +0200 @@ -355,10 +355,9 @@ # If we are going to use a client cert/key pair for authentication, # we choose TLSv1 method. tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) - client_cert_path = self._owner._owner._caller.client_cert log.debug('Using client cert and key from %s' % conn.client_cert) try: - p12 = OpenSSL.crypto.load_pkcs12(open(client_cert_path).read()) + p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read()) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load client pkcs12 certificate from ' 'file %s: %s ... Is it a valid PKCS12 cert?' % \

1 0

gajim: Fixed a typo. Thanks to Dicson. Fixes #5714
by Alexander Cherniuk 23 Apr '10

23 Apr '10

changeset 2e312d7abd40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2e312d7abd40 description: Fixed a typo. Thanks to Dicson. Fixes #5714 diffstat: src/common/location_listener.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fb1036d5aad6 -r 2e312d7abd40 src/common/location_listener.py --- a/src/common/location_listener.py Fri Apr 23 15:08:42 2010 +0300 +++ b/src/common/location_listener.py Fri Apr 23 21:13:41 2010 +0300 @@ -69,7 +69,7 @@ name, description, service, path = cli.GetPositionProvider() if path: provider = bus.get_object(service, path) - fields, timestamp, lat, lon, alt, accuray = provider.GetPosition() + fields, timestamp, lat, lon, alt, accuracy = provider.GetPosition() self._on_geoclue_position_changed(fields, timestamp, lat, lon, alt, accuracy)

1 0

gajim: Unobvious code execution order. Minor fix. Fixes #5713
by Alexander Cherniuk 23 Apr '10

23 Apr '10

changeset a984a4d63eae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a984a4d63eae description: Unobvious code execution order. Minor fix. Fixes #5713 diffstat: src/common/xmpp/transports_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 34338e1bf078 -r a984a4d63eae src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Mon Apr 19 12:09:19 2010 +0300 +++ b/src/common/xmpp/transports_nb.py Fri Apr 23 15:10:24 2010 +0300 @@ -336,6 +336,7 @@ # variable for errno symbol that will be found from exception raised # from connect() errnum = 0 + errstr = str() # set timeout for TCP connecting - if nonblocking connect() fails, pollend # is called. If if succeeds pollout is called.

1 0

gajim: Unobvious code execution order. Minor fix. Fixes #5713
by Alexander Cherniuk 23 Apr '10

23 Apr '10

changeset fb1036d5aad6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb1036d5aad6 description: Unobvious code execution order. Minor fix. Fixes #5713 diffstat: src/common/xmpp/transports_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 514956dd8155 -r fb1036d5aad6 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Wed Apr 21 20:25:27 2010 +0200 +++ b/src/common/xmpp/transports_nb.py Fri Apr 23 15:08:42 2010 +0300 @@ -342,6 +342,7 @@ # variable for errno symbol that will be found from exception raised # from connect() errnum = 0 + errstr = str() # set timeout for TCP connecting - if nonblocking connect() fails, pollend # is called. If if succeeds pollout is called.

1 0

gajim-website: l10n: Updated ru_RU translation to 91%
by dicson_ 23 Apr '10

23 Apr '10

changeset 70eca52bd0f9 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=70eca52bd0f9 description: l10n: Updated ru_RU translation to 91% New status: 181 messages complete with 6 fuzzies and 11 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: locale/ru_RU/LC_MESSAGES/msg.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (25 lines): diff -r ada71a88973c -r 70eca52bd0f9 locale/ru_RU/LC_MESSAGES/msg.po --- a/locale/ru_RU/LC_MESSAGES/msg.po Sat Apr 17 10:32:03 2010 +0000 +++ b/locale/ru_RU/LC_MESSAGES/msg.po Fri Apr 23 04:38:33 2010 +0000 @@ -517,9 +517,8 @@ msgstr " В Windows\n" #: downloads.php:206 -#, fuzzy msgid " You first have to install mercurial for windows. In order to do that, download the binary" -msgstr " Сначала вам нужно устновить subversion для windows. Чтобы это сделать, загрузите исполняемый файл" +msgstr " Сначала вам нужно устновить меркуриал для windows. Чтобы это сделать, загрузите исполняемый файл" #: downloads.php:208 #, fuzzy @@ -633,9 +632,8 @@ msgstr "локальная связь (bonjour / zeroconf)" #: index.php:38 -#, fuzzy msgid "Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian" -msgstr "Gajim доступен на 24 языках: английском, баскском, белорусском, болгарском, бразильском, британском, галисийский, датском, литовском, немецком, норвежском (Bokmål), испанском, итальянском, китайском (упрощённом), польском, русском, сербском, словацком, французском, хорватском, чешском, шведском и эсперанто" +msgstr "Gajim доступен на 25 языках: английском, баскском, белорусском, болгарском, бразильском, британском, галисийском, датском, литовском, немецком, норвежском (Bokmål), испанском, итальянском, китайском (упрощённом), польском, русском, сербском, словацком, французском, хорватском, чешском, шведском, японском, украинском и эсперанто" #: index.php:48 msgid "NEWS"

1 0

gajim: [Jingle] Fix misplaced tags in error stanzas ; added erro...
by Thibaut Girka 21 Apr '10

21 Apr '10

changeset 514956dd8155 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=514956dd8155 description: [Jingle] Fix misplaced tags in error stanzas ; added error type support (for types other than cancel) diffstat: src/common/jingle_session.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (41 lines): diff -r d302367f5132 -r 514956dd8155 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Apr 21 14:59:46 2010 +0300 +++ b/src/common/jingle_session.py Wed Apr 21 20:25:27 2010 +0200 @@ -278,7 +278,7 @@ # it's a jingle action action = jingle.getAttr('action') if action not in self.callbacks: - self.__send_error(stanza, 'bad_request') + self.__send_error(stanza, 'bad-request') return # FIXME: If we aren't initiated and it's not a session-initiate... if action != 'session-initiate' and self.state == JingleStates.ended: @@ -353,7 +353,7 @@ # TODO: ringing, active, (un)hold, (un)mute payload = jingle.getPayload() if payload: - self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info') + self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') raise xmpp.NodeProcessed def __on_content_remove(self, stanza, jingle, error, action): @@ -555,13 +555,16 @@ jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) return stanza, jingle - def __send_error(self, stanza, error, jingle_error=None, text=None): - err = xmpp.Error(stanza, '%s %s' % (xmpp.NS_STANZAS, error)) + def __send_error(self, stanza, error, jingle_error=None, text=None, type_=None): + err_stanza = xmpp.Error(stanza, '%s %s' % (xmpp.NS_STANZAS, error)) + err = err_stanza.getTag('error') + if type_: + err.setAttr('type', type_) if jingle_error: err.setTag(jingle_error, namespace=xmpp.NS_JINGLE_ERRORS) if text: err.setTagData('text', text) - self.connection.connection.send(err) + self.connection.connection.send(err_stanza) self.__dispatch_error(error, jingle_error, text) def __append_content(self, jingle, content):

1 0

gajim: <confirm/> must be included if it's a message instead of ...
by Alexander Cherniuk 21 Apr '10

21 Apr '10

changeset d302367f5132 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d302367f5132 description: <confirm/> must be included if it's a message instead of an IQ. Fixes #5690 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7b93a731eb71 -r d302367f5132 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Apr 19 17:26:59 2010 +0300 +++ b/src/common/connection_handlers.py Wed Apr 21 14:59:46 2010 +0300 @@ -992,7 +992,7 @@ if answer == 'yes': confirm = iq_obj.getTag('confirm') reply = iq_obj.buildReply('result') - if iq_obj.getType() == 'message': + if iq_obj.getName() == 'message': reply.addChild(node=confirm) self.connection.send(reply) elif answer == 'no':

1 0

gajim: Fix the check of whether command succeeded or not
by Alexander Cherniuk 19 Apr '10

19 Apr '10

changeset 7b93a731eb71 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b93a731eb71 description: Fix the check of whether command succeeded or not diffstat: src/command_system/implementation/middleware.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 9436064192c6 -r 7b93a731eb71 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Mon Apr 19 13:28:25 2010 +0300 +++ b/src/command_system/implementation/middleware.py Mon Apr 19 17:26:59 2010 +0300 @@ -35,15 +35,15 @@ """ def process_as_command(self, text): + self.command_succeeded = False flag = super(ChatCommandProcessor, self).process_as_command(text) - if flag and self.command_succeded: + if flag and self.command_succeeded: self.add_history(text) self.clear_input() return flag def execute_command(self, name, arguments): try: - self.command_succeded = False super(ChatCommandProcessor, self).execute_command(name, arguments) except NoCommandError, error: details = dict(name=error.name, message=error.message) @@ -57,7 +57,7 @@ self.echo("An error occured while trying to execute the command", 'error') print_exc() else: - self.command_succeded = True + self.command_succeeded = True def looks_like_command(self, text, body, name, arguments): # Command escape stuff ggoes here. If text was prepended by the

1 0

gajim: A fix for the SASL EXTERNAL. Thanks to Calmar. Fixes #5704
by Alexander Cherniuk 19 Apr '10

19 Apr '10

changeset 9436064192c6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9436064192c6 description: A fix for the SASL EXTERNAL. Thanks to Calmar. Fixes #5704 diffstat: src/common/xmpp/tls_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c3693e47feae -r 9436064192c6 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Apr 19 12:37:08 2010 +0300 +++ b/src/common/xmpp/tls_nb.py Mon Apr 19 13:28:25 2010 +0300 @@ -355,6 +355,7 @@ # If we are going to use a client cert/key pair for authentication, # we choose TLSv1 method. tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) + client_cert_path = self._owner._owner._caller.client_cert log.debug('Using client cert and key from %s' % conn.client_cert) try: p12 = OpenSSL.crypto.load_pkcs12(open(client_cert_path).read())

1 0

gajim: gtk.Builder.get_widget is now known as gtk.Builder.get_ob...
by Alexander Cherniuk 19 Apr '10

19 Apr '10

changeset c3693e47feae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3693e47feae description: gtk.Builder.get_widget is now known as gtk.Builder.get_object. Fixes #5709 diffstat: src/config.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (29 lines): diff -r 1ff08c474cac -r c3693e47feae src/config.py --- a/src/config.py Sun Apr 18 20:57:47 2010 +0200 +++ b/src/config.py Mon Apr 19 12:37:08 2010 +0300 @@ -1648,14 +1648,14 @@ self.dialog.destroy() if not path_to_clientcert_file: return - self.xml.get_widget('cert_entry1').set_text(path_to_clientcert_file) + self.xml.get_object('cert_entry1').set_text(path_to_clientcert_file) gajim.config.set_per('accounts', self.current_account, 'client_cert', path_to_clientcert_file) def on_cancel(widget): self.dialog.destroy() - path_to_clientcert_file = self.xml.get_widget('cert_entry1').get_text() + path_to_clientcert_file = self.xml.get_object('cert_entry1').get_text() self.dialog = dialogs.ClientCertChooserDialog(path_to_clientcert_file, on_ok, on_cancel) @@ -1817,7 +1817,7 @@ 'accounts', account, 'resource')) client_cert = gajim.config.get_per('accounts', account, 'client_cert') - self.xml.get_widget('cert_entry1').set_text(client_cert) + self.xml.get_object('cert_entry1').set_text(client_cert) self.xml.get_object('adjust_priority_with_status_checkbutton1').\ set_active(gajim.config.get_per('accounts', account,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2010