Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: Touchup for /dtmf implementation
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset 204ec09ebdc1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=204ec09ebdc1 description: Touchup for /dtmf implementation diffstat: src/command_system/implementation/standard.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 287eea4c6bad -r 204ec09ebdc1 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 18 07:37:49 2010 +0200 +++ b/src/command_system/implementation/standard.py Thu Mar 18 08:17:48 2010 +0200 @@ -173,13 +173,12 @@ gajim.connections[self.account].sendPing(self.contact) @command - @documentation(_("Sends DTMF events through an open audio session")) + @documentation(_("Send DTMF events through an open audio session")) def dtmf(self, events): if not self.audio_sid: raise CommandError(_("There is no open audio session with this contact")) # Valid values for DTMF tones are *, # or a number - events = [event for event in events - if event in ('*', '#') or event.isdigit()] + events = filter(lambda e: e in ('*', '#') or e.isdigit (), events) if events: session = gajim.connections[self.account].get_jingle_session( self.contact.get_full_jid(), self.audio_sid)

1 0

gajim: Added a comment about command escaping and tiny touchups
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset 287eea4c6bad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=287eea4c6bad description: Added a comment about command escaping and tiny touchups diffstat: src/command_system/errors.py | 6 +++++ src/command_system/framework.py | 4 +- src/command_system/implementation/middleware.py | 29 +++++++++++++++--------- 3 files changed, 26 insertions(+), 13 deletions(-) diffs (97 lines): diff -r 84266101d98c -r 287eea4c6bad src/command_system/errors.py --- a/src/command_system/errors.py Thu Mar 18 06:52:05 2010 +0200 +++ b/src/command_system/errors.py Thu Mar 18 07:37:49 2010 +0200 @@ -45,3 +45,9 @@ Used to indicate errors occured during command execution. """ pass + +class NoCommandError(BaseError): + """ + Used to indicate an inability to find the specified command. + """ + pass diff -r 84266101d98c -r 287eea4c6bad src/command_system/framework.py --- a/src/command_system/framework.py Thu Mar 18 06:52:05 2010 +0200 +++ b/src/command_system/framework.py Thu Mar 18 07:37:49 2010 +0200 @@ -25,7 +25,7 @@ from dispatching import Dispatcher, HostDispatcher, ContainerDispatcher from mapping import parse_arguments, adapt_arguments -from errors import DefinitionError, CommandError +from errors import DefinitionError, CommandError, NoCommandError class CommandHost(object): """ @@ -128,7 +128,7 @@ def get_command(self, name): command = Dispatcher.get_command(self.COMMAND_HOST, name) if not command: - raise CommandError("Command does not exist", name=name) + raise NoCommandError("Command does not exist", name=name) return command def list_commands(self): diff -r 84266101d98c -r 287eea4c6bad src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Thu Mar 18 06:52:05 2010 +0200 +++ b/src/command_system/implementation/middleware.py Thu Mar 18 07:37:49 2010 +0200 @@ -26,7 +26,7 @@ from common import gajim from ..framework import CommandProcessor -from ..errors import CommandError +from ..errors import CommandError, NoCommandError class ChatCommandProcessor(CommandProcessor): """ @@ -44,33 +44,40 @@ def execute_command(self, name, arguments): try: super(ChatCommandProcessor, self).execute_command(name, arguments) + except NoCommandError, error: + details = dict(name=error.name, message=error.message) + message = "%(name)s: %(message)s\n" % details + message += "Try using the //%(name)s or /say /%(name)s " % details + message += "construct if you intended to send it as a text." + self.echo(message, 'error') except CommandError, error: - self.echo("%s: %s" %(error.name, error.message), 'error') + self.echo("%s: %s" % (error.name, error.message), 'error') except Exception: self.echo("An error occured while trying to execute the command", 'error') print_exc() def looks_like_command(self, text, body, name, arguments): - # Command escape stuff ggoes here. If text was prepended by the command - # prefix twice, like //not_a_command (if prefix is set to /) then it - # will be escaped, that is sent just as a regular message with one (only - # one) prefix removed, so message will be /not_a_command. + # Command escape stuff ggoes here. If text was prepended by the + # command prefix twice, like //not_a_command (if prefix is set + # to /) then it will be escaped, that is sent just as a regular + # message with one (only one) prefix removed, so message will be + # /not_a_command. if body.startswith(self.COMMAND_PREFIX): self.send(body) return True def command_preprocessor(self, command, name, arguments, args, kwargs): - # If command argument contain h or help option - forward it to the /help - # command. Dont forget to pass self, as all commands are unbound. And - # also don't forget to print output. + # If command argument contain h or help option - forward it to + # the /help command. Dont forget to pass self, as all commands + # are unbound. And also don't forget to print output. if 'h' in kwargs or 'help' in kwargs: help = self.get_command('help') self.echo(help(self, name)) return True def command_postprocessor(self, command, name, arguments, args, kwargs, value): - # If command returns a string - print it to a user. A convenient and - # sufficient in most simple cases shortcut to a using echo. + # If command returns a string - print it to a user. A convenient + # and sufficient in most simple cases shortcut to a using echo. if value and isinstance(value, StringTypes): self.echo(value)

1 0

gajim: Tiny code cleanup
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset 84266101d98c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84266101d98c description: Tiny code cleanup diffstat: src/common/xmpp/auth_nb.py | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diffs (46 lines): diff -r 97c8808659ca -r 84266101d98c src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Wed Mar 17 16:59:25 2010 +0200 +++ b/src/common/xmpp/auth_nb.py Thu Mar 18 06:52:05 2010 +0200 @@ -422,13 +422,18 @@ self.on_sasl() raise NodeProcessed + @staticmethod + def _convert_to_iso88591(string): + try: + string = string.decode('utf-8').encode('iso-8859-1') + except UnicodeEncodeError: + pass + return string + def set_password(self, password): - if password is None: - self.password = '' - else: - self.password = password + self.password = '' if password is None else password if self.mechanism == 'SCRAM-SHA-1': - nonce = ''.join('%x' % randint(0, 2**28) for randint in \ + nonce = ''.join('%x' % randint(0, 2 ** 28) for randint in \ itertools.repeat(random.randint, 7)) self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. @@ -437,15 +442,9 @@ node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': - def convert_to_iso88591(string): - try: - string = string.decode('utf-8').encode('iso-8859-1') - except UnicodeEncodeError: - pass - return string - hash_username = convert_to_iso88591(self.resp['username']) - hash_realm = convert_to_iso88591(self.resp['realm']) - hash_password = convert_to_iso88591(self.password) + hash_username = self._convert_to_iso88591(self.resp['username']) + hash_realm = self._convert_to_iso88591(self.resp['realm']) + hash_password = self._convert_to_iso88591(self.password) A1 = C([H(C([hash_username, hash_realm, hash_password])), self.resp['nonce'], self.resp['cnonce']]) A2 = C(['AUTHENTICATE', self.resp['digest-uri']])

1 0

gajim: Misindented statement
by Alexander Cherniuk 17 Mar '10

17 Mar '10

changeset 97c8808659ca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97c8808659ca description: Misindented statement diffstat: src/dataforms_widget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 863dabb43577 -r 97c8808659ca src/dataforms_widget.py --- a/src/dataforms_widget.py Tue Mar 16 07:09:44 2010 +0100 +++ b/src/dataforms_widget.py Wed Mar 17 16:59:25 2010 +0200 @@ -400,7 +400,7 @@ check.set_active(value in field.values) check.connect('toggled', self.on_list_multi_checkbutton_toggled, field, value) - widget.pack_start(check, expand=False) + widget.pack_start(check, expand=False) else: # more than 5 options: show combobox def on_list_multi_treeview_changed(selection, f):

1 0

gajim: [MattJ] don't send an authorization identity in SASL PLAI...
by Yann Leboulanger 16 Mar '10

16 Mar '10

changeset 863dabb43577 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=863dabb43577 description: [MattJ] don't send an authorization identity in SASL PLAIN. Fixes #5658 diffstat: src/common/xmpp/auth_nb.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 59c46cf16c09 -r 863dabb43577 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Mon Mar 15 23:33:02 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Tue Mar 16 07:09:44 2010 +0100 @@ -463,8 +463,7 @@ '\r', '').replace('\n', '') node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \ - self._owner.Server, self.username, self.password) + sasl_data = u'\x00%s\x00%s' % (self.username, self.password) sasl_data = sasl_data.encode('utf-8').encode('base64').replace( '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},

1 0

gajim: update debian folder from 0.13.3 release. Fixes #5649
by Yann Leboulanger 15 Mar '10

15 Mar '10

changeset 59c46cf16c09 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59c46cf16c09 description: update debian folder from 0.13.3 release. Fixes #5649 diffstat: debian/changelog | 16 ++++++++++++++++ debian/control | 2 +- debian/copyright | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diffs (54 lines): diff -r 0f10e7de2074 -r 59c46cf16c09 debian/changelog --- a/debian/changelog Mon Mar 15 21:34:28 2010 +0100 +++ b/debian/changelog Mon Mar 15 23:33:02 2010 +0100 @@ -1,3 +1,19 @@ +gajim (0.13.3-1) unstable; urgency=low + + * New upstream release. + * Fix connection to facebook. Closes: #569767 + + -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 23 Feb 2010 21:00:41 +0100 + +gajim (0.13.2-1) unstable; urgency=low + + * New upstream release. + * Fix gnomekeyring usage. Closes: #562913 + * Fix completion. Closes: #563930 + * Fix typo in suggests list. Closes: #564754 + + -- Yann Leboulanger <asterix(a)lagaule.org> Thu, 14 Jan 2010 21:23:36 +0100 + gajim (0.13.1-1) unstable; urgency=low * New upstream release. Closes: #559905 diff -r 0f10e7de2074 -r 59c46cf16c09 debian/control --- a/debian/control Mon Mar 15 21:34:28 2010 +0100 +++ b/debian/control Mon Mar 15 23:33:02 2010 +0100 @@ -15,7 +15,7 @@ XB-Python-Version: ${python:Versions} Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 0f10e7de2074 -r 59c46cf16c09 debian/copyright --- a/debian/copyright Mon Mar 15 21:34:28 2010 +0100 +++ b/debian/copyright Mon Mar 15 23:33:02 2010 +0100 @@ -5,12 +5,12 @@ http://www.gajim.org/downloads/ Upstream Authors: + - Alexander Cherniuk <ts33kr(a)gmail.com> - Yann Le Boulanger <asterix(a)lagaule.org> - - Jean-Marie Traissard <jim(a)lapin.org> - - Stephan Erb <steve-e(a)h3c.de> + - Jonathan Schleifer <js-gajim(a)webkeks.org> -Copyright: (c) 2003-2009 Gajim Team +Copyright: (c) 2003-2010 Gajim Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by

1 0

gajim: Refuse multiple sessions and implement alternative-sessio...
by Thibaut GIRKA 15 Mar '10

15 Mar '10

changeset 0f10e7de2074 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f10e7de2074 description: Refuse multiple sessions and implement alternative-session; make jingle GUI a bit more reliable. diffstat: src/chat_control.py | 13 ++++++++----- src/common/jingle.py | 14 ++++++++++++++ src/common/jingle_session.py | 12 ++++++++++++ src/dialogs.py | 15 ++++----------- src/gui_interface.py | 7 ++++--- 5 files changed, 42 insertions(+), 19 deletions(-) diffs (132 lines): diff -r 89231f809778 -r 0f10e7de2074 src/chat_control.py --- a/src/chat_control.py Mon Mar 15 19:25:27 2010 +0100 +++ b/src/chat_control.py Mon Mar 15 21:34:28 2010 +0100 @@ -1620,11 +1620,14 @@ 'stop': self.JINGLE_STATE_AVAILABLE, 'error': self.JINGLE_STATE_ERROR} - if state in states: - jingle_state = states[state] - if getattr(self, jingle_type + '_state') == jingle_state: - return - setattr(self, jingle_type + '_state', jingle_state) + jingle_state = states[state] + if getattr(self, jingle_type + '_state') == jingle_state: + return + + if state == 'stop' and getattr(self, jingle_type + '_sid') not in (None, sid): + return + + setattr(self, jingle_type + '_state', jingle_state) # Destroy existing session with the user when he signs off # We need to do that before modifying the sid diff -r 89231f809778 -r 0f10e7de2074 src/common/jingle.py --- a/src/common/jingle.py Mon Mar 15 19:25:27 2010 +0100 +++ b/src/common/jingle.py Mon Mar 15 21:34:28 2010 +0100 @@ -121,6 +121,20 @@ jingle.start_session() return jingle.sid + + def iter_jingle_sessions(self, jid, sid=None, media=None): + if sid: + return (session for session in self.__sessions.values() if session.sid == sid) + sessions = (session for session in self.__sessions.values() if session.peerjid == jid) + if media: + if media not in ('audio', 'video'): + return tuple() + else: + return (session for session in sessions if session.get_content(media)) + else: + return sessions + + def get_jingle_session(self, jid, sid=None, media=None): if sid: if sid in self.__sessions: diff -r 89231f809778 -r 0f10e7de2074 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Mar 15 19:25:27 2010 +0100 +++ b/src/common/jingle_session.py Mon Mar 15 21:34:28 2010 +0100 @@ -426,6 +426,16 @@ # Jingle with unknown entities, it SHOULD return a <service-unavailable/> # error. + # Check if there's already a session with this user: + for session in self.connection.iter_jingle_sessions(self.peerjid): + if not session is self: + reason = xmpp.Node('reason') + alternative_session = reason.setTag('alternative-session') + alternative_session.setTagData('sid', session.sid) + self.__ack(stanza, jingle, error, action) + self._session_terminate(reason) + raise xmpp.NodeProcessed + # Lets check what kind of jingle session does the peer want contents, contents_rejected, reason_txt = self.__parse_contents(jingle) @@ -520,6 +530,7 @@ self.connection.dispatch('JINGLE_ERROR', (self.peerjid, self.sid, text)) def __reason_from_stanza(self, stanza): + # TODO: Move to GUI? reason = 'success' reasons = ['success', 'busy', 'cancel', 'connectivity-error', 'decline', 'expired', 'failed-application', 'failed-transport', @@ -602,6 +613,7 @@ jingle.addChild(node=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') self.connection.connection.send(stanza) + # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): self.__dispatch_error(reason, reason, text) diff -r 89231f809778 -r 0f10e7de2074 src/dialogs.py --- a/src/dialogs.py Mon Mar 15 19:25:27 2010 +0100 +++ b/src/dialogs.py Mon Mar 15 21:34:28 2010 +0100 @@ -4925,17 +4925,10 @@ #TODO: Ensure that ctrl.contact.resource == resource jid = gajim.get_jid_without_resource(self.fjid) resource = gajim.get_resource_from_jid(self.fjid) - ctrl = gajim.interface.msg_win_mgr.get_control(self.fjid, self.account) - if not ctrl: - ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.account) - if not ctrl: - # open chat control - contact = gajim.contacts.get_contact(self.account, jid, resource) - if not contact: - contact = gajim.contacts.get_contact(self.account, jid) - if not contact: - return - ctrl = gajim.interface.new_chat(contact, self.account, resource) + ctrl = (gajim.interface.msg_win_mgr.get_control(self.fjid, self.account) + or gajim.interface.msg_win_mgr.get_control(jid, self.account) + or gajim.interface.new_chat_from_jid(self.account, jid)) + # Chat control opened, update content's status audio = session.get_content('audio') video = session.get_content('video') diff -r 89231f809778 -r 0f10e7de2074 src/gui_interface.py --- a/src/gui_interface.py Mon Mar 15 19:25:27 2010 +0100 +++ b/src/gui_interface.py Mon Mar 15 21:34:28 2010 +0100 @@ -1775,9 +1775,8 @@ jid = gajim.get_jid_without_resource(peerjid) resource = gajim.get_resource_from_jid(peerjid) - ctrl = self.msg_win_mgr.get_control(peerjid, account) - if not ctrl: - ctrl = self.msg_win_mgr.get_control(jid, account) + ctrl = (self.msg_win_mgr.get_control(peerjid, account) + or self.msg_win_mgr.get_control(jid, account)) if ctrl: if 'audio' in content_types: ctrl.set_audio_state('connection_received', sid) @@ -2811,6 +2810,8 @@ ctrl.user_nick = gajim.nicks[account] gobject.idle_add(mw.window.grab_focus) + return ctrl + def on_open_chat_window(self, widget, contact, account, resource=None, session=None): # Get the window containing the chat

1 0

gajim: Fix TraceBack in the case of failure in jingle content ne...
by Thibaut GIRKA 15 Mar '10

15 Mar '10

changeset 89231f809778 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89231f809778 description: Fix TraceBack in the case of failure in jingle content negotiation diffstat: src/common/jingle_session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 821b94b405f2 -r 89231f809778 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Mar 14 22:47:54 2010 +0100 +++ b/src/common/jingle_session.py Mon Mar 15 19:25:27 2010 +0100 @@ -427,13 +427,13 @@ # error. # Lets check what kind of jingle session does the peer want - contents, contents_rejected, reason = self.__parse_contents(jingle) + contents, contents_rejected, reason_txt = self.__parse_contents(jingle) # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate reason = xmpp.Node('reason') - reason.setTag(reason) + reason.setTag(reason_txt) self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed

1 0

gajim: Fix a TraceBack when a stun host name cannot be resolved.
by Thibaut GIRKA 14 Mar '10

14 Mar '10

changeset 821b94b405f2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=821b94b405f2 description: Fix a TraceBack when a stun host name cannot be resolved. diffstat: src/common/jingle_rtp.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 7764ea678f4c -r 821b94b405f2 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Mar 14 22:12:10 2010 +0100 +++ b/src/common/jingle_rtp.py Sun Mar 14 22:47:54 2010 +0100 @@ -28,6 +28,10 @@ from jingle_content import contents, JingleContent, JingleContentSetupException +import logging +log = logging.getLogger('gajim.c.jingle_rtp') + + class JingleRTPContent(JingleContent): def __init__(self, session, media, transport=None): if transport is None:

1 0

gajim: ability to do jingle with zeroconf
by Yann Leboulanger 14 Mar '10

14 Mar '10

changeset 7764ea678f4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7764ea678f4c description: ability to do jingle with zeroconf diffstat: src/common/jingle_session.py | 5 +++-- src/common/zeroconf/client_zeroconf.py | 5 ++++- src/common/zeroconf/connection_handlers_zeroconf.py | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diffs (54 lines): diff -r dfb2c3bb98da -r 7764ea678f4c src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Mar 14 22:01:48 2010 +0100 +++ b/src/common/jingle_session.py Sun Mar 14 22:12:10 2010 +0100 @@ -68,8 +68,9 @@ self.connection = con # connection to use # our full jid #FIXME: Get rid of gajim here? - self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \ - con.server_resource + self.ourjid = gajim.get_jid_from_account(self.connection.name) + if con.server_resource: + self.ourjid = self.ourjid + '/' + con.server_resource self.peerjid = jid # jid we connect to # jid we use as the initiator self.initiator = weinitiate and self.ourjid or self.peerjid diff -r dfb2c3bb98da -r 7764ea678f4c src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Mar 14 22:01:48 2010 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Sun Mar 14 22:12:10 2010 +0100 @@ -319,6 +319,9 @@ common.xmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._DiscoverItemsGetCB, 'get', common.xmpp.NS_DISCO_ITEMS) + self.RegisterHandler('iq', self._caller._JingleCB, 'result') + self.RegisterHandler('iq', self._caller._JingleCB, 'error') + self.RegisterHandler('iq', self._caller._JingleCB, 'set', common.xmpp.NS_JINGLE) class P2PConnection(IdleObject, PlugIn): def __init__(self, sock_hash, _sock, host=None, port=None, caller=None, @@ -765,7 +768,7 @@ """ Generate a random id """ - ''.join(Random().sample(string.letters + string.digits, 6)) + return ''.join(Random().sample(string.letters + string.digits, 6)) def RegisterDisconnectHandler(self, handler): """ diff -r dfb2c3bb98da -r 7764ea678f4c src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Sun Mar 14 22:01:48 2010 +0100 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun Mar 14 22:12:10 2010 +0100 @@ -72,11 +72,12 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionSocks5BytestreamZeroconf, ConnectionCommands, ConnectionPEP, -connection_handlers.ConnectionHandlersBase): +connection_handlers.ConnectionHandlersBase, connection_handlers.ConnectionJingle): def __init__(self): ConnectionVcard.__init__(self) ConnectionSocks5BytestreamZeroconf.__init__(self) ConnectionCommands.__init__(self) + connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) try:

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010