Commits June 2010

commits@gajim.org

4 participants
38 discussions

gajim: [Zash] fix traceback when sending messages over zeroconf....
by Yann Leboulanger 18 Jun '10

18 Jun '10

changeset bda0dc14fb70 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bda0dc14fb70 description: [Zash] fix traceback when sending messages over zeroconf. Fixes #5784. diffstat: src/common/zeroconf/connection_zeroconf.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r fffe1b752a89 -r bda0dc14fb70 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Wed Jun 16 10:13:23 2010 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Fri Jun 18 07:45:07 2010 +0200 @@ -309,9 +309,9 @@ def send_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, - user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, callback=None, callback_args=[], - now=True): + user_nick=None, xhtml=None, label=None, session=None, forward_from=None, + form_node=None, original_message=None, delayed=None, callback=None, + callback_args=[], now=True): def on_send_ok(msg_id): self.dispatch('MSGSENT', (jid, msg, keyID))

1 0

gajim: prevent traceback when disconnecting while a jingle sessi...
by Yann Leboulanger 16 Jun '10

16 Jun '10

changeset fffe1b752a89 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fffe1b752a89 description: prevent traceback when disconnecting while a jingle session is active. diffstat: src/common/jingle_session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 6cb271a58696 -r fffe1b752a89 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jun 13 18:17:36 2010 +0200 +++ b/src/common/jingle_session.py Wed Jun 16 10:13:23 2010 +0200 @@ -625,7 +625,8 @@ assert self.state != JingleStates.ended stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') - self.connection.connection.send(stanza) + if self.connection.connection and self.connection.connected >= 2: + self.connection.connection.send(stanza) # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'):

1 0

gajim: fix coding style: use 'is' operator when comparing object...
by fantasticsid＠lagaule.org 14 Jun '10

14 Jun '10

changeset c4e1118a99ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4e1118a99ea description: fix coding style: use 'is' operator when comparing object to None. put space around '%' operator. remove redundant str() on arguments. diffstat: src/common/jingle_ft.py | 14 +++++++------- src/common/protocol/bytestream.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diffs (66 lines): diff -r d45271697968 -r c4e1118a99ea src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Jun 14 20:41:24 2010 +0800 +++ b/src/common/jingle_ft.py Mon Jun 14 21:21:22 2010 +0800 @@ -42,21 +42,21 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.file_props = file_props - if file_props == None: + if file_props is None: self.weinitiate = False else: self.weinitiate = True - if self.file_props != None: + if self.file_props is not None: self.file_props['sender'] = session.ourjid self.file_props['session-type'] = 'jingle' self.file_props['sid'] = session.sid self.file_props['transfered_size'] = [] - log.info("FT request: %s"%file_props) + log.info("FT request: %s" % file_props) - if transport == None: + if transport is None: self.transport = JingleTransportICEUDP() self.session = session @@ -64,7 +64,7 @@ def __on_session_initiate(self, stanza, content, error, action): jid = unicode(stanza.getFrom()) - log.info("jid:%s"%jid) + log.info("jid:%s" % jid) file_props = {'type': 'r'} file_props['sender'] = jid @@ -84,13 +84,13 @@ file_props['desc'] = file_desc_tag.getData() file_props['receiver'] = self.session.ourjid - log.info("ourjid: %s"%self.session.ourjid) + log.info("ourjid: %s" % self.session.ourjid) file_props['sid'] = unicode(stanza.getTag('jingle').getAttr('sid')) file_props['transfered_size'] = [] self.file_props = file_props - log.info("FT request: %s"%file_props) + log.info("FT request: %s" % file_props) #TODO #add file transfer to queue diff -r d45271697968 -r c4e1118a99ea src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Jun 14 20:41:24 2010 +0800 +++ b/src/common/protocol/bytestream.py Mon Jun 14 21:21:22 2010 +0800 @@ -156,7 +156,7 @@ field = _feature.setField('stream-method') field.delAttr('type') field.setValue(xmpp.NS_BYTESTREAM) - log.info("send_file_approval: %s"%(str(iq))) + log.info("send_file_approval: %s" % iq) self.connection.send(iq) def send_file_rejection(self, file_props, code='403', typ=None):

1 0

gajim: send session-accept stanza if user approve file transfer
by fantasticsid＠lagaule.org 14 Jun '10

14 Jun '10

changeset d45271697968 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d45271697968 description: send session-accept stanza if user approve file transfer diffstat: src/common/jingle_ft.py | 14 ++++++++++++++ src/common/protocol/bytestream.py | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diffs (85 lines): diff -r 5fa0a6559312 -r d45271697968 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jun 08 21:24:41 2010 +0800 +++ b/src/common/jingle_ft.py Mon Jun 14 20:41:24 2010 +0800 @@ -47,10 +47,20 @@ else: self.weinitiate = True + if self.file_props != None: + self.file_props['sender'] = session.ourjid + self.file_props['session-type'] = 'jingle' + self.file_props['sid'] = session.sid + self.file_props['transfered_size'] = [] + + log.info("FT request: %s"%file_props) + + if transport == None: self.transport = JingleTransportICEUDP() self.session = session + self.media = 'file' def __on_session_initiate(self, stanza, content, error, action): jid = unicode(stanza.getFrom()) @@ -60,6 +70,8 @@ file_props['sender'] = jid file_props['request-id'] = unicode(stanza.getAttr('id')) + file_props['session-type'] = 'jingle' + file_tag = content.getTag('description').getTag('offer').getTag('file') for attribute in file_tag.getAttrs(): if attribute in ('name', 'size', 'hash', 'date'): @@ -75,6 +87,8 @@ log.info("ourjid: %s"%self.session.ourjid) file_props['sid'] = unicode(stanza.getTag('jingle').getAttr('sid')) file_props['transfered_size'] = [] + + self.file_props = file_props log.info("FT request: %s"%file_props) diff -r 5fa0a6559312 -r d45271697968 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Jun 08 21:24:41 2010 +0800 +++ b/src/common/protocol/bytestream.py Mon Jun 14 20:41:24 2010 +0800 @@ -37,6 +37,9 @@ from common.socks5 import Socks5Receiver +import logging +log = logging.getLogger('gajim.c.protocol.bytestream') + def is_transfer_paused(file_props): if 'stopped' in file_props and file_props['stopped']: @@ -125,6 +128,21 @@ # user response to ConfirmationDialog may come after we've disconneted if not self.connection or self.connected < 2: return + + #file transfer initiated by a jingle session + log.info("send_file_approval: jingle session accept") + if file_props.get('session-type') == 'jingle': + session = self.get_jingle_session(file_props['sender'], file_props['sid']) + if not session: + return + jid = gajim.get_jid_without_resource(file_props['sender']) + resource = gajim.get_resource_from_jid(file_props['sender']) + + if not session.accepted: + session.approve_session() + session.approve_content('file') + return + iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result') iq.setAttr('id', file_props['request-id']) si = iq.setTag('si', namespace=xmpp.NS_SI) @@ -138,6 +156,7 @@ field = _feature.setField('stream-method') field.delAttr('type') field.setValue(xmpp.NS_BYTESTREAM) + log.info("send_file_approval: %s"%(str(iq))) self.connection.send(iq) def send_file_rejection(self, file_props, code='403', typ=None):

1 0

gajim: don't forget password when authentication fails. It may b...
by Yann Leboulanger 13 Jun '10

13 Jun '10

changeset 6cb271a58696 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6cb271a58696 description: don't forget password when authentication fails. It may be a server problem. Fixes #5779 diffstat: src/common/connection.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 0583f6926894 -r 6cb271a58696 src/common/connection.py --- a/src/common/connection.py Fri Jun 11 12:04:16 2010 +0200 +++ b/src/common/connection.py Sun Jun 13 18:17:36 2010 +0200 @@ -1308,8 +1308,6 @@ self.on_connect_auth(con) self.on_connect_auth = None else: - # Forget password, it's wrong - self.password = None gajim.log.debug("Couldn't authenticate to %s" % self._hostname) self.disconnect(on_purpose = True) self.dispatch('STATUS', 'offline')

1 0

gajim: update python nedded version for 0.14, remove useless pyt...
by Yann Leboulanger 11 Jun '10

11 Jun '10

changeset 0583f6926894 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0583f6926894 description: update python nedded version for 0.14, remove useless python-central dep diffstat: debian/control | 4 ++-- debian/pycompat | 1 - debian/pyversions | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diffs (26 lines): diff -r 05fdb406668d -r 0583f6926894 debian/control --- a/debian/control Thu Jun 10 13:02:30 2010 +0200 +++ b/debian/control Fri Jun 11 12:04:16 2010 +0200 @@ -2,9 +2,9 @@ Section: net Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> -Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, python-central (>= 0.5) +Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick Build-Conflicts: python2.3 -XS-Python-Version: >= 2.4 +XS-Python-Version: >= 2.5 Standards-Version: 3.8.3 Homepage: http://www.gajim.org Vcs-Hg: http://hg.gajim.org/gajim/ diff -r 05fdb406668d -r 0583f6926894 debian/pycompat --- a/debian/pycompat Thu Jun 10 13:02:30 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -2 diff -r 05fdb406668d -r 0583f6926894 debian/pyversions --- a/debian/pyversions Thu Jun 10 13:02:30 2010 +0200 +++ b/debian/pyversions Fri Jun 11 12:04:16 2010 +0200 @@ -1,1 +1,1 @@ -2.4 +2.5-

1 0

gajim: update and clean debian folder
by Yann Leboulanger 10 Jun '10

10 Jun '10

changeset 05fdb406668d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05fdb406668d description: update and clean debian folder diffstat: debian/changelog | 7 +++++++ debian/rules | 5 ++--- debian/watch | 8 ++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diffs (42 lines): diff -r ea10571f1eec -r 05fdb406668d debian/changelog --- a/debian/changelog Thu Jun 10 10:26:15 2010 +0200 +++ b/debian/changelog Thu Jun 10 13:02:30 2010 +0200 @@ -1,3 +1,10 @@ +gajim (0.13.4-1) unstable; urgency=low + + * New upstream release. + * Fix flood when trying to join a full MUC. Closes: #575688 + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 02 Apr 2010 10:19:59 +0200 + gajim (0.13.3-1) unstable; urgency=low * New upstream release. diff -r ea10571f1eec -r 05fdb406668d debian/rules --- a/debian/rules Thu Jun 10 10:26:15 2010 +0200 +++ b/debian/rules Thu Jun 10 13:02:30 2010 +0200 @@ -7,10 +7,9 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/autotools.mk -PYTHONVER = 2.5 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr -DEB_MAKE_BUILD_TARGET := all PYTHON=python$(PYTHONVER) -DEB_MAKE_INSTALL_TARGET = install PYTHON=python$(PYTHONVER) DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_BUILD_TARGET := all +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) binary-install/gajim:: rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* diff -r ea10571f1eec -r 05fdb406668d debian/watch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/watch Thu Jun 10 13:02:30 2010 +0200 @@ -0,0 +1,8 @@ +# Control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://www.gajim.org/downloads/([\d.]*)/gajim-([\d\.]*)\.tar\.gz

1 0

gajim: when a groupchat occupand uses a previously used nick for...
by Yann Leboulanger 10 Jun '10

10 Jun '10

changeset ea10571f1eec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ea10571f1eec description: when a groupchat occupand uses a previously used nick for which you had a window opened, closes the previous one. diffstat: src/message_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 5cc58753c91c -r ea10571f1eec src/message_window.py --- a/src/message_window.py Thu Jun 10 09:24:22 2010 +0200 +++ b/src/message_window.py Thu Jun 10 10:26:15 2010 +0200 @@ -687,6 +687,10 @@ except KeyError: return + if new_jid in self._controls[acct]: + self.remove_tab(self._controls[acct][new_jid], + self.CLOSE_CLOSE_BUTTON, force=True) + self._controls[acct][new_jid] = ctrl del self._controls[acct][old_jid]

1 0

gajim: treat incoming messages from a groupchat jid as a groupch...
by Yann Leboulanger 10 Jun '10

10 Jun '10

changeset 5cc58753c91c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5cc58753c91c description: treat incoming messages from a groupchat jid as a groupchat message diffstat: src/common/connection_handlers.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diffs (27 lines): diff -r 435395f8ac18 -r 5cc58753c91c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jun 09 23:13:17 2010 +0300 +++ b/src/common/connection_handlers.py Thu Jun 10 09:24:22 2010 +0200 @@ -1484,7 +1484,7 @@ thread_id = msg.getThread() - if not mtype: + if not mtype or mtype not in ('chat', 'groupchat', 'error'): mtype = 'normal' msgtxt = msg.getBody() @@ -1493,6 +1493,14 @@ xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO) session = None + gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, self.name) + if not gc_control and \ + jid in gajim.interface.minimized_controls[self.name]: + gc_control = gajim.interface.minimized_controls[self.name][jid] + + if gc_control and jid == frm: # message from a gc without a resource + mtype = 'groupchat' + if mtype != 'groupchat': session = self.get_or_create_session(frm, thread_id)

1 0

gajim: Corrected exception handling. We really should bump to Py...
by Alexander Cherniuk 09 Jun '10

09 Jun '10

changeset 435395f8ac18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=435395f8ac18 description: Corrected exception handling. We really should bump to Python 2.6. Fixes #5778 diffstat: src/common/xmpp/transports_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 8a06f34896d0 -r 435395f8ac18 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Wed Jun 09 10:39:36 2010 +0200 +++ b/src/common/xmpp/transports_nb.py Wed Jun 09 23:13:17 2010 +0300 @@ -351,8 +351,8 @@ try: self._sock.setblocking(False) self._sock.connect((self.server, self.port)) - except Exception, (errnum, errstr): - pass + except Exception, exc: + errnum, errstr = exc.args if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2010