Commits January 2014

commits@gajim.org

3 participants
34 discussions

gajim: Copyright 2013>2014
by Gajim 02 Jan '14

02 Jan '14

changeset ab96f0a9ef2a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ab96f0a9ef2a description: Copyright 2013>2014 diffstat: setup_win32.py | 2 +- src/adhoc_commands.py | 2 +- src/advanced_configuration_window.py | 2 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 2 +- src/common/commands.py | 2 +- src/common/config.py | 2 +- src/common/configpaths.py | 2 +- src/common/connection.py | 2 +- src/common/connection_handlers.py | 2 +- src/common/connection_handlers_events.py | 2 +- src/common/contacts.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 2 +- src/common/dh.py | 2 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 2 +- src/common/gnupg.py | 4 ++-- src/common/gpg.py | 2 +- src/common/helpers.py | 2 +- src/common/i18n.py | 2 +- src/common/location_listener.py | 2 +- src/common/logger.py | 2 +- src/common/optparser.py | 2 +- src/common/passwords.py | 2 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 2 +- src/common/zeroconf/connection_zeroconf.py | 2 +- src/config.py | 2 +- src/conversation_textview.py | 2 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 4 ++-- src/disco.py | 2 +- src/features_window.py | 2 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 2 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 2 +- src/groups.py | 2 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 2 +- src/gui_menu_builder.py | 2 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 2 +- src/ipython_view.py | 2 +- src/logind_listener.py | 2 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 2 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 2 +- src/profile_window.py | 2 +- src/remote_control.py | 2 +- src/roster_window.py | 2 +- src/search_window.py | 2 +- src/session.py | 2 +- src/statusicon.py | 2 +- src/tooltips.py | 2 +- src/upower_listener.py | 2 +- src/vcard.py | 2 +- 78 файлов изменено, 80 вставок(+), 80 удалений(-) различия (урезанные с 950 до 300 строк): diff -r 554dbab03d48 -r ab96f0a9ef2a setup_win32.py --- a/setup_win32.py Wed Jan 01 22:32:00 2014 +0100 +++ b/setup_win32.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,6 +1,6 @@ ## setup_win32.py (run me as python setup_win32.py py2exe -O2) ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/adhoc_commands.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## Stephan Erb <steve-e AT h3c.de> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/advanced_configuration_window.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> ## Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/atom_window.py --- a/src/atom_window.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/atom_window.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/atom_window.py ## ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/cell_renderer_image.py --- a/src/cell_renderer_image.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/cell_renderer_image.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/cell_renderer_image.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/chat_control.py --- a/src/chat_control.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/chat_control.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> ## Travis Shirk <travis AT pobox.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/atom.py --- a/src/common/atom.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/atom.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/caps_cache.py --- a/src/common/caps_cache.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/caps_cache.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## Jonathan Schleifer <js-gajim AT webkeks.org> ## Copyright (C) 2008-2009 Stephan Erb <steve-e AT h3c.de> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/check_paths.py --- a/src/common/check_paths.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/check_paths.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/commands.py --- a/src/common/commands.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/commands.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/commands.py ## -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/config.py --- a/src/common/config.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/config.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/config.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/configpaths.py --- a/src/common/configpaths.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/configpaths.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Junglecow J <junglecow AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/connection.py --- a/src/common/connection.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/connection.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> ## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection_handlers.py Thu Jan 02 12:33:54 2014 +0400 @@ -6,7 +6,7 @@ ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> ## Jean-Marie Traissard <jim AT lapin.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/connection_handlers_events.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/connection_handlers_events.py ## -## Copyright (C) 2010-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2010-2014 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/contacts.py --- a/src/common/contacts.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/contacts.py Thu Jan 02 12:33:54 2014 +0400 @@ -4,7 +4,7 @@ ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> ## Tomasz Melcer <liori AT exroot.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/dataforms.py --- a/src/common/dataforms.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dataforms.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## src/common/dataforms.py ## ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/dbus_support.py --- a/src/common/dbus_support.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dbus_support.py Thu Jan 02 12:33:54 2014 +0400 @@ -4,7 +4,7 @@ ## Copyright (C) 2005 Andrew Sayman <lorien420 AT myrealbox.com> ## Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/defs.py --- a/src/common/defs.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/defs.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/defs.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Tomasz Melcer <liori AT exroot.org> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/dh.py --- a/src/common/dh.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/dh.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/dh.py ## -## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## ## This file is part of Gajim. diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/events.py --- a/src/common/events.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/events.py Thu Jan 02 12:33:54 2014 +0400 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/exceptions.py --- a/src/common/exceptions.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/exceptions.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/exceptions.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/fuzzyclock.py --- a/src/common/fuzzyclock.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/fuzzyclock.py Thu Jan 02 12:33:54 2014 +0400 @@ -2,7 +2,7 @@ ## src/common/fuzzyclock.py ## ## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> -## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2009 Benjamin Richter <br AT waldteufel-online.net> ## diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/gajim.py --- a/src/common/gajim.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/gajim.py Thu Jan 02 12:33:54 2014 +0400 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/gajim.py ## -## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> diff -r 554dbab03d48 -r ab96f0a9ef2a src/common/gnupg.py --- a/src/common/gnupg.py Wed Jan 01 22:32:00 2014 +0100 +++ b/src/common/gnupg.py Thu Jan 02 12:33:54 2014 +0400 @@ -27,7 +27,7 @@ and so does not work on Windows). Renamed to gnupg.py to avoid confusion with the previous versions. -Modifications Copyright (C) 2008-2013 Vinay Sajip. All rights reserved. +Modifications Copyright (C) 2008-2014 Vinay Sajip. All rights reserved. A unittest harness (test_gnupg.py) has also been added. """ @@ -35,7 +35,7 @@

1 0

gajim: send jabber:iq:last to bare jid when contact is offline. ...
by Gajim 01 Jan '14

01 Jan '14

changeset 554dbab03d48 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=554dbab03d48 description: send jabber:iq:last to bare jid when contact is offline. Fixes #7610 diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1e593220a950 -r 554dbab03d48 src/vcard.py --- a/src/vcard.py Wed Jan 01 20:49:53 2014 +0100 +++ b/src/vcard.py Wed Jan 01 22:32:00 2014 +0100 @@ -438,7 +438,7 @@ self.contact.jid) else: gajim.connections[self.account].request_last_status_time( - self.contact.jid, self.contact.resource) + self.contact.jid, '') # do not wait for os_info if contact is not connected or has error # additional check for observer is needed, as show is offline for him

1 0

gajim: add a <private> element to message stanza when message ca...
by Gajim 01 Jan '14

01 Jan '14

changeset 1e593220a950 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1e593220a950 description: add a <private> element to message stanza when message carbons is enabled and message is encrypted. Fixes #7616 diffstat: src/common/connection.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r 5abfcbebff64 -r 1e593220a950 src/common/connection.py --- a/src/common/connection.py Tue Dec 31 14:28:24 2013 +0100 +++ b/src/common/connection.py Wed Jan 01 20:49:53 2014 +0100 @@ -164,6 +164,7 @@ self.roster_supported = True self.blocking_supported = False self.addressing_supported = False + self.carbons_enabled = False self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -421,6 +422,8 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) + if self.carbons_enabled: + msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) if form_node: msg_iq.addChild(node=form_node) @@ -493,6 +496,9 @@ # XEP-0200 if session.enable_encryption: msg_iq = session.encrypt_stanza(msg_iq) + if self.carbons_enabled: + msg_iq.addChild(name='private', + namespace=nbxmpp.NS_CARBONS) if callback: callback(jid, msg, keyID, forward_from, session, original_message, @@ -1939,7 +1945,8 @@ if nbxmpp.NS_ADDRESS in obj.features: self.addressing_supported = True if nbxmpp.NS_CARBONS in obj.features and gajim.config.get_per( - 'accounts', self.name, 'enable_message_carbons'): + 'accounts', self.name, 'enable_message_carbons'): + self.carbons_enabled = True # Server supports carbons, activate it iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS)

1 0

gajim-website: new windows installer
by Gajim Website 01 Jan '14

01 Jan '14

changeset 8ce70abb34ad in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=8ce70abb34ad description: new windows installer diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1577df49957a -r 8ce70abb34ad downloads.php --- a/downloads.php Mon Dec 16 16:06:52 2013 +0100 +++ b/downloads.php Wed Jan 01 13:39:31 2014 +0100 @@ -147,7 +147,7 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" <br/>\n"); -print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-beta2-1.exe\">"._("Gajim installer")."</a> "; +print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-beta2-2.exe\">"._("Gajim installer")."</a> "; printf(_("for %s version "), "0.16-beta2"); print (".\n"); print (" <br/>\n");

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2014