Commits October 2011

commits@gajim.org

3 participants
64 discussions

gajim: fix logger name
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset 824b54a64fea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=824b54a64fea description: fix logger name diffstat: src/common/ged.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b44f29557564 -r 824b54a64fea src/common/ged.py --- a/src/common/ged.py Fri Oct 07 17:51:32 2011 +0200 +++ b/src/common/ged.py Fri Oct 07 17:51:57 2011 +0200 @@ -26,7 +26,7 @@ ''' import logging -log = logging.getLogger('gajim.common.ged') +log = logging.getLogger('gajim.c.ged') PRECORE = 10 CORE = 20

1 0

gajim: fix getting session jid. Fixes #6994
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset b44f29557564 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b44f29557564 description: fix getting session jid. Fixes #6994 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1013d2e5a4f1 -r b44f29557564 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Oct 07 10:17:35 2011 +0200 +++ b/src/common/connection_handlers.py Fri Oct 07 17:51:32 2011 +0200 @@ -926,7 +926,7 @@ # there won't be any sessions here if the contact terminated # their sessions before going offline (which we do) for sess in self.get_sessions(jid): - sess_fjid = str(sess.jid) + sess_fjid = sess.jid.getStripped() if sess.resource: sess_fjid += '/' + sess.resource if obj.fjid != sess_fjid:

1 0

gajim: don't traceback when securitylabel has no displaymarking ...
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset 1013d2e5a4f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1013d2e5a4f1 description: don't traceback when securitylabel has no displaymarking element. Fixes #7006 diffstat: src/common/connection_handlers.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 266ac0500f09 -r 1013d2e5a4f1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Oct 06 09:11:14 2011 +0200 +++ b/src/common/connection_handlers.py Fri Oct 07 10:17:35 2011 +0200 @@ -1418,7 +1418,11 @@ labels = {} ll = [] for item in items: - label = item.getTag('displaymarking').getData() + display_tag = item.getTag('displaymarking') + if display_tag: + label = display_tag.getData() + else: + label = '' labels[label] = item ll.append(label) if to not in self.seclabel_catalogues:

1 0

gajim: fixes IBB. Fixes #6990
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset 266ac0500f09 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=266ac0500f09 description: fixes IBB. Fixes #6990 diffstat: src/common/protocol/bytestream.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diffs (28 lines): diff -r 17a1885653f5 -r 266ac0500f09 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Oct 06 08:53:31 2011 +0200 +++ b/src/common/protocol/bytestream.py Thu Oct 06 09:11:14 2011 +0200 @@ -721,11 +721,6 @@ def __init__(self): ConnectionBytestream.__init__(self) self._streams = {} - self._ampnode = xmpp.Node(xmpp.NS_AMP + ' amp', payload=[xmpp.Node( - 'rule', {'condition': 'deliver-at', 'value': 'stored', - 'action': 'error'}), xmpp.Node('rule', - {'condition': 'match-resource', 'value': 'exact', - 'action':'error'})]) self.last_sent_ibb_id = None def IBBIqHandler(self, conn, stanza): @@ -840,9 +835,9 @@ file_props['started'] = True if file_props['seq'] == 65536: file_props['seq'] = 0 - self.last_sent_ibb_id = self.connection.send(xmpp.Protocol('iq', - file_props['direction'][1:], payload=[datanode, - self._ampnode])) + self.last_sent_ibb_id = self.connection.send(xmpp.Protocol( + name='iq', to=file_props['direction'][1:], typ='set', + payload=[datanode])) current_time = time.time() file_props['elapsed-time'] += current_time - file_props[ 'last-time']

1 0

gajim: improve code. see #6957
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset 17a1885653f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17a1885653f5 description: improve code. see #6957 diffstat: src/config.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (20 lines): diff -r bf58c7e33495 -r 17a1885653f5 src/config.py --- a/src/config.py Thu Oct 06 00:41:17 2011 +0300 +++ b/src/config.py Thu Oct 06 08:53:31 2011 +0200 @@ -3768,14 +3768,12 @@ for field in obj.config: if field in ('key', 'instructions', 'x', 'registered'): continue - if not obj.config[field]: - # ignore empty tag - continue empty_config = False break - if not obj.is_form and empty_config: + if empty_config: self.forward_button.set_sensitive(False) self.notebook.set_current_page(4) # show form page + return self.data_form_widget.show_all() self.xml.get_object('form_vbox').pack_start(self.data_form_widget) self.ssl_fingerprint = obj.ssl_fingerprint

1 0

gajim: fixes #7007 and #6957
by Fomin Denis 08 Oct '11

08 Oct '11

changeset bf58c7e33495 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bf58c7e33495 description: fixes #7007 and #6957 diffstat: src/config.py | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diffs (34 lines): diff -r a5c40000c045 -r bf58c7e33495 src/config.py --- a/src/config.py Fri Sep 30 13:47:15 2011 +0300 +++ b/src/config.py Thu Oct 06 00:41:17 2011 +0300 @@ -3764,18 +3764,18 @@ self.data_form_widget = dataforms_widget.DataFormWidget(dataform) else: self.data_form_widget = FakeDataForm(obj.config) - empty_config = True - for field in obj.config: - if field == 'instructions': - continue - if not obj.config[field]: - # ignore empty tag - continue - empty_config = False - break - if not obj.is_form and empty_config: - self.forward_button.set_sensitive(False) - self.notebook.set_current_page(4) # show form page + empty_config = True + for field in obj.config: + if field in ('key', 'instructions', 'x', 'registered'): + continue + if not obj.config[field]: + # ignore empty tag + continue + empty_config = False + break + if not obj.is_form and empty_config: + self.forward_button.set_sensitive(False) + self.notebook.set_current_page(4) # show form page self.data_form_widget.show_all() self.xml.get_object('form_vbox').pack_start(self.data_form_widget) self.ssl_fingerprint = obj.ssl_fingerprint

1 0

gajim: revert [3bd5f54fca8d]
by Fomin Denis 08 Oct '11

08 Oct '11

changeset ae10e1fb5546 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae10e1fb5546 description: revert [3bd5f54fca8d] diffstat: src/command_system/implementation/execute.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4eae89028b4b -r ae10e1fb5546 src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Fri Oct 07 22:22:25 2011 +0300 +++ b/src/command_system/implementation/execute.py Sat Oct 08 22:54:05 2011 +0300 @@ -41,7 +41,7 @@ from hosts import * class Execute(CommandContainer): - AUTOMATIC = False + AUTOMATIC = True HOSTS = ChatCommands, PrivateChatCommands, GroupChatCommands DIRECTORY = "~"

1 0

gajim: Fix gtk.label + wrapping in the dataform widget.(problem ...
by Fomin Denis 07 Oct '11

07 Oct '11

changeset 4eae89028b4b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4eae89028b4b description: Fix gtk.label + wrapping in the dataform widget.(problem - http://img36.imageshack.us/img36/2782/tmpbhyeyn.png) diffstat: src/gtkgui_helpers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6abeae5e986c -r 4eae89028b4b src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Oct 07 17:57:24 2011 +0200 +++ b/src/gtkgui_helpers.py Fri Oct 07 22:22:25 2011 +0300 @@ -1081,6 +1081,7 @@ return # set wrap width to the pango.Layout of the labels ### + widget.set_alignment(0.0, 0.0) layout.set_width (allocation.width * pango.SCALE) lh = layout.get_size()[1]

1 0

gajim: [Zash] support latest version of XEP-0258. Fixes #7010
by Yann Leboulanger 07 Oct '11

07 Oct '11

changeset 6abeae5e986c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6abeae5e986c description: [Zash] support latest version of XEP-0258. Fixes #7010 diffstat: src/common/connection.py | 3 ++- src/common/connection_handlers.py | 10 +++------- src/common/xmpp/protocol.py | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diffs (48 lines): diff -r a207e3701d33 -r 6abeae5e986c src/common/connection.py --- a/src/common/connection.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/connection.py Fri Oct 07 17:57:24 2011 +0200 @@ -2052,7 +2052,8 @@ if not gajim.account_is_connected(self.name): return self.seclabel_catalogue_request(to, callback) - iq = common.xmpp.Iq(typ='get') + server = gajim.get_jid_from_account(self.name).split("@")[1] # Really, no better way? + iq = common.xmpp.Iq(typ='get', to=server) iq2 = iq.addChild(name='catalog', namespace=common.xmpp.NS_SECLABEL_CATALOG) iq2.setAttr('to', to) self.connection.send(iq) diff -r a207e3701d33 -r 6abeae5e986c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/connection_handlers.py Fri Oct 07 17:57:24 2011 +0200 @@ -1413,16 +1413,12 @@ log.debug('SecLabelCB') query = iq_obj.getTag('catalog') to = query.getAttr('to') - items = query.getTags('securitylabel') + items = query.getTags('item') labels = {} ll = [] for item in items: - display_tag = item.getTag('displaymarking') - if display_tag: - label = display_tag.getData() - else: - label = '' - labels[label] = item + label = item.getAttr('selector') + labels[label] = item.getTag('securitylabel') ll.append(label) if to not in self.seclabel_catalogues: self.seclabel_catalogues[to] = [[], None, None] diff -r a207e3701d33 -r 6abeae5e986c src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/xmpp/protocol.py Fri Oct 07 17:57:24 2011 +0200 @@ -119,7 +119,7 @@ NS_RSM = 'http://jabber.org/protocol/rsm' NS_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' NS_SECLABEL = 'urn:xmpp:sec-label:0' -NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:0' +NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:2' NS_SEARCH = 'jabber:iq:search' NS_SERVER = 'jabber:server' NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session'

1 0

gajim: fix logger name
by Yann Leboulanger 07 Oct '11

07 Oct '11

changeset a207e3701d33 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a207e3701d33 description: fix logger name diffstat: src/common/ged.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a52a4421e1ba -r a207e3701d33 src/common/ged.py --- a/src/common/ged.py Fri Oct 07 17:51:32 2011 +0200 +++ b/src/common/ged.py Fri Oct 07 17:51:57 2011 +0200 @@ -26,7 +26,7 @@ ''' import logging -log = logging.getLogger('gajim.common.ged') +log = logging.getLogger('gajim.c.ged') PRECORE = 10 CORE = 20

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011