diff --git a/scripts/gajim-remote.in b/scripts/gajim-remote.in
index 8d771a1c6c7c9f61863fa3c0409692f9f4606c35..10268dbd200b01b654f65a9c8214d99042c67ca2 100644
--- a/scripts/gajim-remote.in
+++ b/scripts/gajim-remote.in
@@ -1,28 +1,23 @@
#!/bin/sh
-## gajim
+## scripts/gajim-remote.in
##
-## Contributors for this file:
-## - Yann Le Boulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-## - Dimitur Kirov <dkirov@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <nkour@jabber.org>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@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"
diff --git a/scripts/gajim.in b/scripts/gajim.in
index a627ce637d643039ad2e4cb1c4bf26e713220dd3..619e4dc5e5fbacfebbf8bfdd6e9bcf58f858d993 100644
--- a/scripts/gajim.in
+++ b/scripts/gajim.in
@@ -1,27 +1,25 @@
#!/bin/sh
-## gajim
+## scripts/gajim.in
##
-## Contributors for this file:
-## - Yann Le Boulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@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@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <nkour@jabber.org>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@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"
diff --git a/setup_osx.py b/setup_osx.py
index 18bf349611b1391d64c5c51010f29552ba3344bf..cb0df022126a8180e697492935c06a25c567c9ba 100644
--- a/setup_osx.py
+++ b/setup_osx.py
@@ -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]
diff --git a/setup_win32.py b/setup_win32.py
index 968229fc5cc91b466f43a6cf50ed63367797c0b5..d421357704340c67fa015e929aadd92eb6f4d73f 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -1,7 +1,8 @@
## setup_win32.py (run me as python setup_win32.py py2exe -O2)
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@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 sys
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',]
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index f728eb18d49ec25141f4ce15d168ec404f7df2da..ff80d8cabe6bbb869dd9af921577ce77eb34ebd9 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -1,8 +1,11 @@
# -*- coding: utf-8 -*-
-## adhoc_commands.py
+## src/adhoc_commands.py
##
-## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
-## Nikos Kouremenos <nkour@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
diff --git a/src/advanced.py b/src/advanced.py
index 360c18e06ac56b6cc50f86c11619a97c2746c494..76839cd8cfcc98553a30ceac0fd897f30a967b9e 100644
--- a/src/advanced.py
+++ b/src/advanced.py
@@ -1,8 +1,12 @@
-## advanced.py
+## src/advanced.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Vincent Hanquez <tab@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 @@ class AdvancedConfigurationWindow(object):
def on_advanced_entry_changed(self, widget):
self.modelfilter.refilter()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/atom_window.py b/src/atom_window.py
index 5fdc272f91ecdbe7e2427f675628cae380be7045..8e71130ba9ca64a3c6e474231a3f881559bf073d 100644
--- a/src/atom_window.py
+++ b/src/atom_window.py
@@ -1,11 +1,9 @@
-## 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-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2006-2007 Liori (I think) put ur self here please
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class AtomWindow:
helpers.launch_browser_mailer('url', uri)
return True
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py
index 7f4f2a3452ff34f0b7cd0e7cc79a6798f5f84479..af7a96faad7e34b7aa333fced8d202bf60c27c9c 100644
--- a/src/cell_renderer_image.py
+++ b/src/cell_renderer_image.py
@@ -1,17 +1,10 @@
-## cell_renderer_image.py
+## src/cell_renderer_image.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class CellRendererImage(gtk.GenericCellRenderer):
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:
diff --git a/src/chat_control.py b/src/chat_control.py
index ce9274ce7255bbe5aaf5bc17fa1e0ad9ce6d874d..8bf5e712db24e99c3647d02e8fb4895fdb401cd9 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1,12 +1,15 @@
-## chat_control.py
+## src/chat_control.py
##
-## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2006-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Julien Pivotto <roidelapluie@gmail.com>
-## Stephan Erb <steve-e@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
diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py
index 75f707588a1c6d37eec27ddd399c74748ac24838..1aad663bde08184a811932ebfb2446415e42d43e 100644
--- a/src/common/GnuPG.py
+++ b/src/common/GnuPG.py
@@ -1,17 +1,12 @@
-## common/GnuPG.py
+## src/common/GnuPG.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ if gajim.HAVE_GPG:
out = out + "-----END PGP %s-----\n" % type
return out
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/GnuPGInterface.py b/src/common/GnuPGInterface.py
index 73189116a8abea6476d858b8d7219c126b5e3e83..e7b074558ad3bb22402a486274cc7b8027761861 100644
--- a/src/common/GnuPGInterface.py
+++ b/src/common/GnuPGInterface.py
@@ -1,3 +1,26 @@
+## src/common/GnuPGInterface.py
+##
+## Copyright (C) 2001 Frank J. Tobin <ftobin@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 @@ Here is an example of generating a key:
>>> proc.handles['logger'].close()
>>>
>>> proc.wait()
-
-
-COPYRIGHT:
-
-Copyright (C) 2001 Frank J. Tobin, ftobin@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 @@ GnuPGInterface = GnuPG
if __name__ == '__main__':
_run_doctests()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/__init__.py b/src/common/__init__.py
index bbd45f43dba15fb5ce7784d316fcf574147fe5d3..5ef271917da7645d184d9f81e57432f0270c74e5 100644
--- a/src/common/__init__.py
+++ b/src/common/__init__.py
@@ -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:
diff --git a/src/common/atom.py b/src/common/atom.py
index 3031e6651f571b79a6ae9e6231ba135d43bad360..4b99d533a9c419efd30f4b90e605944b0162fd11 100644
--- a/src/common/atom.py
+++ b/src/common/atom.py
@@ -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 @@ class OldEntry(xmpp.Node, object):
feed_tagline = u''
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/caps.py b/src/common/caps.py
index ea29abbd74fc8744c1dfaf6ed7501bcf0ca00d47..abc7db94a13f21aa085963488338830f6c5c0980 100644
--- a/src/common/caps.py
+++ b/src/common/caps.py
@@ -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 *
diff --git a/src/common/check_paths.py b/src/common/check_paths.py
index d93a8fbab83195811c32e90103def63b196b31b4..160fe4f70b68d87a55b9dd9d8aebfec6cd924d84 100644
--- a/src/common/check_paths.py
+++ b/src/common/check_paths.py
@@ -1,7 +1,12 @@
+## src/common/check_paths.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@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 @@ def create_path(directory):
print _('creating %s directory') % directory
os.mkdir(directory, 0700)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/commands.py b/src/common/commands.py
index 51d075b15a728e0bc431e9472f6895263645aac5..85d7e9b54a8807d97dd96789247f1075686172fa 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -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 @@ class ConnectionCommands:
raise xmpp.NodeProcessed
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/config.py b/src/common/config.py
index 9943b5e177542740e46398074dc4926f0ce3af14..b6f909c14769998934292e460fd57dab61e15a62 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -1,15 +1,20 @@
-## common/config.py
+## src/common/config.py
+##
+## 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>
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2004-2005 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2006 Stefan Bethge <stefan@lanpartei.de>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
-## Stephan Erb <steve-e@h3c.de>
-##
## 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/>.
##
diff --git a/src/common/configpaths.py b/src/common/configpaths.py
index ab153f7d6c2a0bf31f23409ebe4609c18cd9a99e..311defe48280e0facad23fe1dca44fa6fa665a9d 100644
--- a/src/common/configpaths.py
+++ b/src/common/configpaths.py
@@ -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 @@ class ConfigPaths:
gajimpaths = ConfigPaths()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/connection.py b/src/common/connection.py
index 86c5b72144e91ad0fc9ec53a9622644ec2239b5d..0ed03748ea34f64d36c1750a9039c8aaf04ddca2 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1,13 +1,20 @@
-## common/connection.py
+## src/common/connection.py
##
-##
-## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
-## Stephan Erb <steve-e@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>
+## 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>
##
## This file is part of Gajim.
##
@@ -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
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 7af206c05e7344255e5599d3172bffdf8f044951..2a575e0469252c08d2fd27a1c054dd4363cc40eb 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1,11 +1,16 @@
+## src/common/connection_handlers.py
##
-## Copyright (C) 2006 Gajim Team
-##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-## - Dimitur Kirov <dkirov@gmail.com>
-## - Travis Shirk <travis@pobox.com>
+## 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>
##
## This file is part of Gajim.
##
@@ -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
diff --git a/src/common/contacts.py b/src/common/contacts.py
index f38847735efae56916ba21b9ea820bf69ed25bdf..67b03fce8356df4f41344453a3a4ebca076a4771 100644
--- a/src/common/contacts.py
+++ b/src/common/contacts.py
@@ -1,10 +1,16 @@
-## common/contacts.py
+## src/common/contacts.py
##
-## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Julien Pivotto <roidelapluie@gmail.com>
-## Stephan Erb <steve-e@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
diff --git a/src/common/crypto.py b/src/common/crypto.py
index 9c0caaaea0d060b5216a6a24cf9ae138a8098e0b..859b8ba15a8d200ac19b4ef8f935a81c6d6badfe 100644
--- a/src/common/crypto.py
+++ b/src/common/crypto.py
@@ -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 @@ def powmod(base, exp, mod):
return result
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index 5855acd2ac25712ebce9ef757e6d7caf45944e4d..59f39981548cb085a9908b683f0d5fa58b117097 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -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. """
diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py
index d9c04ab0d38e192fe5acd2ac6c57f4f7be09e61d..76afe2d61548c9c8c99e0425239277246d8ae0ca 100644
--- a/src/common/dbus_support.py
+++ b/src/common/dbus_support.py
@@ -1,9 +1,12 @@
-## dbus_support.py
+## src/common/dbus_support.py
##
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005 Andrew Sayman <lorien420@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 @@ if supported:
'''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:
diff --git a/src/common/defs.py b/src/common/defs.py
index 51cf2e03278eecb96efe93edbbecb3d460473cb2..047f9202ea41ae46c71891c5f899fdd09759d8cf 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -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 = '../'
diff --git a/src/common/dh.py b/src/common/dh.py
index f336edc167e7a9b5b7bc97ef37149a705846d881..d371a58231b96c783e3a95cf6e7accedb6380df9 100644
--- a/src/common/dh.py
+++ b/src/common/dh.py
@@ -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 @@ def hex_to_decimal(stripee):
primes = map(hex_to_decimal, hex_primes)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/events.py b/src/common/events.py
index 8dbf17a3190d0b964bc607effa5f7bb7cca5472a..2741e30e4fdd2791ba17ff6edf0470335ff882c5 100644
--- a/src/common/events.py
+++ b/src/common/events.py
@@ -1,15 +1,12 @@
-## common/events.py
+## src/common/events.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-##
-## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class Events:
{account1: {jid1: [ev1, ev2], },. }'''
return self._get_some_events('roster')
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/exceptions.py b/src/common/exceptions.py
index a6e9ea9719d2da33cf5ef35292636104bb28d2f7..2a9b4247da9bf6e0e8534e5690f8f6339e40dbac 100644
--- a/src/common/exceptions.py
+++ b/src/common/exceptions.py
@@ -1,7 +1,10 @@
-## exceptions.py
+## src/common/exceptions.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@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 @@ class GajimGeneralException(Exception):
def __str__(self):
return self.text
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py
index 36a5585eea4b5821677c7369d9a9587832ce5f47..8fd38f3c5e94ad310d2f0749bd7840be4aa6e58d 100755
--- a/src/common/fuzzyclock.py
+++ b/src/common/fuzzyclock.py
@@ -1,14 +1,9 @@
-## fuzzyclock.py
+## src/common/fuzzyclock.py
##
-## Contributors for this file:
-##
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Christoph Neuroth <delmonico@gmx.net>
-##
-## Copyright (C) 2006 Christoph Neuroth <delmonico@gmx.net>
-## Yann Leboulanger <asterix@lagaule.org>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class FuzzyClock:
return newTimeStr
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/gajim.py b/src/common/gajim.py
index e071568bb640104c219d985f241ec9dc6670d388..a60b235b70904fae57a10535270f68976e2550b5 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -1,9 +1,15 @@
-## common/gajim.py
+## src/common/gajim.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@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
diff --git a/src/common/helpers.py b/src/common/helpers.py
index d354ee0e00e3a7cf7dccd1b4b071a41d02e4a85a..e0c9994418505b4a917c2c18dc63974d3f3f07ae 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -1,12 +1,18 @@
-## common/helpers.py
+## src/common/helpers.py
+##
+## 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>
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Stephan Erb <steve-e@h3c.de>
-##
## 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
diff --git a/src/common/i18n.py b/src/common/i18n.py
index 0ffe57909df51d2abdae971de4a702331b427f2a..4d15e7536ce5638124cbc87f9476f1f9388da8f1 100644
--- a/src/common/i18n.py
+++ b/src/common/i18n.py
@@ -1,17 +1,10 @@
-## common/i18n.py
-## -*- coding: utf-8 -*-
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
+## src/common/i18n.py
##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@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 @@ def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None):
text = text % replace_plural
return text
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/logger.py b/src/common/logger.py
index be29b7ccab64eafaacae9d3b4abee32003c5e233..c917024ce9ba1dfda99ca006b91872a1fa7960b1 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -1,7 +1,13 @@
-## logger.py
+## src/common/logger.py
##
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@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 @@ class Logger:
except sqlite.OperationalError, e:
print >> sys.stderr, str(e)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/nslookup.py b/src/common/nslookup.py
index 12722b4782e9b7a588938f7a9da94eee462d41e2..f5c2cbd768bbb6aed10c25bf2d8f771e3ded28bf 100644
--- a/src/common/nslookup.py
+++ b/src/common/nslookup.py
@@ -1,6 +1,9 @@
-## common/nslookup.py
+## src/common/nslookup.py
##
-## Copyright (C) 2006 Dimitur Kirov <dkirov@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 @@ if __name__ == '__main__':
gobject.timeout_add(200, process)
gtk.main()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 8dfb03f7046387513dcc58f1111c88fdf3c54e18..5b017cbe64e6c169d686e73d44874133be639ae3 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -1,7 +1,15 @@
+## src/common/optparser.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2007 Stephan Erb <steve-e@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 @@ class OptionsParser:
con.close()
gajim.config.set('version', '0.11.4.4')
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/passwords.py b/src/common/passwords.py
index 1ec2f29dca50d888334467468d81685ec553ce6c..9a48841ed4cbe87956cd971c016862accda38233 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -1,6 +1,12 @@
+## src/common/passwords.py
##
-## Copyright (C) 2006 Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
-## Copyright (C) 2006 Nikos Kouremenos <kourem@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 get_password(account_name):
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:
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index 587c68960bb04d2b254129b7b5d58f4fc36a1a24..57b3a2f55f5775a2e4372a05a677de76290cd239 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -1,8 +1,9 @@
+## src/common/proxy65_manager.py
##
-## Copyright (C) 2006 Gajim Team
-##
-## Contributors for this file:
-## - Dimitur Kirov <dkirov@gmail.com>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class HostTester(Socks5, IdleObject):
return
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/pubsub.py b/src/common/pubsub.py
index e5e8bf8f9ca93b676b67163000e397714c7fab2b..dfed21487f5db727a2ef8b225a3261c0706d8637 100644
--- a/src/common/pubsub.py
+++ b/src/common/pubsub.py
@@ -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 @@ class ConnectionPubSub:
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:
diff --git a/src/common/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py
index 8c7d059b27ccf06a0d813ec4c616b2f28fd628dc..2be34de8aa8ac35564189811e4b8f46f08d8ce87 100644
--- a/src/common/rst_xhtml_generator.py
+++ b/src/common/rst_xhtml_generator.py
@@ -1,8 +1,10 @@
-## rst_xhtml_generator.py
+## src/common/rst_xhtml_generator.py
##
-## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2006 Nikos Kouremenos <kourem@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 @@ test2_
""")
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:
diff --git a/src/common/sleepy.py b/src/common/sleepy.py
index 4cc36970c87c164705291d75ded80baf10d7e64e..c42e52546666549d5c3fafb7d548d1b5fbbb33b3 100644
--- a/src/common/sleepy.py
+++ b/src/common/sleepy.py
@@ -1,13 +1,11 @@
-## common/sleepy.py
+## src/common/sleepy.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Nikos Kouremenos <kourem@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>
##
## This file is part of Gajim.
##
@@ -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 @@ if os.name == 'nt':
else:
Sleepy = SleepyUnix
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/socks5.py b/src/common/socks5.py
index c813213622994908c61602ab1e78773eb0043137..a8590a9986fa1c9c82321f4a6a044f6fc739de77 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -1,19 +1,10 @@
-
-## common/xmpp/socks5.py
-##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-## - Dimitur Kirov <dkirov@gmail.com>
+## src/common/socks5.py
##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class Socks5Receiver(Socks5, IdleObject):
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:
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index dd8041064010cfb00da574ac55d304bbe307a9e6..91e4b7f5c2eff7ee0380f368f2caf4d07cf83f1c 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -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
diff --git a/src/common/xmpp_stringprep.py b/src/common/xmpp_stringprep.py
index e3a760f0504d9ec1655d07af46ef45dc6ff538c6..1ed1cb945579d9e14cbf42bbccd435d0253ca6f1 100644
--- a/src/common/xmpp_stringprep.py
+++ b/src/common/xmpp_stringprep.py
@@ -1,11 +1,10 @@
-## common/xmpp_stringprep.py
+## src/common/xmpp_stringprep.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2001-2005 Twisted Matrix Laboratories.
-## Copyright (C) 2005 Gajim Team
+## 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>
##
## 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 sys, warnings
@@ -264,4 +263,4 @@ else:
nameprep = NamePrep()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/config.py b/src/config.py
index 6d3e4e37100b1d9f14af27f9dc2b2f37ad47f2e2..b9fb2adaae3ed892e5273cf37f5c906ae6df7abb 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1,12 +1,19 @@
-## config.py
+## src/config.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2003-2005 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2006 Stefan Bethge <stefan@lanpartei.de>
-## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de>
-## Copyright (C) 2007 Travis Shirk <travis@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
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index f6268d840efc62baf0b0e8862d5bf49c8db55ac9..285841baa7189dd3be167785ca3847aa1c30f678 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -1,8 +1,15 @@
-## conversation_textview.py
+## src/conversation_textview.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@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
diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py
index 3e62573d762a1631f0cedddf21569955440cc4a3..b0abb97d0bc040c46e59293c349bfc97cd17757e 100644
--- a/src/dataforms_widget.py
+++ b/src/dataforms_widget.py
@@ -1,9 +1,9 @@
-## dataforms.py
+## src/dataforms_widget.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2003-2005 Vincent Hanquez <tab@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 @@ class SingleForm(gtk.Table, object):
model.clear()
del field.values
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/dialogs.py b/src/dialogs.py
index 03936b3db8449c6363b03532463cdfdcba84c6b2..7ffad29cad7bda960dbe8e079a1ca982f3ea6e94 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1,15 +1,18 @@
# -*- coding: utf-8 -*-
-## dialogs.py
+## src/dialogs.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2005 Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Julien Pivotto <roidelapluie@gmail.com>
-## Copyright (C) 2007-2008 Stephan Erb <steve-e@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
diff --git a/src/disco.py b/src/disco.py
index 4196643ecfd4e069381f551c47b627d4436bdf55..8bbc01c848bf8bf651d523fdaa1bceb6e24fd461 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -1,9 +1,13 @@
# -*- coding: utf-8 -*-
-## config.py
+## src/disco.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Stéphan Kochen <stephan@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
diff --git a/src/features_window.py b/src/features_window.py
index 44d47616146e9d467429a3ce27e37adfee7d1e8a..3a804c0bd01d39ce02721c1d3373635b809a4557 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -1,7 +1,11 @@
-## features_window.py
+## src/features_window.py
##
-## Copyright (C) 2007 Yann Leboulanger <asterix@lagaule.org>
-## Stephan Erb <steve-e@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 @@ class FeaturesWindow:
from common import gajim
return gajim.HAVE_PYSEXY
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index c5050ac6c45e9a053c53095c021f22a4e35ec4d1..a4575b03d1e82509b8d4827b86d29f3795f0486c 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -1,11 +1,10 @@
-## filetransfers_window.py
+## src/filetransfers_window.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Copyright (C) 2004-2005 Vincent Hanquez <tab@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
diff --git a/src/gajim-remote.py b/src/gajim-remote.py
index 3e7032ec133fb5f063edb5a5c5bcde4389dcc442..b5b6a0a18411a511c10dd5fe6d0781ec9042206f 100755
--- a/src/gajim-remote.py
+++ b/src/gajim-remote.py
@@ -1,8 +1,14 @@
#!/usr/bin/env python
+## src/gajim-remote.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@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
diff --git a/src/gajim.py b/src/gajim.py
index 88ed340318358338e27d6a8b43b2dd5c43a07a02..50265fc34aae9fbf20e3682fe8241693ded86a85 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1,14 +1,24 @@
#!/usr/bin/env python
-## gajim.py
+## src/gajim.py
##
-##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Julien Pivotto <roidelapluie@gmail.com>
-## Stephan Erb <steve-e@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 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>
##
## This file is part of Gajim.
##
@@ -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
diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py
index 7de3e8338c7b7bb12bb6e7fa56213fa7a1d4b32f..9d522c31478fdbe44b9f47c700f20d3bb82e4944 100644
--- a/src/gajim_themes_window.py
+++ b/src/gajim_themes_window.py
@@ -1,19 +1,11 @@
-## gajim_themes_window.py
+## src/gajim_themes_window.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-## - Dimitur Kirov <dkirov@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de>
+## 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>
##
## This file is part of Gajim.
##
@@ -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 @@ class GajimThemesWindow:
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:
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 3f4628a55b70bec6c807df8c6af1d646cd6d375b..357ab4e8d389ab17cfbfdb95af2efb8de7d887c4 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -1,17 +1,15 @@
-## groupchat_control.py
+## src/groupchat_control.py
##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
-## Lukas Petrovicky <lukas@petrovicky.net>
-## Stephan Erb <steve-e@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
diff --git a/src/groups.py b/src/groups.py
index c8f0c549274195f7299b67c0f4c64a160d8f26d7..a86a4dc1d02f50dd9f3aab6afffdb5e73e3cfd57 100644
--- a/src/groups.py
+++ b/src/groups.py
@@ -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 @@ class GroupsPostWindow:
# close the window
self.window.destroy()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/gtkexcepthook.py b/src/gtkexcepthook.py
index fad9b850d2b9ce570763bf93c9e3c6ff778ebf3c..170422ce79812a0cad4219f564e840d0dde7c1f3 100644
--- a/src/gtkexcepthook.py
+++ b/src/gtkexcepthook.py
@@ -1,9 +1,9 @@
-## gtkexcepthook.py
+## src/gtkexcepthook.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-##
-## Initially written and submitted by Gustavo J. A. M. Carneiro
+## 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>
##
## This file is part of Gajim.
##
@@ -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
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 5e3d379571bbe57bf74e5ee1c17ad1c9d95acf8f..933d15836b7b472a21d50472ed337b8569a5a3c9 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -1,12 +1,15 @@
-## gtkgui_helpers.py
+## src/gtkgui_helpers.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2004-2005 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007 Stephan Erb <steve-e@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
diff --git a/src/gtkspellmodule.c b/src/gtkspellmodule.c
index 988c6ea63e537d1fe36e64e188fc8a5254a4e2aa..af31bc2c458898ab86d3b9135a6509e85e40e35b 100644
--- a/src/gtkspellmodule.c
+++ b/src/gtkspellmodule.c
@@ -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>
diff --git a/src/history_manager.py b/src/history_manager.py
index 126fa968ab7ce12f6afe981998b3426c50192cb9..175b022187a86fc54ad8303598f0b84bacdbc664 100755
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -1,7 +1,12 @@
#!/usr/bin/env python
-## history_manager.py
+## src/history_manager.py
##
-## Copyright (C) 2006-2007 Nikos Kouremenos <kourem@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
diff --git a/src/history_window.py b/src/history_window.py
index 5e66d7c5f339aaa006c81a8b4539e9d16d915f85..476e9ad561c54b4849057bacbc8691e78f6428a8 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -1,18 +1,14 @@
-## history_window.py
+## src/history_window.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007-2008 Stephan Erb <steve-e@h3c.de>
+## 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>
##
## This file is part of Gajim.
##
@@ -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
diff --git a/src/htmltextview.py b/src/htmltextview.py
index 1f47a3372e9316cfa4f6e88a2ec0fbc81cff3771..5863d4f19e73303a97d115603eb3c2bd42469f84 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -1,24 +1,28 @@
-### 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:
diff --git a/src/ipython_view.py b/src/ipython_view.py
index ace9352beaab191cfa1b68e2f81e21a2f37a4c9f..cad6be0bb3550693f4b46b5b2b147fb4e02de54e 100644
--- a/src/ipython_view.py
+++ b/src/ipython_view.py
@@ -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 @@ class IPythonView(ConsoleView, IterableIPShell):
self.cout.truncate(0)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/lastfm.py b/src/lastfm.py
index 2d6796b0f73014720e951e2d0d6aed2298113089..a9efbf60860ed75bee8362d27144297dbefa8c56 100644
--- a/src/lastfm.py
+++ b/src/lastfm.py
@@ -1,25 +1,25 @@
#!/usr/bin/env python
-"""
-LastFM Python class
-Copyright (C) 2007 Olivier Mehani <shtrom@ssji.net>
-
-$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
-"""
+## src/lastfm.py
+##
+## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org>
+## Olivier Mehani <shtrom@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/>.
+##
__version__ = '$Revision: 64 $'
diff --git a/src/lastfm_track_listener.py b/src/lastfm_track_listener.py
index 2f8cbff22da610f9902fb123570fbf4f836aec9d..9d48f3c2584c2610fde88c795325ff101ef5a9da 100644
--- a/src/lastfm_track_listener.py
+++ b/src/lastfm_track_listener.py
@@ -1,20 +1,25 @@
# -*- coding: utf-8 -*-
-## lastfmtracklistener.py
+## src/lastfm_track_listener.py
##
-## Copyright (C) 2007 Olivier Mehani <shtrom-gajim@ssji.net>
-## Heavily based on music_track_listener.py:
-## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro@gmail.com>
-## Copyright (C) 2006 Nikos Kouremenos <kourem@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 @@ if __name__ == '__main__':
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:
diff --git a/src/message_control.py b/src/message_control.py
index d8ddacf1c5d8d092ec95db9eb0254afe6d98e7be..bced23d3c42d22167309e4841cad75135cb6d25b 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -1,7 +1,14 @@
-## message_control.py
+## src/message_control.py
##
-## Copyright (C) 2006-2007 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2007 Stephan Erb <steve-e@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
diff --git a/src/message_textview.py b/src/message_textview.py
index 7013c6006b9561f3137d82a9da042064a7d1a320..c4fb798eec209b7317206a5c941d7b1454a671bd 100644
--- a/src/message_textview.py
+++ b/src/message_textview.py
@@ -1,17 +1,9 @@
-## message_textview.py
+## src/message_textview.py
##
-## Contributors for this file:
-## - Yann Leboulanger <asterix@lagaule.org>
-## - Nikos Kouremenos <kourem@gmail.com>
-##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Nikos Kouremenos <kourem@gmail.com>
-## Dimitur Kirov <dkirov@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
+## 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>
##
## This file is part of Gajim.
##
@@ -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.binding_entry_add_signal(MessageTextView, gtk.keysyms.KP_Enter,
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:
diff --git a/src/message_window.py b/src/message_window.py
index 14e88e591195a4a9e49f3d4cb54460dc9ae96077..ba200ea70ab79a3508c0bf146ab1544572e88c38 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -1,15 +1,15 @@
-## message_window.py
+## src/message_window.py
##
-## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
-## Vincent Hanquez <tab@snarc.org>
-## Dimitur Kirov <dkirov@gmail.com>
-## Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2005-2008 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2006 Geobert Quach <geobert@gmail.com>
-## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de>
-## Copyright (C) 2005-2008 Nikos Kouremenos <kourem@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
diff --git a/src/music_track_listener.py b/src/music_track_listener.py
index b969782220262b277e69174909a3ee54c5cbb5b0..1f2f00a9ee126e9d677270c7905593d6fafc62c1 100644
--- a/src/music_track_listener.py
+++ b/src/music_track_listener.py
@@ -1,8 +1,12 @@
# -*- coding: utf-8 -*-
-## musictracklistener.py
+## src/music_track_listener.py
##
-## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro@gmail.com>
-## Copyright (C) 2006 Nikos Kouremenos <kourem@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 @@ if __name__ == '__main__':
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:
diff --git a/src/negotiation.py b/src/negotiation.py
index 865f7d22716dd2926547671a410b01ce4403e286..2c8cd4afc3981ea27897b2dfe9da83255e8cf4b9 100644
--- a/src/negotiation.py
+++ b/src/negotiation.py
@@ -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 @@ class FeatureNegotiationWindow:
self.window.destroy()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py
index e95a3651effa702e6b3574242b0d06f34fb67405..bab796cac0cd47db2619702306f96d07340b4cf8 100644
--- a/src/network_manager_listener.py
+++ b/src/network_manager_listener.py
@@ -1,7 +1,11 @@
# -*- 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.
##
@@ -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 @@ else:
except:
pass
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/notify.py b/src/notify.py
index 09c3ad82b8b77c27a76dc180ffa988fbb1c671fe..7a8531d20a7a40d5b750049d93626d30b9aff9c9 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -1,12 +1,15 @@
-## notify.py
+## src/notify.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Andrew Sayman <lorien420@myrealbox.com>
-## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de>
-##
-## Notification daemon connection via D-Bus code:
-## Copyright (C) 2005 by Sebastian Estienne
+## 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>
##
## 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
@@ -586,4 +589,4 @@ class DesktopNotification:
self.version = self.default_version
self.attempt_notify()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/osx/growl/_growl.c b/src/osx/growl/_growl.c
index 11ac07e932f92a3d2ffc04ca1c7f5d8edd61be23..06ddc026cbfeaacd5733e52a0249679f8aa104e6 100644
--- a/src/osx/growl/_growl.c
+++ b/src/osx/growl/_growl.c
@@ -2,6 +2,25 @@
* Copyright 2004-2005 The Growl Project.
* Created by Jeremy Rossi <jeremy@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>
diff --git a/src/osx/growl/_growlImage.m b/src/osx/growl/_growlImage.m
index d4b2b72f9fe5884e6fd317245769b511f15e6df3..29840929ba218f5780d026a65cd1a127977f139d 100644
--- a/src/osx/growl/_growlImage.m
+++ b/src/osx/growl/_growlImage.m
@@ -1,6 +1,24 @@
/*
* Copyright 2004 Mark Rowe <bdash@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"
diff --git a/src/osx/nsapp.m b/src/osx/nsapp.m
index 4e7b6bde4c558dbde67a184e2bc389c07c0ce57d..e06ae08697c4d14238ee5c0506b24cfbc5c402bd 100644
--- a/src/osx/nsapp.m
+++ b/src/osx/nsapp.m
@@ -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>
diff --git a/src/osx/syncmenu/pysyncmenu.c b/src/osx/syncmenu/pysyncmenu.c
index d2e304f9f9830e85eedfcb2abff0aa886a7659a5..ea8955e86796de0b52284a8af819fa5971973754 100644
--- a/src/osx/syncmenu/pysyncmenu.c
+++ b/src/osx/syncmenu/pysyncmenu.c
@@ -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>
diff --git a/src/profile_window.py b/src/profile_window.py
index 78bbfb56167b8ac27762bad12414df23d41b57a0..7e95b914f3531e2911d591485610cc22deaa0834 100644
--- a/src/profile_window.py
+++ b/src/profile_window.py
@@ -1,7 +1,9 @@
-## profile_window.py
+## src/profile_window.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@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 @@ class ProfileWindow:
def on_cancel_button_clicked(self, widget):
self.window.destroy()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/remote_control.py b/src/remote_control.py
index 7615e4c6462b7f93af2e8a33167312dd1a6760ba..daf66f84c45e511c877e3b68bf51ba9d8224ff98 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -1,12 +1,14 @@
-## remote_control.py
+## src/remote_control.py
##
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2006 Andrew Sayman <lorien420@myrealbox.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
-## Copyright (C) 2007 Travis Shirk <travis@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 @@ class SignalObject(dbus.service.Object):
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:
diff --git a/src/roster_window.py b/src/roster_window.py
index d2ae2699f1226d0a3baf79df71d0d198f2e969dd..eb4816cb72e6906954dee44a88ef232614f5a2d2 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1,13 +1,21 @@
# -*- coding: utf-8 -*-
-## roster_window.py
+## src/roster_window.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Travis Shirk <travis@pobox.com>
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
-## Copyright (C) 2007-2008 Stephan Erb <steve-e@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
diff --git a/src/search_window.py b/src/search_window.py
index 231bee6fcca8c47b9c7a311dc3b45f5d1db149c0..69cd71c4c8e93242c3dc61fedffbd351e45c674f 100644
--- a/src/search_window.py
+++ b/src/search_window.py
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
-## search_window.py
+## src/search_window.py
##
-## Copyright (C) 2007 Yann Leboulanger <asterix@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 @@ class SearchWindow:
self.data_form_widget.title)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/secrets.py b/src/secrets.py
index 1861d330df345088de42b3a80c4f0ff580396a97..bfceee432ed8ebe975de2e3949f9c7473983b224 100644
--- a/src/secrets.py
+++ b/src/secrets.py
@@ -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 @@ def secrets():
return secrets_cache
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/session.py b/src/session.py
index bcd54f13d96893d0b126537ebe442df7a33f26d0..930312f5a08eb3e4ee3b901cb4149a64b346a2c2 100644
--- a/src/session.py
+++ b/src/session.py
@@ -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 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
negotiation.FeatureNegotiationWindow(account, self.jid, self, form)
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/statusicon.py b/src/statusicon.py
index 7fa5f93223906dcfbdbf1029cd6467872c3c8aa8..619c96915c748256c02ad623a51272fce51b4c30 100644
--- a/src/statusicon.py
+++ b/src/statusicon.py
@@ -1,22 +1,25 @@
-## statusicon.py
+## src/statusicon.py
##
-## Copyright (C) 2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@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 @@ class StatusIcon(systray.Systray):
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 @@ class StatusIcon(systray.Systray):
#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:
diff --git a/src/systray.py b/src/systray.py
index 90c4fcee8abf2d1416c625924d16b3505c884e37..3a23a494e910a0751b48112ca58d240145f186a4 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -1,12 +1,16 @@
-## systray.py
+## src/systray.py
##
-## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
-## Copyright (C) 2005 Norman Rasmussen <norman@rasmussen.co.za>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@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
diff --git a/src/tooltips.py b/src/tooltips.py
index 29fa771957e3f312bcb2b6f6410dc36b260419ec..9932177be4b0b013db664128478e6e8bbc4f1165 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -1,10 +1,17 @@
# -*- coding: utf-8 -*-
-## tooltips.py
+## src/tooltips.py
##
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org>
-## Copyright (C) 2007 Julien Pivotto <roidelapluie@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
diff --git a/src/trayicon.override b/src/trayicon.override
index 6752c2850a251887d4fd1f42fe0d1ad6434550e8..75bd7ed8f2bfe09648446ad9802272b9dcb75a2d 100644
--- a/src/trayicon.override
+++ b/src/trayicon.override
@@ -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>
diff --git a/src/trayiconmodule.c b/src/trayiconmodule.c
index c2959a4854c921bcbf845273931648540a9438b1..427540885ea5180745b3efd51308ee2adf3575cf 100644
--- a/src/trayiconmodule.c
+++ b/src/trayiconmodule.c
@@ -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>
diff --git a/src/vcard.py b/src/vcard.py
index 8406ec5998ee14c57050ea2453714843f13e6e91..bd159bd5e7a207cd2f498fa6a7228e47c39d209d 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -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@lagaule.org>
-## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2006 Stefan Bethge <stefan@lanpartei.de>
-## Copyright (C) 2007 Lukas Petrovicky <lukas@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 @@ class ZeroconfVcardWindow:
def on_close_button_clicked(self, widget):
self.window.destroy()
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3: