[nautilus] Updated FSF's address



commit e314fbcc9936491357345193901b5b257d687cec
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Jan 23 12:51:32 2014 +0100

    Updated FSF's address

 data/dbus-interfaces.xml                           |    4 +---
 data/freedesktop-dbus-interfaces.xml               |    4 +---
 data/shell-search-provider-dbus-interfaces.xml     |    4 +---
 eel/check-program.c                                |    3 +--
 eel/eel-accessibility.c                            |    3 +--
 eel/eel-accessibility.h                            |    3 +--
 eel/eel-art-extensions.c                           |    3 +--
 eel/eel-art-extensions.h                           |    3 +--
 eel/eel-canvas.c                                   |    3 +--
 eel/eel-canvas.h                                   |    3 +--
 eel/eel-debug.c                                    |    4 +---
 eel/eel-debug.h                                    |    4 +---
 eel/eel-gdk-extensions.c                           |    3 +--
 eel/eel-gdk-extensions.h                           |    3 +--
 eel/eel-glib-extensions.c                          |    3 +--
 eel/eel-glib-extensions.h                          |    3 +--
 eel/eel-gnome-extensions.c                         |    3 +--
 eel/eel-gnome-extensions.h                         |    3 +--
 eel/eel-graphic-effects.c                          |    4 +---
 eel/eel-graphic-effects.h                          |    4 +---
 eel/eel-gtk-extensions.c                           |    3 +--
 eel/eel-gtk-extensions.h                           |    3 +--
 eel/eel-lib-self-check-functions.c                 |    4 +---
 eel/eel-lib-self-check-functions.h                 |    4 +---
 eel/eel-self-checks.c                              |    4 +---
 eel/eel-self-checks.h                              |    4 +---
 eel/eel-stock-dialogs.c                            |    3 +--
 eel/eel-stock-dialogs.h                            |    3 +--
 eel/eel-string.c                                   |    3 +--
 eel/eel-string.h                                   |    3 +--
 eel/eel-vfs-extensions.c                           |    3 +--
 eel/eel-vfs-extensions.h                           |    3 +--
 eel/eel.h                                          |    3 +--
 libnautilus-private/nautilus-bookmark.c            |    3 +--
 libnautilus-private/nautilus-bookmark.h            |    3 +--
 libnautilus-private/nautilus-canvas-container.c    |    3 +--
 libnautilus-private/nautilus-canvas-container.h    |    3 +--
 libnautilus-private/nautilus-canvas-dnd.c          |    3 +--
 libnautilus-private/nautilus-canvas-dnd.h          |    3 +--
 libnautilus-private/nautilus-canvas-item.c         |    4 +---
 libnautilus-private/nautilus-canvas-item.h         |    4 +---
 libnautilus-private/nautilus-canvas-private.h      |    3 +--
 libnautilus-private/nautilus-clipboard-monitor.c   |    4 +---
 libnautilus-private/nautilus-clipboard-monitor.h   |    4 +---
 libnautilus-private/nautilus-clipboard.c           |    4 +---
 libnautilus-private/nautilus-clipboard.h           |    4 +---
 libnautilus-private/nautilus-column-chooser.c      |    3 +--
 libnautilus-private/nautilus-column-chooser.h      |    3 +--
 libnautilus-private/nautilus-column-utilities.c    |    3 +--
 libnautilus-private/nautilus-column-utilities.h    |    3 +--
 libnautilus-private/nautilus-default-file-icon.c   |    4 +---
 libnautilus-private/nautilus-default-file-icon.h   |    4 +---
 .../nautilus-desktop-directory-file.c              |    4 +---
 .../nautilus-desktop-directory-file.h              |    4 +---
 libnautilus-private/nautilus-desktop-directory.c   |    4 +---
 libnautilus-private/nautilus-desktop-directory.h   |    4 +---
 libnautilus-private/nautilus-desktop-icon-file.c   |    4 +---
 libnautilus-private/nautilus-desktop-icon-file.h   |    4 +---
 .../nautilus-desktop-link-monitor.c                |    4 +---
 .../nautilus-desktop-link-monitor.h                |    4 +---
 libnautilus-private/nautilus-desktop-link.c        |    4 +---
 libnautilus-private/nautilus-desktop-link.h        |    4 +---
 libnautilus-private/nautilus-desktop-metadata.c    |    3 +--
 libnautilus-private/nautilus-desktop-metadata.h    |    3 +--
 libnautilus-private/nautilus-directory-async.c     |    4 +---
 libnautilus-private/nautilus-directory-notify.h    |    4 +---
 libnautilus-private/nautilus-directory-private.h   |    4 +---
 libnautilus-private/nautilus-directory.c           |    4 +---
 libnautilus-private/nautilus-directory.h           |    4 +---
 libnautilus-private/nautilus-dnd.c                 |    3 +--
 libnautilus-private/nautilus-dnd.h                 |    3 +--
 libnautilus-private/nautilus-entry.c               |    4 +---
 libnautilus-private/nautilus-entry.h               |    4 +---
 libnautilus-private/nautilus-file-attributes.h     |    4 +---
 libnautilus-private/nautilus-file-changes-queue.c  |    4 +---
 libnautilus-private/nautilus-file-changes-queue.h  |    4 +---
 .../nautilus-file-conflict-dialog.c                |    4 +---
 .../nautilus-file-conflict-dialog.h                |    4 +---
 libnautilus-private/nautilus-file-dnd.c            |    3 +--
 libnautilus-private/nautilus-file-dnd.h            |    3 +--
 libnautilus-private/nautilus-file-operations.c     |    4 +---
 libnautilus-private/nautilus-file-operations.h     |    4 +---
 libnautilus-private/nautilus-file-private.h        |    4 +---
 libnautilus-private/nautilus-file-queue.c          |    4 +---
 libnautilus-private/nautilus-file-queue.h          |    4 +---
 libnautilus-private/nautilus-file-undo-manager.c   |    4 +---
 libnautilus-private/nautilus-file-undo-manager.h   |    4 +---
 .../nautilus-file-undo-operations.c                |    4 +---
 .../nautilus-file-undo-operations.h                |    4 +---
 libnautilus-private/nautilus-file-utilities.c      |    3 +--
 libnautilus-private/nautilus-file-utilities.h      |    3 +--
 libnautilus-private/nautilus-file.c                |    4 +---
 libnautilus-private/nautilus-file.h                |    4 +---
 libnautilus-private/nautilus-global-preferences.c  |    3 +--
 libnautilus-private/nautilus-global-preferences.h  |    3 +--
 libnautilus-private/nautilus-icon-info.c           |    4 +---
 libnautilus-private/nautilus-keyfile-metadata.c    |    3 +--
 libnautilus-private/nautilus-keyfile-metadata.h    |    3 +--
 .../nautilus-lib-self-check-functions.c            |    4 +---
 .../nautilus-lib-self-check-functions.h            |    4 +---
 libnautilus-private/nautilus-link.c                |    4 +---
 libnautilus-private/nautilus-link.h                |    4 +---
 libnautilus-private/nautilus-metadata.c            |    4 +---
 libnautilus-private/nautilus-metadata.h            |    4 +---
 .../nautilus-mime-application-chooser.c            |    3 +--
 .../nautilus-mime-application-chooser.h            |    3 +--
 libnautilus-private/nautilus-monitor.c             |    4 +---
 libnautilus-private/nautilus-monitor.h             |    4 +---
 libnautilus-private/nautilus-profile.c             |    3 +--
 libnautilus-private/nautilus-profile.h             |    3 +--
 libnautilus-private/nautilus-program-choosing.c    |    3 +--
 libnautilus-private/nautilus-program-choosing.h    |    3 +--
 .../nautilus-progress-info-manager.c               |    3 +--
 .../nautilus-progress-info-manager.h               |    3 +--
 libnautilus-private/nautilus-progress-info.c       |    4 +---
 libnautilus-private/nautilus-progress-info.h       |    4 +---
 libnautilus-private/nautilus-query.c               |    3 +--
 libnautilus-private/nautilus-query.h               |    3 +--
 libnautilus-private/nautilus-recent.c              |    4 +---
 .../nautilus-search-directory-file.c               |    4 +---
 .../nautilus-search-directory-file.h               |    4 +---
 libnautilus-private/nautilus-search-directory.c    |    4 +---
 libnautilus-private/nautilus-search-directory.h    |    4 +---
 libnautilus-private/nautilus-search-engine-model.c |    3 +--
 libnautilus-private/nautilus-search-engine-model.h |    3 +--
 .../nautilus-search-engine-simple.c                |    3 +--
 .../nautilus-search-engine-simple.h                |    3 +--
 .../nautilus-search-engine-tracker.c               |    3 +--
 .../nautilus-search-engine-tracker.h               |    3 +--
 libnautilus-private/nautilus-search-engine.c       |    3 +--
 libnautilus-private/nautilus-search-engine.h       |    3 +--
 libnautilus-private/nautilus-search-hit.c          |    3 +--
 libnautilus-private/nautilus-search-hit.h          |    3 +--
 .../nautilus-selection-canvas-item.c               |    4 +---
 .../nautilus-selection-canvas-item.h               |    4 +---
 libnautilus-private/nautilus-thumbnails.c          |    4 +---
 libnautilus-private/nautilus-thumbnails.h          |    4 +---
 libnautilus-private/nautilus-trash-monitor.c       |    4 +---
 libnautilus-private/nautilus-trash-monitor.h       |    4 +---
 libnautilus-private/nautilus-tree-view-drag-dest.c |    4 +---
 libnautilus-private/nautilus-tree-view-drag-dest.h |    4 +---
 libnautilus-private/nautilus-ui-utilities.c        |    3 +--
 libnautilus-private/nautilus-ui-utilities.h        |    3 +--
 libnautilus-private/nautilus-undo-private.h        |    4 +---
 libnautilus-private/nautilus-vfs-directory.c       |    4 +---
 libnautilus-private/nautilus-vfs-directory.h       |    4 +---
 libnautilus-private/nautilus-vfs-file.c            |    4 +---
 libnautilus-private/nautilus-vfs-file.h            |    4 +---
 src/nautilus-application.h                         |    4 +---
 src/nautilus-autorun-software.c                    |    3 +--
 src/nautilus-canvas-view-container.c               |    3 +--
 src/nautilus-canvas-view-container.h               |    3 +--
 src/nautilus-canvas-view.c                         |    3 +--
 src/nautilus-canvas-view.h                         |    3 +--
 src/nautilus-connect-server-dialog.c               |    3 +--
 src/nautilus-connect-server-dialog.h               |    3 +--
 src/nautilus-convert-metadata.c                    |    3 +--
 src/nautilus-desktop-canvas-view.c                 |    3 +--
 src/nautilus-desktop-canvas-view.h                 |    3 +--
 src/nautilus-empty-view.c                          |    3 +--
 src/nautilus-empty-view.h                          |    3 +--
 src/nautilus-error-reporting.c                     |    3 +--
 src/nautilus-error-reporting.h                     |    3 +--
 src/nautilus-file-management-properties.c          |    3 +--
 src/nautilus-file-management-properties.h          |    3 +--
 src/nautilus-floating-bar.c                        |    4 +---
 src/nautilus-floating-bar.h                        |    4 +---
 src/nautilus-image-properties-page.c               |    4 +---
 src/nautilus-image-properties-page.h               |    4 +---
 src/nautilus-list-model.c                          |    3 +--
 src/nautilus-list-model.h                          |    3 +--
 src/nautilus-list-view-private.h                   |    3 +--
 src/nautilus-list-view.c                           |    3 +--
 src/nautilus-list-view.h                           |    3 +--
 src/nautilus-location-entry.c                      |    3 +--
 src/nautilus-location-entry.h                      |    3 +--
 src/nautilus-mime-actions.c                        |    3 +--
 src/nautilus-mime-actions.h                        |    3 +--
 src/nautilus-pathbar.c                             |    4 +---
 src/nautilus-pathbar.h                             |    4 +---
 src/nautilus-progress-info-widget.c                |    4 +---
 src/nautilus-progress-info-widget.h                |    4 +---
 src/nautilus-progress-ui-handler.c                 |    4 +---
 src/nautilus-progress-ui-handler.h                 |    4 +---
 src/nautilus-properties-window.c                   |    3 +--
 src/nautilus-properties-window.h                   |    3 +--
 src/nautilus-query-editor.c                        |    3 +--
 src/nautilus-query-editor.h                        |    3 +--
 src/nautilus-special-location-bar.c                |    3 +--
 src/nautilus-special-location-bar.h                |    3 +--
 src/nautilus-trash-bar.c                           |    3 +--
 src/nautilus-trash-bar.h                           |    3 +--
 src/nautilus-view-dnd.c                            |    4 +---
 src/nautilus-view-dnd.h                            |    4 +---
 src/nautilus-view.c                                |    4 +---
 src/nautilus-view.h                                |    4 +---
 src/nautilus-window-slot-dnd.c                     |    3 +--
 src/nautilus-window-slot-dnd.h                     |    3 +--
 src/nautilus-window-slot.c                         |    4 +---
 src/nautilus-window-slot.h                         |    4 +---
 src/nautilus-x-content-bar.c                       |    3 +--
 src/nautilus-x-content-bar.h                       |    3 +--
 test/test-nautilus-mime-actions-set.c              |    3 +--
 test/test-nautilus-mime-actions.c                  |    3 +--
 204 files changed, 204 insertions(+), 506 deletions(-)
---
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 85e08c6..35fb994 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -16,9 +16,7 @@
  Lesser General Public License for more details.
 
  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.
+ Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
 
  Author: Alexander Larsson <alexl redhat com>
 -->
diff --git a/data/freedesktop-dbus-interfaces.xml b/data/freedesktop-dbus-interfaces.xml
index 3ebd049..da37ca0 100644
--- a/data/freedesktop-dbus-interfaces.xml
+++ b/data/freedesktop-dbus-interfaces.xml
@@ -14,9 +14,7 @@
  Lesser General Public License for more details.
 
  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.
+ Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
   <interface name='org.freedesktop.FileManager1'>
diff --git a/data/shell-search-provider-dbus-interfaces.xml b/data/shell-search-provider-dbus-interfaces.xml
index 9c7368e..f6840e2 100644
--- a/data/shell-search-provider-dbus-interfaces.xml
+++ b/data/shell-search-provider-dbus-interfaces.xml
@@ -14,9 +14,7 @@
  Lesser General Public License for more details.
 
  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.
+ Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
   <interface name='org.gnome.Shell.SearchProvider2'>
diff --git a/eel/check-program.c b/eel/check-program.c
index e5d58ec..b291802 100644
--- a/eel/check-program.c
+++ b/eel/check-program.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 */
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
index dbdc147..40ffd53 100644
--- a/eel/eel-accessibility.c
+++ b/eel/eel-accessibility.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors:
        Anders Carlsson <andersca gnu org>
diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h
index c6971bc..9dc26e4 100644
--- a/eel/eel-accessibility.h
+++ b/eel/eel-accessibility.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Anders Carlsson <andersca gnu org>
 */
diff --git a/eel/eel-art-extensions.c b/eel/eel-art-extensions.c
index b0b969a..8178fb4 100644
--- a/eel/eel-art-extensions.c
+++ b/eel/eel-art-extensions.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
             Ramiro Estrugo <ramiro eazel com>
diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h
index d135d80..e030872 100644
--- a/eel/eel-art-extensions.h
+++ b/eel/eel-art-extensions.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
             Ramiro Estrugo <ramiro eazel com>
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 0739ceb..0040a43 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 /*
   @NOTATION@
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h
index c7ebbea..28d5d02 100644
--- a/eel/eel-canvas.h
+++ b/eel/eel-canvas.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 /*
   @NOTATION@
diff --git a/eel/eel-debug.c b/eel/eel-debug.c
index e49d4ff..7de786e 100644
--- a/eel/eel-debug.c
+++ b/eel/eel-debug.c
@@ -15,9 +15,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-debug.h b/eel/eel-debug.h
index 52a0d64..d475119 100644
--- a/eel/eel-debug.h
+++ b/eel/eel-debug.h
@@ -15,9 +15,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c
index 743503c..49ff0d2 100644
--- a/eel/eel-gdk-extensions.c
+++ b/eel/eel-gdk-extensions.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>, 
             Pavel Cisler <pavel eazel com>,
diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h
index dda7f53..9be06ab 100644
--- a/eel/eel-gdk-extensions.h
+++ b/eel/eel-gdk-extensions.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>,
             Ramiro Estrugo <ramiro eazel com>
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
index c8f574b..1f1dc5f 100644
--- a/eel/eel-glib-extensions.c
+++ b/eel/eel-glib-extensions.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
index 876889f..2ccb862 100644
--- a/eel/eel-glib-extensions.h
+++ b/eel/eel-glib-extensions.h
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
index e7b8ecb..3005958 100644
--- a/eel/eel-gnome-extensions.c
+++ b/eel/eel-gnome-extensions.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-gnome-extensions.h b/eel/eel-gnome-extensions.h
index 8a00d5e..d6bd8a7 100644
--- a/eel/eel-gnome-extensions.h
+++ b/eel/eel-gnome-extensions.h
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c
index 8bb4a53..ebc6393 100644
--- a/eel/eel-graphic-effects.c
+++ b/eel/eel-graphic-effects.c
@@ -17,9 +17,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file contains pixbuf manipulation routines used for graphical effects like pre-lighting
diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h
index 2fe6fab..6f38eb6 100644
--- a/eel/eel-graphic-effects.h
+++ b/eel/eel-graphic-effects.h
@@ -15,9 +15,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
  
    Authors: Andy Hertzfeld <andy eazel com>
  */
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index 804584d..38d7c00 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
             Ramiro Estrugo <ramiro eazel com>
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
index 5b58c76..67e811b 100644
--- a/eel/eel-gtk-extensions.h
+++ b/eel/eel-gtk-extensions.h
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
             Ramiro Estrugo <ramiro eazel com>
diff --git a/eel/eel-lib-self-check-functions.c b/eel/eel-lib-self-check-functions.c
index dd9770a..bb789e7 100644
--- a/eel/eel-lib-self-check-functions.c
+++ b/eel/eel-lib-self-check-functions.c
@@ -16,9 +16,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-lib-self-check-functions.h b/eel/eel-lib-self-check-functions.h
index f34fcda..ed9de8f 100644
--- a/eel/eel-lib-self-check-functions.h
+++ b/eel/eel-lib-self-check-functions.h
@@ -16,9 +16,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-self-checks.c b/eel/eel-self-checks.c
index ee3c697..d5b9ff4 100644
--- a/eel/eel-self-checks.c
+++ b/eel/eel-self-checks.c
@@ -15,9 +15,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h
index 4ae8377..6a0eef0 100644
--- a/eel/eel-self-checks.h
+++ b/eel/eel-self-checks.h
@@ -15,9 +15,7 @@
    Library General Public License for more details.
   
    You should have received a copy of the GNU Library 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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index d95ef6e..a6e8c26 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-stock-dialogs.h b/eel/eel-stock-dialogs.h
index 0fb16f4..ea1ffee 100644
--- a/eel/eel-stock-dialogs.h
+++ b/eel/eel-stock-dialogs.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-string.c b/eel/eel-string.c
index 3ab5e8d..178af36 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-string.h b/eel/eel-string.h
index fd29567..8119c16 100644
--- a/eel/eel-string.h
+++ b/eel/eel-string.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
 */
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c
index 84a38a1..cf6a6c1 100644
--- a/eel/eel-vfs-extensions.c
+++ b/eel/eel-vfs-extensions.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
            Pavel Cisler <pavel eazel com>
diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h
index 90364de..e44546f 100644
--- a/eel/eel-vfs-extensions.h
+++ b/eel/eel-vfs-extensions.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin eazel com>
            Pavel Cisler <pavel eazel com>
diff --git a/eel/eel.h b/eel/eel.h
index 294ff93..d9f1b46 100644
--- a/eel/eel.h
+++ b/eel/eel.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Maciej Stachowiak <mjs eazel com>
 */
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 2f09fc3..112d974 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: John Sullivan <sullivan eazel com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h
index 736e41a..c67dd53 100644
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: John Sullivan <sullivan eazel com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index 91efe47..f223a6e 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ettore Perazzoli <ettore gnu org>,
    Darin Adler <darin bentspoon com>
diff --git a/libnautilus-private/nautilus-canvas-container.h b/libnautilus-private/nautilus-canvas-container.h
index ff534a7..69db8b1 100644
--- a/libnautilus-private/nautilus-canvas-container.h
+++ b/libnautilus-private/nautilus-canvas-container.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ettore Perazzoli <ettore gnu org>, Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/libnautilus-private/nautilus-canvas-dnd.c
index 2e9a3a5..0670438 100644
--- a/libnautilus-private/nautilus-canvas-dnd.c
+++ b/libnautilus-private/nautilus-canvas-dnd.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ettore Perazzoli <ettore gnu org>,
             Darin Adler <darin bentspoon com>,
diff --git a/libnautilus-private/nautilus-canvas-dnd.h b/libnautilus-private/nautilus-canvas-dnd.h
index f7068b0..f780848 100644
--- a/libnautilus-private/nautilus-canvas-dnd.h
+++ b/libnautilus-private/nautilus-canvas-dnd.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ettore Perazzoli <ettore gnu org>,
             Darin Adler <darin bentspoon com>,
diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c
index 5266996..733e5b0 100644
--- a/libnautilus-private/nautilus-canvas-item.c
+++ b/libnautilus-private/nautilus-canvas-item.c
@@ -17,9 +17,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-canvas-item.h b/libnautilus-private/nautilus-canvas-item.h
index 2c9e511..bf98bea 100644
--- a/libnautilus-private/nautilus-canvas-item.h
+++ b/libnautilus-private/nautilus-canvas-item.h
@@ -17,9 +17,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef NAUTILUS_CANVAS_ITEM_H
diff --git a/libnautilus-private/nautilus-canvas-private.h b/libnautilus-private/nautilus-canvas-private.h
index 3753ad1..9dab8cb 100644
--- a/libnautilus-private/nautilus-canvas-private.h
+++ b/libnautilus-private/nautilus-canvas-private.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Ettore Perazzoli <ettore gnu org>
 */
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c 
b/libnautilus-private/nautilus-clipboard-monitor.c
index 1db98d2..9ae66f6 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-clipboard-monitor.h 
b/libnautilus-private/nautilus-clipboard-monitor.h
index e56e418..8aa4788 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.h
+++ b/libnautilus-private/nautilus-clipboard-monitor.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c
index 8cb3237..dd6f9c0 100644
--- a/libnautilus-private/nautilus-clipboard.c
+++ b/libnautilus-private/nautilus-clipboard.c
@@ -19,9 +19,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rebecca Schulman <rebecka eazel com>,
  *          Darin Adler <darin bentspoon com>
diff --git a/libnautilus-private/nautilus-clipboard.h b/libnautilus-private/nautilus-clipboard.h
index 84441e3..26d9762 100644
--- a/libnautilus-private/nautilus-clipboard.h
+++ b/libnautilus-private/nautilus-clipboard.h
@@ -16,9 +16,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Rebecca Schulman <rebecka eazel com>
  */
diff --git a/libnautilus-private/nautilus-column-chooser.c b/libnautilus-private/nautilus-column-chooser.c
index ee4f370..4ab540d 100644
--- a/libnautilus-private/nautilus-column-chooser.c
+++ b/libnautilus-private/nautilus-column-chooser.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the column COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Dave Camp <dave ximian com>
 */
diff --git a/libnautilus-private/nautilus-column-chooser.h b/libnautilus-private/nautilus-column-chooser.h
index 31a141b..4d3d490 100644
--- a/libnautilus-private/nautilus-column-chooser.h
+++ b/libnautilus-private/nautilus-column-chooser.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the column COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Dave Camp <dave ximian com>
 */
diff --git a/libnautilus-private/nautilus-column-utilities.c b/libnautilus-private/nautilus-column-utilities.c
index 5eba7ff..2d8c33b 100644
--- a/libnautilus-private/nautilus-column-utilities.c
+++ b/libnautilus-private/nautilus-column-utilities.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the column COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Dave Camp <dave ximian com>
 */
diff --git a/libnautilus-private/nautilus-column-utilities.h b/libnautilus-private/nautilus-column-utilities.h
index f2d92c4..c6bda95 100644
--- a/libnautilus-private/nautilus-column-utilities.h
+++ b/libnautilus-private/nautilus-column-utilities.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the column COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Dave Camp <dave ximian com>
 */
diff --git a/libnautilus-private/nautilus-default-file-icon.c 
b/libnautilus-private/nautilus-default-file-icon.c
index 6e35add..7543518 100644
--- a/libnautilus-private/nautilus-default-file-icon.c
+++ b/libnautilus-private/nautilus-default-file-icon.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-default-file-icon.h 
b/libnautilus-private/nautilus-default-file-icon.h
index d872480..2d3fd08 100644
--- a/libnautilus-private/nautilus-default-file-icon.h
+++ b/libnautilus-private/nautilus-default-file-icon.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-desktop-directory-file.c 
b/libnautilus-private/nautilus-desktop-directory-file.c
index 24ea0e4..586fd1b 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/libnautilus-private/nautilus-desktop-directory-file.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-directory-file.h 
b/libnautilus-private/nautilus-desktop-directory-file.h
index 033320e..bf542db 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.h
+++ b/libnautilus-private/nautilus-desktop-directory-file.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-directory.c 
b/libnautilus-private/nautilus-desktop-directory.c
index 0be4df5..d390221 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@@ -17,9 +17,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-directory.h 
b/libnautilus-private/nautilus-desktop-directory.h
index 7c1d245..bf34230 100644
--- a/libnautilus-private/nautilus-desktop-directory.h
+++ b/libnautilus-private/nautilus-desktop-directory.h
@@ -17,9 +17,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c 
b/libnautilus-private/nautilus-desktop-icon-file.c
index fbcaf53..f546efa 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
+++ b/libnautilus-private/nautilus-desktop-icon-file.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-icon-file.h 
b/libnautilus-private/nautilus-desktop-icon-file.h
index 5bb80d0..9d8f438 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.h
+++ b/libnautilus-private/nautilus-desktop-icon-file.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c 
b/libnautilus-private/nautilus-desktop-link-monitor.c
index de1a242..0af855f 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.h 
b/libnautilus-private/nautilus-desktop-link-monitor.h
index 4dca437..ef3493d 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.h
+++ b/libnautilus-private/nautilus-desktop-link-monitor.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index 07300c0..40d4122 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-link.h b/libnautilus-private/nautilus-desktop-link.h
index 0cfa3d9..b9d82e6 100644
--- a/libnautilus-private/nautilus-desktop-link.h
+++ b/libnautilus-private/nautilus-desktop-link.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-desktop-metadata.c b/libnautilus-private/nautilus-desktop-metadata.c
index bb19101..09cca74 100644
--- a/libnautilus-private/nautilus-desktop-metadata.c
+++ b/libnautilus-private/nautilus-desktop-metadata.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-desktop-metadata.h b/libnautilus-private/nautilus-desktop-metadata.h
index a578ea0..22e7299 100644
--- a/libnautilus-private/nautilus-desktop-metadata.h
+++ b/libnautilus-private/nautilus-desktop-metadata.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 2e316a7..c7bd86b 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-directory-notify.h b/libnautilus-private/nautilus-directory-notify.h
index 52dcdfe..624d855 100644
--- a/libnautilus-private/nautilus-directory-notify.h
+++ b/libnautilus-private/nautilus-directory-notify.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-directory-private.h 
b/libnautilus-private/nautilus-directory-private.h
index 1d34200..7fd092b 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index ada6e63..98dac79 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index a11377e..400c74b 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
index dcb990f..3ff9844 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Pavel Cisler <pavel eazel com>,
            Ettore Perazzoli <ettore gnu org>
diff --git a/libnautilus-private/nautilus-dnd.h b/libnautilus-private/nautilus-dnd.h
index d82627e..d3e7924 100644
--- a/libnautilus-private/nautilus-dnd.h
+++ b/libnautilus-private/nautilus-dnd.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Pavel Cisler <pavel eazel com>,
            Ettore Perazzoli <ettore gnu org>
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 73b58fd..9c470b5 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -19,9 +19,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h
index be2a6db..4c39d1d 100644
--- a/libnautilus-private/nautilus-entry.h
+++ b/libnautilus-private/nautilus-entry.h
@@ -19,9 +19,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef NAUTILUS_ENTRY_H
diff --git a/libnautilus-private/nautilus-file-attributes.h b/libnautilus-private/nautilus-file-attributes.h
index fee97b9..9a8dbff 100644
--- a/libnautilus-private/nautilus-file-attributes.h
+++ b/libnautilus-private/nautilus-file-attributes.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-file-changes-queue.c 
b/libnautilus-private/nautilus-file-changes-queue.c
index 571eaf8..4c83515 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -13,9 +13,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
    Author: Pavel Cisler <pavel eazel com>
 */
diff --git a/libnautilus-private/nautilus-file-changes-queue.h 
b/libnautilus-private/nautilus-file-changes-queue.h
index 5c430c7..cd4054b 100644
--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@@ -13,9 +13,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
    Author: Pavel Cisler <pavel eazel com>  
 */
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c 
b/libnautilus-private/nautilus-file-conflict-dialog.c
index 5b68140..a14c5f0 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
    
    Authors: Cosimo Cecchi <cosimoc gnome org>
 */
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.h 
b/libnautilus-private/nautilus-file-conflict-dialog.h
index 3bc08ea..dbac8e1 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.h
+++ b/libnautilus-private/nautilus-file-conflict-dialog.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
    
    Authors: Cosimo Cecchi <cosimoc gnome org>
 */
diff --git a/libnautilus-private/nautilus-file-dnd.c b/libnautilus-private/nautilus-file-dnd.c
index 5155d63..1160255 100644
--- a/libnautilus-private/nautilus-file-dnd.c
+++ b/libnautilus-private/nautilus-file-dnd.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Pavel Cisler <pavel eazel com>,
 */
diff --git a/libnautilus-private/nautilus-file-dnd.h b/libnautilus-private/nautilus-file-dnd.h
index 41e2ba8..59f7b00 100644
--- a/libnautilus-private/nautilus-file-dnd.h
+++ b/libnautilus-private/nautilus-file-dnd.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Pavel Cisler <pavel eazel com>,
 */
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 4fa2c1f..cb65b15 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -17,9 +17,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
    
    Authors: Alexander Larsson <alexl redhat com>
             Ettore Perazzoli <ettore gnu org> 
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index e0af100..87611b6 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
    
    Authors: Ettore Perazzoli <ettore gnu org>,
             Pavel Cisler <pavel eazel com>
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index ff58386..535615c 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-file-queue.c b/libnautilus-private/nautilus-file-queue.c
index d5679fd..9e84900 100644
--- a/libnautilus-private/nautilus-file-queue.c
+++ b/libnautilus-private/nautilus-file-queue.c
@@ -13,9 +13,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
    Author: Maciej Stachowiak <mjs noisehavoc org>
 */
diff --git a/libnautilus-private/nautilus-file-queue.h b/libnautilus-private/nautilus-file-queue.h
index 92331d4..3de6b45 100644
--- a/libnautilus-private/nautilus-file-queue.h
+++ b/libnautilus-private/nautilus-file-queue.h
@@ -13,9 +13,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
    Author: Maciej Stachowiak <mjs noisehavoc org>
 */
diff --git a/libnautilus-private/nautilus-file-undo-manager.c 
b/libnautilus-private/nautilus-file-undo-manager.c
index 26555af..497e3d1 100644
--- a/libnautilus-private/nautilus-file-undo-manager.c
+++ b/libnautilus-private/nautilus-file-undo-manager.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Amos Brocco <amos brocco gmail com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-file-undo-manager.h 
b/libnautilus-private/nautilus-file-undo-manager.h
index d07ab89..f8d8ccd 100644
--- a/libnautilus-private/nautilus-file-undo-manager.h
+++ b/libnautilus-private/nautilus-file-undo-manager.h
@@ -15,9 +15,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Amos Brocco <amos brocco gmail com>
  */
diff --git a/libnautilus-private/nautilus-file-undo-operations.c 
b/libnautilus-private/nautilus-file-undo-operations.c
index 1741562..717f6f8 100644
--- a/libnautilus-private/nautilus-file-undo-operations.c
+++ b/libnautilus-private/nautilus-file-undo-operations.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Amos Brocco <amos brocco gmail com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-file-undo-operations.h 
b/libnautilus-private/nautilus-file-undo-operations.h
index 0c8fd2e..5a3953f 100644
--- a/libnautilus-private/nautilus-file-undo-operations.h
+++ b/libnautilus-private/nautilus-file-undo-operations.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Amos Brocco <amos brocco gmail com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index a28f961..e91e601 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 10b368e..e75bf05 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 4287fc8..482ad21 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index fb1c62c..29778d6 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-global-preferences.c 
b/libnautilus-private/nautilus-global-preferences.c
index 921e11b..75afe0f 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 */
diff --git a/libnautilus-private/nautilus-global-preferences.h 
b/libnautilus-private/nautilus-global-preferences.h
index 7f4ede5..5ec3e08 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 */
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
index 81894d2..8a17d64 100644
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-keyfile-metadata.c b/libnautilus-private/nautilus-keyfile-metadata.c
index a1cee24..6658ee7 100644
--- a/libnautilus-private/nautilus-keyfile-metadata.c
+++ b/libnautilus-private/nautilus-keyfile-metadata.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-keyfile-metadata.h b/libnautilus-private/nautilus-keyfile-metadata.h
index db9eb69..d8d5b45 100644
--- a/libnautilus-private/nautilus-keyfile-metadata.h
+++ b/libnautilus-private/nautilus-keyfile-metadata.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.c 
b/libnautilus-private/nautilus-lib-self-check-functions.c
index 2451016..1ed804e 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.c
+++ b/libnautilus-private/nautilus-lib-self-check-functions.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h 
b/libnautilus-private/nautilus-lib-self-check-functions.h
index b2f971c..4d84194 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.h
+++ b/libnautilus-private/nautilus-lib-self-check-functions.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 2d9adee..4b563d8 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Authors: Jonathan Blandford <jrb redhat com>
             Alexander Larsson <alexl redhat com>
diff --git a/libnautilus-private/nautilus-link.h b/libnautilus-private/nautilus-link.h
index e687bcc..9945f3d 100644
--- a/libnautilus-private/nautilus-link.h
+++ b/libnautilus-private/nautilus-link.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Authors: Jonathan Blandford <jrb redhat com>
 */
diff --git a/libnautilus-private/nautilus-metadata.c b/libnautilus-private/nautilus-metadata.c
index def85ea..ecc5354 100644
--- a/libnautilus-private/nautilus-metadata.c
+++ b/libnautilus-private/nautilus-metadata.c
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-metadata.h b/libnautilus-private/nautilus-metadata.h
index d7ee6de..9926d06 100644
--- a/libnautilus-private/nautilus-metadata.h
+++ b/libnautilus-private/nautilus-metadata.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: John Sullivan <sullivan eazel com>
 */
diff --git a/libnautilus-private/nautilus-mime-application-chooser.c 
b/libnautilus-private/nautilus-mime-application-chooser.c
index 0200e13..9d15946 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.c
+++ b/libnautilus-private/nautilus-mime-application-chooser.c
@@ -18,8 +18,7 @@
  *
  *  You should have received a copy of the GNU Library General Public
  *  License along application the Gnome Library; see the file COPYING.LIB.  If not,
- *  write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
+ *  see <http://www.gnu.org/licenses/>.
  *
  *  Authors: Dave Camp <dave novell com>
  *           Alexander Larsson <alexl redhat com>
diff --git a/libnautilus-private/nautilus-mime-application-chooser.h 
b/libnautilus-private/nautilus-mime-application-chooser.h
index 8b7eaae..2198360 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.h
+++ b/libnautilus-private/nautilus-mime-application-chooser.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along application the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Dave Camp <dave novell com>
 */
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 46b229a..5b21c24 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Authors: Seth Nickell <seth eazel com>
             Darin Adler <darin bentspoon com>
diff --git a/libnautilus-private/nautilus-monitor.h b/libnautilus-private/nautilus-monitor.h
index 31e20be..1fa78c0 100644
--- a/libnautilus-private/nautilus-monitor.h
+++ b/libnautilus-private/nautilus-monitor.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Authors: Seth Nickell <seth eazel com>
             Darin Adler <darin bentspoon com>
diff --git a/libnautilus-private/nautilus-profile.c b/libnautilus-private/nautilus-profile.c
index 8c8d284..e1a9491 100644
--- a/libnautilus-private/nautilus-profile.c
+++ b/libnautilus-private/nautilus-profile.c
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: William Jon McCann <mccann jhu edu>
  *
diff --git a/libnautilus-private/nautilus-profile.h b/libnautilus-private/nautilus-profile.h
index c8c7704..2ca5374 100644
--- a/libnautilus-private/nautilus-profile.h
+++ b/libnautilus-private/nautilus-profile.h
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: William Jon McCann <mccann jhu edu>
  *
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index 6c74760..7160214 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: John Sullivan <sullivan eazel com>
 */
diff --git a/libnautilus-private/nautilus-program-choosing.h b/libnautilus-private/nautilus-program-choosing.h
index 56fa836..c1d8b7b 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: John Sullivan <sullivan eazel com>
 */
diff --git a/libnautilus-private/nautilus-progress-info-manager.c 
b/libnautilus-private/nautilus-progress-info-manager.c
index 04d488f..97343ee 100644
--- a/libnautilus-private/nautilus-progress-info-manager.c
+++ b/libnautilus-private/nautilus-progress-info-manager.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-progress-info-manager.h 
b/libnautilus-private/nautilus-progress-info-manager.h
index be2dd5f..21c22f0 100644
--- a/libnautilus-private/nautilus-progress-info-manager.h
+++ b/libnautilus-private/nautilus-progress-info-manager.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Cosimo Cecchi <cosimoc redhat com>
  */
diff --git a/libnautilus-private/nautilus-progress-info.c b/libnautilus-private/nautilus-progress-info.c
index 56aabcd..16b2cb2 100644
--- a/libnautilus-private/nautilus-progress-info.c
+++ b/libnautilus-private/nautilus-progress-info.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-progress-info.h b/libnautilus-private/nautilus-progress-info.h
index d017f33..edca861 100644
--- a/libnautilus-private/nautilus-progress-info.h
+++ b/libnautilus-private/nautilus-progress-info.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
index f282b0c..453fe0a 100644
--- a/libnautilus-private/nautilus-query.c
+++ b/libnautilus-private/nautilus-query.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Anders Carlsson <andersca imendio com>
  *
diff --git a/libnautilus-private/nautilus-query.h b/libnautilus-private/nautilus-query.h
index f482700..8601dde 100644
--- a/libnautilus-private/nautilus-query.h
+++ b/libnautilus-private/nautilus-query.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Anders Carlsson <andersca imendio com>
  *
diff --git a/libnautilus-private/nautilus-recent.c b/libnautilus-private/nautilus-recent.c
index 244cbe4..ded4ea5 100644
--- a/libnautilus-private/nautilus-recent.c
+++ b/libnautilus-private/nautilus-recent.c
@@ -13,9 +13,7 @@
  * 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. 
+ * along with this program; if not, see <http://www.gnu.org/licenses/>. 
  */
 
 #include "config.h"
diff --git a/libnautilus-private/nautilus-search-directory-file.c 
b/libnautilus-private/nautilus-search-directory-file.c
index 8bad8f6..a027df0 100644
--- a/libnautilus-private/nautilus-search-directory-file.c
+++ b/libnautilus-private/nautilus-search-directory-file.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Anders Carlsson <andersca imendio com>
 */
diff --git a/libnautilus-private/nautilus-search-directory-file.h 
b/libnautilus-private/nautilus-search-directory-file.h
index f37b1d4..4294d19 100644
--- a/libnautilus-private/nautilus-search-directory-file.h
+++ b/libnautilus-private/nautilus-search-directory-file.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index 16a6b33..3f9144c 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -13,9 +13,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Anders Carlsson <andersca imendio com>
 */
diff --git a/libnautilus-private/nautilus-search-directory.h b/libnautilus-private/nautilus-search-directory.h
index e8b0c67..fe56cfd 100644
--- a/libnautilus-private/nautilus-search-directory.h
+++ b/libnautilus-private/nautilus-search-directory.h
@@ -17,9 +17,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef NAUTILUS_SEARCH_DIRECTORY_H
diff --git a/libnautilus-private/nautilus-search-engine-model.c 
b/libnautilus-private/nautilus-search-engine-model.c
index 754584d..6b4166b 100644
--- a/libnautilus-private/nautilus-search-engine-model.c
+++ b/libnautilus-private/nautilus-search-engine-model.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/libnautilus-private/nautilus-search-engine-model.h 
b/libnautilus-private/nautilus-search-engine-model.h
index 1b9b3c4..9439d80 100644
--- a/libnautilus-private/nautilus-search-engine-model.h
+++ b/libnautilus-private/nautilus-search-engine-model.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/libnautilus-private/nautilus-search-engine-simple.c 
b/libnautilus-private/nautilus-search-engine-simple.c
index 9c80d2e..75b88cd 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/libnautilus-private/nautilus-search-engine-simple.h 
b/libnautilus-private/nautilus-search-engine-simple.h
index 93f491e..9f93f43 100644
--- a/libnautilus-private/nautilus-search-engine-simple.h
+++ b/libnautilus-private/nautilus-search-engine-simple.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c 
b/libnautilus-private/nautilus-search-engine-tracker.c
index 4fbeb38..c53810c 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Jamie McCracken <jamiemcc gnome org>
  *
diff --git a/libnautilus-private/nautilus-search-engine-tracker.h 
b/libnautilus-private/nautilus-search-engine-tracker.h
index a7db293..0377c50 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.h
+++ b/libnautilus-private/nautilus-search-engine-tracker.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Jamie McCracken (jamiemcc gnome org)
  *
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index 31fa941..42b7ab7 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Anders Carlsson <andersca imendio com>
  *
diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
index 916dbdd..a1a8d0b 100644
--- a/libnautilus-private/nautilus-search-engine.h
+++ b/libnautilus-private/nautilus-search-engine.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Anders Carlsson <andersca imendio com>
  *
diff --git a/libnautilus-private/nautilus-search-hit.c b/libnautilus-private/nautilus-search-hit.c
index 3f3313c..a6dc16c 100644
--- a/libnautilus-private/nautilus-search-hit.c
+++ b/libnautilus-private/nautilus-search-hit.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libnautilus-private/nautilus-search-hit.h b/libnautilus-private/nautilus-search-hit.h
index 005990a..9ba43e4 100644
--- a/libnautilus-private/nautilus-search-hit.h
+++ b/libnautilus-private/nautilus-search-hit.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libnautilus-private/nautilus-selection-canvas-item.c 
b/libnautilus-private/nautilus-selection-canvas-item.c
index 7ef8bb3..52c12a6 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.c
+++ b/libnautilus-private/nautilus-selection-canvas-item.c
@@ -16,9 +16,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Federico Mena <federico nuclecu unam mx>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-selection-canvas-item.h 
b/libnautilus-private/nautilus-selection-canvas-item.h
index 28a467e..bb82c03 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.h
+++ b/libnautilus-private/nautilus-selection-canvas-item.h
@@ -16,9 +16,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Federico Mena <federico nuclecu unam mx>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index a194d0c..e04ed84 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Andy Hertzfeld <andy eazel com>
 */
diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h
index ce46f57..69bbbbc 100644
--- a/libnautilus-private/nautilus-thumbnails.h
+++ b/libnautilus-private/nautilus-thumbnails.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Andy Hertzfeld <andy eazel com>
 */
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 441cf7c..7cf15de 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Pavel Cisler <pavel eazel com>
 */
diff --git a/libnautilus-private/nautilus-trash-monitor.h b/libnautilus-private/nautilus-trash-monitor.h
index 2d8692b..ff0c485 100644
--- a/libnautilus-private/nautilus-trash-monitor.h
+++ b/libnautilus-private/nautilus-trash-monitor.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Pavel Cisler <pavel eazel com>
 */
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c 
b/libnautilus-private/nautilus-tree-view-drag-dest.c
index 9861688..ee57881 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -16,9 +16,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  * 
  * Author: Dave Camp <dave ximian com>
  * XDS support: Benedikt Meurer <benny xfce org> (adapted by Amos Brocco <amos brocco unifr ch>)
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.h 
b/libnautilus-private/nautilus-tree-view-drag-dest.h
index 40ea1fc..e415f41 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.h
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.h
@@ -16,9 +16,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  * 
  * Author: Dave Camp <dave ximian com>
  */
diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c
index 7a1ec36..7b08b8c 100644
--- a/libnautilus-private/nautilus-ui-utilities.c
+++ b/libnautilus-private/nautilus-ui-utilities.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-ui-utilities.h b/libnautilus-private/nautilus-ui-utilities.h
index 333285e..d988585 100644
--- a/libnautilus-private/nautilus-ui-utilities.h
+++ b/libnautilus-private/nautilus-ui-utilities.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Alexander Larsson <alexl redhat com>
 */
diff --git a/libnautilus-private/nautilus-undo-private.h b/libnautilus-private/nautilus-undo-private.h
index 3e6d75f..625fcc6 100644
--- a/libnautilus-private/nautilus-undo-private.h
+++ b/libnautilus-private/nautilus-undo-private.h
@@ -17,9 +17,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef NAUTILUS_UNDO_PRIVATE_H
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index 29264ce..a51c192 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-vfs-directory.h b/libnautilus-private/nautilus-vfs-directory.h
index fcfb512..da63b09 100644
--- a/libnautilus-private/nautilus-vfs-directory.h
+++ b/libnautilus-private/nautilus-vfs-directory.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index d907d8d..5fa15e2 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/libnautilus-private/nautilus-vfs-file.h b/libnautilus-private/nautilus-vfs-file.h
index aac9371..fdb0a41 100644
--- a/libnautilus-private/nautilus-vfs-file.h
+++ b/libnautilus-private/nautilus-vfs-file.h
@@ -16,9 +16,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Darin Adler <darin bentspoon com>
 */
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 18b8db3..75679a4 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -16,9 +16,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __NAUTILUS_APPLICATION_H__
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index d63a682..3a1eb0a 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: David Zeuthen <davidz redhat com>
 */
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index e786e4a..a966713 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Michael Meeks <michael ximian com>
 */
diff --git a/src/nautilus-canvas-view-container.h b/src/nautilus-canvas-view-container.h
index 6677d74..c588517 100644
--- a/src/nautilus-canvas-view-container.h
+++ b/src/nautilus-canvas-view-container.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Michael Meeks <michael ximian com>
 */
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 50af736..c3dad37 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/src/nautilus-canvas-view.h b/src/nautilus-canvas-view.h
index 6325a99..e2b77ed 100644
--- a/src/nautilus-canvas-view.h
+++ b/src/nautilus-canvas-view.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: John Sullivan <sullivan eazel com>
  *
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index 7de6983..bd18e4d 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/nautilus-connect-server-dialog.h b/src/nautilus-connect-server-dialog.h
index 9f8cbd2..352be4d 100644
--- a/src/nautilus-connect-server-dialog.h
+++ b/src/nautilus-connect-server-dialog.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef NAUTILUS_CONNECT_SERVER_DIALOG_H
diff --git a/src/nautilus-convert-metadata.c b/src/nautilus-convert-metadata.c
index 3fb642c..88c9266 100644
--- a/src/nautilus-convert-metadata.c
+++ b/src/nautilus-convert-metadata.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors:
  *   Alexander Larsson <alexl redhat com>
diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
index f1556de..628ea45 100644
--- a/src/nautilus-desktop-canvas-view.c
+++ b/src/nautilus-desktop-canvas-view.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Mike Engber <engber eazel com>
            Gene Z. Ragan <gzr eazel com>
diff --git a/src/nautilus-desktop-canvas-view.h b/src/nautilus-desktop-canvas-view.h
index cd084a5..8d0c4a4 100644
--- a/src/nautilus-desktop-canvas-view.h
+++ b/src/nautilus-desktop-canvas-view.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Mike Engber <engber eazel com>
 */
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c
index 2037133..7a13446 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Christian Neumair <chris gnome-de org>
 */
diff --git a/src/nautilus-empty-view.h b/src/nautilus-empty-view.h
index 14ce14c..56ff4e9 100644
--- a/src/nautilus-empty-view.h
+++ b/src/nautilus-empty-view.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Christian Neumair <chris gnome-de org>
 */
diff --git a/src/nautilus-error-reporting.c b/src/nautilus-error-reporting.c
index d0f2d7e..ef714dd 100644
--- a/src/nautilus-error-reporting.c
+++ b/src/nautilus-error-reporting.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/src/nautilus-error-reporting.h b/src/nautilus-error-reporting.h
index 4272982..3f2aa13 100644
--- a/src/nautilus-error-reporting.h
+++ b/src/nautilus-error-reporting.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
 */
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 911291b..fe5c1d8 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Jan Arne Petersen <jpetersen uni-bonn de>
 */
diff --git a/src/nautilus-file-management-properties.h b/src/nautilus-file-management-properties.h
index 48857f7..c417971 100644
--- a/src/nautilus-file-management-properties.h
+++ b/src/nautilus-file-management-properties.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Jan Arne Petersen <jpetersen uni-bonn de>
 */
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index 40090f1..d107e8c 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  *
diff --git a/src/nautilus-floating-bar.h b/src/nautilus-floating-bar.h
index ba31ac5..59fd1ab 100644
--- a/src/nautilus-floating-bar.h
+++ b/src/nautilus-floating-bar.h
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  *
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 4ef5e86..fb5a34c 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  * XMP support by Hubert Figuiere <hfiguiere novell com>
diff --git a/src/nautilus-image-properties-page.h b/src/nautilus-image-properties-page.h
index 7853f41..210e9ee 100644
--- a/src/nautilus-image-properties-page.h
+++ b/src/nautilus-image-properties-page.h
@@ -14,9 +14,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  */
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index dc861c5..925683f 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Anders Carlsson <andersca gnu org>, Soeren Sandmann (sandmann daimi au dk), Dave Camp <dave 
ximian com>
 */
diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h
index 57ecd64..7169a7a 100644
--- a/src/nautilus-list-model.h
+++ b/src/nautilus-list-model.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Anders Carlsson <andersca gnu org>
 */
diff --git a/src/nautilus-list-view-private.h b/src/nautilus-list-view-private.h
index d1d3672..ad8c331 100644
--- a/src/nautilus-list-view-private.h
+++ b/src/nautilus-list-view-private.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Rebecca Schulman <rebecka mit edu>
 
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index e428e70..6faf28f 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
             Anders Carlsson <andersca gnu org>
diff --git a/src/nautilus-list-view.h b/src/nautilus-list-view.h
index 91a26dd..0edddda 100644
--- a/src/nautilus-list-view.h
+++ b/src/nautilus-list-view.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: John Sullivan <sullivan eazel com>
             Anders Carlsson <andersca gnu org>
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 4de76c5..a5f23f8 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Maciej Stachowiak <mjs eazel com>
  *         Ettore Perazzoli <ettore gnu org>
diff --git a/src/nautilus-location-entry.h b/src/nautilus-location-entry.h
index 21e30e9..d4c826b 100644
--- a/src/nautilus-location-entry.h
+++ b/src/nautilus-location-entry.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Maciej Stachowiak <mjs eazel com>
  *         Ettore Perazzoli <ettore gnu org>
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 401aa8c..ca1f0ac 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Maciej Stachowiak <mjs eazel com>
 */
diff --git a/src/nautilus-mime-actions.h b/src/nautilus-mime-actions.h
index 8f9b73a..91ea7be 100644
--- a/src/nautilus-mime-actions.h
+++ b/src/nautilus-mime-actions.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Maciej Stachowiak <mjs eazel com>
 */
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index b16f7f4..09ecae8 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/src/nautilus-pathbar.h b/src/nautilus-pathbar.h
index 984e0e3..471c0e1 100644
--- a/src/nautilus-pathbar.h
+++ b/src/nautilus-pathbar.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * 
  */
diff --git a/src/nautilus-progress-info-widget.c b/src/nautilus-progress-info-widget.c
index 637ec15..491ac8b 100644
--- a/src/nautilus-progress-info-widget.c
+++ b/src/nautilus-progress-info-widget.c
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/src/nautilus-progress-info-widget.h b/src/nautilus-progress-info-widget.h
index 4b0373d..38915d1 100644
--- a/src/nautilus-progress-info-widget.h
+++ b/src/nautilus-progress-info-widget.h
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/src/nautilus-progress-ui-handler.c b/src/nautilus-progress-ui-handler.c
index 020ec04..d21874d 100644
--- a/src/nautilus-progress-ui-handler.c
+++ b/src/nautilus-progress-ui-handler.c
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/src/nautilus-progress-ui-handler.h b/src/nautilus-progress-ui-handler.h
index f09c2ea..35f22e4 100644
--- a/src/nautilus-progress-ui-handler.h
+++ b/src/nautilus-progress-ui-handler.h
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          Cosimo Cecchi <cosimoc redhat com>
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 047843e..68e68cd 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin bentspoon com>
 */
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 593d9d6..f9f39fb 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -17,8 +17,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Darin Adler <darin bentspoon com>
 */
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 349f400..20a6e4f 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/src/nautilus-query-editor.h b/src/nautilus-query-editor.h
index f394143..4733953 100644
--- a/src/nautilus-query-editor.h
+++ b/src/nautilus-query-editor.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  *
diff --git a/src/nautilus-special-location-bar.c b/src/nautilus-special-location-bar.c
index 0c5350b..e28bbc9 100644
--- a/src/nautilus-special-location-bar.c
+++ b/src/nautilus-special-location-bar.c
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/nautilus-special-location-bar.h b/src/nautilus-special-location-bar.h
index 0e34e58..c72aaa5 100644
--- a/src/nautilus-special-location-bar.h
+++ b/src/nautilus-special-location-bar.h
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index cf6e2fc..7f7a76b 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Paolo Borelli <pborelli katamail com>
  *
diff --git a/src/nautilus-trash-bar.h b/src/nautilus-trash-bar.h
index beb7f7c..9190415 100644
--- a/src/nautilus-trash-bar.h
+++ b/src/nautilus-trash-bar.h
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Paolo Borelli <pborelli katamail com>
  *
diff --git a/src/nautilus-view-dnd.c b/src/nautilus-view-dnd.c
index 5459f97..2a55240 100644
--- a/src/nautilus-view-dnd.c
+++ b/src/nautilus-view-dnd.c
@@ -17,9 +17,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ettore Perazzoli
  *         Darin Adler <darin bentspoon com>
diff --git a/src/nautilus-view-dnd.h b/src/nautilus-view-dnd.h
index bdfa1f6..bd09af4 100644
--- a/src/nautilus-view-dnd.h
+++ b/src/nautilus-view-dnd.h
@@ -17,9 +17,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ettore Perazzoli
  *         Darin Adler <darin bentspoon com>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 481d039..1965ac0 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -16,9 +16,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ettore Perazzoli,
  *          John Sullivan <sullivan eazel com>,
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index 594101a..98f3d57 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -15,9 +15,7 @@
  * 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ettore Perazzoli
  *         Darin Adler <darin bentspoon com>
diff --git a/src/nautilus-window-slot-dnd.c b/src/nautilus-window-slot-dnd.c
index 3d6638c..548515c 100644
--- a/src/nautilus-window-slot-dnd.c
+++ b/src/nautilus-window-slot-dnd.c
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Pavel Cisler <pavel eazel com>,
  *         Ettore Perazzoli <ettore gnu org>
diff --git a/src/nautilus-window-slot-dnd.h b/src/nautilus-window-slot-dnd.h
index 86b8166..a4897b6 100644
--- a/src/nautilus-window-slot-dnd.h
+++ b/src/nautilus-window-slot-dnd.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * Authors: Pavel Cisler <pavel eazel com>,
  *         Ettore Perazzoli <ettore gnu org>
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 545eee4..922ee7e 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Christian Neumair <cneumair gnome org>
 */
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 13acf8c..aa9766d 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -15,9 +15,7 @@
    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.
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
   
    Author: Christian Neumair <cneumair gnome org>
 */
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index fae3767..586296a 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -14,8 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: David Zeuthen <davidz redhat com>
  *          Paolo Borelli <pborelli katamail com>
diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h
index 0bbfafe..4b0d7e6 100644
--- a/src/nautilus-x-content-bar.h
+++ b/src/nautilus-x-content-bar.h
@@ -14,8 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: David Zeuthen <davidz redhat com>
  *          Paolo Borelli <pborelli katamail com>
diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index b615d91..6b576a6 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Maciej Stachowiak <mjs eazel com>
 */
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index e77fff1..ff0b5db 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Maciej Stachowiak <mjs eazel com>
 */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]