Commits December 2009

commits@gajim.org

8 participants
127 discussions

gajim: Merge changes from default branch into osx_newbuildsys br...
by Jonathan Schleifer 26 Dec '09

26 Dec '09

changeset 5b3ed346a6af in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5b3ed346a6af description: Merge changes from default branch into osx_newbuildsys branch. diffstat: src/command_system/errors.py | 3 ++ src/command_system/implementation/standard.py | 29 +++++++++++++++++++++++++++ src/common/connection.py | 5 ++- src/common/connection_handlers.py | 2 - src/common/jingle_content.py | 4 ++- src/gui_interface.py | 8 +----- src/roster_window.py | 5 ++++ 7 files changed, 45 insertions(+), 11 deletions(-) diffs (145 lines): diff -r 91e62efdb6b8 -r 5b3ed346a6af src/command_system/errors.py --- a/src/command_system/errors.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/command_system/errors.py Sat Dec 26 12:51:40 2009 +0100 @@ -30,6 +30,9 @@ super(BaseError, self).__init__() + def __str__(self): + return self.message + class DefinitionError(BaseError): """ Used to indicate errors occured on command definition. diff -r 91e62efdb6b8 -r 5b3ed346a6af src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/command_system/implementation/standard.py Sat Dec 26 12:51:40 2009 +0100 @@ -128,6 +128,35 @@ self.echo(formatted) + @command(raw=True, empty=True) + @documentation(_(""" + Set current the status + + Status can be given as one of the following values: online, away, + chat, xa, dnd. + """)) + def status(self, status, message): + if status not in ('online', 'away', 'chat', 'xa', 'dnd'): + raise CommandError("Invalid status given") + for connection in gajim.connections.itervalues(): + connection.change_status(status, message) + + @command(raw=True, empty=True) + @documentation(_("Set the current status to away")) + def away(self, message): + if not message: + message = _("Away") + for connection in gajim.connections.itervalues(): + connection.change_status('away', message) + + @command('back', raw=True, empty=True) + @documentation(_("Set the current status to online")) + def online(self, message): + if not message: + message = _("Available") + for connection in gajim.connections.itervalues(): + connection.change_status('online', message) + class StandardChatCommands(CommandContainer): """ This command container contains standard command which are unique to a chat. diff -r 91e62efdb6b8 -r 5b3ed346a6af src/common/connection.py --- a/src/common/connection.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/common/connection.py Sat Dec 26 12:51:40 2009 +0100 @@ -1309,8 +1309,8 @@ def _on_xmpp_ping_answer(self, iq_obj): id_ = unicode(iq_obj.getAttr('id')) - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None + assert id_ == self.awaiting_xmpp_ping_id + self.awaiting_xmpp_ping_id = None def sendPing(self, pingTo=None): """ @@ -2226,6 +2226,7 @@ def check_pingalive(self): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect + log.warn("No reply received for keepalive ping. Reconnecting.") self._disconnectedReconnCB() def _reconnect_alarm(self): diff -r 91e62efdb6b8 -r 5b3ed346a6af src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/common/connection_handlers.py Sat Dec 26 12:51:40 2009 +0100 @@ -981,8 +981,6 @@ self.dispatch('ENTITY_TIME', (jid_stripped, resource, '')) self.entity_time_ids.remove(id_) return - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode)) diff -r 91e62efdb6b8 -r 5b3ed346a6af src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/common/jingle_content.py Sat Dec 26 12:51:40 2009 +0100 @@ -15,6 +15,8 @@ Handles Jingle contents (XEP 0166) """ +import xmpp + contents = {} def get_jingle_content(node): @@ -131,4 +133,4 @@ self.callbacks = None del self.session.contents[(self.creator, self.name)] -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff -r 91e62efdb6b8 -r 5b3ed346a6af src/gui_interface.py --- a/src/gui_interface.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/gui_interface.py Sat Dec 26 12:51:40 2009 +0100 @@ -2265,7 +2265,8 @@ w = ctrl.parent_win elif type_ in ('normal', 'file-request', 'file-request-error', - 'file-send-error', 'file-error', 'file-stopped', 'file-completed'): + 'file-send-error', 'file-error', 'file-stopped', 'file-completed', + 'jingle-incoming'): # Get the first single message event event = gajim.events.get_first_event(account, fjid, type_) if not event: @@ -2301,11 +2302,6 @@ self.show_unsubscribed_dialog(account, contact) gajim.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) - elif type_ == 'jingle-incoming': - event = gajim.events.get_first_event(account, jid, type_) - peerjid, sid, content_types = event.parameters - dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) - gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl) w.window.window.focus(gtk.get_current_event_time()) diff -r 91e62efdb6b8 -r 5b3ed346a6af src/roster_window.py --- a/src/roster_window.py Sat Dec 26 12:50:17 2009 +0100 +++ b/src/roster_window.py Sat Dec 26 12:51:40 2009 +0100 @@ -1849,6 +1849,11 @@ gajim.interface.show_unsubscribed_dialog(account, data) gajim.events.remove_events(account, jid, event) return True + elif event.type_ == 'jingle-incoming': + peerjid, sid, content_types = data + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) + gajim.events.remove_events(account, jid, event) + return True return False ################################################################################

1 0

gajim: Fix last merge.
by Jonathan Schleifer 26 Dec '09

26 Dec '09

changeset 91e62efdb6b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=91e62efdb6b8 description: Fix last merge. diffstat: extra.mk.in | 1 - src/Makefile | 3 +-- src/common/Makefile | 1 - src/common/configpaths.py | 2 +- src/gui_interface.py | 4 ++++ 5 files changed, 6 insertions(+), 5 deletions(-) diffs (64 lines): diff -r 37fde3b2545b -r 91e62efdb6b8 extra.mk.in --- a/extra.mk.in Sat Dec 19 13:30:03 2009 +0100 +++ b/extra.mk.in Sat Dec 26 12:50:17 2009 +0100 @@ -1,4 +1,3 @@ -TRAYMODULE = @TRAYMODULE@ OSX_IDLEMODULE = @OSX_IDLEMODULE@ OSX_MODULES = @OSX_MODULES@ PYTHON_CFLAGS = @PYTHON_INCLUDES@ diff -r 37fde3b2545b -r 91e62efdb6b8 src/Makefile --- a/src/Makefile Sat Dec 19 13:30:03 2009 +0100 +++ b/src/Makefile Sat Dec 26 12:50:17 2009 +0100 @@ -1,6 +1,6 @@ include ../extra.mk -SUBDIRS = common ${TRAYMODULE} osx +SUBDIRS = common osx SRCS = adhoc_commands.py \ advanced_configuration_window.py \ @@ -41,7 +41,6 @@ secrets.py \ session.py \ statusicon.py \ - systray.py \ tooltips.py \ vcard.py DISTCLEAN = trayicon.so diff -r 37fde3b2545b -r 91e62efdb6b8 src/common/Makefile --- a/src/common/Makefile Sat Dec 19 13:30:03 2009 +0100 +++ b/src/common/Makefile Sat Dec 26 12:50:17 2009 +0100 @@ -6,7 +6,6 @@ GnuPGInterface.py \ __init__.py \ atom.py \ - caps.py \ check_paths.py \ commands.py \ config.py \ diff -r 37fde3b2545b -r 91e62efdb6b8 src/common/configpaths.py --- a/src/common/configpaths.py Sat Dec 19 13:30:03 2009 +0100 +++ b/src/common/configpaths.py Sat Dec 26 12:50:17 2009 +0100 @@ -123,7 +123,7 @@ self.add('DATA', os.path.join(u'..', windowsify(u'data'))) if 'GAJIM_ICONDIR' in os.environ: self.add('ICONS', fse(os.environ['GAJIM_ICONDIR'])) - else + else: self.add('ICONS', os.path.join(u'..', windowsify(u'icons'))) self.add('HOME', fse(os.path.expanduser('~'))) try: diff -r 37fde3b2545b -r 91e62efdb6b8 src/gui_interface.py --- a/src/gui_interface.py Sat Dec 19 13:30:03 2009 +0100 +++ b/src/gui_interface.py Sat Dec 26 12:50:17 2009 +0100 @@ -3379,6 +3379,10 @@ import statusicon self.systray = statusicon.StatusIcon() + if sys.platform == 'darwin': + import dock + self.dock = dock.Dock() + pix = gtkgui_helpers.get_icon_pixmap('gajim', 32) # set the icon to all windows gtk.window_set_default_icon(pix)

1 0

gajim: Added /status, /away, /online commands. Fixed command err...
by Alexander Cherniuk 22 Dec '09

22 Dec '09

changeset f6c4bf3a5767 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f6c4bf3a5767 description: Added /status, /away, /online commands. Fixed command error reporting diffstat: src/command_system/errors.py | 3 ++ src/command_system/implementation/standard.py | 29 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diffs (52 lines): diff -r d90d9aee1358 -r f6c4bf3a5767 src/command_system/errors.py --- a/src/command_system/errors.py Sun Dec 20 23:16:58 2009 +0100 +++ b/src/command_system/errors.py Tue Dec 22 21:31:11 2009 +0200 @@ -30,6 +30,9 @@ super(BaseError, self).__init__() + def __str__(self): + return self.message + class DefinitionError(BaseError): """ Used to indicate errors occured on command definition. diff -r d90d9aee1358 -r f6c4bf3a5767 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Dec 20 23:16:58 2009 +0100 +++ b/src/command_system/implementation/standard.py Tue Dec 22 21:31:11 2009 +0200 @@ -128,6 +128,35 @@ self.echo(formatted) + @command(raw=True, empty=True) + @documentation(_(""" + Set current the status + + Status can be given as one of the following values: online, away, + chat, xa, dnd. + """)) + def status(self, status, message): + if status not in ('online', 'away', 'chat', 'xa', 'dnd'): + raise CommandError("Invalid status given") + for connection in gajim.connections.itervalues(): + connection.change_status(status, message) + + @command(raw=True, empty=True) + @documentation(_("Set the current status to away")) + def away(self, message): + if not message: + message = _("Away") + for connection in gajim.connections.itervalues(): + connection.change_status('away', message) + + @command('back', raw=True, empty=True) + @documentation(_("Set the current status to online")) + def online(self, message): + if not message: + message = _("Available") + for connection in gajim.connections.itervalues(): + connection.change_status('online', message) + class StandardChatCommands(CommandContainer): """ This command container contains standard command which are unique to a chat.

1 0

gajim: Remove some unneeded bits in the xmpp ping code. Add addi...
by Stephan Erb 20 Dec '09

20 Dec '09

changeset d90d9aee1358 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d90d9aee1358 description: Remove some unneeded bits in the xmpp ping code. Add additional logging. diffstat: src/common/connection.py | 5 +++-- src/common/connection_handlers.py | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diffs (34 lines): diff -r b5d07e1048e9 -r d90d9aee1358 src/common/connection.py --- a/src/common/connection.py Sun Dec 20 13:37:56 2009 +0100 +++ b/src/common/connection.py Sun Dec 20 23:16:58 2009 +0100 @@ -1309,8 +1309,8 @@ def _on_xmpp_ping_answer(self, iq_obj): id_ = unicode(iq_obj.getAttr('id')) - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None + assert id_ == self.awaiting_xmpp_ping_id + self.awaiting_xmpp_ping_id = None def sendPing(self, pingTo=None): """ @@ -2226,6 +2226,7 @@ def check_pingalive(self): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect + log.warn("No reply received for keepalive ping. Reconnecting.") self._disconnectedReconnCB() def _reconnect_alarm(self): diff -r b5d07e1048e9 -r d90d9aee1358 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 20 13:37:56 2009 +0100 +++ b/src/common/connection_handlers.py Sun Dec 20 23:16:58 2009 +0100 @@ -981,8 +981,6 @@ self.dispatch('ENTITY_TIME', (jid_stripped, resource, '')) self.entity_time_ids.remove(id_) return - if id_ == self.awaiting_xmpp_ping_id: - self.awaiting_xmpp_ping_id = None errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode))

1 0

gajim: Import xmpp in jingle_content, so that JingleContent.__co...
by Thibaut GIRKA 20 Dec '09

20 Dec '09

changeset b5d07e1048e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5d07e1048e9 description: Import xmpp in jingle_content, so that JingleContent.__content can work. fixes #5524 diffstat: src/common/jingle_content.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (19 lines): diff -r ff84be74130a -r b5d07e1048e9 src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Dec 19 22:24:15 2009 +0100 +++ b/src/common/jingle_content.py Sun Dec 20 13:37:56 2009 +0100 @@ -15,6 +15,8 @@ Handles Jingle contents (XEP 0166) """ +import xmpp + contents = {} def get_jingle_content(node): @@ -131,4 +133,4 @@ self.callbacks = None del self.session.contents[(self.creator, self.name)] -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

gajim: Remove duplicated code...
by Thibaut GIRKA 19 Dec '09

19 Dec '09

changeset ff84be74130a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff84be74130a description: Remove duplicated code... diffstat: src/gui_interface.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (25 lines): diff -r 79540a4c8b77 -r ff84be74130a src/gui_interface.py --- a/src/gui_interface.py Sat Dec 19 22:17:56 2009 +0100 +++ b/src/gui_interface.py Sat Dec 19 22:24:15 2009 +0100 @@ -2265,7 +2265,8 @@ w = ctrl.parent_win elif type_ in ('normal', 'file-request', 'file-request-error', - 'file-send-error', 'file-error', 'file-stopped', 'file-completed'): + 'file-send-error', 'file-error', 'file-stopped', 'file-completed', + 'jingle-incoming'): # Get the first single message event event = gajim.events.get_first_event(account, fjid, type_) if not event: @@ -2301,11 +2302,6 @@ self.show_unsubscribed_dialog(account, contact) gajim.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) - elif type_ == 'jingle-incoming': - event = gajim.events.get_first_event(account, jid, type_) - peerjid, sid, content_types = event.parameters - dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) - gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl) w.window.window.focus(gtk.get_current_event_time())

1 0

gajim: Handle jingle-incoming events in roster too
by Thibaut GIRKA 19 Dec '09

19 Dec '09

changeset 79540a4c8b77 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79540a4c8b77 description: Handle jingle-incoming events in roster too diffstat: src/roster_window.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r d373e1fe8661 -r 79540a4c8b77 src/roster_window.py --- a/src/roster_window.py Sat Dec 19 13:49:10 2009 +0200 +++ b/src/roster_window.py Sat Dec 19 22:17:56 2009 +0100 @@ -1844,6 +1844,11 @@ gajim.interface.show_unsubscribed_dialog(account, data) gajim.events.remove_events(account, jid, event) return True + elif event.type_ == 'jingle-incoming': + peerjid, sid, content_types = data + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) + gajim.events.remove_events(account, jid, event) + return True return False ################################################################################

1 0

gajim: Merge default branch into osx_newbuildsys branch.
by Jonathan Schleifer 19 Dec '09

19 Dec '09

changeset 37fde3b2545b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37fde3b2545b description: Merge default branch into osx_newbuildsys branch. diffstat: .hgignore | 7 +- AUTHORS | 1 + ChangeLog | 2 +- README.html | 7 +- THANKS.artists | 2 +- configure.ac | 48 +- data/defs.py.in | 2 +- data/emoticons/tango/alien.png | 0 data/emoticons/tango/angel.png | 0 data/emoticons/tango/arrogant.png | 0 data/emoticons/tango/beer.png | 0 data/emoticons/tango/bomb.png | 0 data/emoticons/tango/clap.png | 0 data/emoticons/tango/confused.png | 0 data/emoticons/tango/cowboy.png | 0 data/emoticons/tango/crying.png | 0 data/emoticons/tango/curl-lip.png | 0 data/emoticons/tango/cute.png | 0 data/emoticons/tango/dance.png | 0 data/emoticons/tango/devil.png | 0 data/emoticons/tango/disapointed.png | 0 data/emoticons/tango/doh.png | 0 data/emoticons/tango/dont-know.png | 0 data/emoticons/tango/embarrassed.png | 0 data/emoticons/tango/emoticons.py | 52 + data/emoticons/tango/fingers-crossed.png | 0 data/emoticons/tango/freaked-out.png | 0 data/emoticons/tango/giggle.png | 0 data/emoticons/tango/glasses-cool.png | 0 data/emoticons/tango/go-away.png | 0 data/emoticons/tango/good.png | 0 data/emoticons/tango/handshake.png | 0 data/emoticons/tango/hypnotized.png | 0 data/emoticons/tango/kiss.png | 0 data/emoticons/tango/laugh.png | 0 data/emoticons/tango/love.png | 0 data/emoticons/tango/mail.png | 0 data/emoticons/tango/musical-note.png | 0 data/emoticons/tango/party.png | 0 data/emoticons/tango/pissed-off.png | 0 data/emoticons/tango/question.png | 0 data/emoticons/tango/rose.png | 0 data/emoticons/tango/rotfl.png | 0 data/emoticons/tango/sad.png | 0 data/emoticons/tango/sarcastic.png | 0 data/emoticons/tango/shout.png | 0 data/emoticons/tango/shut-mouth.png | 0 data/emoticons/tango/sick.png | 0 data/emoticons/tango/silly.png | 0 data/emoticons/tango/sleepy.png | 0 data/emoticons/tango/smirk.png | 0 data/emoticons/tango/terror.png | 0 data/emoticons/tango/thinking.png | 0 data/emoticons/tango/tongue.png | 0 data/emoticons/tango/tremble.png | 0 data/emoticons/tango/victory.png | 0 data/emoticons/tango/wink.png | 0 data/glade/message_window.glade | 1177 +- data/glade/preferences_window.glade | 291 +- data/glade/roster_item_exchange_window.glade | 34 +- data/iconsets/jabberbulb/32x32/icos/online.ico | 0 data/pixmaps/agents/aim.png | 0 data/pixmaps/agents/bytestreams.png | 0 data/pixmaps/agents/conference.png | 0 data/pixmaps/agents/disc.png | 0 data/pixmaps/agents/error.png | 0 data/pixmaps/agents/facebook.png | 0 data/pixmaps/agents/gadu-gadu.png | 0 data/pixmaps/agents/http-ws.png | 0 data/pixmaps/agents/icq.png | 0 data/pixmaps/agents/irc.png | 0 data/pixmaps/agents/jabber.png | 0 data/pixmaps/agents/jud.png | 0 data/pixmaps/agents/mail.png | 0 data/pixmaps/agents/mrim.png | 0 data/pixmaps/agents/msn.png | 0 data/pixmaps/agents/pubsub.png | 0 data/pixmaps/agents/rss.png | 0 data/pixmaps/agents/sip.png | 0 data/pixmaps/agents/sms.png | 0 data/pixmaps/agents/tv.png | 0 data/pixmaps/agents/weather.png | 0 data/pixmaps/agents/yahoo.png | 0 data/pixmaps/events/chat_msg_recv.png | 0 data/pixmaps/events/connection_lost.png | 0 data/pixmaps/events/ft_done.png | 0 data/pixmaps/events/ft_error.png | 0 data/pixmaps/events/ft_request.png | 0 data/pixmaps/events/ft_stopped.png | 0 data/pixmaps/events/gc_invitation.png | 0 data/pixmaps/events/new_email_recv.png | 0 data/pixmaps/events/priv_msg_recv.png | 0 data/pixmaps/events/single_msg_recv.png | 0 data/pixmaps/events/subscription_request.png | 0 data/pixmaps/events/unsubscribed.png | 0 data/pixmaps/gajim.png | 0 data/pixmaps/gajim.svg | 444 - data/pixmaps/gajim_about.png | 0 data/pixmaps/kbd_input.png | 0 data/pixmaps/muc_separator.png | 0 data/pixmaps/person.png | 0 data/pixmaps/receipt_missing.png | 0 data/pixmaps/security-high-big.png | 0 data/pixmaps/security-high.png | 0 data/pixmaps/security-low-big.png | 0 data/pixmaps/security-low.png | 0 data/pixmaps/upload.png | 0 gajim.nsi | 4 +- icons/Makefile.am | 7 + icons/hicolor/128x128/apps/gajim_about.png | 0 icons/hicolor/16x16/actions/gajim-cam_active.png | 0 icons/hicolor/16x16/actions/gajim-cam_inactive.png | 0 icons/hicolor/16x16/actions/gajim-earth.png | 0 icons/hicolor/16x16/actions/gajim-kbd_input.png | 0 icons/hicolor/16x16/actions/gajim-mic_active.png | 0 icons/hicolor/16x16/actions/gajim-mic_inactive.png | 0 icons/hicolor/16x16/actions/gajim-muc_separator.png | 0 icons/hicolor/16x16/actions/gajim-receipt_missing.png | 0 icons/hicolor/16x16/actions/gajim-security_high.png | 0 icons/hicolor/16x16/actions/gajim-security_low.png | 0 icons/hicolor/16x16/actions/gajim-upload.png | 0 icons/hicolor/32x32/categories/gajim-agent-aim.png | 0 icons/hicolor/32x32/categories/gajim-agent-bytestreams.png | 0 icons/hicolor/32x32/categories/gajim-agent-conference.png | 0 icons/hicolor/32x32/categories/gajim-agent-disc.png | 0 icons/hicolor/32x32/categories/gajim-agent-error.png | 0 icons/hicolor/32x32/categories/gajim-agent-facebook.png | 0 icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png | 0 icons/hicolor/32x32/categories/gajim-agent-http-ws.png | 0 icons/hicolor/32x32/categories/gajim-agent-icq.png | 0 icons/hicolor/32x32/categories/gajim-agent-irc.png | 0 icons/hicolor/32x32/categories/gajim-agent-jabber.png | 0 icons/hicolor/32x32/categories/gajim-agent-jud.png | 0 icons/hicolor/32x32/categories/gajim-agent-mail.png | 0 icons/hicolor/32x32/categories/gajim-agent-mrim.png | 0 icons/hicolor/32x32/categories/gajim-agent-msn.png | 0 icons/hicolor/32x32/categories/gajim-agent-pubsub.png | 0 icons/hicolor/32x32/categories/gajim-agent-rss.png | 0 icons/hicolor/32x32/categories/gajim-agent-sip.png | 0 icons/hicolor/32x32/categories/gajim-agent-sms.png | 0 icons/hicolor/32x32/categories/gajim-agent-tv.png | 0 icons/hicolor/32x32/categories/gajim-agent-weather.png | 0 icons/hicolor/32x32/categories/gajim-agent-yahoo.png | 0 icons/hicolor/48x48/actions/gajim-chat_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-connection_lost.png | 0 icons/hicolor/48x48/actions/gajim-ft_done.png | 0 icons/hicolor/48x48/actions/gajim-ft_error.png | 0 icons/hicolor/48x48/actions/gajim-ft_request.png | 0 icons/hicolor/48x48/actions/gajim-ft_stopped.png | 0 icons/hicolor/48x48/actions/gajim-gc_invitation.png | 0 icons/hicolor/48x48/actions/gajim-new_email_recv.png | 0 icons/hicolor/48x48/actions/gajim-priv_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-security_high.png | 0 icons/hicolor/48x48/actions/gajim-security_low.png | 0 icons/hicolor/48x48/actions/gajim-single_msg_recv.png | 0 icons/hicolor/48x48/actions/gajim-subscription_request.png | 0 icons/hicolor/48x48/actions/gajim-unsubscribed.png | 0 icons/hicolor/64x64/apps/gajim.png | 0 icons/hicolor/scalable/apps/gajim.svg | 444 + po/be.po | 4382 ++++--- po/be(a)latin.po | 4379 ++++--- po/bg.po | 4201 +++--- po/br.po | 4400 ++++--- po/cs.po | 4181 +++--- po/da.po | 4960 ++++---- po/de.po | 6584 +++++------ po/el.po | 4427 ++++--- po/en_GB.po | 4796 ++++---- po/eo.po | 4373 ++++--- po/es.po | 5120 ++++---- po/eu.po | 4393 ++++--- po/fr.po | 4745 ++++---- po/gl.po | 4833 ++++---- po/hr.po | 4784 ++++---- po/it.po | 4377 ++++--- po/lt.po | 6409 +++++------ po/nb.po | 4806 ++++---- po/nl.po | 4439 ++++--- po/no.po | 4806 ++++---- po/pl.po | 4206 +++--- po/pt.po | 4437 ++++--- po/pt_BR.po | 4567 ++++---- po/ru.po | 4483 ++++--- po/sk.po | 4203 +++--- po/sr.po | 4761 ++++---- po/sr(a)Latn.po | 4775 ++++---- po/sv.po | 4511 ++++---- po/uk.po | 4533 ++++---- po/zh_CN.po | 4355 ++++--- setup_win32.py | 1 + src/adhoc_commands.py | 105 +- src/advanced_configuration_window.py | 10 +- src/atom_window.py | 18 +- src/chat_control.py | 631 +- src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 6 +- src/command_system/framework.py | 6 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 84 +- src/command_system/mapping.py | 2 +- src/common/GnuPG.py | 8 +- src/common/GnuPGInterface.py | 62 +- src/common/account.py | 32 + src/common/atom.py | 53 +- src/common/caps.py | 398 - src/common/caps_cache.py | 393 + src/common/check_paths.py | 12 +- src/common/commands.py | 42 +- src/common/config.py | 17 +- src/common/configpaths.py | 9 +- src/common/connection.py | 1152 +- src/common/connection_handlers.py | 820 +- src/common/contacts.py | 725 +- src/common/dataforms.py | 132 +- src/common/dbus_support.py | 24 +- src/common/defs.py | 2 +- src/common/dh.py | 7 +- src/common/events.py | 93 +- src/common/exceptions.py | 70 +- src/common/fuzzyclock.py | 6 +- src/common/gajim.py | 69 +- src/common/helpers.py | 289 +- src/common/i18n.py | 11 +- src/common/idle.py | 4 +- src/common/jingle.py | 1087 +- src/common/jingle_content.py | 134 + src/common/jingle_rtp.py | 344 + src/common/jingle_session.py | 657 + src/common/jingle_transport.py | 148 + src/common/kwalletbinding.py | 12 +- src/common/latex.py | 5 +- src/common/location_listener.py | 137 + src/common/logger.py | 227 +- src/common/logging_helpers.py | 6 +- src/common/meta.py | 36 - src/common/multimedia_helpers.py | 101 + src/common/optparser.py | 94 +- src/common/passwords.py | 2 + src/common/pep.py | 753 +- src/common/protocol/__init__.py | 3 + src/common/protocol/bytestream.py | 650 + src/common/protocol/caps.py | 108 + src/common/proxy65_manager.py | 69 +- src/common/pubsub.py | 32 +- src/common/resolver.py | 64 +- src/common/rst_xhtml_generator.py | 39 +- src/common/sleepy.py | 8 +- src/common/socks5.py | 179 +- src/common/stanza_session.py | 72 +- src/common/xmpp/auth_nb.py | 106 +- src/common/xmpp/bosh.py | 72 +- src/common/xmpp/c14n.py | 5 +- src/common/xmpp/client_nb.py | 152 +- src/common/xmpp/dispatcher_nb.py | 200 +- src/common/xmpp/features_nb.py | 65 +- src/common/xmpp/idlequeue.py | 172 +- src/common/xmpp/plugin.py | 31 +- src/common/xmpp/protocol.py | 1311 +- src/common/xmpp/proxy_connectors.py | 54 +- src/common/xmpp/roster_nb.py | 314 +- src/common/xmpp/simplexml.py | 567 +- src/common/xmpp/stringprepare.py | 51 +- src/common/xmpp/tls_nb.py | 50 +- src/common/xmpp/transports_nb.py | 311 +- src/common/zeroconf/client_zeroconf.py | 101 +- src/common/zeroconf/connection_handlers_zeroconf.py | 339 +- src/common/zeroconf/connection_zeroconf.py | 501 +- src/common/zeroconf/roster_zeroconf.py | 7 +- src/config.py | 214 +- src/conversation_textview.py | 97 +- src/dataforms_widget.py | 64 +- src/dialogs.py | 446 +- src/disco.py | 479 +- src/features_window.py | 17 +- src/filetransfers_window.py | 212 +- src/gajim-remote.py | 36 +- src/gajim.py | 3421 +------ src/gajim_themes_window.py | 31 +- src/groupchat_control.py | 284 +- src/groups.py | 13 +- src/gtkgui_helpers.py | 280 +- src/gui_interface.py | 3501 ++++++ src/gui_menu_builder.py | 32 +- src/history_manager.py | 64 +- src/history_window.py | 73 +- src/htmltextview.py | 87 +- src/ipython_view.py | 147 +- src/message_control.py | 93 +- src/message_textview.py | 17 +- src/message_window.py | 102 +- src/negotiation.py | 5 +- src/network_manager_listener.py | 12 +- src/notify.py | 91 +- src/profile_window.py | 31 +- src/remote_control.py | 132 +- src/roster_window.py | 1147 +- src/search_window.py | 10 +- src/session.py | 23 +- src/statusicon.py | 382 +- src/systray.py | 459 - src/tooltips.py | 154 +- src/vcard.py | 31 +- test/integration/__init__.py | 6 + test/integration/test_gui_event_integration.py | 193 + test/integration/test_resolver.py | 102 + test/integration/test_roster.py | 205 + test/integration/test_xmpp_client_nb.py | 171 + test/integration/test_xmpp_transports_nb.py | 278 + test/lib/gajim_mocks.py | 8 +- test/runtests.py | 24 +- test/test_caps.py | 154 - test/test_contacts.py | 51 - test/test_misc_interface.py | 224 - test/test_resolver.py | 102 - test/test_roster.py | 209 - test/test_sessions.py | 210 - test/test_xmpp_client_nb.py | 171 - test/test_xmpp_dispatcher_nb.py | 99 - test/test_xmpp_transports_nb.py | 332 - test/unit/__init__.py | 5 + test/unit/test_account.py | 21 + test/unit/test_caps_cache.py | 151 + test/unit/test_contacts.py | 129 + test/unit/test_gui_interface.py | 115 + test/unit/test_protocol_caps.py | 75 + test/unit/test_sessions.py | 214 + test/unit/test_xmpp_dispatcher_nb.py | 99 + test/unit/test_xmpp_transports_nb.py | 80 + 332 files changed, 89017 insertions(+), 84027 deletions(-) diffs (truncated from 314319 to 300 lines): diff -r 7a127277ffa8 -r 37fde3b2545b .hgignore --- a/.hgignore Mon Nov 02 23:03:34 2009 +0100 +++ b/.hgignore Sat Dec 19 13:30:03 2009 +0100 @@ -2,13 +2,12 @@ *.orig *.gmo *.in -*.la -*.lo *.m4 *.pyc *.pyo *.o -*.Plo +*.so +*.dylib *~ autom4te.cache data/defs.py @@ -23,6 +22,4 @@ syntax: regexp ^config\.* ^config\/ -^src\/\.libs -^src\/trayicon.c ^scripts\/gajim.* diff -r 7a127277ffa8 -r 37fde3b2545b AUTHORS --- a/AUTHORS Mon Nov 02 23:03:34 2009 +0100 +++ b/AUTHORS Sat Dec 19 13:30:03 2009 +0100 @@ -1,5 +1,6 @@ CURRENT DEVELOPERS: +Alexander Cherniuk (ts33kr AT gmail.com) Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) Julien Pivotto (roidelapluie AT gmail.com) diff -r 7a127277ffa8 -r 37fde3b2545b ChangeLog --- a/ChangeLog Mon Nov 02 23:03:34 2009 +0100 +++ b/ChangeLog Sat Dec 19 13:30:03 2009 +0100 @@ -15,7 +15,7 @@ * Ability to enable / disable accounts * better URL recognition * groupchat autoreconnect - * Store passwords in KDE wallet is available + * Store passwords in KDE wallet if available * Better MUC errors handling * Fix sound player launch (don't create zombies anymore) * Optional shell like completion diff -r 7a127277ffa8 -r 37fde3b2545b README.html --- a/README.html Mon Nov 02 23:03:34 2009 +0100 +++ b/README.html Sat Dec 19 13:30:03 2009 +0100 @@ -16,7 +16,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.12 or higher</li> +<li>pygtk2.16 or higher</li> <li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> @@ -34,11 +34,10 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> -<li>python-dbus bindings (>=0.80)</li> +<li>python-dbus bindings (>=0.81)</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul> @@ -53,8 +52,6 @@ <ul> <li>python-dev</li> <li>python-gtk2-dev</li> -<li>libgtk2.0-dev aka. gtk2-devel</li> -<li>libgtkspell-dev (for the gtkspell module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 7a127277ffa8 -r 37fde3b2545b THANKS.artists --- a/THANKS.artists Mon Nov 02 23:03:34 2009 +0100 +++ b/THANKS.artists Sat Dec 19 13:30:03 2009 +0100 @@ -1,10 +1,10 @@ Anders Ström Christophe Got Dennis Craven +Dmitry Korzhevin Guillaume Morin Gvorcek Spajreh Josef Vybíral Membris Khan Rederick Asher Jakub Szypulka - diff -r 7a127277ffa8 -r 37fde3b2545b configure.ac --- a/configure.ac Mon Nov 02 23:03:34 2009 +0100 +++ b/configure.ac Sat Dec 19 13:30:03 2009 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.5.8-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.0-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_SRCDIR(src) @@ -33,7 +33,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` @@ -97,28 +97,27 @@ fi fi -dnl **** -dnl tray icon -dnl **** -AC_ARG_ENABLE(trayicon, - [ --disable-trayicon do not build trayicon module [default yes]], - enable_trayicon=$enableval, enable_trayicon=yes) -if test "x$enable_trayicon" = "xyes" -a "x$have_cocoa" != "xtrue"; then - have_trayicon=true - AC_SUBST(TRAYMODULE, traymodule) -else - have_trayicon=false - AC_SUBST(TRAYMODULE,) -fi - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_SUBST([PYTHON_INCLUDES]) -AS_AC_EXPAND(DATADIR, "${datadir}") -AS_AC_EXPAND(LIBDIR, "${libdir}") +dnl **** +dnl enable installation in python-2.x/site-packages/gajim +dnl **** +AC_ARG_ENABLE(site-packages, + [AS_HELP_STRING([--enable-site-packages], + [install gajim sources in PYTHONDIR/site-packages/gajim +instead of DATADIR/gajim/src.])] +, +AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) +, +AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) + +AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") +AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") AS_AC_EXPAND(DOCDIR, "${docdir}") AS_AC_EXPAND(LOCALEDIR, "${localedir}") @@ -137,10 +136,11 @@ ]) BUILDSYS_TOUCH_DEPS AC_OUTPUT -echo " -***************************** - Build features: - trayicon ......... ${have_trayicon} - idle module OSX .. ${have_idle_osx} - cocoa (OSX)....... ${have_cocoa} +echo " +***************************** + Installation: + Prefix ........... ${prefix} + Python modules ... ${GAJIM_SRCDIR} + Documentation .... ${DOCDIR} + Others ........... ${PKGDATADIR} *****************************" diff -r 7a127277ffa8 -r 37fde3b2545b data/defs.py.in --- a/data/defs.py.in Mon Nov 02 23:03:34 2009 +0100 +++ b/data/defs.py.in Sat Dec 19 13:30:03 2009 +0100 @@ -2,7 +2,7 @@ # do not edit it! docdir = "@DOCDIR@" -datadir = "@DATADIR@" +basedir = "@PKGDATADIR@" version = "@VERSION@" diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/alien.png Binary file data/emoticons/tango/alien.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/angel.png Binary file data/emoticons/tango/angel.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/arrogant.png Binary file data/emoticons/tango/arrogant.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/beer.png Binary file data/emoticons/tango/beer.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/bomb.png Binary file data/emoticons/tango/bomb.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/clap.png Binary file data/emoticons/tango/clap.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/confused.png Binary file data/emoticons/tango/confused.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/cowboy.png Binary file data/emoticons/tango/cowboy.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/crying.png Binary file data/emoticons/tango/crying.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/curl-lip.png Binary file data/emoticons/tango/curl-lip.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/cute.png Binary file data/emoticons/tango/cute.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/dance.png Binary file data/emoticons/tango/dance.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/devil.png Binary file data/emoticons/tango/devil.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/disapointed.png Binary file data/emoticons/tango/disapointed.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/doh.png Binary file data/emoticons/tango/doh.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/dont-know.png Binary file data/emoticons/tango/dont-know.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/embarrassed.png Binary file data/emoticons/tango/embarrassed.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/emoticons.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/emoticons/tango/emoticons.py Sat Dec 19 13:30:03 2009 +0100 @@ -0,0 +1,52 @@ +# coding=utf-8 +emoticons = { + 'angel.png': ['O:-)', 'o:-)', '0:-)'], + 'curl-lip.png': [':-)', ':)', '=)'], + 'sarcastic.png': [';D', ';-D'], + 'sad.png': [':-(', ':(', '=('], + 'wink.png': [';-)', ';)'], + 'tongue.png': [':-P', ':P', ':-p', ':p'], + 'glasses-cool': ['8-)', 'B-)', '(H)'], + 'laugh.png': [':-D', ':D'], + 'embarrassed.png': [':-[', ':['], + 'shout.png': ['=-O', ':-O', ':O'], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'crying.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'shut-mouth': [':-X'], + 'hypnotized.png': ['%)', '%-)'], + 'freaked-out.png': [':o'], + 'thinking.png': [':-|', ':|'], + 'arrogant.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'devil.png': [':->', ']:->', '>:-)', '>:)', '(6)'], + 'musical-note.png': ['[:-}'], + 'sick.png': [':-!'], + 'giggle.png': ['*JOKINGLY*'], + 'cute.png': ['*KISSED*'], + 'sleepy.png': ['*TIRED*'], + 'terror.png': ['*STOP*'], + 'handshake.png': ['*KISSING*'], + 'rose.png': ['@}->--', '(F)'], + 'good.png': ['(Y)', '*THUMBS UP*'], + 'beer.png': ['(B)', '*DRINK*'], + 'love.png': ['<3', '(L)', '*IN LOVE*'], + 'bomb.png': ['@='], + 'question.png': ['*HELP*'], + 'cowboy.png': ['\m/'], + 'fingers-crossed.png': ['*OK*'], + 'alien.png': ['*WASSUP*'], + 'disapointed.png': ['*SORRY*'], + 'clap.png': ['*BRAVO*'], + 'rotfl.png': ['*ROFL*'], + 'dont-know.png': ['*PARDON*'], + 'confused.png': ['*NO*'], + 'silly.png': ['*CRAZY*'], + 'doh.png': ['*DONT_KNOW*'], + 'party.png': ['*DANCE*'], + 'dance.png': ['*YAHOO*'], + 'victory.png': ['*HI*'], + 'go-away.png': ['*BYE*'], + 'smirk.png': ['*YES*'], + 'pissed-off.png': ['*WALL*'], + 'mail.png': ['*WRITE*', '(E)'], + 'tremble.png': ['*SCRATCH*'], +} \ No newline at end of file diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/fingers-crossed.png Binary file data/emoticons/tango/fingers-crossed.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/freaked-out.png Binary file data/emoticons/tango/freaked-out.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/giggle.png Binary file data/emoticons/tango/giggle.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/glasses-cool.png Binary file data/emoticons/tango/glasses-cool.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/go-away.png Binary file data/emoticons/tango/go-away.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/good.png Binary file data/emoticons/tango/good.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/handshake.png Binary file data/emoticons/tango/handshake.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/hypnotized.png Binary file data/emoticons/tango/hypnotized.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/kiss.png Binary file data/emoticons/tango/kiss.png has changed diff -r 7a127277ffa8 -r 37fde3b2545b data/emoticons/tango/laugh.png

1 0

gajim: Removed trailing space
by Alexander Cherniuk 19 Dec '09

19 Dec '09

changeset d373e1fe8661 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d373e1fe8661 description: Removed trailing space diffstat: src/common/protocol/bytestream.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (74 lines): diff -r 31f891f736b6 -r d373e1fe8661 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Dec 19 10:26:03 2009 +0100 +++ b/src/common/protocol/bytestream.py Sat Dec 19 13:49:10 2009 +0200 @@ -138,7 +138,7 @@ if 'idx' in host and host['idx'] > 0: gajim.socks5queue.remove_receiver(host['idx']) gajim.socks5queue.remove_sender(host['idx']) - + def _send_socks5_info(self, file_props): """ Send iq for the present streamhosts and proxies @@ -150,7 +150,7 @@ sha_str = helpers.get_auth_sha(file_props['sid'], sender, receiver) file_props['sha_str'] = sha_str - + port = gajim.config.get('file_transfers_port') listener = gajim.socks5queue.start_listener(port, sha_str, self._result_socks5_sid, file_props['sid']) @@ -166,11 +166,11 @@ query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) query.setAttr('mode', 'plain') query.setAttr('sid', file_props['sid']) - + self._add_addiditional_streamhosts_to_query(query, file_props) self._add_local_ips_as_streamhosts_to_query(query, file_props) self._add_proxy_streamhosts_to_query(query, file_props) - + self.connection.send(iq) def _add_streamhosts_to_query(self, query, sender, port, hosts): @@ -188,7 +188,7 @@ for addr in socket.getaddrinfo(socket.gethostname(), None): if not addr[4][0] in my_ips and not addr[4][0].startswith('127'): my_ips.append(addr[4][0]) - + sender = file_props['sender'] port = gajim.config.get('file_transfers_port') self._add_streamhosts_to_query(query, sender, port, my_ips) @@ -219,9 +219,9 @@ proxyhost['port'], [proxyhost['host']]) def _get_file_transfer_proxies_from_config(self, file_props): - configured_proxies = gajim.config.get_per('accounts', self.name, + configured_proxies = gajim.config.get_per('accounts', self.name, 'file_transfer_proxies') - shall_use_proxies = gajim.config.get_per('accounts', self.name, + shall_use_proxies = gajim.config.get_per('accounts', self.name, 'use_ft_proxies') if shall_use_proxies and configured_proxies: proxyhost_dicts = [] @@ -232,7 +232,7 @@ if default_proxy in proxies: proxies.remove(default_proxy) proxies.insert(0, default_proxy) - + for proxy in proxies: (host, _port, jid) = gajim.proxy65_manager.get_proxy(proxy, self.name) if not host: @@ -631,7 +631,7 @@ file_props['error'] = -3 self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, '')) raise xmpp.NodeProcessed - + class ConnectionBytestreamZeroconf(ConnectionBytestream):

1 0

gajim: add missing import to common/protocol/bytestream.py. Fixe...
by Yann Leboulanger 19 Dec '09

19 Dec '09

changeset 31f891f736b6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31f891f736b6 description: add missing import to common/protocol/bytestream.py. Fixes #5520 diffstat: src/common/protocol/bytestream.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r e60b59ea7b45 -r 31f891f736b6 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Fri Dec 18 17:27:09 2009 +0100 +++ b/src/common/protocol/bytestream.py Sat Dec 19 10:26:03 2009 +0100 @@ -35,6 +35,8 @@ from common import helpers from common import dataforms +from common.socks5 import Socks5Receiver + def is_transfer_paused(file_props): if 'stopped' in file_props and file_props['stopped']: @@ -520,7 +522,7 @@ file_props['streamhosts'] = [] file_props['streamhosts'].append(proxy) file_props['is_a_proxy'] = True - receiver = socks5.Socks5Receiver(gajim.idlequeue, proxy, + receiver = Socks5Receiver(gajim.idlequeue, proxy, file_props['sid'], file_props) gajim.socks5queue.add_receiver(self.name, receiver) proxy['idx'] = receiver.queue_idx

1 0

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2009