Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10251 - trunk/src
by js＠gajim.org 16 Aug '08

16 Aug '08

Author: js Date: 2008-08-16 21:49:56 +0200 (Sat, 16 Aug 2008) New Revision: 10251 Modified: trunk/src/gajim.py Log: Make a string translatable. Fixes #4203. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-15 17:31:51 UTC (rev 10250) +++ trunk/src/gajim.py 2008-08-16 19:49:56 UTC (rev 10251) @@ -1290,7 +1290,7 @@ # Standard way, the message comes from the occupant who set the subject text = None if len(jids) > 1: - text = '%s has set the subject to %s' % (jids[1], array[1]) + text = _('%s has set the subject to %s') % (jids[1], array[1]) # Workaround for psi bug http://flyspray.psi-im.org/task/595 , to be # deleted one day. We can receive a subject with a body that contains # "X has set the subject to Y" ...

1 0

[commit-gajim] r10250 - in trunk/src: . common
by roidelapluie＠gajim.org 15 Aug '08

15 Aug '08

Author: roidelapluie Date: 2008-08-15 19:31:51 +0200 (Fri, 15 Aug 2008) New Revision: 10250 Modified: trunk/src/advanced.py trunk/src/atom_window.py trunk/src/cell_renderer_image.py trunk/src/chat_control.py trunk/src/common/GnuPGInterface.py trunk/src/common/__init__.py trunk/src/common/atom.py trunk/src/common/caps.py trunk/src/common/check_paths.py trunk/src/common/commands.py trunk/src/common/config.py trunk/src/common/configpaths.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/common/crypto.py trunk/src/common/dataforms.py trunk/src/common/dbus_support.py trunk/src/common/defs.py trunk/src/common/dh.py trunk/src/common/events.py trunk/src/common/exceptions.py trunk/src/common/fuzzyclock.py trunk/src/common/gajim.py trunk/src/common/helpers.py trunk/src/common/i18n.py trunk/src/common/logger.py trunk/src/common/nslookup.py trunk/src/common/optparser.py trunk/src/common/passwords.py trunk/src/common/pep.py trunk/src/common/proxy65_manager.py trunk/src/common/pubsub.py trunk/src/common/rst_xhtml_generator.py trunk/src/common/sleepy.py trunk/src/common/socks5.py trunk/src/common/stanza_session.py trunk/src/common/xmpp_stringprep.py trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dataforms_widget.py trunk/src/disco.py trunk/src/features_window.py trunk/src/filetransfers_window.py trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/gajim_themes_window.py trunk/src/groupchat_control.py trunk/src/groups.py trunk/src/gtkexcepthook.py trunk/src/gtkgui_helpers.py trunk/src/history_manager.py trunk/src/history_window.py trunk/src/htmltextview.py trunk/src/ipython_view.py trunk/src/lastfm.py trunk/src/lastfm_track_listener.py trunk/src/message_control.py trunk/src/message_textview.py trunk/src/message_window.py trunk/src/negotiation.py trunk/src/network_manager_listener.py trunk/src/notify.py trunk/src/profile_window.py trunk/src/remote_control.py trunk/src/roster_window.py trunk/src/search_window.py trunk/src/secrets.py trunk/src/session.py trunk/src/statusicon.py trunk/src/systray.py trunk/src/tooltips.py trunk/src/vcard.py Log: See #4200. * remove js from some headers * set coding:utf-8 to allow real names in headers Modified: trunk/src/advanced.py =================================================================== --- trunk/src/advanced.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/advanced.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/advanced.py ## ## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> @@ -6,7 +7,6 @@ ## 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> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/atom_window.py =================================================================== --- trunk/src/atom_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/atom_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/atom_window.py ## ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> Modified: trunk/src/cell_renderer_image.py =================================================================== --- trunk/src/cell_renderer_image.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/cell_renderer_image.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/cell_renderer_image.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,6 @@ ## 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> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/chat_control.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/common/GnuPGInterface.py =================================================================== --- trunk/src/common/GnuPGInterface.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/GnuPGInterface.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/GnuPGInterface.py ## -## Copyright (C) 2001 Frank J. Tobin <ftobin(a)neverending.org> +## Copyright (C) 2001 Frank J. Tobin <ftobin AT neverending.org> ## Copyright (C) 2005 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/__init__.py =================================================================== --- trunk/src/common/__init__.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/__init__.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,22 +1,2 @@ -## src/common/__init__.py -## -## Copyright (C) 2005 Yann Leboulanger <asterix AT lagaule.org> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## # vim: se ts=3: Modified: trunk/src/common/atom.py =================================================================== --- trunk/src/common/atom.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/atom.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -4,7 +4,6 @@ ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/caps.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/caps.py ## ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> Modified: trunk/src/common/check_paths.py =================================================================== --- trunk/src/common/check_paths.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/check_paths.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/check_paths.py ## ## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> @@ -6,7 +7,6 @@ ## 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> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/commands.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/commands.py ## ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,6 @@ ## 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> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/config.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/config.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -2,3 +3,3 @@ ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005 Stephan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005 Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/configpaths.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,7 +1,8 @@ +# -*- coding:utf-8 -*- ## src/common/configpaths.py ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> -## Junglecow <junglecow AT gmail.com> +## Junglecow J <junglecow AT gmail.com> ## Copyright (C) 2006-2007 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> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/connection.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/connection.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> @@ -3,9 +4,9 @@ ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stephan Kochen <stephan AT kochen.nl> +## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/connection_handlers.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,7 +1,8 @@ +# -*- coding:utf-8 -*- ## src/common/connection_handlers.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Junglecow <junglecow AT gmail.com> +## Junglecow J <junglecow AT gmail.com> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/contacts.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/contacts.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/crypto.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,8 +1,8 @@ # common crypto functions (mostly specific to XEP-0116, but useful elsewhere) +# -*- coding:utf-8 -*- ## src/common/crypto.py ## ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/dataforms.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,10 +1,10 @@ # this will go to src/common/xmpp later, for now it is in src/common +# -*- coding:utf-8 -*- ## src/common/dataforms.py ## ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/dbus_support.py =================================================================== --- trunk/src/common/dbus_support.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/dbus_support.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/dbus_support.py ## ## Copyright (C) 2005 Andrew Sayman <lorien420 AT myrealbox.com> Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/defs.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/defs.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/common/dh.py =================================================================== --- trunk/src/common/dh.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/dh.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/dh.py ## ## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> @@ -2,3 +3,2 @@ ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/events.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/events.py ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> Modified: trunk/src/common/exceptions.py =================================================================== --- trunk/src/common/exceptions.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/exceptions.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/exceptions.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> @@ -4,7 +5,6 @@ ## Copyright (C) 2005-2008 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> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/fuzzyclock.py =================================================================== --- trunk/src/common/fuzzyclock.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/fuzzyclock.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/fuzzyclock.py ## ## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> @@ -3,5 +4,4 @@ ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/gajim.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/gajim.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,7 @@ ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/helpers.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/helpers.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> Modified: trunk/src/common/i18n.py =================================================================== --- trunk/src/common/i18n.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/i18n.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/i18n.py ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,6 @@ ## Copyright (C) 2004 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2004-2007 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> ## ## This file is part of Gajim. ## Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/logger.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/logger.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -7,7 +8,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Julien Pivotto <roidelapluie AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/nslookup.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/nslookup.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/optparser.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/optparser.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> @@ -9,7 +10,6 @@ ## Brendan Taylor <whateley AT gmail.com> ## Tomasz Melcer <liori AT exroot.org> ## Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/passwords.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/passwords.py ## ## Copyright (C) 2006 Gustavo J. A. M. Carneiro <gjcarneiro AT gmail.com> @@ -5,8 +6,7 @@ ## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Julien Pivotto <roidelapluie AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/pep.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/pep.py ## ## Copyright (C) 2007 Piotr Gaczkowski <doomhammerng AT gmail.com> Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/proxy65_manager.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/proxy65_manager.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> @@ -3,5 +4,4 @@ ## Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/pubsub.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/pubsub.py ## ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> @@ -3,6 +4,5 @@ ## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. Modified: trunk/src/common/rst_xhtml_generator.py =================================================================== --- trunk/src/common/rst_xhtml_generator.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/rst_xhtml_generator.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/rst_xhtml_generator.py ## ## Copyright (C) 2006 Santiago Gala @@ -4,7 +5,6 @@ ## Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/sleepy.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/sleepy.py ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> @@ -3,6 +4,5 @@ ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Mateusz Bilinski <mateusz AT bilinski.it> +## Copyright (C) 2008 Mateusz Biliński <mateusz AT bilinski.it> ## ## This file is part of Gajim. Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/socks5.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/socks5.py ## ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/stanza_session.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/stanza_session.py ## ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> Modified: trunk/src/common/xmpp_stringprep.py =================================================================== --- trunk/src/common/xmpp_stringprep.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/common/xmpp_stringprep.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/xmpp_stringprep.py ## ## Copyright (C) 2001-2005 Twisted Matrix Laboratories @@ -4,7 +5,6 @@ ## Copyright (C) 2005-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/config.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/config.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> @@ -3,8 +4,8 @@ ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> -## Stephan Kochen <stephan AT kochen.nl> +## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> ## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> ## Stefan Bethge <stefan AT lanpartei.de> Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/conversation_textview.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/conversation_textview.py ## ## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/dataforms_widget.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/dataforms_widget.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -3,5 +4,4 @@ ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/disco.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- ## src/disco.py ## -## Copyright (C) 2005-2006 Stephan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2006 Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/features_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/features_window.py ## ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/filetransfers_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/filetransfers_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,6 @@ ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/gajim-remote.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/gajim-remote.py ## ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> @@ -8,7 +9,6 @@ ## Travis Shirk <travis AT pobox.com> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/gajim.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,16 +1,17 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/gajim.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> ## Norman Rasmussen <norman AT rasmussen.co.za> -## Stephan Kochen <stephan AT kochen.nl> +## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Alex Mauer <hawke AT hawkesnest.net> ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> Modified: trunk/src/gajim_themes_window.py =================================================================== --- trunk/src/gajim_themes_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/gajim_themes_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/gajim_themes_window.py ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> @@ -5,7 +6,6 @@ ## Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/groupchat_control.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/groupchat_control.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> Modified: trunk/src/groups.py =================================================================== --- trunk/src/groups.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/groups.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/groups.py ## ## Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org> @@ -2,3 +3,2 @@ ## Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/gtkexcepthook.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/gtkexcepthook.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> @@ -2,4 +3,3 @@ ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> ## Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/gtkgui_helpers.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/gtkgui_helpers.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -4,7 +5,7 @@ ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> -## Copyright (C) 2006-2007 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006-2007 Junglecow J <junglecow AT gmail.com> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 James Newton <redshodan AT gmail.com> ## Julien Pivotto <roidelapluie AT gmail.com> Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/history_manager.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/history_manager.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/history_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/history_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -8,7 +9,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/htmltextview.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/htmltextview.py ## ## Copyright (C) 2005 Gustavo J. A. M. Carneiro Modified: trunk/src/ipython_view.py =================================================================== --- trunk/src/ipython_view.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/ipython_view.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,20 +1,8 @@ #!/usr/bin/python - -## Copyright (c) 2007, IBM Corporation -## All rights reserved. - -## Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -## * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -## * Neither the name of the IBM Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +# -*- coding:utf-8 -*- ## src/ipython_view.py ## ## Copyright (C) 2008 Yann Leboulanger <asterix AT lagaule.org> -## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -30,8 +18,17 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +## Copyright (c) 2007, IBM Corporation +## All rights reserved. +## Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +## * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +## * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +## * Neither the name of the IBM Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ''' Provides IPython console widget. Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/lastfm.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,10 +1,10 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/lastfm.py ## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## Olivier Mehani <shtrom(a)ssji.net> +## Copyright (C) 2007 Olivier Mehani <shtrom AT ssji.net> +## Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/lastfm_track_listener.py =================================================================== --- trunk/src/lastfm_track_listener.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/lastfm_track_listener.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- ## src/lastfm_track_listener.py ## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## Olivier Mehani <shtrom-gajim AT ssji.net> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2007 Olivier Mehani <shtrom-gajim AT ssji.net> +## Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/message_control.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/message_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/message_textview.py =================================================================== --- trunk/src/message_textview.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/message_textview.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/message_textview.py ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> @@ -3,5 +4,4 @@ ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/message_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/message_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> Modified: trunk/src/negotiation.py =================================================================== --- trunk/src/negotiation.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/negotiation.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/negotiation.py ## ## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> @@ -2,3 +3,2 @@ ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/network_manager_listener.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -5,7 +5,6 @@ ## Nikos Kouremenos <kourem AT gmail.com> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/notify.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/notify.py ## ## Copyright (C) 2005 Sebastian Estienne Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/profile_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/profile_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -3,5 +4,4 @@ ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/remote_control.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/remote_control.py ## ## Copyright (C) 2005-2006 Andrew Sayman <lorien420 AT myrealbox.com> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/roster_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -3,7 +3,7 @@ ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stephan Kochen <stephan AT kochen.nl> +## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/search_window.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -3,7 +3,6 @@ ## ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/secrets.py =================================================================== --- trunk/src/secrets.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/secrets.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/secrets.py ## ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/session.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/session.py ## ## Copyright (C) 2008 Yann Leboulanger <asterix AT lagaule.org> Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/statusicon.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/statusicon.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/systray.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/systray.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> @@ -10,7 +11,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> ## Julien Pivotto <roidelapluie AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/tooltips.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -2,7 +2,7 @@ ## src/tooltips.py ## ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stephan Kochen <stephan AT kochen.nl> +## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-08-15 09:35:44 UTC (rev 10249) +++ trunk/src/vcard.py 2008-08-15 17:31:51 UTC (rev 10250) @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/vcard.py ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> @@ -3,6 +4,6 @@ ## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> +## Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Stefan Bethge <stefan AT lanpartei.de>

1 0

[commit-gajim] r10249 - trunk/src
by asterix＠gajim.org 15 Aug '08

15 Aug '08

Author: asterix Date: 2008-08-15 11:35:44 +0200 (Fri, 15 Aug 2008) New Revision: 10249 Modified: trunk/src/message_window.py Log: CTRL+i in private message now works. Fixes #4066 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-15 03:39:27 UTC (rev 10248) +++ trunk/src/message_window.py 2008-08-15 09:35:44 UTC (rev 10249) @@ -320,8 +320,8 @@ elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.g: # CTRL + g control._on_convert_to_gc_menuitem_activate(None) - elif control.type_id == message_control.TYPE_CHAT and \ - keyval == gtk.keysyms.i: # CTRL + i + elif control.type_id in (message_control.TYPE_CHAT, + message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i control._on_contact_information_menuitem_activate(None) elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L control.conv_textview.clear()

1 0

[commit-gajim] r10248 - in trunk/src: . common
by roidelapluie＠gajim.org 15 Aug '08

15 Aug '08

Author: roidelapluie Date: 2008-08-15 05:39:27 +0200 (Fri, 15 Aug 2008) New Revision: 10248 Modified: trunk/src/common/config.py trunk/src/common/connection.py trunk/src/common/pep.py trunk/src/common/sleepy.py trunk/src/config.py trunk/src/disco.py trunk/src/gajim.py trunk/src/roster_window.py trunk/src/tooltips.py Log: Prevent many traceback due to headers and my last commit (it's late, sorry) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/common/config.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -2,7 +2,7 @@ ## ## Copyright (C) 2003-2008 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 Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Alex Mauer <hawke AT hawkesnest.net> ## Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/common/connection.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -3,7 +3,7 @@ ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stéphan Kochen <stephan AT kochen.nl> +## Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/common/pep.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -1,3 +1,27 @@ +## src/common/pep.py +## +## Copyright (C) 2007 Piotr Gaczkowski <doomhammerng AT gmail.com> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jean-Marie Traissard <jim AT lapin.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + from common import gajim, xmpp MOODS = { Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/common/sleepy.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -1,11 +1,10 @@ ## src/common/sleepy.py ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005-2006 Yann Leboulanger <asterix AT lagaule.org> -## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Mateusz Biliński <mateusz AT bilinski.it> +## Mateusz Bilinski <mateusz AT bilinski.it> ## ## This file is part of Gajim. ## Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/config.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -3,7 +3,7 @@ ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> -## Stéphan Kochen <stephan AT kochen.nl> +## Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/disco.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## src/disco.py ## -## Copyright (C) 2005-2006 Stéphan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2006 Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/gajim.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -5,7 +5,7 @@ ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> ## Norman Rasmussen <norman AT rasmussen.co.za> -## Stéphan Kochen <stephan AT kochen.nl> +## Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Alex Mauer <hawke AT hawkesnest.net> ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/roster_window.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -3,7 +3,7 @@ ## ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stéphan Kochen <stephan AT kochen.nl> +## Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-08-15 03:20:23 UTC (rev 10247) +++ trunk/src/tooltips.py 2008-08-15 03:39:27 UTC (rev 10248) @@ -2,7 +2,7 @@ ## src/tooltips.py ## ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -## Stéphan Kochen <stephan AT kochen.nl> +## Stephan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org>

1 0

[commit-gajim] r10247 - in trunk: . scripts src src/common src/osx src/osx/growl src/osx/syncmenu
by roidelapluie＠gajim.org 15 Aug '08

15 Aug '08

Author: roidelapluie Date: 2008-08-15 05:20:23 +0200 (Fri, 15 Aug 2008) New Revision: 10247 Modified: trunk/scripts/gajim-remote.in trunk/scripts/gajim.in trunk/setup_osx.py trunk/setup_win32.py trunk/src/adhoc_commands.py trunk/src/advanced.py trunk/src/atom_window.py trunk/src/cell_renderer_image.py trunk/src/chat_control.py trunk/src/common/GnuPG.py trunk/src/common/GnuPGInterface.py trunk/src/common/__init__.py trunk/src/common/atom.py trunk/src/common/caps.py trunk/src/common/check_paths.py trunk/src/common/commands.py trunk/src/common/config.py trunk/src/common/configpaths.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/common/crypto.py trunk/src/common/dataforms.py trunk/src/common/dbus_support.py trunk/src/common/defs.py trunk/src/common/dh.py trunk/src/common/events.py trunk/src/common/exceptions.py trunk/src/common/fuzzyclock.py trunk/src/common/gajim.py trunk/src/common/helpers.py trunk/src/common/i18n.py trunk/src/common/logger.py trunk/src/common/nslookup.py trunk/src/common/optparser.py trunk/src/common/passwords.py trunk/src/common/proxy65_manager.py trunk/src/common/pubsub.py trunk/src/common/rst_xhtml_generator.py trunk/src/common/sleepy.py trunk/src/common/socks5.py trunk/src/common/stanza_session.py trunk/src/common/xmpp_stringprep.py trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dataforms_widget.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/features_window.py trunk/src/filetransfers_window.py trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/gajim_themes_window.py trunk/src/groupchat_control.py trunk/src/groups.py trunk/src/gtkexcepthook.py trunk/src/gtkgui_helpers.py trunk/src/gtkspellmodule.c trunk/src/history_manager.py trunk/src/history_window.py trunk/src/htmltextview.py trunk/src/ipython_view.py trunk/src/lastfm.py trunk/src/lastfm_track_listener.py trunk/src/message_control.py trunk/src/message_textview.py trunk/src/message_window.py trunk/src/music_track_listener.py trunk/src/negotiation.py trunk/src/network_manager_listener.py trunk/src/notify.py trunk/src/osx/growl/_growl.c trunk/src/osx/growl/_growlImage.m trunk/src/osx/nsapp.m trunk/src/osx/syncmenu/pysyncmenu.c trunk/src/profile_window.py trunk/src/remote_control.py trunk/src/roster_window.py trunk/src/search_window.py trunk/src/secrets.py trunk/src/session.py trunk/src/statusicon.py trunk/src/systray.py trunk/src/tooltips.py trunk/src/trayicon.override trunk/src/trayiconmodule.c trunk/src/vcard.py Log: * Big headers review * Remove some licencing problems * To do: same for images * See #4200 Modified: trunk/scripts/gajim-remote.in =================================================================== --- trunk/scripts/gajim-remote.in 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/scripts/gajim-remote.in 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,28 +1,23 @@ #!/bin/sh -## gajim +## scripts/gajim-remote.in ## -## Contributors for this file: -## - Yann Le Boulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## - Dimitur Kirov <dkirov(a)gmail.com> -## -## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <nkour(a)jabber.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## if test $(id -u) -eq 0; then echo "You must not launch gajim-remote as root, it is INSECURE" Modified: trunk/scripts/gajim.in =================================================================== --- trunk/scripts/gajim.in 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/scripts/gajim.in 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,27 +1,25 @@ #!/bin/sh -## gajim +## scripts/gajim.in ## -## Contributors for this file: -## - Yann Le Boulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2005 Yann Le Boulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <nkour(a)jabber.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> +## This file is part of Gajim. ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## if test $(id -u) -eq 0; then echo "You must not launch Gajim as root, it is INSECURE" Modified: trunk/setup_osx.py =================================================================== --- trunk/setup_osx.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/setup_osx.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +## setup_osx.py +## +## Copyright (C) 2007 James Newton <redshodan AT gmail.com> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + """ Usage: python setup_osx.py [build | dist] Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/setup_win32.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,8 @@ ## setup_win32.py (run me as python setup_win32.py py2exe -O2) ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 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> ## ## This file is part of Gajim. ## @@ -11,11 +12,12 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## from distutils.core import setup import py2exe @@ -24,7 +26,7 @@ import os sys.path.append('src') -# Use local gtk folder instead of the one in PATH that is not latest gtk +# Use local gtk folder instead of the one in PATH that is not latest gtk if 'gtk' in os.listdir('.'): sys.path.append('gtk/bin') includes = ['encodings', 'encodings.utf-8',] Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/adhoc_commands.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- -## adhoc_commands.py +## src/adhoc_commands.py ## -## Copyright (C) 2006 Yann Leboulanger <asterix(a)lagaule.org> -## Nikos Kouremenos <nkour(a)jabber.org> +## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -12,11 +15,12 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## # FIXME: think if we need caching command list. it may be wrong if there will # be entities that often change the list, it may be slow to fetch it every time Modified: trunk/src/advanced.py =================================================================== --- trunk/src/advanced.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/advanced.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,12 @@ -## advanced.py +## src/advanced.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Vincent Hanquez <tab(a)snarc.org> +## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> +## Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005-2007 Yann Leboulanger <asterix AT lagaule.org> +## 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> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -12,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk @@ -272,4 +276,4 @@ def on_advanced_entry_changed(self, widget): self.modelfilter.refilter() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/atom_window.py =================================================================== --- trunk/src/atom_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/atom_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,10 @@ -## atom_window.py - a window to display atom entries from pubsub. +## src/atom_window.py ## -## For now greatly simplified, supports only simple feeds like the -## one from pubsub.com. +## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2007 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> ## -## Copyright (C) 2006-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2006-2007 Liori (I think) put ur self here please -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -15,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## @@ -134,4 +132,4 @@ helpers.launch_browser_mailer('url', uri) return True -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/cell_renderer_image.py =================================================================== --- trunk/src/cell_renderer_image.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/cell_renderer_image.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,18 +1,11 @@ -## cell_renderer_image.py +## src/cell_renderer_image.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 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> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -21,13 +14,14 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + import gtk import gobject @@ -141,4 +135,4 @@ self.get_property('ypad')) return x_offset, y_offset, calc_width, calc_height -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/chat_control.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,15 @@ -## chat_control.py +## src/chat_control.py ## -## Copyright (C) 2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2006-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Julien Pivotto <roidelapluie(a)gmail.com> -## Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Jean-Marie Traissard <jim AT lapin.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -16,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/GnuPG.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,18 +1,13 @@ -## common/GnuPG.py +## src/common/GnuPG.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -21,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gajim @@ -229,4 +224,4 @@ out = out + "-----END PGP %s-----\n" % type return out -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/GnuPGInterface.py =================================================================== --- trunk/src/common/GnuPGInterface.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/GnuPGInterface.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,26 @@ +## src/common/GnuPGInterface.py +## +## Copyright (C) 2001 Frank J. Tobin <ftobin(a)neverending.org> +## Copyright (C) 2005 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + """Interface to GNU Privacy Guard (GnuPG) GnuPGInterface is a Python module to interface with GnuPG. @@ -196,31 +219,6 @@ >>> proc.handles['logger'].close() >>> >>> proc.wait() - - -COPYRIGHT: - -Copyright (C) 2001 Frank J. Tobin, ftobin(a)neverending.org - -LICENSE: - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/copyleft/lesser.html """ import os @@ -656,4 +654,4 @@ if __name__ == '__main__': _run_doctests() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/__init__.py =================================================================== --- trunk/src/common/__init__.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/__init__.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,2 +1,22 @@ +## src/common/__init__.py +## +## Copyright (C) 2005 Yann Leboulanger <asterix AT lagaule.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/atom.py =================================================================== --- trunk/src/common/atom.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/atom.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,4 +1,26 @@ # -*- coding: utf-8 -*- +## src/common/atom.py +## +## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> +## Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + ''' Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports and services. Very simple. Actually implements only atom:entry. Implement more features if you need. ''' @@ -135,4 +157,4 @@ feed_tagline = u'' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/caps.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,5 +1,11 @@ +## src/common/caps.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -9,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## from itertools import * Modified: trunk/src/common/check_paths.py =================================================================== --- trunk/src/common/check_paths.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/check_paths.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,12 @@ +## src/common/check_paths.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os @@ -147,4 +152,4 @@ print _('creating %s directory') % directory os.mkdir(directory, 0700) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/commands.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,5 +1,11 @@ +## src/common/commands.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -9,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import xmpp @@ -413,4 +419,4 @@ raise xmpp.NodeProcessed -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/config.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,15 +1,20 @@ -## common/config.py +## src/common/config.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2004-2005 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Stephan Erb <steve-e(a)h3c.de> -## +## Copyright (C) 2003-2008 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> +## Alex Mauer <hawke AT hawkesnest.net> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 James Newton <redshodan AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -18,11 +23,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/configpaths.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,26 @@ +## src/common/configpaths.py +## +## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> +## Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006-2007 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> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import os import sys import tempfile @@ -122,4 +145,4 @@ gajimpaths = ConfigPaths() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/connection.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,14 +1,21 @@ -## common/connection.py +## src/common/connection.py ## +## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2003-2008 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> +## Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> +## 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Stephan Erb <steve-e(a)h3c.de> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -17,11 +24,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/connection_handlers.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,17 @@ +## src/common/connection_handlers.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Junglecow <junglecow AT gmail.com> +## 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-2008 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> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## - Dimitur Kirov <dkirov(a)gmail.com> -## - Travis Shirk <travis(a)pobox.com> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -15,11 +20,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/contacts.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,10 +1,16 @@ -## common/contacts.py +## src/common/contacts.py ## -## Copyright (C) 2006 Yann Leboulanger <asterix(a)lagaule.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Julien Pivotto <roidelapluie(a)gmail.com> -## Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 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> +## 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -14,11 +20,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import common.gajim Modified: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/crypto.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,4 +1,23 @@ # common crypto functions (mostly specific to XEP-0116, but useful elsewhere) +## src/common/crypto.py +## +## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## import os import math @@ -85,4 +104,4 @@ return result -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/dataforms.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,4 +1,26 @@ # this will go to src/common/xmpp later, for now it is in src/common +## src/common/dataforms.py +## +## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + """ This module contains wrappers for different parts of data forms (JEP 0004). For information how to use them, read documentation. """ Modified: trunk/src/common/dbus_support.py =================================================================== --- trunk/src/common/dbus_support.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/dbus_support.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,12 @@ -## dbus_support.py +## src/common/dbus_support.py ## -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005 Andrew Sayman <lorien420(a)myrealbox.com> +## 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-2007 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> ## ## This file is part of Gajim. ## @@ -13,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os, sys @@ -150,4 +153,4 @@ '''Raised when one of the provided arguments is invalid.''' _dbus_error_name = _GAJIM_ERROR_IFACE + '.InvalidArgument' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/defs.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,27 @@ +## src/common/defs.py +## +## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> +## Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import re docdir = '../' Modified: trunk/src/common/dh.py =================================================================== --- trunk/src/common/dh.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/dh.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +## src/common/dh.py +## +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import string # This file defines a number of constants; specifically, large primes suitable for @@ -206,4 +227,4 @@ primes = map(hex_to_decimal, hex_primes) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/events.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,16 +1,13 @@ -## common/events.py +## src/common/events.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> +## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2006 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -19,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import time @@ -292,4 +289,4 @@ {account1: {jid1: [ev1, ev2], },. }''' return self._get_some_events('roster') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/exceptions.py =================================================================== --- trunk/src/common/exceptions.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/exceptions.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,10 @@ -## exceptions.py +## src/common/exceptions.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 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> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## class PysqliteNotAvailable(Exception): @@ -88,4 +91,4 @@ def __str__(self): return self.text -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/fuzzyclock.py =================================================================== --- trunk/src/common/fuzzyclock.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/fuzzyclock.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,15 +1,10 @@ -## fuzzyclock.py +## src/common/fuzzyclock.py ## -## Contributors for this file: +## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Christoph Neuroth <delmonico(a)gmx.net> -## -## Copyright (C) 2006 Christoph Neuroth <delmonico(a)gmx.net> -## Yann Leboulanger <asterix(a)lagaule.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -18,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## ''' @@ -140,4 +135,4 @@ return newTimeStr -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/gajim.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,15 @@ -## common/gajim.py +## src/common/gajim.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2003-2008 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> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -13,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/helpers.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,18 @@ -## common/helpers.py +## src/common/helpers.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Stephan Erb <steve-e(a)h3c.de> -## +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## James Newton <redshodan AT gmail.com> +## 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -15,11 +21,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import re Modified: trunk/src/common/i18n.py =================================================================== --- trunk/src/common/i18n.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/i18n.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,17 +1,10 @@ -## common/i18n.py -## -*- coding: utf-8 -*- -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## src/common/i18n.py ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2004 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2004-2007 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> ## ## This file is part of Gajim. ## @@ -21,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import locale @@ -87,4 +80,4 @@ text = text % replace_plural return text -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/logger.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,13 @@ -## logger.py +## src/common/logger.py ## -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +17,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## ''' This module allows to access the on-disk database of logs. ''' @@ -761,4 +767,4 @@ except sqlite.OperationalError, e: print >> sys.stderr, str(e) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/nslookup.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,6 +1,9 @@ -## common/nslookup.py +## src/common/nslookup.py ## -## Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -10,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys @@ -334,4 +337,4 @@ gobject.timeout_add(200, process) gtk.main() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/optparser.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,15 @@ +## src/common/optparser.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 James Newton <redshodan AT gmail.com> +## Brendan Taylor <whateley AT gmail.com> +## Tomasz Melcer <liori AT exroot.org> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os @@ -596,4 +604,4 @@ con.close() gajim.config.set('version', '0.11.4.4') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/passwords.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,6 +1,12 @@ +## src/common/passwords.py ## -## Copyright (C) 2006 Gustavo J. A. M. Carneiro <gjcarneiro(a)gmail.com> -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2006 Gustavo J. A. M. Carneiro <gjcarneiro AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -10,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## __all__ = ['get_password', 'save_password'] @@ -138,4 +144,4 @@ def save_password(account_name, password): return get_storage().save_password(account_name, password) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/proxy65_manager.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,10 @@ +## src/common/proxy65_manager.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Contributors for this file: -## - Dimitur Kirov <dkirov(a)gmail.com> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -12,12 +13,13 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + import socket import struct import errno @@ -276,4 +278,4 @@ return -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/pubsub.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,26 @@ +## src/common/pubsub.py +## +## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import xmpp import gajim import connection_handlers @@ -105,4 +128,4 @@ self.awaiting_answers[id] = (connection_handlers.PEP_CONFIG,) self.connection.send(query) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/rst_xhtml_generator.py =================================================================== --- trunk/src/common/rst_xhtml_generator.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/rst_xhtml_generator.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,10 @@ -## rst_xhtml_generator.py +## src/common/rst_xhtml_generator.py ## -## Copyright (C) 2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2006 Santiago Gala +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -12,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## try: @@ -162,4 +164,4 @@ """) print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/sleepy.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,14 +1,12 @@ -## common/sleepy.py +## src/common/sleepy.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Yann Leboulanger <asterix AT lagaule.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Mateusz Biliński <mateusz AT bilinski.it> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -17,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## from common import gajim @@ -129,4 +127,4 @@ else: Sleepy = SleepyUnix -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/socks5.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,20 +1,11 @@ - -## common/xmpp/socks5.py +## src/common/socks5.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## - Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -23,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## @@ -1084,4 +1075,4 @@ if self.queue is not None: self.queue.remove_receiver(self.queue_idx, False) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/stanza_session.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,27 @@ +## src/common/stanza_session.py +## +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Brendan Taylor <whateley AT gmail.com> +## Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + from common import gajim from common import xmpp Modified: trunk/src/common/xmpp_stringprep.py =================================================================== --- trunk/src/common/xmpp_stringprep.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/common/xmpp_stringprep.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,11 @@ -## common/xmpp_stringprep.py +## src/common/xmpp_stringprep.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2001-2005 Twisted Matrix Laboratories +## Copyright (C) 2005-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2001-2005 Twisted Matrix Laboratories. -## Copyright (C) 2005 Gajim Team -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -15,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys, warnings @@ -264,4 +263,4 @@ nameprep = NamePrep() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/config.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,19 @@ -## config.py +## src/config.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2003-2005 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> -## Copyright (C) 2007 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> +## Stéphan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 James Newton <redshodan AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -16,11 +23,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/conversation_textview.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,15 @@ -## conversation_textview.py +## src/conversation_textview.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> +## Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -12,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import random Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/dataforms_widget.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,9 @@ -## dataforms.py +## src/dataforms_widget.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <nkour(a)jabber.org> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2003-2005 Vincent Hanquez <tab(a)snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -13,12 +13,13 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + ''' This module contains widget that can display data form (JEP-0004). Words single and multiple refers here to types of data forms: single means these with one record of data (without <reported/> element), @@ -580,4 +581,4 @@ model.clear() del field.values -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/dialogs.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,15 +1,18 @@ # -*- coding: utf-8 -*- -## dialogs.py +## src/dialogs.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2003-2004 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007-2008 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2005-2008 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -19,11 +22,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/disco.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,13 @@ # -*- coding: utf-8 -*- -## config.py +## src/disco.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Stéphan Kochen <stephan(a)kochen.nl> +## Copyright (C) 2005-2006 Stéphan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -13,11 +17,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## # The appearance of the treeview, and parts of the dialog, are controlled by Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/features_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,11 @@ -## features_window.py +## src/features_window.py ## -## Copyright (C) 2007 Yann Leboulanger <asterix(a)lagaule.org> -## Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os @@ -319,4 +323,4 @@ from common import gajim return gajim.HAVE_PYSEXY -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/filetransfers_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,11 +1,10 @@ -## filetransfers_window.py +## src/filetransfers_window.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2004-2005 Vincent Hanquez <tab(a)snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -15,11 +14,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gajim-remote.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,14 @@ #!/usr/bin/env python +## src/gajim-remote.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -12,11 +18,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## # gajim-remote help will show you the D-BUS API of Gajim Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gajim.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,15 +1,25 @@ #!/usr/bin/env python -## gajim.py +## src/gajim.py ## +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> +## Norman Rasmussen <norman AT rasmussen.co.za> +## Stéphan Kochen <stephan AT kochen.nl> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Alex Mauer <hawke AT hawkesnest.net> +## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## James Newton <redshodan AT gmail.com> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Julien Pivotto <roidelapluie(a)gmail.com> -## Stephan Erb <steve-e(a)h3c.de> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -18,11 +28,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os Modified: trunk/src/gajim_themes_window.py =================================================================== --- trunk/src/gajim_themes_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gajim_themes_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,20 +1,12 @@ -## gajim_themes_window.py +## src/gajim_themes_window.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## - Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -23,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk @@ -403,4 +395,4 @@ self._set_color(True, widget, 'state_muc_directed_msg_color') self.no_update = False -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/groupchat_control.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,17 +1,15 @@ -## groupchat_control.py +## src/groupchat_control.py ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Lukas Petrovicky <lukas(a)petrovicky.net> -## Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2003-2008 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> +## Alex Mauer <hawke AT hawkesnest.net> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007-2008 Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -21,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os Modified: trunk/src/groups.py =================================================================== --- trunk/src/groups.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/groups.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +## src/groups.py +## +## Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org> +## Tomasz Melcer <liori AT exroot.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + '''Window to create new post for discussion groups service.''' import gtk @@ -46,4 +67,4 @@ # close the window self.window.destroy() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gtkexcepthook.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,10 +1,10 @@ -## gtkexcepthook.py +## src/gtkexcepthook.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## -## Initially written and submitted by Gustavo J. A. M. Carneiro -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -13,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gtkgui_helpers.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,15 @@ -## gtkgui_helpers.py +## src/gtkgui_helpers.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2004-2005 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2007 Junglecow <junglecow AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 James Newton <redshodan AT gmail.com> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -16,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import xml.sax.saxutils Modified: trunk/src/gtkspellmodule.c =================================================================== --- trunk/src/gtkspellmodule.c 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/gtkspellmodule.c 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,25 @@ +/* + * src/gtkspellmodule.c + * + * Copyright (C) 2005 Nikos Kouremenos <kourem AT gmail.com> + * Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org> + * + * This file is part of Gajim. + * + * Gajim is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; version 3 only. + * + * Gajim is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Gajim. If not, see <http://www.gnu.org/licenses/>. + * + */ + #include <Python.h> #include <gtk/gtk.h> #include <gtkspell/gtkspell.h> Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/history_manager.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,12 @@ #!/usr/bin/env python -## history_manager.py +## src/history_manager.py ## -## Copyright (C) 2006-2007 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +16,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## ## NOTE: some method names may match those of logger.py but that's it Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/history_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,19 +1,15 @@ -## history_window.py +## src/history_window.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007-2008 Stephan Erb <steve-e(a)h3c.de> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -22,11 +18,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/htmltextview.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,25 +1,29 @@ -### Copyright (C) 2005 Gustavo J. A. M. Carneiro -### Copyright (C) 2006 Santiago Gala -### -### This library is free software; you can redistribute it and/or -### modify it under the terms of the GNU Lesser General Public -### License as published by the Free Software Foundation; either -### version 2 of the License, or (at your option) any later version. -### -### This library is distributed in the hope that it will be useful, -### but WITHOUT ANY WARRANTY; without even the implied warranty of -### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -### Lesser General Public License for more details. +## src/htmltextview.py ## +## Copyright (C) 2005 Gustavo J. A. M. Carneiro +## Copyright (C) 2006 Santiago Gala +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2006-2008 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> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -### -### You should have received a copy of the GNU Lesser General Public -### License along with this library; if not, write to the -### Free Software Foundation, Inc., 59 Temple Place - Suite 330, -### Boston, MA 02111-1307, USA. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## - ''' A gtk.TextView-based renderer for XHTML-IM, as described in: http://www.jabber.org/jeps/jep-0071.html Modified: trunk/src/ipython_view.py =================================================================== --- trunk/src/ipython_view.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/ipython_view.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -11,6 +11,27 @@ ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +## src/ipython_view.py +## +## Copyright (C) 2008 Yann Leboulanger <asterix AT lagaule.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + + ''' Provides IPython console widget. @@ -522,4 +543,4 @@ self.cout.truncate(0) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/lastfm.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,26 +1,26 @@ #!/usr/bin/env python -""" -LastFM Python class -Copyright (C) 2007 Olivier Mehani <shtrom(a)ssji.net> +## src/lastfm.py +## +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Olivier Mehani <shtrom(a)ssji.net> +## Copyright (C) 2007-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## -$Id: lastfm.py 52 2007-11-03 23:19:00Z shtrom $ -Python class to handily retrieve song information from a Last.fm account. - -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 -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -""" - __version__ = '$Revision: 64 $' from urllib import urlopen Modified: trunk/src/lastfm_track_listener.py =================================================================== --- trunk/src/lastfm_track_listener.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/lastfm_track_listener.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,20 +1,25 @@ # -*- coding: utf-8 -*- -## lastfmtracklistener.py +## src/lastfm_track_listener.py ## -## Copyright (C) 2007 Olivier Mehani <shtrom-gajim(a)ssji.net> -## Heavily based on music_track_listener.py: -## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro(a)gmail.com> -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Olivier Mehani <shtrom-gajim AT ssji.net> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## This program is free software; you can redistribute it and/or modify +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import gobject from lastfm import LastFM @@ -102,4 +107,4 @@ print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/message_control.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,14 @@ -## message_control.py +## src/message_control.py ## -## Copyright (C) 2006-2007 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,12 +18,13 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + import gtkgui_helpers from common import gajim Modified: trunk/src/message_textview.py =================================================================== --- trunk/src/message_textview.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/message_textview.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,18 +1,10 @@ -## message_textview.py +## src/message_textview.py ## -## Contributors for this file: -## - Yann Leboulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2007 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) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -21,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk @@ -120,4 +112,4 @@ gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.KP_Enter, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/message_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,15 +1,15 @@ -## message_window.py +## src/message_window.py ## -## Copyright (C) 2003-2004 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Dimitur Kirov <dkirov(a)gmail.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2005-2008 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2006 Geobert Quach <geobert(a)gmail.com> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> -## Copyright (C) 2005-2008 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2008 Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Geobert Quach <geobert AT gmail.com> +## Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -19,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/music_track_listener.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,12 @@ # -*- coding: utf-8 -*- -## musictracklistener.py +## src/music_track_listener.py ## -## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro(a)gmail.com> -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -12,12 +16,13 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + import os import gobject if __name__ == '__main__': @@ -246,4 +251,4 @@ print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/negotiation.py =================================================================== --- trunk/src/negotiation.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/negotiation.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +## src/negotiation.py +## +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import gtkgui_helpers import dataforms_widget @@ -65,4 +86,4 @@ self.window.destroy() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/network_manager_listener.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,8 +1,12 @@ # -*- coding: utf-8 -*- -## network_manager_listener.py -## Copyright (C) 2006 Jeffrey C. Ollie <jeff at ocjtech.us> -## Copyright (C) 2006 Stefan Bethge <stefan at lanpartei.de> +## src/network_manager_listener.py ## +## Copyright (C) 2006 Jeffrey C. Ollie <jeff AT ocjtech.us> +## Nikos Kouremenos <kourem AT gmail.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -11,11 +15,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys @@ -59,4 +63,4 @@ except: pass -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/notify.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,13 +1,16 @@ -## notify.py +## src/notify.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Andrew Sayman <lorien420(a)myrealbox.com> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2005 Sebastian Estienne +## Copyright (C) 2005-2006 Andrew Sayman <lorien420 AT myrealbox.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## -## Notification daemon connection via D-Bus code: -## Copyright (C) 2005 by Sebastian Estienne -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -16,11 +19,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import os @@ -586,4 +589,4 @@ self.version = self.default_version self.attempt_notify() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/osx/growl/_growl.c =================================================================== --- trunk/src/osx/growl/_growl.c 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/osx/growl/_growl.c 2008-08-15 03:20:23 UTC (rev 10247) @@ -2,6 +2,25 @@ * Copyright 2004-2005 The Growl Project. * Created by Jeremy Rossi <jeremy(a)jeremyrossi.com> * Released under the BSD license. + * + * src/osx/growl/_growl.c + * + * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> + * + * This file is part of Gajim. + * + * Gajim is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; version 3 only. + * + * Gajim is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Gajim. If not, see <http://www.gnu.org/licenses/>. + * */ #include <Python.h> Modified: trunk/src/osx/growl/_growlImage.m =================================================================== --- trunk/src/osx/growl/_growlImage.m 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/osx/growl/_growlImage.m 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,6 +1,24 @@ /* * Copyright 2004 Mark Rowe <bdash(a)users.sourceforge.net> * Released under the BSD license. + * src/osx/growl/_growlImage.m + * + * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> + * + * This file is part of Gajim. + * + * Gajim is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; version 3 only. + * + * Gajim is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Gajim. If not, see <http://www.gnu.org/licenses/>. + * */ #include "Python.h" Modified: trunk/src/osx/nsapp.m =================================================================== --- trunk/src/osx/nsapp.m 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/osx/nsapp.m 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +/* +## src/osx/nsapp.m +## +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## +*/ + #import "nsapp.h" #include <notify.h> Modified: trunk/src/osx/syncmenu/pysyncmenu.c =================================================================== --- trunk/src/osx/syncmenu/pysyncmenu.c 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/osx/syncmenu/pysyncmenu.c 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,24 @@ +/* +## src/osx/syncmenu/pysyncmenu.c +## +## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + */ + #include <errno.h> #include <string.h> #include <Python.h> Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/profile_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,9 @@ -## profile_window.py +## src/profile_window.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +13,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## # THIS FILE IS FOR **OUR** PROFILE (when we edit our INFO) @@ -359,4 +361,4 @@ def on_cancel_button_clicked(self, widget): self.window.destroy() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/remote_control.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,14 @@ -## remote_control.py +## src/remote_control.py ## -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Andrew Sayman <lorien420(a)myrealbox.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2005-2006 Andrew Sayman <lorien420 AT myrealbox.com> +## Dimitur Kirov <dkirov AT gmail.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -16,11 +18,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gobject @@ -676,4 +678,4 @@ else: gajim.interface.join_gc_room(account, room_jid, nick, password) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/roster_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,13 +1,21 @@ # -*- coding: utf-8 -*- -## roster_window.py +## src/roster_window.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007-2008 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2003-2008 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> +## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> +## Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## James Newton <redshodan AT gmail.com> +## Tomasz Melcer <liori AT exroot.org> +## 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> +## Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -17,11 +25,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/search_window.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -## search_window.py +## src/search_window.py ## -## Copyright (C) 2007 Yann Leboulanger <asterix(a)lagaule.org> +## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -11,11 +13,12 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## import gobject import gtk @@ -232,4 +235,4 @@ self.data_form_widget.title) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/secrets.py =================================================================== --- trunk/src/secrets.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/secrets.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,23 @@ +## src/secrets.py +## +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + from common.configpaths import gajimpaths from common import crypto @@ -102,4 +122,4 @@ return secrets_cache -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/session.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,3 +1,25 @@ +## src/session.py +## +## Copyright (C) 2008 Yann Leboulanger <asterix AT lagaule.org> +## Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + from common import helpers from common import exceptions @@ -462,4 +484,4 @@ negotiation.FeatureNegotiationWindow(account, self.jid, self, form) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/statusicon.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,22 +1,25 @@ -## statusicon.py +## src/statusicon.py ## -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> +## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## -## Gajim is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; either version 2 -## of the License, or (at your option) any later version. +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import sys @@ -61,10 +64,10 @@ self.status_icon.set_visible(False) self.unsubscribe_events() - def on_status_icon_left_clicked(self, widget): + def on_status_icon_left_clicked(self, widget): if len(gajim.events.get_systray_events()) == 0: - self.on_left_click() - else: + self.on_left_click() + else: self.on_middle_click() def set_img(self): @@ -94,4 +97,4 @@ #elif image.get_storage_type() == gtk.IMAGE_ANIMATION: # self.img_tray.set_from_animation(image.get_animation()) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/systray.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,12 +1,16 @@ -## systray.py +## src/systray.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2003-2004 Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> +## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> +## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -16,11 +20,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/tooltips.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,10 +1,17 @@ # -*- coding: utf-8 -*- -## tooltips.py +## src/tooltips.py ## -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## 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> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## ## This file is part of Gajim. ## @@ -14,11 +21,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## import gtk Modified: trunk/src/trayicon.override =================================================================== --- trunk/src/trayicon.override 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/trayicon.override 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,4 +1,22 @@ -/* -*- Mode: C; c-basic-offset: 4 -*- */ +/* -*- Mode: C; c-basic-offset: 4 -*- + * src/trayicon.override + * + * Copyright (C) 2004-2005 Yann Leboulanger <asterix AT lagaule.org> + * + * This file is part of Gajim. + * + * Gajim is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; version 3 only. + * + * Gajim is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Gajim. If not, see <http://www.gnu.org/licenses/>. + */ %% headers #include <Python.h> Modified: trunk/src/trayiconmodule.c =================================================================== --- trunk/src/trayiconmodule.c 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/trayiconmodule.c 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,4 +1,22 @@ -/* -*- Mode: C; c-basic-offset: 4 -*- */ +/* -*- Mode: C; c-basic-offset: 4 -*- + * src/trayiconmodule.c + * + * Copyright (C) 2004-2005 Yann Leboulanger <asterix AT lagaule.org> + * + * This file is part of Gajim. + * + * Gajim is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; version 3 only. + * + * Gajim is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Gajim. If not, see <http://www.gnu.org/licenses/>. + */ /* include this first, before NO_IMPORT_PYGOBJECT is defined */ #include <pygobject.h> Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-08-14 21:48:43 UTC (rev 10246) +++ trunk/src/vcard.py 2008-08-15 03:20:23 UTC (rev 10247) @@ -1,9 +1,17 @@ -## vcard.py (has VcardWindow class and a func get_avatar_pixbuf_encoded_mime) +## src/vcard.py ## -## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> +## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Junglecow <junglecow AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Stefan Bethge <stefan AT lanpartei.de> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +## Jonathan Schleifer <js-gajim AT webkeks.org> +## Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. ## @@ -13,11 +21,11 @@ ## ## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## # THIS FILE IS FOR **OTHERS'** PROFILE (when we VIEW their INFO) @@ -526,4 +534,4 @@ def on_close_button_clicked(self, widget): self.window.destroy() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10246 - in branches/bosh_support/src/common: . xmpp
by tomk＠gajim.org 14 Aug '08

14 Aug '08

Author: tomk Date: 2008-08-14 23:48:43 +0200 (Thu, 14 Aug 2008) New Revision: 10246 Added: branches/bosh_support/src/common/xmpp/proxy_connectors.py Modified: branches/bosh_support/src/common/connection.py branches/bosh_support/src/common/xmpp/__init__.py branches/bosh_support/src/common/xmpp/auth_nb.py branches/bosh_support/src/common/xmpp/bosh.py branches/bosh_support/src/common/xmpp/client_nb.py branches/bosh_support/src/common/xmpp/dispatcher_nb.py branches/bosh_support/src/common/xmpp/tls_nb.py branches/bosh_support/src/common/xmpp/transports_nb.py Log: - improved SSL connections with BOSH - SSL over HTTP proxy is possible now, Gajim will do HTTP CONNECT on proxy to reach the BOSH Conn manager and try to estabilish TLS (same as what firefox do when approaching HTTPS server via proxy) - moved proxy-connecting code to xmpp/proxy_connectors.py - debugged SOCKS5 proxy code - tested with Tigase server Modified: branches/bosh_support/src/common/connection.py =================================================================== --- branches/bosh_support/src/common/connection.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/connection.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -424,10 +424,8 @@ use_srv = gajim.config.get_per('accounts', self.name, 'use_srv') use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') - print 'use_custom = %s' % use_custom custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') custom_p = gajim.config.get_per('accounts', self.name, 'custom_port') - print 'custom_port = %s' % custom_p # create connection if it doesn't already exist self.connected = 1 @@ -519,9 +517,11 @@ if self._proxy and self._proxy['type']=='bosh': # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" # connection and TLS with handshake right after TCP connecting ("ssl") - try: - self._connection_types.remove('tls') - except ValueError: pass + scheme = common.xmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] + if scheme=='https': + self._connection_types = ['ssl'] + else: + self._connection_types = ['plain'] host = self.select_next_host(self._hosts) self._current_host = host @@ -553,7 +553,7 @@ if self._current_type == 'ssl': # SSL (force TLS on different port than plain) # If we do TLS over BOSH, port of XMPP server should be the standard one - # and TLS should be negotiated because immediate TLS on 5223 is deprecated + # and TLS should be negotiated because TLS on 5223 is deprecated if self._proxy and self._proxy['type']=='bosh': port = self._current_host['port'] else: @@ -583,7 +583,6 @@ log.info('Connecting to %s: [%s:%d]', self.name, self._current_host['host'], port) - print secure_tuple con.connect( hostname=self._current_host['host'], port=port, @@ -1303,6 +1302,7 @@ self.connect(config) def _on_new_account(self, con = None, con_type = None): + print 'on_new_acc- con: %s, con_type: %s' % (con, con_type) if not con_type: self.dispatch('NEW_ACC_NOT_CONNECTED', (_('Could not connect to "%s"') % self._hostname)) Modified: branches/bosh_support/src/common/xmpp/__init__.py =================================================================== --- branches/bosh_support/src/common/xmpp/__init__.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/__init__.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -27,7 +27,7 @@ """ import simplexml, protocol, auth_nb, transports_nb, roster_nb -import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb +import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from client_nb import * from client import * from protocol import * Modified: branches/bosh_support/src/common/xmpp/auth_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/auth_nb.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/auth_nb.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -253,8 +253,6 @@ def plugin(self, owner): ''' Determine the best auth method (digest/0k/plain) and use it for auth. Returns used method name on success. Used internally. ''' - if not self.resource: - return self.authComponent(owner) log.info('Querying server about possible auth methods') self.owner = owner @@ -303,33 +301,6 @@ log.error('Authentication failed!') return self.on_auth(None) - def authComponent(self,owner): - ''' Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. ''' - self.handshake=0 - owner.send(Node(NS_COMPONENT_ACCEPT+' handshake', - payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()])) - owner.RegisterHandler('handshake', self.handshakeHandler, xmlns=NS_COMPONENT_ACCEPT) - self._owner.onreceive(self._on_auth_component) - - def _on_auth_component(self, data): - ''' called when we receive some response, after we send the handshake ''' - if data: - self.Dispatcher.ProcessNonBlocking(data) - if not self.handshake: - log.info('waiting on handshake') - return - self._owner.onreceive(None) - owner._registered_name=self.user - if self.handshake+1: - return self.on_auth('ok') - self.on_auth(None) - - def handshakeHandler(self,disp,stanza): - ''' Handler for registering in dispatcher for accepting transport authentication. ''' - if stanza.getName() == 'handshake': - self.handshake=1 - else: - self.handshake=-1 class NonBlockingBind(PlugIn): ''' Bind some JID to the current connection to allow router know of our location.''' Modified: branches/bosh_support/src/common/xmpp/bosh.py =================================================================== --- branches/bosh_support/src/common/xmpp/bosh.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/bosh.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -1,11 +1,29 @@ +## bosh.py +## +## +## Copyright (C) 2008 Tomas Karasek <tom.to.the.k(a)gmail.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import locale, random + +import locale, random, sha from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ - urisplit + urisplit, DISCONNECT_TIMEOUT_SECONDS from protocol import BOSHBody from simplexml import Node -import sha import logging log = logging.getLogger('gajim.c.x.bosh') @@ -62,6 +80,13 @@ self.key_stack = None self.ack_checker = None self.after_init = False + self.proxy_dict = {} + if self.over_proxy and self.estabilish_tls: + self.proxy_dict['type'] = 'http' + # with SSL over proxy, we do HTTP CONNECT to proxy to open a channel to + # BOSH Connection Manager + self.proxy_dict['xmpp_server'] = (urisplit(self.bosh_uri)[1], self.bosh_port) + self.proxy_dict['credentials'] = self.proxy_creds def connect(self, conn_5tuple, on_connect, on_connect_failure): @@ -81,13 +106,9 @@ self.http_socks.append(self.get_new_http_socket()) self.tcp_connecting_started() - # following connect() is not necessary because sockets can be connected on - # send but we need to know if host is reachable in order to invoke callback - # for connecting failure eventually (the callback is different than callback - # for errors occurring after connection is etabilished) self.http_socks[0].connect( conn_5tuple = conn_5tuple, - on_connect = lambda: self._on_connect(), + on_connect = self._on_connect, on_connect_failure = self._on_connect_failure) def _on_connect(self): @@ -98,28 +119,29 @@ def set_timeout(self, timeout): - if self.get_state() in [CONNECTING, CONNECTED] and self.fd != -1: + if self.get_state() != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) def on_http_request_possible(self): ''' - Called after HTTP response is received - another request is possible. - There should be always one pending request on BOSH CM. + Called after HTTP response is received - when another request is possible. + There should be always one pending request to BOSH CM. ''' log.info('on_http_req possible, state:\n%s' % self.get_current_state()) - if self.get_state() == DISCONNECTING: - self.disconnect() - return + if self.get_state()==DISCONNECTED: return #Hack for making the non-secure warning dialog work - if hasattr(self._owner, 'NonBlockingNonSASL') or hasattr(self._owner, 'SASL'): + if self._owner.got_features: + if (hasattr(self._owner, 'NonBlockingNonSASL') or hasattr(self._owner, 'SASL')): + self.send_BOSH(None) + else: + return + else: self.send_BOSH(None) - else: - self.http_socks[0]._plug_idle(writable=False, readable=True) - return + def get_socket_in(self, state): for s in self.http_socks: @@ -129,7 +151,6 @@ def get_free_socket(self): if self.http_pipelining: - assert( len(self.http_socks) == 1 ) return self.get_socket_in(CONNECTED) else: last_recv_time, tmpsock = 0, None @@ -184,11 +205,12 @@ # CONNECTED with too many pending requests s = self.get_socket_in(DISCONNECTED) - # if we have DISCONNECTED socket, lets connect it and ... + # if we have DISCONNECTED socket, lets connect it and plug for send if s: self.connect_and_flush(s) else: - if len(self.http_socks) > 1: return + #if len(self.http_socks) > 1: return + print 'connecting sock' ss = self.get_new_http_socket() self.http_socks.append(ss) self.connect_and_flush(ss) @@ -200,7 +222,7 @@ if s: s._plug_idle(writable=True, readable=True) else: - log.error('=====!!!!!!!!====> Couldnt get free socket in plug_socket())') + log.error('=====!!!!!!!!====> Couldn\'t get free socket in plug_socket())') def build_stanza(self, socket): if self.prio_bosh_stanzas: @@ -222,21 +244,20 @@ log.info('sending msg with rid=%s to sock %s' % (stanza.getAttr('rid'), id(socket))) - socket.send(stanza) - self.renew_bosh_wait_timeout() + #socket.send(stanza) + self.renew_bosh_wait_timeout(self.bosh_wait + 3) return stanza def on_bosh_wait_timeout(self): - log.error('Connection Manager didn\'t respond within % seconds --> forcing \ - disconnect' % self.bosh_wait) + log.error('Connection Manager didn\'t respond within %s + 3 seconds --> forcing disconnect' % self.bosh_wait) self.disconnect() - def renew_bosh_wait_timeout(self): + def renew_bosh_wait_timeout(self, timeout): if self.wait_cb_time is not None: self.remove_bosh_wait_timeout() - sched_time = self.idlequeue.set_alarm(self.on_bosh_wait_timeout, self.bosh_wait+10) + sched_time = self.idlequeue.set_alarm(self.on_bosh_wait_timeout, timeout) self.wait_cb_time = sched_time def remove_bosh_wait_timeout(self): @@ -244,10 +265,17 @@ self.on_bosh_wait_timeout, self.wait_cb_time) - def on_persistent_fallback(self): + def on_persistent_fallback(self, socket): log.warn('Fallback to nonpersistent HTTP (no pipelining as well)') - self.http_persistent = False - self.http_pipelining = False + if socket.http_persistent: + socket.http_persistent = False + self.http_persistent = False + self.http_pipelining = False + socket.disconnect(do_callback=False) + self.connect_and_flush(socket) + else: + socket.disconnect() + def handle_body_attrs(self, stanza_attrs): @@ -277,7 +305,8 @@ if stanza_attrs.has_key('condition'): condition = stanza_attrs['condition'] log.error('Received terminating stanza: %s - %s' % (condition, bosh_errors[condition])) - self.set_state(DISCONNECTING) + self.disconnect() + return if stanza_attrs['type'] == 'error': # recoverable error @@ -295,8 +324,6 @@ def send(self, stanza, now=False): - # body tags should be send only via send_BOSH() - assert(not isinstance(stanza, BOSHBody)) self.send_BOSH(stanza) @@ -350,6 +377,7 @@ def start_disconnect(self): NonBlockingTransport.start_disconnect(self) + self.renew_bosh_wait_timeout(DISCONNECT_TIMEOUT_SECONDS) self.send_BOSH( (BOSHBody(attrs={'sid': self.bosh_sid, 'type': 'terminate'}), True)) @@ -359,7 +387,7 @@ 'http_port': self.bosh_port, 'http_version': self.http_version, 'http_persistent': self.http_persistent, - 'over_proxy': self.over_proxy} + 'add_proxy_headers': self.over_proxy and not self.estabilish_tls} if self.use_proxy_auth: http_dict['proxy_user'], http_dict['proxy_pass'] = self.proxy_creds @@ -372,6 +400,7 @@ certs = self.certs, on_http_request_possible = self.on_http_request_possible, http_dict = http_dict, + proxy_dict = self.proxy_dict, on_persistent_fallback = self.on_persistent_fallback) s.onreceive(self.on_received_http) s.set_stanza_build_cb(self.build_stanza) Modified: branches/bosh_support/src/common/xmpp/client_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/client_nb.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/client_nb.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -56,12 +56,12 @@ self._owner = self self._registered_name = None self.connected = '' - self._component=0 self.socket = None self.on_connect = None self.on_proxy_failure = None self.on_connect_failure = None self.proxy = None + self.got_features = False def on_disconnect(self): @@ -72,7 +72,6 @@ ''' self.connected='' - log.debug('Client disconnected..') for i in reversed(self.disconnect_handlers): log.debug('Calling disconnect handler %s' % i) i() @@ -84,18 +83,13 @@ self.NonBlockingNonSASL.PlugOut() if self.__dict__.has_key('SASL'): self.SASL.PlugOut() - if self.__dict__.has_key('NonBlockingTLS'): - self.NonBlockingTLS.PlugOut() - if self.__dict__.has_key('NBHTTPProxySocket'): - self.NBHTTPProxySocket.PlugOut() - if self.__dict__.has_key('NBSOCKS5ProxySocket'): - self.NBSOCKS5ProxySocket.PlugOut() if self.__dict__.has_key('NonBlockingTCP'): self.NonBlockingTCP.PlugOut() if self.__dict__.has_key('NonBlockingHTTP'): self.NonBlockingHTTP.PlugOut() if self.__dict__.has_key('NonBlockingBOSH'): self.NonBlockingBOSH.PlugOut() + log.debug('Client disconnected..') def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, @@ -181,7 +175,9 @@ if not mode: # starting state - if self.__dict__.has_key('Dispatcher'): self.Dispatcher.PlugOut() + if self.__dict__.has_key('Dispatcher'): + self.Dispatcher.PlugOut() + self.got_features = False d=dispatcher_nb.Dispatcher().PlugIn(self) on_next_receive('RECEIVE_DOCUMENT_ATTRIBUTES') @@ -197,7 +193,7 @@ mode='FAILURE', data='Error on stream open') if self.incoming_stream_version() == '1.0': - if not self.Dispatcher.Stream.features: + if not self.got_features: on_next_receive('RECEIVE_STREAM_FEATURES') else: log.info('got STREAM FEATURES in first recv') @@ -212,7 +208,7 @@ # sometimes <features> are received together with document # attributes and sometimes on next receive... self.Dispatcher.ProcessNonBlocking(data) - if not self.Dispatcher.Stream.features: + if not self.got_features: self._xmpp_connect_machine( mode='FAILURE', data='Missing <features> in 1.0 stream') @@ -263,10 +259,6 @@ self.on_connect_failure(retry) def _on_connect(self): - if self.secure == 'tls': - self._on_connect_failure('uaaaaaa') - return - print 'self.secure = %s' % self.secure self.onreceive(None) self.on_connect(self, self.connected) @@ -343,7 +335,6 @@ # wrong user/pass, stop auth self.connected = None self._on_sasl_auth(None) - self.SASL.PlugOut() elif self.SASL.startsasl == 'success': auth_nb.NonBlockingBind().PlugIn(self) if self.protocol_type == 'BOSH': @@ -418,6 +409,9 @@ certs = (self.cacerts, self.mycerts) self._on_tcp_failure = self._on_connect_failure + proxy_dict = {} + tcp_host=xmpp_hostname + tcp_port=self.Port if proxy: # with proxies, client connects to proxy instead of directly to @@ -444,27 +438,18 @@ else: self._on_tcp_failure = self.on_proxy_failure - if proxy['type'] == 'socks5': - proxy_class = transports_nb.NBSOCKS5ProxySocket - elif proxy['type'] == 'http': - proxy_class = transports_nb.NBHTTPProxySocket - self.socket = proxy_class( - on_disconnect = self.on_disconnect, - raise_event = self.raise_event, - idlequeue = self.idlequeue, - estabilish_tls = estabilish_tls, - certs = certs, - proxy_creds = (proxy_user, proxy_pass), - xmpp_server = (xmpp_hostname, self.Port)) - else: - tcp_host=xmpp_hostname - tcp_port=self.Port + proxy_dict['type'] = proxy['type'] + proxy_dict['xmpp_server'] = (xmpp_hostname, self.Port) + proxy_dict['credentials'] = (proxy_user, proxy_pass) + + if not proxy or proxy['type'] != 'bosh': self.socket = transports_nb.NonBlockingTCP( on_disconnect = self.on_disconnect, raise_event = self.raise_event, idlequeue = self.idlequeue, estabilish_tls = estabilish_tls, - certs = certs) + certs = certs, + proxy_dict = proxy_dict) self.socket.PlugIn(self) Modified: branches/bosh_support/src/common/xmpp/dispatcher_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/dispatcher_nb.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/dispatcher_nb.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -305,6 +305,7 @@ name = stanza.getName() if name=='features': + self._owner.got_features = True session.Stream.features=stanza xmlns=stanza.getNamespace() @@ -390,7 +391,7 @@ ''' Put stanza on the wire and wait for recipient's response to it. ''' if timeout is None: timeout = DEFAULT_TIMEOUT_SECONDS - self._witid = self._owner.send(stanza) + self._witid = self.send(stanza) if func: self.on_responses[self._witid] = (func, args) if timeout: Added: branches/bosh_support/src/common/xmpp/proxy_connectors.py =================================================================== --- branches/bosh_support/src/common/xmpp/proxy_connectors.py (rev 0) +++ branches/bosh_support/src/common/xmpp/proxy_connectors.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -0,0 +1,221 @@ +## proxy_connectors.py +## based on transports_nb.py +## +## Copyright (C) 2003-2004 Alexey "Snake" Nezhdanov +## modified by Dimitur Kirov <dkirov(a)gmail.com> +## modified by Tomas Karasek <tom.to.the.k(a)gmail.com> +## +## 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 +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +import struct, socket, base64 + +''' +Module containing classes for proxy connecting. So far its HTTP CONNECT +and SOCKS5 proxy. +''' + +import logging +log = logging.getLogger('gajim.c.x.proxy_connectors') + +class ProxyConnector: + ''' + Interface for proxy-connecting object - when tunnneling XMPP over proxies, + some connecting process usually has to be done before opening stream. + Proxy connectors are used right after TCP connection is estabilished. + ''' + def __init__(self, send_method, onreceive, old_on_receive, on_success, + on_failure, xmpp_server, proxy_creds=(None,None)): + + self.send = send_method + self.onreceive = onreceive + self.old_on_receive = old_on_receive + self.on_success = on_success + self.on_failure = on_failure + self.xmpp_server = xmpp_server + self.proxy_user, self.proxy_pass = proxy_creds + self.old_on_receive = old_on_receive + + self.start_connecting() + + def start_connecting(self): + raise NotImplementedException() + + def connecting_over(self): + self.onreceive(self.old_on_receive) + self.on_success() + +class HTTPCONNECTConnector(ProxyConnector): + def start_connecting(self): + ''' + Connects to proxy, supplies login and password to it + (if were specified while creating instance). Instructs proxy to make + connection to the target server. + ''' + log.info('Proxy server contacted, performing authentification') + connector = ['CONNECT %s:%s HTTP/1.1' % self.xmpp_server, + 'Proxy-Connection: Keep-Alive', + 'Pragma: no-cache', + 'Host: %s:%s' % self.xmpp_server, + 'User-Agent: Gajim'] + if self.proxy_user and self.proxy_pass: + credentials = '%s:%s' % (self.proxy_user, self.proxy_pass) + credentials = base64.encodestring(credentials).strip() + connector.append('Proxy-Authorization: Basic '+credentials) + connector.append('\r\n') + self.onreceive(self._on_headers_sent) + self.send('\r\n'.join(connector)) + + def _on_headers_sent(self, reply): + if reply is None: + return + self.reply = reply.replace('\r', '') + try: + proto, code, desc = reply.split('\n')[0].split(' ', 2) + except: + log.error("_on_headers_sent:", exc_info=True) + #traceback.print_exc() + self.on_failure('Invalid proxy reply') + return + if code <> '200': + log.error('Invalid proxy reply: %s %s %s' % (proto, code, desc)) + self.on_failure('Invalid proxy reply') + return + if len(reply) != 2: + pass + self.connecting_over() + + + +class SOCKS5Connector(ProxyConnector): + ''' + SOCKS5 proxy connection class. Allows to use SOCKS5 proxies with + (optionally) simple authentication (only USERNAME/PASSWORD auth). + ''' + def start_connecting(self): + log.info('Proxy server contacted, performing authentification') + if self.proxy_user and self.proxy_pass: + to_send = '\x05\x02\x00\x02' + else: + to_send = '\x05\x01\x00' + self.onreceive(self._on_greeting_sent) + self.send(to_send) + + def _on_greeting_sent(self, reply): + if reply is None: + return + if len(reply) != 2: + self.on_failure('Invalid proxy reply') + return + if reply[0] != '\x05': + log.info('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + if reply[1] == '\x00': + return self._on_proxy_auth('\x01\x00') + elif reply[1] == '\x02': + to_send = '\x01' + chr(len(self.proxy_user)) + self.proxy_user +\ + chr(len(self.proxy_pass)) + self.proxy_pass + self.onreceive(self._on_proxy_auth) + self.send(to_send) + else: + if reply[1] == '\xff': + log.error('Authentification to proxy impossible: no acceptable ' + 'auth method') + self.on_failure('Authentification to proxy impossible: no ' + 'acceptable authentification method') + return + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + + def _on_proxy_auth(self, reply): + if reply is None: + return + if len(reply) != 2: + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + if reply[0] != '\x01': + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + if reply[1] != '\x00': + log.error('Authentification to proxy failed') + self.on_failure('Authentification to proxy failed') + return + log.info('Authentification successfull. Jabber server contacted.') + # Request connection + req = "\x05\x01\x00" + # If the given destination address is an IP address, we'll + # use the IPv4 address request even if remote resolving was specified. + try: + self.ipaddr = socket.inet_aton(self.xmpp_server[0]) + req = req + "\x01" + self.ipaddr + except socket.error: + # Well it's not an IP number, so it's probably a DNS name. +# if self.__proxy[3]==True: + # Resolve remotely + self.ipaddr = None + req = req + "\x03" + chr(len(self.xmpp_server[0])) + self.xmpp_server[0] +# else: +# # Resolve locally +# self.ipaddr = socket.inet_aton(socket.gethostbyname(self.xmpp_server[0])) +# req = req + "\x01" + ipaddr + req = req + struct.pack(">H",self.xmpp_server[1]) + self.onreceive(self._on_req_sent) + self.send(req) + + def _on_req_sent(self, reply): + if reply is None: + return + if len(reply) < 10: + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + if reply[0] != '\x05': + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + if reply[1] != "\x00": + # Connection failed + if ord(reply[1])<9: + errors = ['general SOCKS server failure', + 'connection not allowed by ruleset', + 'Network unreachable', + 'Host unreachable', + 'Connection refused', + 'TTL expired', + 'Command not supported', + 'Address type not supported' + ] + txt = errors[ord(reply[1])-1] + else: + txt = 'Invalid proxy reply' + log.error(txt) + self.on_failure(txt) + return + # Get the bound address/port + elif reply[3] == "\x01": + begin, end = 3, 7 + elif reply[3] == "\x03": + begin, end = 4, 4 + reply[4] + else: + log.error('Invalid proxy reply') + self.on_failure('Invalid proxy reply') + return + self.connecting_over() + + + + + + + + Modified: branches/bosh_support/src/common/xmpp/tls_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/tls_nb.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/tls_nb.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -201,7 +201,7 @@ try: return self.sslobj.read(bufsize) except socket.sslerror, e: - log.debug("Recv: Caught socket.sslerror:", exc_info=True) + log.debug("Recv: Caught socket.sslerror: " + repr(e), exc_info=True) if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE): raise SSLWrapper.Error(self.sock or self.sslobj, e) return None @@ -238,7 +238,6 @@ ''' log.info('Starting TLS estabilishing') PlugIn.PlugIn(self, owner) - print 'inplugin' try: self._owner._plug_idle(writable=False, readable=False) res = self._startSSL() @@ -273,9 +272,18 @@ def _startSSL(self): ''' Immediatedly switch socket to TLS mode. Used internally.''' log.debug("_startSSL called") - if USE_PYOPENSSL: return self._startSSL_pyOpenSSL() - else: return self._startSSL_stdlib() + if USE_PYOPENSSL: result = self._startSSL_pyOpenSSL() + else: result = self._startSSL_stdlib() + + if result: + log.debug("Synchronous handshake completed") + self._owner._plug_idle(writable=True, readable=False) + return True + else: + return False + + def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner @@ -328,9 +336,8 @@ log.error('Error while TLS handshake: ', exc_info=True) return False tcpsock._sslObj.setblocking(False) - log.debug("Synchronous handshake completed") self._owner.ssl_lib = PYOPENSSL - return self._endSSL() + return True def _startSSL_stdlib(self): @@ -349,10 +356,6 @@ log.error("Exception caught in _startSSL_stdlib:", exc_info=True) return False self._owner.ssl_lib = PYSTDLIB - return self._endSSL() - - def _endSSL(self): - self._owner._plug_idle(writable=True, readable=False) return True def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): Modified: branches/bosh_support/src/common/xmpp/transports_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/transports_nb.py 2008-08-14 19:17:53 UTC (rev 10245) +++ branches/bosh_support/src/common/xmpp/transports_nb.py 2008-08-14 21:48:43 UTC (rev 10246) @@ -15,20 +15,21 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -import socket,base64 from simplexml import ustr from client import PlugIn from idlequeue import IdleObject from protocol import * +import proxy_connectors import tls_nb +import socket import sys import os import errno import time - import traceback +import base64 import logging log = logging.getLogger('gajim.c.x.transports_nb') @@ -66,7 +67,7 @@ CONNECT_TIMEOUT_SECONDS = 30 # how long to wait for a disconnect to complete -DISCONNECT_TIMEOUT_SECONDS = 10 +DISCONNECT_TIMEOUT_SECONDS =5 # size of the buffer which reads data from server # if lower, more stanzas will be fragmented and processed twice @@ -82,7 +83,7 @@ CONNECTING = 'CONNECTING' PROXY_CONNECTING = 'PROXY_CONNECTING' CONNECTED = 'CONNECTED' -STATES = [DISCONNECTED, DISCONNECTING, CONNECTING, PROXY_CONNECTING, CONNECTED] +STATES = [DISCONNECTED, CONNECTING, PROXY_CONNECTING, CONNECTED, DISCONNECTING] # transports have different arguments in constructor and same in connect() # method @@ -124,7 +125,7 @@ ''' self.on_connect = on_connect self.on_connect_failure = on_connect_failure - (self.server, self.port) = conn_5tuple[4][:2] + self.server, self.port = conn_5tuple[4][:2] self.conn_5tuple = conn_5tuple @@ -213,7 +214,8 @@ ''' Non-blocking TCP socket wrapper ''' - def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs): + def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, + proxy_dict=None): ''' Class constructor. ''' @@ -224,6 +226,8 @@ # bytes remained from the last send message self.sendbuff = '' + self.proxy_dict = proxy_dict + self.on_remote_disconnect = self.disconnect() def start_disconnect(self): @@ -288,12 +292,29 @@ # which will also remove read_timeouts for descriptor self._on_connect_failure('Exception while connecting to %s:%s - %s %s' % (self.server, self.port, errnum, errstr)) + + def _connect_to_proxy(self): + self.set_state(PROXY_CONNECTING) + if self.proxy_dict['type'] == 'socks5': + proxyclass = proxy_connectors.SOCKS5Connector + elif self.proxy_dict['type'] == 'http' : + proxyclass = proxy_connectors.HTTPCONNECTConnector + proxyclass( + send_method = self.send, + onreceive = self.onreceive, + old_on_receive = self.on_receive, + on_success = self._on_connect, + on_failure = self._on_connect_failure, + xmpp_server = self.proxy_dict['xmpp_server'], + proxy_creds = self.proxy_dict['credentials'] + ) + def _on_connect(self): - ''' with TCP socket, we have to remove send-timeout ''' - self.idlequeue.remove_timeout(self.fd) - self.peerhost = self._sock.getsockname() - print self.estabilish_tls + ''' + Preceeds invoking of on_connect callback. TCP connection is estabilished at + this time. + ''' if self.estabilish_tls: self.tls_init( on_succ = lambda: NonBlockingTransport._on_connect(self), @@ -320,7 +341,10 @@ if self.get_state()==CONNECTING: log.info('%s socket wrapper connected' % id(self)) - self._on_connect() + self.idlequeue.remove_timeout(self.fd) + self.peerhost = self._sock.getsockname() + if self.proxy_dict: self._connect_to_proxy() + else: self._on_connect() return self._do_send() @@ -330,7 +354,7 @@ if self.get_state()==CONNECTING: self._on_connect_failure('Error during connect to %s:%s' % (self.server, self.port)) - else : + else: self.disconnect() def disconnect(self, do_callback=True): @@ -338,6 +362,7 @@ return self.set_state(DISCONNECTED) self.idlequeue.unplug_idle(self.fd) + if self.__dict__.has_key('NonBlockingTLS'): self.NonBlockingTLS.PlugOut() try: self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() @@ -401,8 +426,6 @@ Plugged socket will always be watched for "error" event - in that case, pollend() is called. ''' - self.idlequeue.plug_idle(self, writable, readable) - log.info('Plugging fd %d, W:%s, R:%s' % (self.fd, writable, readable)) self.idlequeue.plug_idle(self, writable, readable) @@ -436,10 +459,6 @@ def _do_receive(self): ''' Reads all pending incoming data. Calls owner's disconnected() method if appropriate.''' - # Misc error signifying that we got disconnected - ERR_DISCONN = -2 - # code for unknown/other errors - ERR_OTHER = -3 received = None errnum = 0 errstr = 'No Error Set' @@ -448,35 +467,29 @@ # get as many bites, as possible, but not more than RECV_BUFSIZE received = self._recv(RECV_BUFSIZE) except socket.error, (errnum, errstr): - # save exception number and message to errnum, errstr log.info("_do_receive: got %s:" % received , exc_info=True) except tls_nb.SSLWrapper.Error, e: - log.info("_do_receive, caugth SSL error: got %s:" % received , exc_info=True) - errnum = tls_nb.gattr(e, 'errno') or ERR_OTHER - errstr = tls_nb.gattr(e, 'exc_str') + log.info("_do_receive, caught SSL error, got %s:" % received , exc_info=True) + errnum, errstr = e.exc - if received == '': - errnum = ERR_DISCONN - errstr = "Connection closed unexpectedly" + if (self.ssl_lib is None and received == '') or \ + (self.ssl_lib == tls_nb.PYSTDLIB and errnum == 8 ) or \ + (self.ssl_lib == tls_nb.PYOPENSSL and errnum == -1 ): + # 8 in stdlib: errstr == EOF occured in violation of protocol + # -1 in pyopenssl: errstr == Unexpected EOF + log.info("Disconnected by remote server: %s %s" % (errnum, errstr), exc_info=True) + self.on_remote_disconnect() + return + - if errnum in (ERR_DISCONN, errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN): - # ECONNRESET - connection you are trying to access has been reset by the peer - # ENOTCONN - Transport endpoint is not connected - # ESHUTDOWN - shutdown(2) has been called on a socket to close down the - # sending end of the transmision, and then data was attempted to be sent - log.error("Connection to %s lost: %s %s" % ( self.server, errnum, errstr), exc_info=True) - if hasattr(self, 'on_remote_disconnect'): self.on_remote_disconnect() - else: self.disconnect() + if errnum: + log.error("Connection to %s:%s lost: %s %s" % ( self.server, self.port, errnum, errstr), exc_info=True) + self.disconnect() return + # this branch is for case of non-fatal SSL errors - None is returned from + # recv() but no errnum is set if received is None: - # because there are two types of TLS wrappers, the TLS plugin recv method - # returns None in case of error - if errnum != 0: - log.error("CConnection to %s lost: %s %s" % (self.server, errnum, errstr)) - self.disconnect() - return - received = '' return # we have received some bytes, stop the timeout! @@ -505,10 +518,10 @@ ''' def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, - on_http_request_possible, on_persistent_fallback, http_dict): + on_http_request_possible, on_persistent_fallback, http_dict, proxy_dict = None): NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) + estabilish_tls, certs, proxy_dict) self.http_protocol, self.http_host, self.http_path = urisplit(http_dict['http_uri']) if self.http_protocol is None: @@ -518,7 +531,7 @@ self.http_port = http_dict['http_port'] self.http_version = http_dict['http_version'] self.http_persistent = http_dict['http_persistent'] - self.over_proxy = http_dict['over_proxy'] + self.add_proxy_headers = http_dict['add_proxy_headers'] if http_dict.has_key('proxy_user') and http_dict.has_key('proxy_pass'): self.proxy_user, self.proxy_pass = http_dict['proxy_user'], http_dict['proxy_pass'] else: @@ -528,46 +541,39 @@ self.recvbuff = '' self.expected_length = 0 self.pending_requests = 0 - self.on_persistent_fallback = on_persistent_fallback self.on_http_request_possible = on_http_request_possible - self.just_responed = False self.last_recv_time = 0 + self.close_current_connection = False + self.on_remote_disconnect = lambda: on_persistent_fallback(self) - def send(self, raw_data, now=False): - NonBlockingTCP.send( - self, - self.build_http_message(raw_data), - now) + def http_send(self, raw_data, now=False): + self.send(self.build_http_message(raw_data), now) - def on_remote_disconnect(self): - log.warn('on_remote_disconnect called, http_persistent = %s' % self.http_persistent) - if self.http_persistent: - self.http_persistent = False - self.on_persistent_fallback() - self.disconnect(do_callback=False) - self.connect( - conn_5tuple = self.conn_5tuple, - on_connect = self.on_http_request_possible, - on_connect_failure = self.disconnect) - - else: - self.disconnect() - return - def _on_receive(self,data): '''Preceeds passing received data to owner class. Gets rid of HTTP headers and checks them.''' + if self.get_state() == PROXY_CONNECTING: + NonBlockingTCP._on_receive(self, data) + return if not self.recvbuff: # recvbuff empty - fresh HTTP message was received - statusline, headers, self.recvbuff = self.parse_http_message(data) + try: + statusline, headers, self.recvbuff = self.parse_http_message(data) + except ValueError: + self.disconnect() + return + if statusline[1] != '200': log.error('HTTP Error: %s %s' % (statusline[1], statusline[2])) self.disconnect() return self.expected_length = int(headers['Content-Length']) + if headers.has_key('Connection') and headers['Connection'].strip()=='close': + self.close_current_connection = True + else: - #sth in recvbuff - append currently received data to HTTP mess in buffer + #sth in recvbuff - append currently received data to HTTP msg in buffer self.recvbuff = '%s%s' % (self.recvbuff, data) if self.expected_length > len(self.recvbuff): @@ -583,9 +589,10 @@ self.recvbuff='' self.expected_length=0 - if not self.http_persistent: + if not self.http_persistent or self.close_current_connection: # not-persistent connections disconnect after response self.disconnect(do_callback = False) + self.close_current_connection = False self.last_recv_time = time.time() self.on_receive(data=httpbody, socket=self) self.on_http_request_possible() @@ -601,9 +608,10 @@ self.http_port, self.http_path) headers = ['%s %s %s' % (method, absolute_uri, self.http_version), 'Host: %s:%s' % (self.http_host, self.http_port), + 'User-Agent: Gajim', 'Content-Type: text/xml; charset=utf-8', 'Content-Length: %s' % len(str(httpbody))] - if self.over_proxy: + if self.add_proxy_headers: headers.append('Proxy-Connection: keep-alive') headers.append('Pragma: no-cache') if self.proxy_user and self.proxy_pass: @@ -646,6 +654,9 @@ self.build_cb = build_cb def _do_send(self): + if self.state == PROXY_CONNECTING: + NonBlockingTCP._do_send(self) + return if not self.sendbuff: stanza = self.build_cb(socket=self) stanza = self.build_http_message(httpbody=stanza) @@ -669,225 +680,4 @@ -class NBProxySocket(NonBlockingTCP): - ''' - Interface for proxy socket wrappers - when tunnneling XMPP over proxies, - some connecting process usually has to be done before opening stream. - ''' - def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, - xmpp_server, proxy_creds=(None,None)): - self.proxy_user, self.proxy_pass = proxy_creds - self.xmpp_server = xmpp_server - NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) - - def _on_connect(self): - ''' - We're redefining _on_connect method to insert proxy-specific mechanism before - invoking the ssl connection and then client callback. All the proxy connecting - is done before XML stream is opened. - ''' - self.set_state(PROXY_CONNECTING) - self._on_tcp_connect() - - - def _on_tcp_connect(self): - '''to be implemented in each proxy socket wrapper''' - pass - - -class NBHTTPProxySocket(NBProxySocket): - ''' This class can be used instead of NonBlockingTCP - HTTP (CONNECT) proxy connection class. Allows to use HTTP proxies like squid with - (optionally) simple authentication (using login and password). - ''' - - def _on_tcp_connect(self): - ''' Starts connection. Connects to proxy, supplies login and password to it - (if were specified while creating instance). Instructs proxy to make - connection to the target server. Returns non-empty sting on success. ''' - log.info('Proxy server contacted, performing authentification') - connector = ['CONNECT %s:%s HTTP/1.0' % self.xmpp_server, - 'Proxy-Connection: Keep-Alive', - 'Pragma: no-cache', - 'Host: %s:%s' % self.xmpp_server, - 'User-Agent: Gajim'] - if self.proxy_user and self.proxy_pass: - credentials = '%s:%s' % (self.proxy_user, self.proxy_pass) - credentials = base64.encodestring(credentials).strip() - connector.append('Proxy-Authorization: Basic '+credentials) - connector.append('\r\n') - self.onreceive(self._on_headers_sent) - self.send('\r\n'.join(connector)) - - def _on_headers_sent(self, reply): - if reply is None: - return - self.reply = reply.replace('\r', '') - try: - proto, code, desc = reply.split('\n')[0].split(' ', 2) - except: - log.error("_on_headers_sent:", exc_info=True) - #traceback.print_exc() - self._on_connect_failure('Invalid proxy reply') - return - if code <> '200': - log.error('Invalid proxy reply: %s %s %s' % (proto, code, desc)) - self._on_connect_failure('Invalid proxy reply') - return - if len(reply) != 2: - pass - NonBlockingTCP._on_connect(self) - #self.onreceive(self._on_proxy_auth) - - def _on_proxy_auth(self, reply): - if self.reply.find('\n\n') == -1: - if reply is None: - self._on_connect_failure('Proxy authentification failed') - return - if reply.find('\n\n') == -1: - self.reply += reply.replace('\r', '') - self._on_connect_failure('Proxy authentification failed') - return - log.info('Authentification successfull. Jabber server contacted.') - self._on_connect(self) - - -class NBSOCKS5ProxySocket(NBProxySocket): - '''SOCKS5 proxy connection class. Uses TCPsocket as the base class - redefines only connect method. Allows to use SOCKS5 proxies with - (optionally) simple authentication (only USERNAME/PASSWORD auth). - ''' - # TODO: replace on_proxy_failure() with - # _on_connect_failure, at the end call _on_connect() - - def _on_tcp_connect(self): - log.info('Proxy server contacted, performing authentification') - if self.proxy.has_key('user') and self.proxy.has_key('password'): - to_send = '\x05\x02\x00\x02' - else: - to_send = '\x05\x01\x00' - self.onreceive(self._on_greeting_sent) - self.send(to_send) - - def _on_greeting_sent(self, reply): - if reply is None: - return - if len(reply) != 2: - self.on_proxy_failure('Invalid proxy reply') - return - if reply[0] != '\x05': - log.info('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - if reply[1] == '\x00': - return self._on_proxy_auth('\x01\x00') - elif reply[1] == '\x02': - to_send = '\x01' + chr(len(self.proxy['user'])) + self.proxy['user'] +\ - chr(len(self.proxy['password'])) + self.proxy['password'] - self.onreceive(self._on_proxy_auth) - self.send(to_send) - else: - if reply[1] == '\xff': - log.error('Authentification to proxy impossible: no acceptable ' - 'auth method') - self._owner.disconnected() - self.on_proxy_failure('Authentification to proxy impossible: no ' - 'acceptable authentification method') - return - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - - def _on_proxy_auth(self, reply): - if reply is None: - return - if len(reply) != 2: - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - if reply[0] != '\x01': - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - if reply[1] != '\x00': - log.error('Authentification to proxy failed') - self._owner.disconnected() - self.on_proxy_failure('Authentification to proxy failed') - return - log.info('Authentification successfull. Jabber server contacted.') - # Request connection - req = "\x05\x01\x00" - # If the given destination address is an IP address, we'll - # use the IPv4 address request even if remote resolving was specified. - try: - self.ipaddr = socket.inet_aton(self.server[0]) - req = req + "\x01" + self.ipaddr - except socket.error: - # Well it's not an IP number, so it's probably a DNS name. -# if self.__proxy[3]==True: - # Resolve remotely - self.ipaddr = None - req = req + "\x03" + chr(len(self.server[0])) + self.server[0] -# else: -# # Resolve locally -# self.ipaddr = socket.inet_aton(socket.gethostbyname(self.server[0])) -# req = req + "\x01" + ipaddr - req = req + struct.pack(">H",self.server[1]) - self.onreceive(self._on_req_sent) - self.send(req) - - def _on_req_sent(self, reply): - if reply is None: - return - if len(reply) < 10: - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - if reply[0] != '\x05': - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - if reply[1] != "\x00": - # Connection failed - self._owner.disconnected() - if ord(reply[1])<9: - errors = ['general SOCKS server failure', - 'connection not allowed by ruleset', - 'Network unreachable', - 'Host unreachable', - 'Connection refused', - 'TTL expired', - 'Command not supported', - 'Address type not supported' - ] - txt = errors[ord(reply[1])-1] - else: - txt = 'Invalid proxy reply' - log.error(txt) - self.on_proxy_failure(txt) - return - # Get the bound address/port - elif reply[3] == "\x01": - begin, end = 3, 7 - elif reply[3] == "\x03": - begin, end = 4, 4 + reply[4] - else: - log.error('Invalid proxy reply') - self._owner.disconnected() - self.on_proxy_failure('Invalid proxy reply') - return - - if self.on_connect_proxy: - self.on_connect_proxy() - - - -

1 0

[commit-gajim] r10245 - in trunk: . scripts
by js＠gajim.org 14 Aug '08

14 Aug '08

Author: js Date: 2008-08-14 21:17:53 +0200 (Thu, 14 Aug 2008) New Revision: 10245 Modified: trunk/launch.sh trunk/scripts/gajim-remote.in trunk/scripts/gajim.in Log: Fully POSIX-compliant shell scripts. Modified: trunk/launch.sh =================================================================== --- trunk/launch.sh 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/launch.sh 2008-08-14 19:17:53 UTC (rev 10245) @@ -1,18 +1,3 @@ #!/bin/sh -if [[ $0 == /* ]]; then - BASE=`dirname $0` -else - BASE=`pwd`/`dirname $0` -fi -OS=`uname -s` - -if [ "x${OS}" == "xDarwin" ]; then - export RESOURCEPATH="${BASE}/dist/Gajim.app/Contents/Resources" - GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current" - export PATH="${GTK_DIR}/bin:$PATH" - export PYTHONPATH="${GTK_DIR}/lib/python2.5/site-packages:${GTK_DIR}/lib/python2.5/site-packages/gtk-2.0:${PYTHONPATH}" - unset GTK_DIR -fi - -cd ${BASE}/src +cd "$(dirname $0)/src" exec python -t gajim.py $@ Modified: trunk/scripts/gajim-remote.in =================================================================== --- trunk/scripts/gajim-remote.in 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/scripts/gajim-remote.in 2008-08-14 19:17:53 UTC (rev 10245) @@ -24,8 +24,9 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -if [ `id -u` -eq 0 ]; then +if test $(id -u) -eq 0; then echo "You must not launch gajim-remote as root, it is INSECURE" + exit 1 fi datadir=@DATADIR@ Modified: trunk/scripts/gajim.in =================================================================== --- trunk/scripts/gajim.in 2008-08-14 18:06:03 UTC (rev 10244) +++ trunk/scripts/gajim.in 2008-08-14 19:17:53 UTC (rev 10245) @@ -23,8 +23,9 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -if [ `id -u` -eq 0 ]; then +if test $(id -u) -eq 0; then echo "You must not launch Gajim as root, it is INSECURE" + exit 1 fi datadir=@DATADIR@

1 0

[commit-gajim] r10244 - trunk
by roidelapluie＠gajim.org 14 Aug '08

14 Aug '08

Author: roidelapluie Date: 2008-08-14 20:06:03 +0200 (Thu, 14 Aug 2008) New Revision: 10244 Modified: trunk/ChangeLog Log: correct changelog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-14 18:01:56 UTC (rev 10243) +++ trunk/ChangeLog 2008-08-14 18:06:03 UTC (rev 10244) @@ -35,7 +35,7 @@ * * OTHER - * Support of PEP (Personal Eventing Protocol) (XEP-0163, XEP-0107, XEP-1018, XEP-0118) + * Support of PEP (Personal Eventing Protocol) (XEP-0163, XEP-0107, XEP-0108, XEP-0118) * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications) * Modified the format of emoticons list file, so we can choose the default code (#3696) * New Remote Controlling Option (XEP-0146): forward unread messages

1 0

[commit-gajim] r10243 - trunk/src
by jim++＠gajim.org 14 Aug '08

14 Aug '08

Author: jim++ Date: 2008-08-14 20:01:56 +0200 (Thu, 14 Aug 2008) New Revision: 10243 Modified: trunk/src/chat_control.py Log: [acm] Typo in [10241] Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-14 17:51:14 UTC (rev 10242) +++ trunk/src/chat_control.py 2008-08-14 18:01:56 UTC (rev 10243) @@ -1569,7 +1569,7 @@ tooltip = _('%(type)s encryption %(status)s active %(authenticated)s.\n' 'Your chat session %(logged)s be logged.'\ % {'type': enc_type, 'status': status_string, - 'authenticated': authenticated_string, 'logged': logged_string) + 'authenticated': authenticated_string, 'logged': logged_string}) self.lock_tooltip.set_tip(self.authentication_button, tooltip) self.widget_set_visible(self.authentication_button, not visible)

1 0

[commit-gajim] r10242 - trunk/src/common
by asterix＠gajim.org 14 Aug '08

14 Aug '08

Author: asterix Date: 2008-08-14 19:51:14 +0200 (Thu, 14 Aug 2008) New Revision: 10242 Modified: trunk/src/common/dataforms.py Log: don't remove label in dataforms if there is no. Fixes #4202 Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-08-14 17:19:21 UTC (rev 10241) +++ trunk/src/common/dataforms.py 2008-08-14 17:51:14 UTC (rev 10242) @@ -129,7 +129,8 @@ assert isinstance(value, basestring) self.setAttr('label', value) def fdel(self): - self.delAttr('label') + if self.getAttr('label'): + self.delAttr('label') return locals() @nested_property

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008