From de4a23e75196eb81a14535454f4235c3733c533f Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Fri, 15 Aug 2008 17:31:51 +0000 Subject: See #4200. * remove js from some headers * set coding:utf-8 to allow real names in headers --- src/advanced.py | 2 +- src/atom_window.py | 1 + src/cell_renderer_image.py | 2 +- src/chat_control.py | 1 + src/common/GnuPGInterface.py | 4 ++-- src/common/__init__.py | 20 -------------------- src/common/atom.py | 1 - src/common/caps.py | 1 + src/common/check_paths.py | 2 +- src/common/commands.py | 2 +- src/common/config.py | 3 ++- src/common/configpaths.py | 3 ++- src/common/connection.py | 5 +++-- src/common/connection_handlers.py | 3 ++- src/common/contacts.py | 1 + src/common/crypto.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 1 + src/common/defs.py | 1 + src/common/dh.py | 2 +- src/common/events.py | 1 + src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 3 ++- src/common/helpers.py | 1 + src/common/i18n.py | 2 +- src/common/logger.py | 2 +- src/common/nslookup.py | 1 + src/common/optparser.py | 2 +- src/common/passwords.py | 4 ++-- src/common/pep.py | 1 + src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 4 ++-- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 4 ++-- src/common/socks5.py | 1 + src/common/stanza_session.py | 1 + src/common/xmpp_stringprep.py | 2 +- src/config.py | 5 +++-- src/conversation_textview.py | 1 + src/dataforms_widget.py | 2 +- src/disco.py | 3 +-- src/features_window.py | 1 + src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 5 +++-- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 1 + src/groups.py | 2 +- src/gtkexcepthook.py | 4 ++-- src/gtkgui_helpers.py | 3 ++- src/history_manager.py | 1 + src/history_window.py | 2 +- src/htmltextview.py | 1 + src/ipython_view.py | 23 ++++++++++------------- src/lastfm.py | 6 +++--- src/lastfm_track_listener.py | 5 ++--- src/message_control.py | 1 + src/message_textview.py | 2 +- src/message_window.py | 1 + src/negotiation.py | 2 +- src/network_manager_listener.py | 1 - src/notify.py | 1 + src/profile_window.py | 2 +- src/remote_control.py | 1 + src/roster_window.py | 2 +- src/search_window.py | 1 - src/secrets.py | 1 + src/session.py | 1 + src/statusicon.py | 1 + src/systray.py | 2 +- src/tooltips.py | 2 +- src/vcard.py | 5 +++-- 73 files changed, 99 insertions(+), 94 deletions(-) (limited to 'src') diff --git a/src/advanced.py b/src/advanced.py index 76839cd8c..eba6d8fad 100644 --- a/src/advanced.py +++ b/src/advanced.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/advanced.py ## ## Copyright (C) 2005 Travis Shirk @@ -6,7 +7,6 @@ ## Nikos Kouremenos ## Copyright (C) 2006 Dimitur Kirov ## Copyright (C) 2006-2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/atom_window.py b/src/atom_window.py index 8e71130ba..ed7d6a956 100644 --- a/src/atom_window.py +++ b/src/atom_window.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/atom_window.py ## ## Copyright (C) 2006 Tomasz Melcer diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py index af7a96faa..dcf12ae89 100644 --- a/src/cell_renderer_image.py +++ b/src/cell_renderer_image.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/cell_renderer_image.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005 Vincent Hanquez ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2006 Travis Shirk -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/chat_control.py b/src/chat_control.py index 8bf5e712d..a5928e2e0 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov diff --git a/src/common/GnuPGInterface.py b/src/common/GnuPGInterface.py index e7b074558..f798d785b 100644 --- a/src/common/GnuPGInterface.py +++ b/src/common/GnuPGInterface.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/GnuPGInterface.py ## -## Copyright (C) 2001 Frank J. Tobin +## Copyright (C) 2001 Frank J. Tobin ## Copyright (C) 2005 Nikos Kouremenos ## Copyright (C) 2006-2007 Yann Leboulanger ## Copyright (C) 2008 Jean-Marie Traissard -## Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/__init__.py b/src/common/__init__.py index 5ef271917..de18c8159 100644 --- a/src/common/__init__.py +++ b/src/common/__init__.py @@ -1,22 +1,2 @@ -## src/common/__init__.py -## -## Copyright (C) 2005 Yann Leboulanger -## Nikos Kouremenos -## Copyright (C) 2008 Jonathan Schleifer -## -## 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 . -## # vim: se ts=3: diff --git a/src/common/atom.py b/src/common/atom.py index 4b99d533a..ff9765b27 100644 --- a/src/common/atom.py +++ b/src/common/atom.py @@ -4,7 +4,6 @@ ## Copyright (C) 2006 Jean-Marie Traissard ## Tomasz Melcer ## Copyright (C) 2006-2007 Yann Leboulanger -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/caps.py b/src/common/caps.py index abc7db94a..fe52704e0 100644 --- a/src/common/caps.py +++ b/src/common/caps.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/caps.py ## ## Copyright (C) 2007 Tomasz Melcer diff --git a/src/common/check_paths.py b/src/common/check_paths.py index 160fe4f70..4edca5d7f 100644 --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/check_paths.py ## ## Copyright (C) 2005-2006 Travis Shirk @@ -6,7 +7,6 @@ ## Copyright (C) 2006 Dimitur Kirov ## Copyright (C) 2007 Tomasz Melcer ## Copyright (C) 2008 Jean-Marie Traissard -## Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/commands.py b/src/common/commands.py index 85d7e9b54..73dbd5b72 100644 --- a/src/common/commands.py +++ b/src/common/commands.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/commands.py ## ## Copyright (C) 2006-2007 Yann Leboulanger ## Tomasz Melcer ## Copyright (C) 2007 Jean-Marie Traissard ## Copyright (C) 2008 Brendan Taylor -## Jonathan Schleifer ## Stephan Erb ## ## This file is part of Gajim. diff --git a/src/common/config.py b/src/common/config.py index f895c73d8..ed7e88f7a 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -1,8 +1,9 @@ +# -*- coding:utf-8 -*- ## src/common/config.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2004-2005 Vincent Hanquez -## Copyright (C) 2005 Stephan Kochen +## Copyright (C) 2005 Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Alex Mauer ## Nikos Kouremenos diff --git a/src/common/configpaths.py b/src/common/configpaths.py index 311defe48..5f59fa4c5 100644 --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -1,7 +1,8 @@ +# -*- coding:utf-8 -*- ## src/common/configpaths.py ## ## Copyright (C) 2006 Jean-Marie Traissard -## Junglecow +## Junglecow J ## Copyright (C) 2006-2007 Yann Leboulanger ## Copyright (C) 2007 Brendan Taylor ## Copyright (C) 2008 Jonathan Schleifer diff --git a/src/common/connection.py b/src/common/connection.py index 5a0f0fff2..ecf39193c 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1,13 +1,14 @@ +# -*- coding:utf-8 -*- ## src/common/connection.py ## ## Copyright (C) 2003-2005 Vincent Hanquez ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005 Alex Mauer -## Stephan Kochen +## Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Travis Shirk ## Nikos Kouremenos -## Copyright (C) 2006 Junglecow +## Copyright (C) 2006 Junglecow J ## Stefan Bethge ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Tomasz Melcer diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 2a575e046..361b4e9e5 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1,7 +1,8 @@ +# -*- coding:utf-8 -*- ## src/common/connection_handlers.py ## ## Copyright (C) 2006 Dimitur Kirov -## Junglecow +## Junglecow J ## Copyright (C) 2006-2007 Tomasz Melcer ## Travis Shirk ## Nikos Kouremenos diff --git a/src/common/contacts.py b/src/common/contacts.py index 67b03fce8..944576096 100644 --- a/src/common/contacts.py +++ b/src/common/contacts.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/contacts.py ## ## Copyright (C) 2006 Dimitur Kirov diff --git a/src/common/crypto.py b/src/common/crypto.py index 859b8ba15..2044cd9af 100644 --- a/src/common/crypto.py +++ b/src/common/crypto.py @@ -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 -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/dataforms.py b/src/common/dataforms.py index 59f399815..144df2bab 100644 --- a/src/common/dataforms.py +++ b/src/common/dataforms.py @@ -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 ## Copyright (C) 2006-2008 Yann Leboulanger ## Copyright (C) 2007 Stephan Erb -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py index 76afe2d61..dd741c597 100644 --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/dbus_support.py ## ## Copyright (C) 2005 Andrew Sayman diff --git a/src/common/defs.py b/src/common/defs.py index 047f9202e..55a2b92bd 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/defs.py ## ## Copyright (C) 2006 Nikos Kouremenos diff --git a/src/common/dh.py b/src/common/dh.py index d371a5823..e9b30d32e 100644 --- a/src/common/dh.py +++ b/src/common/dh.py @@ -1,8 +1,8 @@ +# -*- coding:utf-8 -*- ## src/common/dh.py ## ## Copyright (C) 2007 Yann Leboulanger ## Copyright (C) 2008 Brendan Taylor -## Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/events.py b/src/common/events.py index 2741e30e4..26e47fadf 100644 --- a/src/common/events.py +++ b/src/common/events.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/events.py ## ## Copyright (C) 2006 Jean-Marie Traissard diff --git a/src/common/exceptions.py b/src/common/exceptions.py index 2a9b4247d..52c08b631 100644 --- a/src/common/exceptions.py +++ b/src/common/exceptions.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/exceptions.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos ## Copyright (C) 2005-2008 Yann Leboulanger ## Copyright (C) 2006 Jean-Marie Traissard ## Copyright (C) 2007 Brendan Taylor -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py index 8fd38f3c5..372681207 100755 --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/common/fuzzyclock.py ## ## Copyright (C) 2006 Christoph Neuroth ## Copyright (C) 2006-2007 Yann Leboulanger ## Copyright (C) 2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/gajim.py b/src/common/gajim.py index a60b235b7..932a9ec13 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -1,10 +1,11 @@ +# -*- coding:utf-8 -*- ## src/common/gajim.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005-2006 Dimitur Kirov ## Travis Shirk ## Nikos Kouremenos -## Copyright (C) 2006 Junglecow +## Copyright (C) 2006 Junglecow J ## Stefan Bethge ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007-2008 Brendan Taylor diff --git a/src/common/helpers.py b/src/common/helpers.py index e0c999441..570b5213b 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/helpers.py ## ## Copyright (C) 2003-2008 Yann Leboulanger diff --git a/src/common/i18n.py b/src/common/i18n.py index 4d15e7536..b4c02ac41 100644 --- a/src/common/i18n.py +++ b/src/common/i18n.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/i18n.py ## ## Copyright (C) 2003-2007 Yann Leboulanger ## Copyright (C) 2004 Vincent Hanquez ## Copyright (C) 2004-2007 Yann Leboulanger ## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/logger.py b/src/common/logger.py index c917024ce..698e11f2f 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/logger.py ## ## Copyright (C) 2003-2008 Yann Leboulanger @@ -7,7 +8,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Tomasz Melcer ## Julien Pivotto -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/nslookup.py b/src/common/nslookup.py index f5c2cbd76..e7b55ab98 100644 --- a/src/common/nslookup.py +++ b/src/common/nslookup.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/nslookup.py ## ## Copyright (C) 2006 Dimitur Kirov diff --git a/src/common/optparser.py b/src/common/optparser.py index 5b017cbe6..52cb72937 100644 --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/optparser.py ## ## Copyright (C) 2003-2005 Vincent Hanquez @@ -9,7 +10,6 @@ ## Brendan Taylor ## Tomasz Melcer ## Stephan Erb -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/passwords.py b/src/common/passwords.py index 9a48841ed..2acd536cc 100644 --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/passwords.py ## ## Copyright (C) 2006 Gustavo J. A. M. Carneiro @@ -5,8 +6,7 @@ ## Copyright (C) 2006-2008 Yann Leboulanger ## Copyright (C) 2007 Jean-Marie Traissard ## Julien Pivotto -## Copyright (C) 2008 Jonathan Schleifer -## Stephan Erb +## Copyright (C) 2008 Stephan Erb ## ## This file is part of Gajim. ## diff --git a/src/common/pep.py b/src/common/pep.py index 9814c4937..24bd6ef35 100644 --- a/src/common/pep.py +++ b/src/common/pep.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/pep.py ## ## Copyright (C) 2007 Piotr Gaczkowski diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py index 57b3a2f55..a3fd34ce2 100644 --- a/src/common/proxy65_manager.py +++ b/src/common/proxy65_manager.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/common/proxy65_manager.py ## ## Copyright (C) 2006 Dimitur Kirov ## Jean-Marie Traissard ## Copyright (C) 2007 Yann Leboulanger -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/pubsub.py b/src/common/pubsub.py index dfed21487..dad29d187 100644 --- a/src/common/pubsub.py +++ b/src/common/pubsub.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/pubsub.py ## ## Copyright (C) 2006 Tomasz Melcer ## Copyright (C) 2006-2008 Yann Leboulanger ## Copyright (C) 2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer -## Stephan Erb +## Copyright (C) 2008 Stephan Erb ## ## This file is part of Gajim. ## diff --git a/src/common/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py index 2be34de8a..315b011ad 100644 --- a/src/common/rst_xhtml_generator.py +++ b/src/common/rst_xhtml_generator.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/rst_xhtml_generator.py ## ## Copyright (C) 2006 Santiago Gala ## Nikos Kouremenos ## Copyright (C) 2006-2007 Yann Leboulanger ## Copyright (C) 2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/common/sleepy.py b/src/common/sleepy.py index a017600e6..0073908fd 100644 --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/sleepy.py ## ## Copyright (C) 2003-2007 Yann Leboulanger ## Copyright (C) 2005-2006 Nikos Kouremenos ## Copyright (C) 2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer -## Mateusz Bilinski +## Copyright (C) 2008 Mateusz Biliński ## ## This file is part of Gajim. ## diff --git a/src/common/socks5.py b/src/common/socks5.py index a8590a998..6787f2ffe 100644 --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/socks5.py ## ## Copyright (C) 2005-2006 Dimitur Kirov diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py index 91e4b7f5c..7fe015073 100644 --- a/src/common/stanza_session.py +++ b/src/common/stanza_session.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/common/stanza_session.py ## ## Copyright (C) 2007 Julien Pivotto diff --git a/src/common/xmpp_stringprep.py b/src/common/xmpp_stringprep.py index 1ed1cb945..eb587dbca 100644 --- a/src/common/xmpp_stringprep.py +++ b/src/common/xmpp_stringprep.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/common/xmpp_stringprep.py ## ## Copyright (C) 2001-2005 Twisted Matrix Laboratories ## Copyright (C) 2005-2007 Yann Leboulanger ## Copyright (C) 2006 Stefan Bethge ## Copyright (C) 2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/config.py b/src/config.py index 35f367dff..e93cf561d 100644 --- a/src/config.py +++ b/src/config.py @@ -1,12 +1,13 @@ +# -*- coding:utf-8 -*- ## src/config.py ## ## Copyright (C) 2003-2005 Vincent Hanquez ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005 Alex Podaras -## Stephan Kochen +## Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Nikos Kouremenos -## Copyright (C) 2006 Junglecow +## Copyright (C) 2006 Junglecow J ## Copyright (C) 2006-2007 Travis Shirk ## Stefan Bethge ## Copyright (C) 2006-2008 Jean-Marie Traissard diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 285841baa..2209038e2 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/conversation_textview.py ## ## Copyright (C) 2005 Norman Rasmussen diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py index b0abb97d0..e69ad7222 100644 --- a/src/dataforms_widget.py +++ b/src/dataforms_widget.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/dataforms_widget.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2006 Tomasz Melcer ## Copyright (C) 2006-2007 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/disco.py b/src/disco.py index 3f947b340..e1a4df11e 100644 --- a/src/disco.py +++ b/src/disco.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- ## src/disco.py ## -## Copyright (C) 2005-2006 Stephan Kochen +## Copyright (C) 2005-2006 Stéphan Kochen ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2005-2008 Yann Leboulanger ## Copyright (C) 2006 Dimitur Kirov ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Stephan Erb -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/features_window.py b/src/features_window.py index 3a804c0bd..bf0a0881b 100644 --- a/src/features_window.py +++ b/src/features_window.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/features_window.py ## ## Copyright (C) 2007 Jean-Marie Traissard diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index a4575b03d..fa51520ba 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -1,10 +1,10 @@ +# -*- coding:utf-8 -*- ## src/filetransfers_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005-2006 Dimitur Kirov ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2006 Travis Shirk -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/gajim-remote.py b/src/gajim-remote.py index b5b6a0a18..41a43658a 100755 --- a/src/gajim-remote.py +++ b/src/gajim-remote.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/gajim-remote.py ## ## Copyright (C) 2005-2006 Dimitur Kirov @@ -8,7 +9,6 @@ ## Travis Shirk ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Julien Pivotto -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/gajim.py b/src/gajim.py index 7a0099233..c8698bc17 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1,16 +1,17 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/gajim.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2004-2005 Vincent Hanquez ## Copyright (C) 2005 Alex Podaras ## Norman Rasmussen -## Stephan Kochen +## Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Alex Mauer ## Copyright (C) 2005-2007 Travis Shirk ## Nikos Kouremenos -## Copyright (C) 2006 Junglecow +## Copyright (C) 2006 Junglecow J ## Stefan Bethge ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Lukas Petrovicky diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py index 9d522c314..97c1fa2bc 100644 --- a/src/gajim_themes_window.py +++ b/src/gajim_themes_window.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/gajim_themes_window.py ## ## Copyright (C) 2003-2007 Yann Leboulanger @@ -5,7 +6,6 @@ ## Nikos Kouremenos ## Copyright (C) 2006 Jean-Marie Traissard ## Copyright (C) 2007 Stephan Erb -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 357ab4e8d..6c6ff651a 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/groupchat_control.py ## ## Copyright (C) 2003-2008 Yann Leboulanger diff --git a/src/groups.py b/src/groups.py index a86a4dc1d..a827ed288 100644 --- a/src/groups.py +++ b/src/groups.py @@ -1,8 +1,8 @@ +# -*- coding:utf-8 -*- ## src/groups.py ## ## Copyright (C) 2006 Yann Leboulanger ## Tomasz Melcer -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/gtkexcepthook.py b/src/gtkexcepthook.py index 170422ce7..04470cae0 100644 --- a/src/gtkexcepthook.py +++ b/src/gtkexcepthook.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/gtkexcepthook.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos ## Copyright (C) 2005-2008 Yann Leboulanger -## Copyright (C) 2008 Jonathan Schleifer -## Stephan Erb +## Copyright (C) 2008 Stephan Erb ## ## This file is part of Gajim. ## diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 933d15836..7aed83fef 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -1,10 +1,11 @@ +# -*- coding:utf-8 -*- ## src/gtkgui_helpers.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005-2006 Dimitur Kirov ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2006 Travis Shirk -## Copyright (C) 2006-2007 Junglecow +## Copyright (C) 2006-2007 Junglecow J ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 James Newton ## Julien Pivotto diff --git a/src/history_manager.py b/src/history_manager.py index 175b02218..2dd20f5c6 100755 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/history_manager.py ## ## Copyright (C) 2006 Dimitur Kirov diff --git a/src/history_window.py b/src/history_window.py index 476e9ad56..8c60aa5ef 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/history_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger @@ -8,7 +9,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007-2008 Stephan Erb ## Copyright (C) 2008 Brendan Taylor -## Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/htmltextview.py b/src/htmltextview.py index 5863d4f19..342cffadf 100644 --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/htmltextview.py ## ## Copyright (C) 2005 Gustavo J. A. M. Carneiro diff --git a/src/ipython_view.py b/src/ipython_view.py index cad6be0bb..37b8213ad 100644 --- a/src/ipython_view.py +++ b/src/ipython_view.py @@ -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 -## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -30,7 +18,16 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see . ## +## 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. diff --git a/src/lastfm.py b/src/lastfm.py index a9efbf608..a5d0840f5 100644 --- a/src/lastfm.py +++ b/src/lastfm.py @@ -1,10 +1,10 @@ #!/usr/bin/env python +# -*- coding:utf-8 -*- ## src/lastfm.py ## -## Copyright (C) 2007 Yann Leboulanger -## Olivier Mehani +## Copyright (C) 2007 Olivier Mehani +## Yann Leboulanger ## Copyright (C) 2007-2008 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/lastfm_track_listener.py b/src/lastfm_track_listener.py index 9d48f3c25..6d43475ee 100644 --- a/src/lastfm_track_listener.py +++ b/src/lastfm_track_listener.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- ## src/lastfm_track_listener.py ## -## Copyright (C) 2007 Yann Leboulanger -## Olivier Mehani -## Copyright (C) 2008 Jonathan Schleifer +## Copyright (C) 2007 Olivier Mehani +## Yann Leboulanger ## ## This file is part of Gajim. ## diff --git a/src/message_control.py b/src/message_control.py index bced23d3c..88923e625 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/message_control.py ## ## Copyright (C) 2006 Dimitur Kirov diff --git a/src/message_textview.py b/src/message_textview.py index c4fb798ee..334bdac93 100644 --- a/src/message_textview.py +++ b/src/message_textview.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/message_textview.py ## ## Copyright (C) 2003-2007 Yann Leboulanger ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2006 Dimitur Kirov -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/message_window.py b/src/message_window.py index 2be38edf5..998cbbb6a 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/message_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger diff --git a/src/negotiation.py b/src/negotiation.py index 2c8cd4afc..5e7f15ded 100644 --- a/src/negotiation.py +++ b/src/negotiation.py @@ -1,8 +1,8 @@ +# -*- coding:utf-8 -*- ## src/negotiation.py ## ## Copyright (C) 2007 Yann Leboulanger ## Copyright (C) 2007-2008 Brendan Taylor -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py index bab796cac..91a37d0cb 100644 --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -5,7 +5,6 @@ ## Nikos Kouremenos ## Stefan Bethge ## Copyright (C) 2006-2007 Yann Leboulanger -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/notify.py b/src/notify.py index 7a8531d20..623a6529f 100644 --- a/src/notify.py +++ b/src/notify.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/notify.py ## ## Copyright (C) 2005 Sebastian Estienne diff --git a/src/profile_window.py b/src/profile_window.py index 7e95b914f..9b204b824 100644 --- a/src/profile_window.py +++ b/src/profile_window.py @@ -1,9 +1,9 @@ +# -*- coding:utf-8 -*- ## src/profile_window.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005-2006 Nikos Kouremenos ## Copyright (C) 2006-2008 Jean-Marie Traissard -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/remote_control.py b/src/remote_control.py index daf66f84c..835c0b377 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/remote_control.py ## ## Copyright (C) 2005-2006 Andrew Sayman diff --git a/src/roster_window.py b/src/roster_window.py index d7528488f..eb4816cb7 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3,7 +3,7 @@ ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005 Alex Mauer -## Stephan Kochen +## Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Copyright (C) 2005-2007 Travis Shirk ## Nikos Kouremenos diff --git a/src/search_window.py b/src/search_window.py index 69cd71c4c..dc53c68af 100644 --- a/src/search_window.py +++ b/src/search_window.py @@ -3,7 +3,6 @@ ## ## Copyright (C) 2007 Stephan Erb ## Copyright (C) 2007-2008 Yann Leboulanger -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/secrets.py b/src/secrets.py index bfceee432..772dfb83a 100644 --- a/src/secrets.py +++ b/src/secrets.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/secrets.py ## ## Copyright (C) 2007-2008 Brendan Taylor diff --git a/src/session.py b/src/session.py index 930312f5a..f3c60fc39 100644 --- a/src/session.py +++ b/src/session.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/session.py ## ## Copyright (C) 2008 Yann Leboulanger diff --git a/src/statusicon.py b/src/statusicon.py index 619c96915..1a46f7e3f 100644 --- a/src/statusicon.py +++ b/src/statusicon.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/statusicon.py ## ## Copyright (C) 2006 Nikos Kouremenos diff --git a/src/systray.py b/src/systray.py index 3a23a494e..18f626716 100644 --- a/src/systray.py +++ b/src/systray.py @@ -1,3 +1,4 @@ +# -*- coding:utf-8 -*- ## src/systray.py ## ## Copyright (C) 2003-2005 Vincent Hanquez @@ -10,7 +11,6 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard ## Copyright (C) 2007 Lukas Petrovicky ## Julien Pivotto -## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## diff --git a/src/tooltips.py b/src/tooltips.py index 0982c1265..9932177be 100644 --- a/src/tooltips.py +++ b/src/tooltips.py @@ -2,7 +2,7 @@ ## src/tooltips.py ## ## Copyright (C) 2005 Alex Mauer -## Stephan Kochen +## Stéphan Kochen ## Copyright (C) 2005-2006 Dimitur Kirov ## Copyright (C) 2005-2007 Nikos Kouremenos ## Copyright (C) 2005-2008 Yann Leboulanger diff --git a/src/vcard.py b/src/vcard.py index bd159bd5e..47a1b45a7 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -1,10 +1,11 @@ +# -*- coding:utf-8 -*- ## src/vcard.py ## ## Copyright (C) 2003-2008 Yann Leboulanger ## Copyright (C) 2005 Vincent Hanquez ## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2006 Dimitur Kirov -## Junglecow +## Copyright (C) 2006 Junglecow J +## Dimitur Kirov ## Travis Shirk ## Stefan Bethge ## Copyright (C) 2006-2008 Jean-Marie Traissard -- cgit v1.2.3