14 files changed, 38 insertions, 14 deletions

diff --git a/src/ArrowButton.cc b/src/ArrowButton.cc
index c6d01c2..c7daa81 100644
--- a/src/ArrowButton.cc
+++ b/src/ArrowButton.cc
@@ -1,5 +1,5 @@
 // ArrowButton.cc for Fluxbox Window Manager
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/ArrowButton.hh b/src/ArrowButton.hh
index ee0a364..bb41e1b 100644
--- a/src/ArrowButton.hh
+++ b/src/ArrowButton.hh
@@ -1,5 +1,5 @@
 // ArrowButton.hh for Fluxbox Window Manager
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/AtomHandler.hh b/src/AtomHandler.hh
index 1135ffb..cd02754 100644
--- a/src/AtomHandler.hh
+++ b/src/AtomHandler.hh
@@ -1,6 +1,6 @@
 // AtomHandler for fluxbox
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
-//               2003-2004 Simon Bowden    (rathnor at users.sourceforge.net)
+// Copyright (c) 2002-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//               2003-2005 Simon Bowden    (rathnor at users.sourceforge.net)
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
diff --git a/src/BoolMenuItem.hh b/src/BoolMenuItem.hh
index 7e20c24..b81b0e5 100644
--- a/src/BoolMenuItem.hh
+++ b/src/BoolMenuItem.hh
@@ -1,5 +1,5 @@
 // BoolMenuItem.hh for Fluxbox Window Manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/BorderTheme.cc b/src/BorderTheme.cc
index fe387a1..eef3d48 100644
--- a/src/BorderTheme.cc
+++ b/src/BorderTheme.cc
@@ -1,3 +1,27 @@
+// BorderTheme.cc
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// $Id$
+
 #include "BorderTheme.hh"
 
 BorderTheme::BorderTheme(FbTk::Theme &theme, const std::string &name,
diff --git a/src/BorderTheme.hh b/src/BorderTheme.hh
index f9ed59d..8de8905 100644
--- a/src/BorderTheme.hh
+++ b/src/BorderTheme.hh
@@ -1,5 +1,5 @@
 // BorderTheme.hh
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index d3e3757..9c61772 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -1,5 +1,5 @@
 // FbCommandFactory.cc for Fluxbox Window manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbCommandFactory.hh b/src/FbCommandFactory.hh
index d1fd797..1014a15 100644
--- a/src/FbCommandFactory.hh
+++ b/src/FbCommandFactory.hh
@@ -1,5 +1,5 @@
 // FbCommandFactory.hh for Fluxbox Window manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 8d57456..301bee5 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -1,5 +1,5 @@
 // FbCommands.cc for Fluxbox
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbCommands.hh b/src/FbCommands.hh
index 917ab30..e91fcda 100644
--- a/src/FbCommands.hh
+++ b/src/FbCommands.hh
@@ -1,5 +1,5 @@
 // FbCommands.hh for Fluxbox
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbRootWindow.cc b/src/FbRootWindow.cc
index 7cec234..569f845 100644
--- a/src/FbRootWindow.cc
+++ b/src/FbRootWindow.cc
@@ -1,5 +1,5 @@
 // FbRootWindow.cc
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen<at>users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbRootWindow.hh b/src/FbRootWindow.hh
index 5ef72fe..6735693 100644
--- a/src/FbRootWindow.hh
+++ b/src/FbRootWindow.hh
@@ -1,5 +1,5 @@
 // FbRootWindow.hh for fluxbox
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 44c55f1..7bc8ae1 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -1,5 +1,5 @@
 // WorkspaceCmd.cc for Fluxbox - an X11 Window manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen{<a*t>}users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/WorkspaceCmd.hh b/src/WorkspaceCmd.hh
index 5a16c40..40aafe6 100644
--- a/src/WorkspaceCmd.hh
+++ b/src/WorkspaceCmd.hh
@@ -1,5 +1,5 @@
 // WorkspaceCmd.hh for Fluxbox - an X11 Window manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen{<a*t>}users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a