Commits July 2011

commits@gajim.org

3 participants
40 discussions

gajim: handle message-outgoing events for zeroconf. We can now s...
by Yann Leboulanger 19 Jul '11

19 Jul '11

changeset c0119fce8654 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c0119fce8654 description: handle message-outgoing events for zeroconf. We can now send messages in trunk. Fixes #6920 diffstat: src/common/zeroconf/connection_zeroconf.py | 45 ++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diffs (69 lines): diff -r 2ccbbe76aaab -r c0119fce8654 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Tue Jul 19 00:09:33 2011 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Tue Jul 19 23:05:32 2011 +0200 @@ -43,6 +43,7 @@ from common.connection import CommonConnection from common import gajim +from common import ged from common.zeroconf import client_zeroconf from common.zeroconf import zeroconf from connection_handlers_zeroconf import * @@ -64,6 +65,9 @@ CommonConnection.__init__(self, name) self.is_zeroconf = True + gajim.ged.register_event_handler('message-outgoing', ged.OUT_CORE, + self._nec_message_outgoing) + def get_config_values_or_default(self): """ Get name, host, port from config, or create zeroconf account with default @@ -367,6 +371,47 @@ forward_from=forward_from, form_node=form_node, original_message=original_message, delayed=delayed, callback=cb) + def _nec_message_outgoing(self, obj): + if obj.account != self.name: + return + + def on_send_ok(msg_id): + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=obj.keyID)) + if obj.callback: + obj.callback(obj.msg_id, *obj.callback_args) + + if not obj.is_loggable: + return + self.log_message(obj.jid, obj.message, obj.forward_from, + obj.session, obj.original_message, obj.subject, obj.type_) + + def on_send_not_ok(reason): + reason += ' ' + _('Your message could not be sent.') + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, + time_=None, session=obj.session)) + + def cb(jid, msg, keyID, forward_from, session, original_message, subject, + type_, msg_iq, xhtml): + ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok, + on_not_ok=on_send_not_ok) + + if ret == -1: + # Contact Offline + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=jid, error_code=-1, error_msg=_( + 'Contact is offline. Your message could not be sent.'), + msg=None, time_=None, session=session)) + + self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, + subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, + composing_xep=obj.composing_xep, resource=obj.resource, + user_nick=obj.user_nick, xhtml=obj.xhtml, label=obj.label, + session=obj.session, forward_from=obj.forward_from, + form_node=obj.form_node, original_message=obj.original_message, + delayed=obj.delayed, callback=cb) + def send_stanza(self, stanza): # send a stanza untouched if not self.connection:

1 0

gajim: some french translation update. Fixes #6921
by Yann Leboulanger 18 Jul '11

18 Jul '11

changeset 2ccbbe76aaab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ccbbe76aaab description: some french translation update. Fixes #6921 diffstat: po/fr.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diffs (166 lines): diff -r 2b6d2460a2b6 -r 2ccbbe76aaab po/fr.po --- a/po/fr.po Fri Jul 01 16:08:15 2011 +0200 +++ b/po/fr.po Tue Jul 19 00:09:33 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-20 23:14+0200\n" +"POT-Creation-Date: 2011-07-19 00:05+0200\n" "PO-Revision-Date: 2011-05-30 08:28+0100\n" "Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" "Language-Team: <>\n" @@ -3194,7 +3194,6 @@ msgstr "Chiffrement GPG activé" #: ../src/chat_control.py:1643 ../src/chat_control.py:1646 -#: ../src/features_window.py:108 msgid "Requires python-farsight." msgstr "Nécessite python-farsight." @@ -4911,7 +4910,7 @@ #: ../src/common/connection.py:1198 ../src/common/connection.py:1332 #: ../src/common/connection.py:1941 -#: ../src/common/zeroconf/connection_zeroconf.py:200 +#: ../src/common/zeroconf/connection_zeroconf.py:203 #, python-format msgid "Could not connect to \"%s\"" msgstr "Impossible de se connecter à \"%s\"" @@ -5304,14 +5303,12 @@ msgstr "Disponible pour discuter" #: ../src/common/helpers.py:233 -#, fuzzy msgid "?user status:_Available" -msgstr "?transfer status:En pause" +msgstr "?user status:_Disponible" #: ../src/common/helpers.py:235 ../src/tooltips.py:189 -#, fuzzy msgid "?user status:Available" -msgstr "?transfer status:En pause" +msgstr "?user status:Disponible" #: ../src/common/helpers.py:237 msgid "Connecting" @@ -6331,11 +6328,11 @@ "[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un " "problème a eu lieu.]" -#: ../src/common/zeroconf/connection_zeroconf.py:188 +#: ../src/common/zeroconf/connection_zeroconf.py:191 msgid "Avahi error" msgstr "Erreur d'Avahi" -#: ../src/common/zeroconf/connection_zeroconf.py:189 +#: ../src/common/zeroconf/connection_zeroconf.py:192 #, python-format msgid "" "%s\n" @@ -6344,43 +6341,43 @@ "%s\n" "La messagerie en « link-local » pourrait ne pas fonctionner correctement." -#: ../src/common/zeroconf/connection_zeroconf.py:201 +#: ../src/common/zeroconf/connection_zeroconf.py:204 msgid "Please check if Avahi or Bonjour is installed." msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés." -#: ../src/common/zeroconf/connection_zeroconf.py:211 -#: ../src/common/zeroconf/connection_zeroconf.py:215 +#: ../src/common/zeroconf/connection_zeroconf.py:214 +#: ../src/common/zeroconf/connection_zeroconf.py:218 msgid "Could not start local service" msgstr "Impossible de lancer le service local" -#: ../src/common/zeroconf/connection_zeroconf.py:212 +#: ../src/common/zeroconf/connection_zeroconf.py:215 #, python-format msgid "Unable to bind to port %d." msgstr "Impossible de débloquer le port %d." -#: ../src/common/zeroconf/connection_zeroconf.py:216 -#: ../src/common/zeroconf/connection_zeroconf.py:300 -#: ../src/common/zeroconf/connection_zeroconf.py:313 -#: ../src/common/zeroconf/connection_zeroconf.py:329 +#: ../src/common/zeroconf/connection_zeroconf.py:219 +#: ../src/common/zeroconf/connection_zeroconf.py:303 +#: ../src/common/zeroconf/connection_zeroconf.py:316 +#: ../src/common/zeroconf/connection_zeroconf.py:332 msgid "Please check if avahi-daemon is running." msgstr "Vérifiez si avahi-daemon est actif." -#: ../src/common/zeroconf/connection_zeroconf.py:299 -#: ../src/common/zeroconf/connection_zeroconf.py:312 -#: ../src/common/zeroconf/connection_zeroconf.py:328 +#: ../src/common/zeroconf/connection_zeroconf.py:302 +#: ../src/common/zeroconf/connection_zeroconf.py:315 +#: ../src/common/zeroconf/connection_zeroconf.py:331 #, python-format msgid "Could not change status of account \"%s\"" msgstr "Impossible de changer l'état du compte « %s »" -#: ../src/common/zeroconf/connection_zeroconf.py:347 +#: ../src/common/zeroconf/connection_zeroconf.py:353 msgid "Your message could not be sent." msgstr "Votre message n'a pas pu être envoyé." -#: ../src/common/zeroconf/connection_zeroconf.py:361 +#: ../src/common/zeroconf/connection_zeroconf.py:367 msgid "Contact is offline. Your message could not be sent." msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé." -#: ../src/common/zeroconf/connection_zeroconf.py:387 +#: ../src/common/zeroconf/connection_zeroconf.py:395 msgid "" "Connection to host could not be established: Timeout while sending data." msgstr "" @@ -7206,7 +7203,7 @@ msgid "Subscription request from %s" msgstr "Requête d'inscription de la part de %s" -#: ../src/dialogs.py:2246 ../src/gui_interface.py:1941 +#: ../src/dialogs.py:2246 ../src/gui_interface.py:1948 #, python-format msgid "You are already in group chat %s" msgstr "Vous êtes déjà dans le salon %s" @@ -7252,11 +7249,11 @@ "L'identifiant jabber du salon de discussion contient des caractères " "interdits." -#: ../src/dialogs.py:2455 ../src/gui_interface.py:1929 +#: ../src/dialogs.py:2455 ../src/gui_interface.py:1930 msgid "This is not a group chat" msgstr "Ceci n'est pas une conversation multi-utilisateurs" -#: ../src/dialogs.py:2456 ../src/gui_interface.py:1930 +#: ../src/dialogs.py:2456 ../src/gui_interface.py:1931 #, python-format msgid "%s is not the name of a group chat." msgstr "%s n'est pas un nom de salon de discussion valide" @@ -8131,10 +8128,13 @@ msgid "Ability to start audio and video chat." msgstr "Possibilité de démarrer une conversation audio et vidéo." +#: ../src/features_window.py:108 +msgid "Requires python-farsight and gstreamer-plugins-bad." +msgstr "Nécessite python-farsight et gstreamer-plugins-bad." + #: ../src/features_window.py:116 -#, fuzzy msgid "?features:Available" -msgstr "Disponible" +msgstr "?features:Disponible" #: ../src/features_window.py:123 msgid "Feature" @@ -9511,7 +9511,7 @@ "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/" "wiki/Emoticons pour plus de détails." -#: ../src/gui_interface.py:1948 ../src/roster_window.py:3784 +#: ../src/gui_interface.py:1955 ../src/roster_window.py:3784 msgid "You cannot join a group chat while you are invisible" msgstr "" "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "

1 0

gajim: test case for jingle
by Jefry Lagrange 17 Jul '11

17 Jul '11

changeset cc977417ccc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc977417ccc4 description: test case for jingle diffstat: src/common/jingle_ft.py | 8 +- test/unit/test_jingle.py | 157 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 4 deletions(-) diffs (181 lines): diff -r e89e040c3090 -r cc977417ccc4 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 14 19:07:14 2011 -0400 +++ b/src/common/jingle_ft.py Sun Jul 17 18:28:38 2011 -0400 @@ -74,12 +74,12 @@ self.file_props['transfered_size'] = [] log.info("FT request: %s" % file_props) - + if transport is None: self.transport = JingleTransportSocks5() - self.transport.set_connection(session.connection) - self.transport.set_file_props(self.file_props) - self.transport.set_our_jid(session.ourjid) + self.transport.set_connection(session.connection) + self.transport.set_file_props(self.file_props) + self.transport.set_our_jid(session.ourjid) log.info('ourjid: %s' % session.ourjid) if self.file_props is not None: diff -r e89e040c3090 -r cc977417ccc4 test/unit/test_jingle.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/unit/test_jingle.py Sun Jul 17 18:28:38 2011 -0400 @@ -0,0 +1,157 @@ +''' +Tests for dispatcher_nb.py +''' +import unittest + +import lib +lib.setup_env() + +from mock import Mock + +from common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream +from common.xmpp import dispatcher_nb +from common.xmpp import protocol +from common.jingle import ConnectionJingle +from common import gajim +from common.socks5 import SocksQueue +import common + + +session_init = ''' +<iq xmlns="jabber:client" to="jingleft(a)thiessen.im/Gajim" type="set" id="43"> +<jingle xmlns="urn:xmpp:jingle:1" action="session-initiate" initiator="jtest(a)thiessen.im/Gajim" sid="38"> +<content name="fileWL1Y2JIPTM5RAD68" creator="initiator"> +<security xmlns="urn:xmpp:jingle:security:xtls:0"> +<method name="x509" /> +</security> +<description xmlns="urn:xmpp:jingle:apps:file-transfer:1"> +<offer> +<file xmlns="http://jabber.org/protocol/si/profile/file-transfer" name="to" size="2273"> +<desc /> +</file> +</offer> +</description> +<transport xmlns="urn:xmpp:jingle:transports:s5b:1" sid="39"> +<candidate jid="jtest(a)thiessen.im/Gajim" cid="40" priority="8257536" host="192.168.2.100" type="direct" port="28011" /> +<candidate jid="proxy.thiessen.im" cid="41" priority="655360" host="192.168.2.100" type="proxy" port="5000" /> +<candidate jid="proxy.jabbim.cz" cid="42" priority="655360" host="192.168.2.100" type="proxy" port="7777" /> +</transport> +</content> +</jingle> +</iq> + ''' + + +transport_info = ''' +<iq from='jtest(a)thiessen.im/Gajim' + id='hjdi8' + to='jingleft(a)thiessen.im/Gajim' + type='set'> + <jingle xmlns='urn:xmpp:jingle:1' + action='transport-info' + initiator='jtest(a)thiessen.im/Gajim' + sid='38'> + <content creator='initiator' name='fileWL1Y2JIPTM5RAD68'> + <transport xmlns='urn:xmpp:jingle:transports:s5b:1' + sid='vj3hs98y'> + <candidate-used cid='hr65dqyd'/> + </transport> + </content> + </jingle> +</iq> + +''' + +class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream, + ConnectionIBBytestream): + + def __init__(self): + Mock.__init__(self) + ConnectionJingle.__init__(self) + ConnectionSocks5Bytestream.__init__(self) + ConnectionIBBytestream.__init__(self) + self.connected = 2 # This tells gajim we are connected + + + def send(self, stanza=None, when=None): + # Called when gajim wants to send something + print str(stanza) + +class TestJingle(unittest.TestCase): + + def setUp(self): + self.dispatcher = dispatcher_nb.XMPPDispatcher() + gajim.nec = Mock() + gajim.socks5queue = SocksQueue(Mock()) + # Setup mock client + self.client = Connection() + self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? + self.client._caller = Connection() + self.client.defaultNamespace = protocol.NS_CLIENT + self.client.Connection = Connection() # mock transport + self.con = self.client.Connection + self.con.server_resource = None + self.con.connection = Connection() + + ''' + Fake file_props when we recieve a file. Gajim creates a file_props + out of a FileRequestRecieve event and from then on it changes in + a lot of places. It is easier to just copy it in here. + If the session_initiate stanza changes, this also must change. + ''' + self.recieve_file = {'stream-methods': + 'http://jabber.org/protocol/bytestreams', + 'sender': u'jtest(a)thiessen.im/Gajim', + 'file-name': u'test_recieved_file', + 'request-id': u'43', 'sid': u'39', + 'session-sid': u'38', 'session-type': 'jingle', + 'transfered_size': [], 'receiver': + u'jingleft(a)thiessen.im/Gajim', 'desc': '', + u'size': u'2273', 'type': 'r', + 'streamhosts': [{'initiator': + u'jtest(a)thiessen.im/Gajim', + 'target': u'jingleft(a)thiessen.im/Gajim', + 'cid': u'41', 'state': 0, 'host': u'192.168.2.100', + 'type': u'direct', 'port': u'28011'}, + {'initiator': u'jtest(a)thiessen.im/Gajim', + 'target': u'jingleft(a)thiessen.im/Gajim', + 'cid': u'42', 'state': 0, 'host': u'192.168.2.100', + 'type': u'proxy', 'port': u'5000'}], + u'name': u'to'} + + def tearDown(self): + # Unplug if needed + if hasattr(self.dispatcher, '_owner'): + self.dispatcher.PlugOut() + + def _simulate_connect(self): + self.dispatcher.PlugIn(self.client) # client is owner + # Simulate that we have established a connection + self.dispatcher.StreamInit() + self.dispatcher.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>") + + def _simulate_jingle_session(self): + + self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set' + , common.xmpp.NS_JINGLE) + self.dispatcher.ProcessNonBlocking(session_init) + session = self.con._sessions.values()[0] # The only session we have + jft = session.contents.values()[0] # jingleFT object + jft.file_props = self.recieve_file # We plug file_props manually + # The user accepts to recieve the file + # we have to manually simulate this behavior + session.approve_session() + self.con.send_file_approval(self.recieve_file) + + self.dispatcher.ProcessNonBlocking(transport_info) + + + def test_jingle_session(self): + self._simulate_connect() + self._simulate_jingle_session() + + + + +if __name__ == '__main__': + unittest.main()

1 0

gajim: fixed session-accept
by Jefry Lagrange 14 Jul '11

14 Jul '11

changeset e89e040c3090 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e89e040c3090 description: fixed session-accept diffstat: src/common/jingle_session.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diffs (31 lines): diff -r 11008ed81d7b -r e89e040c3090 src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Jul 05 20:35:36 2011 +0200 +++ b/src/common/jingle_session.py Thu Jul 14 19:07:14 2011 -0400 @@ -385,7 +385,7 @@ transport = JingleTransportIBB() self.modify_content(creator, name, transport) - #self.state = JingleStates.pending + self.state = JingleStates.pending self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) self.__session_accept() @@ -627,14 +627,12 @@ return (reason, text) def __make_jingle(self, action, reason=None): - stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid)) + stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid), + frm=self.responder) attrs = {'action': action, 'sid': self.sid} - if action == 'session-initiate': - attrs['initiator'] = self.initiator - elif action == 'session-accept': - attrs['responder'] = self.responder - elif action == 'transport-replace': + if action == 'session-initiate' or action == 'session-accept' or \ + action == 'transport-replace': attrs['initiator'] = self.initiator jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None:

1 0

gajim: remove useless demandimport ignore
by Yann Leboulanger 05 Jul '11

05 Jul '11

changeset 11008ed81d7b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11008ed81d7b description: remove useless demandimport ignore diffstat: src/gajim.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (18 lines): diff -r d4d017adf294 -r 11008ed81d7b src/gajim.py --- a/src/gajim.py Tue Jul 05 14:05:16 2011 -0400 +++ b/src/gajim.py Tue Jul 05 20:35:36 2011 +0200 @@ -36,13 +36,11 @@ ## from common import demandimport - demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic' - ,'FileRequestReceivedEvent'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] import os import sys

1 0

gajim: Fixes jingleFT IBB fallback
by Jefry Lagrange 05 Jul '11

05 Jul '11

changeset d4d017adf294 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d4d017adf294 description: Fixes jingleFT IBB fallback diffstat: src/common/jingle_content.py | 11 +++++++++++ src/common/jingle_ft.py | 10 ++++++++-- src/common/jingle_session.py | 8 ++------ src/common/protocol/bytestream.py | 7 +++---- src/common/socks5.py | 2 +- src/gajim.py | 4 +++- 6 files changed, 28 insertions(+), 14 deletions(-) diffs (162 lines): diff -r 51c9600fc1f1 -r d4d017adf294 src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/common/jingle_content.py Tue Jul 05 14:05:16 2011 -0400 @@ -138,6 +138,17 @@ content = self.__content() content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) + + def send_error_candidate(self): + """ + Sends a candidate-error when we can't connect to a candidate. + """ + content = self.__content() + tp = self.transport.make_transport() + tp.addChild(name='candidate-error') + content.addChild(node=tp) + self.session.send_transport_info(content) + def send_description_info(self): content = self.__content() diff -r 51c9600fc1f1 -r d4d017adf294 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/common/jingle_ft.py Tue Jul 05 14:05:16 2011 -0400 @@ -23,7 +23,6 @@ import xmpp from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 -from jingle_transport import JingleTransportIBB from common import helpers from common.socks5 import Socks5Receiver from common.connection_handlers_events import FileRequestReceivedEvent @@ -88,6 +87,7 @@ self.session = session self.media = 'file' + def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, @@ -131,6 +131,9 @@ if not self.weinitiate: # proxy activated from initiator return + if content.getTag('transport').getTag('candidate-error'): + self.session.transport_replace() + return streamhost_cid = content.getTag('transport').getTag('candidate-used').\ getAttr('cid') streamhost_used = None @@ -147,7 +150,7 @@ if proxy['host'] == streamhost_used['host'] and \ proxy['port'] == streamhost_used['port'] and \ proxy['jid'] == streamhost_used['jid']: - streamhost_used = proxy + host_used = proxy break if 'streamhosts' not in self.file_props: self.file_props['streamhosts'] = [] @@ -238,6 +241,9 @@ self.session.send_transport_info(content) def _on_connect_error(self, to, _id, sid, code=404): + if code == 404 and self.file_props['sid'] == sid: + self.send_error_candidate() + log.info('connect error, sid=' + sid) def _fill_content(self, content): diff -r 51c9600fc1f1 -r d4d017adf294 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/common/jingle_session.py Tue Jul 05 14:05:16 2011 -0400 @@ -314,7 +314,7 @@ 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: + if action not in ['session-initiate','session-terminate'] and self.state == JingleStates.ended: self.__send_error(stanza, 'item-not-found', 'unknown-session') return else: @@ -367,7 +367,7 @@ self.__append_contents(jingle) self.__broadcast(stanza, jingle, None, 'transport-replace') self.connection.connection.send(stanza) - #self.collect_iq_id(stanza.getID()) + self.state = JingleStates.pending def __on_transport_replace(self, stanza, jingle, error, action): @@ -599,10 +599,6 @@ def __dispatch_error(self, error=None, text=None, type_=None): - if type_ == 'cancel' and error == 'item-not-found': - # We coudln't connect with sock5stream, we fallback to IBB - self.transport_replace() - return if text: text = '%s (%s)' % (error, text) if type_ != 'modify': diff -r 51c9600fc1f1 -r d4d017adf294 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/common/protocol/bytestream.py Tue Jul 05 14:05:16 2011 -0400 @@ -128,7 +128,7 @@ feature.addChild(node=_feature) field = _feature.setField('stream-method') field.setAttr('type', 'list-single') - #field.addOption(xmpp.NS_BYTESTREAM) + field.addOption(xmpp.NS_BYTESTREAM) field.addOption(xmpp.NS_IBB) self.connection.send(iq) @@ -795,8 +795,7 @@ 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])) + file_props['direction'][1:], 'set', payload=[datanode])) current_time = time.time() file_props['elapsed-time'] += current_time - file_props[ 'last-time'] @@ -871,7 +870,7 @@ # look in sending files if sid in self.files_props.keys(): conn.send(stanza.buildReply('result')) - gajim.socks5queue.complete_transfer_cb(self.name, file_props) + gajim.socks5queue.complete_transfer_cb(self.name, self.files_props[sid]) del self.files_props[sid] # look in receiving files elif gajim.socks5queue.get_file_props(self.name, sid): diff -r 51c9600fc1f1 -r d4d017adf294 src/common/socks5.py --- a/src/common/socks5.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/common/socks5.py Tue Jul 05 14:05:16 2011 -0400 @@ -209,7 +209,7 @@ return # failure_cb exists - this means that it has never been called if 'failure_cb' in file_props and file_props['failure_cb']: - file_props['failure_cb'](streamhost['initiator'], streamhost['id'], + file_props['failure_cb'](streamhost['initiator'], streamhost['idx'], file_props['sid'], code = 404) del(file_props['failure_cb']) diff -r 51c9600fc1f1 -r d4d017adf294 src/gajim.py --- a/src/gajim.py Sat Jul 02 00:52:35 2011 +0200 +++ b/src/gajim.py Tue Jul 05 14:05:16 2011 -0400 @@ -36,11 +36,13 @@ ## from common import demandimport + demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic' + ,'FileRequestReceivedEvent'] import os import sys

1 0

gajim: prevent traceback when using normal socks5 FT
by Yann Leboulanger 01 Jul '11

01 Jul '11

changeset 51c9600fc1f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=51c9600fc1f1 description: prevent traceback when using normal socks5 FT diffstat: src/gui_interface.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4c57cd302a0a -r 51c9600fc1f1 src/gui_interface.py --- a/src/gui_interface.py Sat Jul 02 00:47:33 2011 +0200 +++ b/src/gui_interface.py Sat Jul 02 00:52:35 2011 +0200 @@ -922,7 +922,8 @@ jid = unicode(file_props['receiver']) # End jingle session - if file_props['session-type'] == 'jingle' and file_props['type'] == 'r': + if file_props.get('session-type') == 'jingle' and file_props['type'] ==\ + 'r': session = gajim.connections[account].get_jingle_session(jid, sid=file_props['session-sid']) # get content:

1 0

gajim: fix import loops
by Yann Leboulanger 01 Jul '11

01 Jul '11

changeset 4c57cd302a0a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c57cd302a0a description: fix import loops diffstat: src/common/jingle_ft.py | 1 - src/common/protocol/bytestream.py | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (73 lines): diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jun 28 18:31:07 2011 -0400 +++ b/src/common/jingle_ft.py Sat Jul 02 00:47:33 2011 +0200 @@ -24,7 +24,6 @@ from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 from jingle_transport import JingleTransportIBB -from jingle_session import JingleStates from common import helpers from common.socks5 import Socks5Receiver from common.connection_handlers_events import FileRequestReceivedEvent diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Jun 28 18:31:07 2011 -0400 +++ b/src/common/protocol/bytestream.py Sat Jul 02 00:47:33 2011 +0200 @@ -37,8 +37,6 @@ from common import gajim from common import helpers from common import dataforms -from common.connection_handlers_events import FileRequestReceivedEvent, \ - FileRequestErrorEvent from common import ged from common import jingle_xtls @@ -250,6 +248,7 @@ raise xmpp.NodeProcessed def _siSetCB(self, con, iq_obj): + from common.connection_handlers_events import FileRequestReceivedEvent gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self, stanza=iq_obj)) raise xmpp.NodeProcessed @@ -269,6 +268,7 @@ return jid = self._ft_get_from(iq_obj) file_props['error'] = -3 + from common.connection_handlers_events import FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=jid, file_props=file_props, error_msg='')) raise xmpp.NodeProcessed @@ -302,6 +302,8 @@ if contact.get_full_jid() == receiver_jid: file_props['error'] = -5 self.remove_transfer(file_props) + from common.connection_handlers_events import \ + FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=contact.jid, file_props=file_props, error_msg='')) @@ -364,6 +366,7 @@ self._result_socks5_sid, file_props['sid']) if not listener: file_props['error'] = -5 + from common.connection_handlers_events import FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=unicode(receiver), file_props=file_props, error_msg='')) self._connect_error(unicode(receiver), file_props['sid'], @@ -494,6 +497,8 @@ if file_props is not None: self.disconnect_transfer(file_props) file_props['error'] = -3 + from common.connection_handlers_events import \ + FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=to, file_props=file_props, error_msg=msg)) @@ -526,6 +531,7 @@ return file_props = self.files_props[id_] file_props['error'] = -4 + from common.connection_handlers_events import FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=jid, file_props=file_props, error_msg='')) raise xmpp.NodeProcessed

1 0

gajim: fix error dialog. Fixes #6906
by Yann Leboulanger 01 Jul '11

01 Jul '11

changeset 93a3916f2788 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93a3916f2788 description: fix error dialog. Fixes #6906 diffstat: src/gui_interface.py | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diffs (57 lines): diff -r 4f267c122997 -r 93a3916f2788 src/gui_interface.py --- a/src/gui_interface.py Thu Jun 30 08:06:03 2011 +0200 +++ b/src/gui_interface.py Fri Jul 01 16:08:15 2011 +0200 @@ -2689,7 +2689,8 @@ Join the room immediately """ - if gajim.contacts.get_contact(account, room_jid): + if gajim.contacts.get_contact(account, room_jid) and \ + not gajim.contacts.get_contact(account, room_jid).is_groupchat(): dialogs.ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return @@ -2697,11 +2698,17 @@ if not nick: nick = gajim.nicks[account] - if self.msg_win_mgr.has_window(room_jid, account) and \ - gajim.gc_connected[account][room_jid]: - gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - win = gc_ctrl.parent_win - win.set_active_tab(gc_ctrl) + minimized_control = gajim.interface.minimized_controls[account].get( + room_jid, None) + + if (self.msg_win_mgr.has_window(room_jid, account) or \ + minimized_control) and gajim.gc_connected[account][room_jid]: + if self.msg_win_mgr.has_window(room_jid, account): + gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) + win = gc_ctrl.parent_win + win.set_active_tab(gc_ctrl) + else: + self.roster.on_groupchat_maximized(None, room_jid, account) dialogs.ErrorDialog(_('You are already in group chat %s') % \ room_jid) return @@ -2712,9 +2719,6 @@ _('You cannot join a group chat while you are invisible')) return - minimized_control = gajim.interface.minimized_controls[account].get( - room_jid, None) - if minimized_control is None and not self.msg_win_mgr.has_window( room_jid, account): # Join new groupchat @@ -2734,10 +2738,6 @@ gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) gc_control.nick = nick gc_control.parent_win.set_active_tab(gc_control) - else: - # We are already in this groupchat and it is minimized - minimized_control.nick = nick - self.roster.add_groupchat(room_jid, account) # Connect gajim.connections[account].join_gc(nick, room_jid, password)

1 0

gajim: fix error dialog. Fixes #6906
by Yann Leboulanger 01 Jul '11

01 Jul '11

changeset 2b6d2460a2b6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b6d2460a2b6 description: fix error dialog. Fixes #6906 diffstat: src/gui_interface.py | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diffs (57 lines): diff -r 5b0d36675b14 -r 2b6d2460a2b6 src/gui_interface.py --- a/src/gui_interface.py Sun Jun 26 00:28:42 2011 +0400 +++ b/src/gui_interface.py Fri Jul 01 16:08:15 2011 +0200 @@ -1925,7 +1925,8 @@ Join the room immediately """ - if gajim.contacts.get_contact(account, room_jid): + if gajim.contacts.get_contact(account, room_jid) and \ + not gajim.contacts.get_contact(account, room_jid).is_groupchat(): dialogs.ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return @@ -1933,11 +1934,17 @@ if not nick: nick = gajim.nicks[account] - if self.msg_win_mgr.has_window(room_jid, account) and \ - gajim.gc_connected[account][room_jid]: - gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - win = gc_ctrl.parent_win - win.set_active_tab(gc_ctrl) + minimized_control = gajim.interface.minimized_controls[account].get( + room_jid, None) + + if (self.msg_win_mgr.has_window(room_jid, account) or \ + minimized_control) and gajim.gc_connected[account][room_jid]: + if self.msg_win_mgr.has_window(room_jid, account): + gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) + win = gc_ctrl.parent_win + win.set_active_tab(gc_ctrl) + else: + self.roster.on_groupchat_maximized(None, room_jid, account) dialogs.ErrorDialog(_('You are already in group chat %s') % \ room_jid) return @@ -1948,9 +1955,6 @@ _('You cannot join a group chat while you are invisible')) return - minimized_control = gajim.interface.minimized_controls[account].get( - room_jid, None) - if minimized_control is None and not self.msg_win_mgr.has_window( room_jid, account): # Join new groupchat @@ -1970,10 +1974,6 @@ gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) gc_control.nick = nick gc_control.parent_win.set_active_tab(gc_control) - else: - # We are already in this groupchat and it is minimized - minimized_control.nick = nick - self.roster.add_groupchat(room_jid, account) # Connect gajim.connections[account].join_gc(nick, room_jid, password)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2011