[commit-gajim] r10247 - in trunk: . scripts src src/common src/osx src/osx/growl src/osx/syncmenu - Commits

15 Aug 2008

Author: roidelapluie
Date: 2008-08-15 05:20:23 +0200 (Fri, 15 Aug 2008)
New Revision: 10247
Modified:
   trunk/scripts/gajim-remote.in
   trunk/scripts/gajim.in
   trunk/setup_osx.py
   trunk/setup_win32.py
   trunk/src/adhoc_commands.py
   trunk/src/advanced.py
   trunk/src/atom_window.py
   trunk/src/cell_renderer_image.py
   trunk/src/chat_control.py
   trunk/src/common/GnuPG.py
   trunk/src/common/GnuPGInterface.py
   trunk/src/common/__init__.py
   trunk/src/common/atom.py
   trunk/src/common/caps.py
   trunk/src/common/check_paths.py
   trunk/src/common/commands.py
   trunk/src/common/config.py
   trunk/src/common/configpaths.py
   trunk/src/common/connection.py
   trunk/src/common/connection_handlers.py
   trunk/src/common/contacts.py
   trunk/src/common/crypto.py
   trunk/src/common/dataforms.py
   trunk/src/common/dbus_support.py
   trunk/src/common/defs.py
   trunk/src/common/dh.py
   trunk/src/common/events.py
   trunk/src/common/exceptions.py
   trunk/src/common/fuzzyclock.py
   trunk/src/common/gajim.py
   trunk/src/common/helpers.py
   trunk/src/common/i18n.py
   trunk/src/common/logger.py
   trunk/src/common/nslookup.py
   trunk/src/common/optparser.py
   trunk/src/common/passwords.py
   trunk/src/common/proxy65_manager.py
   trunk/src/common/pubsub.py
   trunk/src/common/rst_xhtml_generator.py
   trunk/src/common/sleepy.py
   trunk/src/common/socks5.py
   trunk/src/common/stanza_session.py
   trunk/src/common/xmpp_stringprep.py
   trunk/src/config.py
   trunk/src/conversation_textview.py
   trunk/src/dataforms_widget.py
   trunk/src/dialogs.py
   trunk/src/disco.py
   trunk/src/features_window.py
   trunk/src/filetransfers_window.py
   trunk/src/gajim-remote.py
   trunk/src/gajim.py
   trunk/src/gajim_themes_window.py
   trunk/src/groupchat_control.py
   trunk/src/groups.py
   trunk/src/gtkexcepthook.py
   trunk/src/gtkgui_helpers.py
   trunk/src/gtkspellmodule.c
   trunk/src/history_manager.py
   trunk/src/history_window.py
   trunk/src/htmltextview.py
   trunk/src/ipython_view.py
   trunk/src/lastfm.py
   trunk/src/lastfm_track_listener.py
   trunk/src/message_control.py
   trunk/src/message_textview.py
   trunk/src/message_window.py
   trunk/src/music_track_listener.py
   trunk/src/negotiation.py
   trunk/src/network_manager_listener.py
   trunk/src/notify.py
   trunk/src/osx/growl/_growl.c
   trunk/src/osx/growl/_growlImage.m
   trunk/src/osx/nsapp.m
   trunk/src/osx/syncmenu/pysyncmenu.c
   trunk/src/profile_window.py
   trunk/src/remote_control.py
   trunk/src/roster_window.py
   trunk/src/search_window.py
   trunk/src/secrets.py
   trunk/src/session.py
   trunk/src/statusicon.py
   trunk/src/systray.py
   trunk/src/tooltips.py
   trunk/src/trayicon.override
   trunk/src/trayiconmodule.c
   trunk/src/vcard.py
Log:
 * Big headers review
 * Remove some licencing problems
 * To do: same for images
 * See #4200
Modified: trunk/scripts/gajim-remote.in
===================================================================

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

    