8 files changed, 60 insertions, 61 deletions
diff --git a/Makefile.am b/Makefile.am
index bfa0dca..d5900a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
 # This file is part of pavucontrol.
 #
+# Copyright 2006-2008 Lennart Poettering
+#
 # pavucontrol 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
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #
 # pavucontrol is distributed in the hope that it will be useful, but
@@ -11,9 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pavucontrol; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = bootstrap.sh README LICENSE
 SUBDIRS=src doc
diff --git a/bootstrap.sh b/bootstrap.sh
index 2758474..f03ceff 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,9 +2,11 @@
 
 # This file is part of pavucontrol.
 #
-# pavucontrol 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
+# Copyright 2006-2008 Lennart Poettering
+#
+# pavucontrol 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.
 #
 # pavucontrol is distributed in the hope that it will be useful, but
@@ -13,8 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pavucontrol; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
 VERSION=1.9
 
diff --git a/configure.ac b/configure.ac
index 85f3471..f1c13d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,11 @@
 
 # This file is part of pavucontrol.
 #
-# pavucontrol 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
+# Copyright 2006-2008 Lennart Poettering
+#
+# pavucontrol 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.
 #
 # pavucontrol is distributed in the hope that it will be useful, but
@@ -14,8 +16,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pavucontrol; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.57)
 AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bccc116..a08c59e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,20 @@
 # This file is part of pavucontrol.
 #
-# pavucontrol 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.
+# Copyright 2006-2008 Lennart Poettering
+#
+# pavucontrol 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.
 #
 # pavucontrol is distributed in the hope 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 pavucontrol; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# You should have received a copy of the GNU General Public
+# License along with pavucontrol. If not, see
+# <http://www.gnu.org/licenses/>.
 
 noinst_DATA = README.html README
 EXTRA_DIST = $(noinst_DATA) style.css README.html.in
@@ -31,4 +33,3 @@ tidy: README.html
 	tidy -e < README.html
 
 .PHONY: tidy
-
diff --git a/doc/README.html.in b/doc/README.html.in
index 4d5b3ea..ed27320 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -27,19 +27,15 @@
 <h2><a name="license">License</a></h2>
 
 <p>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.</p>
+modify it under the terms of the GNU Public License as published by
+the Free Software Foundation, either version 2 of the License, or (at
+your option) any later version.</p>
 
 <p>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.</p>
 
-<p>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., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
-
 <h2><a name="news">News</a></h2>
 
 <div class="news-date">Fri Mar 28
diff --git a/doc/style.css b/doc/style.css
index a8f004f..b185c24 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,24 +1,25 @@
 /***
- * This file is part of pavucontrol.
- *
- * pavucontrol 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.
- *
- * pavucontrol is distributed in the hope 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 pavucontrol; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- ***/
+  This file is part of pavucontrol.
 
-body { color: black; background-color: white; } 
-a:link, a:visited { color: #900000; }       
-div.news-date { font-size: 80%; font-style: italic; } 
+  Copyright 2006-2008 Lennart Poettering
+
+  pavucontrol 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.
+
+  pavucontrol is distributed in the hope 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 pavucontrol. If not, see <http://www.gnu.org/licenses/>.
+  ***/
+
+body { color: black; background-color: white; }
+a:link, a:visited { color: #900000; }
+div.news-date { font-size: 80%; font-style: italic; }
 pre { background-color: #f0f0f0; padding: 0.4cm; }
 .grey { color: #8f8f8f; font-size: 80%; }
 table {  margin-left: 1cm; border:1px solid lightgrey; padding: 0.2cm; }
diff --git a/src/Makefile.am b/src/Makefile.am
index 799505a..0bdc05b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,10 @@
 # This file is part of pavucontrol.
 #
+# Copyright 2006-2008 Lennart Poettering
+#
 # pavucontrol 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
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #
 # pavucontrol is distributed in the hope that it will be useful, but
@@ -11,9 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pavucontrol; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 
 desktopdir = $(datadir)/applications
 
@@ -25,5 +25,6 @@ dist_desktop_DATA=pavucontrol.desktop
 pavucontrol_SOURCES=pavucontrol.cc
 
 pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
-pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) 
-pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\"
+pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
+#pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\"
+pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"pavucontrol.glade\"
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 1b57404..08b3877 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -1,13 +1,13 @@
 /***
   This file is part of pavucontrol.
 
-  Copyright 2006-2008 Lennart Poettering <mzcnihpbageby (at) 0pointer (dot) de>
+  Copyright 2006-2008 Lennart Poettering
   Copyright 2008 Sjoerd Simons <sjoerd@luon.net>
 
   pavucontrol 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.
+  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.
 
   pavucontrol is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with pavucontrol; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H