summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eel/check-program.c1
-rw-r--r--eel/eel-accessibility.c1
-rw-r--r--eel/eel-accessibility.h1
-rw-r--r--eel/eel-art-extensions.c1
-rw-r--r--eel/eel-art-extensions.h1
-rw-r--r--eel/eel-canvas.c1
-rw-r--r--eel/eel-canvas.h1
-rw-r--r--eel/eel-debug.c3
-rw-r--r--eel/eel-debug.h3
-rw-r--r--eel/eel-gdk-extensions.c1
-rw-r--r--eel/eel-gdk-extensions.h1
-rw-r--r--eel/eel-glib-extensions.c1
-rw-r--r--eel/eel-glib-extensions.h1
-rw-r--r--eel/eel-gnome-extensions.c1
-rw-r--r--eel/eel-gnome-extensions.h1
-rw-r--r--eel/eel-graphic-effects.c1
-rw-r--r--eel/eel-graphic-effects.h3
-rw-r--r--eel/eel-gtk-extensions.c1
-rw-r--r--eel/eel-gtk-extensions.h1
-rw-r--r--eel/eel-lib-self-check-functions.c3
-rw-r--r--eel/eel-lib-self-check-functions.h3
-rw-r--r--eel/eel-self-checks.c3
-rw-r--r--eel/eel-self-checks.h3
-rw-r--r--eel/eel-stock-dialogs.c1
-rw-r--r--eel/eel-stock-dialogs.h1
-rw-r--r--eel/eel-string.c3
-rw-r--r--eel/eel-string.h3
-rw-r--r--eel/eel-vfs-extensions.c1
-rw-r--r--eel/eel-vfs-extensions.h1
-rw-r--r--eel/eel.h1
-rw-r--r--libnautilus-private/nautilus-bookmark.c1
-rw-r--r--libnautilus-private/nautilus-bookmark.h1
-rw-r--r--libnautilus-private/nautilus-canvas-container.c1
-rw-r--r--libnautilus-private/nautilus-canvas-container.h1
-rw-r--r--libnautilus-private/nautilus-canvas-dnd.c1
-rw-r--r--libnautilus-private/nautilus-canvas-dnd.h1
-rw-r--r--libnautilus-private/nautilus-canvas-item.c1
-rw-r--r--libnautilus-private/nautilus-canvas-item.h1
-rw-r--r--libnautilus-private/nautilus-canvas-private.h1
-rw-r--r--libnautilus-private/nautilus-clipboard-monitor.c3
-rw-r--r--libnautilus-private/nautilus-clipboard-monitor.h3
-rw-r--r--libnautilus-private/nautilus-clipboard.c1
-rw-r--r--libnautilus-private/nautilus-clipboard.h1
-rw-r--r--libnautilus-private/nautilus-column-chooser.c1
-rw-r--r--libnautilus-private/nautilus-column-chooser.h1
-rw-r--r--libnautilus-private/nautilus-column-utilities.c1
-rw-r--r--libnautilus-private/nautilus-column-utilities.h1
-rw-r--r--libnautilus-private/nautilus-default-file-icon.c3
-rw-r--r--libnautilus-private/nautilus-default-file-icon.h3
-rw-r--r--libnautilus-private/nautilus-desktop-directory-file.c3
-rw-r--r--libnautilus-private/nautilus-desktop-directory-file.h3
-rw-r--r--libnautilus-private/nautilus-desktop-directory.c3
-rw-r--r--libnautilus-private/nautilus-desktop-directory.h3
-rw-r--r--libnautilus-private/nautilus-desktop-icon-file.c5
-rw-r--r--libnautilus-private/nautilus-desktop-icon-file.h3
-rw-r--r--libnautilus-private/nautilus-desktop-link-monitor.c3
-rw-r--r--libnautilus-private/nautilus-desktop-link-monitor.h3
-rw-r--r--libnautilus-private/nautilus-desktop-link.c3
-rw-r--r--libnautilus-private/nautilus-desktop-link.h3
-rw-r--r--libnautilus-private/nautilus-desktop-metadata.c1
-rw-r--r--libnautilus-private/nautilus-desktop-metadata.h1
-rw-r--r--libnautilus-private/nautilus-directory-async.c3
-rw-r--r--libnautilus-private/nautilus-directory-notify.h3
-rw-r--r--libnautilus-private/nautilus-directory-private.h3
-rw-r--r--libnautilus-private/nautilus-directory.c3
-rw-r--r--libnautilus-private/nautilus-directory.h3
-rw-r--r--libnautilus-private/nautilus-dnd.c1
-rw-r--r--libnautilus-private/nautilus-dnd.h1
-rw-r--r--libnautilus-private/nautilus-entry.c1
-rw-r--r--libnautilus-private/nautilus-entry.h1
-rw-r--r--libnautilus-private/nautilus-file-attributes.h3
-rw-r--r--libnautilus-private/nautilus-file-changes-queue.c3
-rw-r--r--libnautilus-private/nautilus-file-changes-queue.h3
-rw-r--r--libnautilus-private/nautilus-file-conflict-dialog.c1
-rw-r--r--libnautilus-private/nautilus-file-conflict-dialog.h1
-rw-r--r--libnautilus-private/nautilus-file-dnd.c1
-rw-r--r--libnautilus-private/nautilus-file-dnd.h1
-rw-r--r--libnautilus-private/nautilus-file-operations.c1
-rw-r--r--libnautilus-private/nautilus-file-operations.h1
-rw-r--r--libnautilus-private/nautilus-file-private.h3
-rw-r--r--libnautilus-private/nautilus-file-queue.c3
-rw-r--r--libnautilus-private/nautilus-file-queue.h3
-rw-r--r--libnautilus-private/nautilus-file-undo-manager.c1
-rw-r--r--libnautilus-private/nautilus-file-undo-manager.h1
-rw-r--r--libnautilus-private/nautilus-file-undo-operations.c1
-rw-r--r--libnautilus-private/nautilus-file-undo-operations.h1
-rw-r--r--libnautilus-private/nautilus-file-utilities.c1
-rw-r--r--libnautilus-private/nautilus-file-utilities.h1
-rw-r--r--libnautilus-private/nautilus-file.c11
-rw-r--r--libnautilus-private/nautilus-file.h3
-rw-r--r--libnautilus-private/nautilus-global-preferences.c1
-rw-r--r--libnautilus-private/nautilus-global-preferences.h1
-rw-r--r--libnautilus-private/nautilus-icon-info.c1
-rw-r--r--libnautilus-private/nautilus-keyfile-metadata.c1
-rw-r--r--libnautilus-private/nautilus-keyfile-metadata.h1
-rw-r--r--libnautilus-private/nautilus-lib-self-check-functions.c3
-rw-r--r--libnautilus-private/nautilus-lib-self-check-functions.h3
-rw-r--r--libnautilus-private/nautilus-link.c3
-rw-r--r--libnautilus-private/nautilus-link.h3
-rw-r--r--libnautilus-private/nautilus-metadata.c1
-rw-r--r--libnautilus-private/nautilus-metadata.h3
-rw-r--r--libnautilus-private/nautilus-mime-application-chooser.c1
-rw-r--r--libnautilus-private/nautilus-mime-application-chooser.h1
-rw-r--r--libnautilus-private/nautilus-module.c1
-rw-r--r--libnautilus-private/nautilus-monitor.c3
-rw-r--r--libnautilus-private/nautilus-monitor.h3
-rw-r--r--libnautilus-private/nautilus-profile.c3
-rw-r--r--libnautilus-private/nautilus-profile.h3
-rw-r--r--libnautilus-private/nautilus-program-choosing.c1
-rw-r--r--libnautilus-private/nautilus-program-choosing.h1
-rw-r--r--libnautilus-private/nautilus-progress-info-manager.c1
-rw-r--r--libnautilus-private/nautilus-progress-info-manager.h1
-rw-r--r--libnautilus-private/nautilus-progress-info.c3
-rw-r--r--libnautilus-private/nautilus-progress-info.h3
-rw-r--r--libnautilus-private/nautilus-query.c1
-rw-r--r--libnautilus-private/nautilus-query.h1
-rw-r--r--libnautilus-private/nautilus-recent.c1
-rw-r--r--libnautilus-private/nautilus-search-directory-file.c3
-rw-r--r--libnautilus-private/nautilus-search-directory-file.h3
-rw-r--r--libnautilus-private/nautilus-search-directory.c1
-rw-r--r--libnautilus-private/nautilus-search-directory.h3
-rw-r--r--libnautilus-private/nautilus-search-engine-model.c1
-rw-r--r--libnautilus-private/nautilus-search-engine-model.h1
-rw-r--r--libnautilus-private/nautilus-search-engine-simple.c1
-rw-r--r--libnautilus-private/nautilus-search-engine-simple.h1
-rw-r--r--libnautilus-private/nautilus-search-engine-tracker.c1
-rw-r--r--libnautilus-private/nautilus-search-engine-tracker.h1
-rw-r--r--libnautilus-private/nautilus-search-engine.c1
-rw-r--r--libnautilus-private/nautilus-search-engine.h1
-rw-r--r--libnautilus-private/nautilus-search-hit.c3
-rw-r--r--libnautilus-private/nautilus-search-hit.h3
-rw-r--r--libnautilus-private/nautilus-search-provider.c3
-rw-r--r--libnautilus-private/nautilus-selection-canvas-item.c1
-rw-r--r--libnautilus-private/nautilus-selection-canvas-item.h1
-rw-r--r--libnautilus-private/nautilus-signaller.c1
-rw-r--r--libnautilus-private/nautilus-signaller.h1
-rw-r--r--libnautilus-private/nautilus-thumbnails.c3
-rw-r--r--libnautilus-private/nautilus-thumbnails.h3
-rw-r--r--libnautilus-private/nautilus-trash-monitor.c1
-rw-r--r--libnautilus-private/nautilus-trash-monitor.h1
-rw-r--r--libnautilus-private/nautilus-tree-view-drag-dest.c1
-rw-r--r--libnautilus-private/nautilus-tree-view-drag-dest.h1
-rw-r--r--libnautilus-private/nautilus-ui-utilities.c1
-rw-r--r--libnautilus-private/nautilus-ui-utilities.h1
-rw-r--r--libnautilus-private/nautilus-undo-private.h1
-rw-r--r--libnautilus-private/nautilus-vfs-directory.c3
-rw-r--r--libnautilus-private/nautilus-vfs-directory.h3
-rw-r--r--libnautilus-private/nautilus-vfs-file.c3
-rw-r--r--libnautilus-private/nautilus-vfs-file.h3
-rw-r--r--src/nautilus-application.c1
-rw-r--r--src/nautilus-application.h1
-rw-r--r--src/nautilus-autorun-software.c1
-rw-r--r--src/nautilus-bookmark-list.c1
-rw-r--r--src/nautilus-bookmark-list.h1
-rw-r--r--src/nautilus-canvas-view-container.c1
-rw-r--r--src/nautilus-canvas-view-container.h1
-rw-r--r--src/nautilus-canvas-view.c1
-rw-r--r--src/nautilus-desktop-canvas-view.c1
-rw-r--r--src/nautilus-desktop-canvas-view.h1
-rw-r--r--src/nautilus-desktop-window.c1
-rw-r--r--src/nautilus-desktop-window.h1
-rw-r--r--src/nautilus-empty-view.c1
-rw-r--r--src/nautilus-empty-view.h1
-rw-r--r--src/nautilus-error-reporting.c1
-rw-r--r--src/nautilus-error-reporting.h1
-rw-r--r--src/nautilus-files-view-dnd.c1
-rw-r--r--src/nautilus-files-view-dnd.h1
-rw-r--r--src/nautilus-files-view.h1
-rw-r--r--src/nautilus-floating-bar.c1
-rw-r--r--src/nautilus-floating-bar.h1
-rw-r--r--src/nautilus-image-properties-page.c1
-rw-r--r--src/nautilus-image-properties-page.h1
-rw-r--r--src/nautilus-list-model.c1
-rw-r--r--src/nautilus-list-model.h1
-rw-r--r--src/nautilus-list-view.c1
-rw-r--r--src/nautilus-list-view.h1
-rw-r--r--src/nautilus-location-entry.c1
-rw-r--r--src/nautilus-location-entry.h1
-rw-r--r--src/nautilus-main.c1
-rw-r--r--src/nautilus-mime-actions.c1
-rw-r--r--src/nautilus-mime-actions.h1
-rw-r--r--src/nautilus-notebook.c1
-rw-r--r--src/nautilus-pathbar.c1
-rw-r--r--src/nautilus-pathbar.h1
-rw-r--r--src/nautilus-preferences-window.c1
-rw-r--r--src/nautilus-preferences-window.h1
-rw-r--r--src/nautilus-progress-info-widget.c1
-rw-r--r--src/nautilus-progress-info-widget.h1
-rw-r--r--src/nautilus-progress-persistence-handler.c1
-rw-r--r--src/nautilus-progress-persistence-handler.h1
-rw-r--r--src/nautilus-properties-window.c1
-rw-r--r--src/nautilus-properties-window.h1
-rw-r--r--src/nautilus-query-editor.c1
-rw-r--r--src/nautilus-query-editor.h1
-rw-r--r--src/nautilus-self-check-functions.c1
-rw-r--r--src/nautilus-self-check-functions.h1
-rw-r--r--src/nautilus-special-location-bar.c3
-rw-r--r--src/nautilus-special-location-bar.h3
-rw-r--r--src/nautilus-toolbar.c1
-rw-r--r--src/nautilus-toolbar.h1
-rw-r--r--src/nautilus-trash-bar.c1
-rw-r--r--src/nautilus-trash-bar.h1
-rw-r--r--src/nautilus-window-slot.c3
-rw-r--r--src/nautilus-window-slot.h3
-rw-r--r--src/nautilus-window.c1
-rw-r--r--src/nautilus-window.h1
-rw-r--r--src/nautilus-x-content-bar.c1
-rw-r--r--src/nautilus-x-content-bar.h1
208 files changed, 68 insertions, 276 deletions
diff --git a/eel/check-program.c b/eel/check-program.c
index b2918022e..ca109740f 100644
--- a/eel/check-program.c
+++ b/eel/check-program.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* check-program.c: A simple driver for eel self checks.
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
index 40ffd53af..83b88accd 100644
--- a/eel/eel-accessibility.c
+++ b/eel/eel-accessibility.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-accessibility.h - Utility functions for accessibility
Copyright (C) 2002 Anders Carlsson, Sun Microsystems, Inc.
diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h
index 9dc26e406..bed9b4cd9 100644
--- a/eel/eel-accessibility.h
+++ b/eel/eel-accessibility.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-accessibility.h - Utility functions for accessibility
Copyright (C) 2002 Anders Carlsson
diff --git a/eel/eel-art-extensions.c b/eel/eel-art-extensions.c
index 8178fb4c9..38072b562 100644
--- a/eel/eel-art-extensions.c
+++ b/eel/eel-art-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-art-extensions.c - implementation of libart extension functions.
diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h
index e0308729f..8f40d562b 100644
--- a/eel/eel-art-extensions.h
+++ b/eel/eel-art-extensions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-art-extensions.h - interface of libart extension functions.
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index cbc4372fd..45f3665e4 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
/*
* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h
index 56db0b775..adff7f773 100644
--- a/eel/eel-canvas.h
+++ b/eel/eel-canvas.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
/*
* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
diff --git a/eel/eel-debug.c b/eel/eel-debug.c
index 7de786e0f..df3f51d78 100644
--- a/eel/eel-debug.c
+++ b/eel/eel-debug.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-debug.c: Eel debugging aids.
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/eel/eel-debug.h b/eel/eel-debug.h
index d47511918..0abc1a07d 100644
--- a/eel/eel-debug.h
+++ b/eel/eel-debug.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-debug.h: Eel debugging aids.
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c
index 49ff0d25b..dc06f9d4c 100644
--- a/eel/eel-gdk-extensions.c
+++ b/eel/eel-gdk-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gdk-extensions.c: Graphics routines to augment what's in gdk.
diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h
index 9be06abf1..d65d2b104 100644
--- a/eel/eel-gdk-extensions.h
+++ b/eel/eel-gdk-extensions.h
@@ -1,4 +1,3 @@
-// /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gdk-extensions.h: Graphics routines to augment what's in gdk.
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
index 709c37a79..5564eda08 100644
--- a/eel/eel-glib-extensions.c
+++ b/eel/eel-glib-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-glib-extensions.c - implementation of new functions that conceptually
belong in glib. Perhaps some of these will be
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
index f23302433..56f23c2ce 100644
--- a/eel/eel-glib-extensions.h
+++ b/eel/eel-glib-extensions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-glib-extensions.h - interface for new functions that conceptually
belong in glib. Perhaps some of these will be
diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
index 30059583b..fe5efef9a 100644
--- a/eel/eel-gnome-extensions.c
+++ b/eel/eel-gnome-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gnome-extensions.c - implementation of new functions that operate on
gnome classes. Perhaps some of these should be
diff --git a/eel/eel-gnome-extensions.h b/eel/eel-gnome-extensions.h
index d6bd8a7f6..3465906a4 100644
--- a/eel/eel-gnome-extensions.h
+++ b/eel/eel-gnome-extensions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gnome-extensions.h - interface for new functions that operate on
gnome classes. Perhaps some of these should be
diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c
index 3ffeb76bf..820435ab7 100644
--- a/eel/eel-graphic-effects.c
+++ b/eel/eel-graphic-effects.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Eel - pixbuf manipulation routines for graphical effects.
*
diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h
index d7cbf1518..850ba7605 100644
--- a/eel/eel-graphic-effects.h
+++ b/eel/eel-graphic-effects.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-graphic-effects.h: Pixmap manipulation routines for graphical effects.
Copyright (C) 2000 Eazel, Inc.
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index a68ff4679..d694ad4f1 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gtk-extensions.c - implementation of new functions that operate on
gtk classes. Perhaps some of these should be
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
index 67e811b33..53a326ad3 100644
--- a/eel/eel-gtk-extensions.h
+++ b/eel/eel-gtk-extensions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-gtk-extensions.h - interface for new functions that operate on
gtk classes. Perhaps some of these should be
diff --git a/eel/eel-lib-self-check-functions.c b/eel/eel-lib-self-check-functions.c
index bb789e72e..2c180e8ae 100644
--- a/eel/eel-lib-self-check-functions.c
+++ b/eel/eel-lib-self-check-functions.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-lib-self-check-functions.c: Wrapper for all self check functions
in Eel proper.
diff --git a/eel/eel-lib-self-check-functions.h b/eel/eel-lib-self-check-functions.h
index 11386e8e6..da8fd43f0 100644
--- a/eel/eel-lib-self-check-functions.h
+++ b/eel/eel-lib-self-check-functions.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-lib-self-check-functions.h: Wrapper and prototypes for all
self-check functions in libeel.
diff --git a/eel/eel-self-checks.c b/eel/eel-self-checks.c
index d5b9ff40d..8de01a421 100644
--- a/eel/eel-self-checks.c
+++ b/eel/eel-self-checks.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-self-checks.c: The self-check framework.
Copyright (C) 1999 Eazel, Inc.
diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h
index 6a0eef0a2..ba5d07695 100644
--- a/eel/eel-self-checks.h
+++ b/eel/eel-self-checks.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-self-checks.h: The self-check framework.
Copyright (C) 1999 Eazel, Inc.
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index 12da1b5f8..2de57672b 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-stock-dialogs.c: Various standard dialogs for Eel.
diff --git a/eel/eel-stock-dialogs.h b/eel/eel-stock-dialogs.h
index 016128dd8..25ab1ca2f 100644
--- a/eel/eel-stock-dialogs.h
+++ b/eel/eel-stock-dialogs.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-stock-dialogs.h: Various standard dialogs for Eel.
diff --git a/eel/eel-string.c b/eel/eel-string.c
index 178af36da..28c7e5024 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-string.c: String routines to augment <string.h>.
Copyright (C) 2000 Eazel, Inc.
diff --git a/eel/eel-string.h b/eel/eel-string.h
index 8119c16a9..202eec2a3 100644
--- a/eel/eel-string.h
+++ b/eel/eel-string.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
eel-string.h: String routines to augment <string.h>.
Copyright (C) 2000 Eazel, Inc.
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c
index cf6a6c14d..5dd6225c4 100644
--- a/eel/eel-vfs-extensions.c
+++ b/eel/eel-vfs-extensions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-vfs-extensions.c - gnome-vfs extensions. Its likely some of these will
be part of gnome-vfs in the future.
diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h
index e44546fd3..f64af0a18 100644
--- a/eel/eel-vfs-extensions.h
+++ b/eel/eel-vfs-extensions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel-vfs-extensions.h - gnome-vfs extensions. Its likely some of these will
be part of gnome-vfs in the future.
diff --git a/eel/eel.h b/eel/eel.h
index d9f1b46ae..e028d7d4c 100644
--- a/eel/eel.h
+++ b/eel/eel.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* eel.h
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index e4bb5db8c..bd154524f 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-bookmark.c - implementation of individual bookmarks.
*
diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h
index 135c3eb80..b716bebf2 100644
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-bookmark.h - implementation of individual bookmarks.
*
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index a562ac080..6b292c4f8 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-canvas-container.c - Canvas container widget.
diff --git a/libnautilus-private/nautilus-canvas-container.h b/libnautilus-private/nautilus-canvas-container.h
index 711b3ea4b..461804069 100644
--- a/libnautilus-private/nautilus-canvas-container.h
+++ b/libnautilus-private/nautilus-canvas-container.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* gnome-canvas-container.h - Canvas container widget.
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/libnautilus-private/nautilus-canvas-dnd.c
index 2b6d2a39c..f4b63e6c8 100644
--- a/libnautilus-private/nautilus-canvas-dnd.c
+++ b/libnautilus-private/nautilus-canvas-dnd.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-canvas-dnd.c - Drag & drop handling for the canvas container widget.
diff --git a/libnautilus-private/nautilus-canvas-dnd.h b/libnautilus-private/nautilus-canvas-dnd.h
index c015f7632..473faeb32 100644
--- a/libnautilus-private/nautilus-canvas-dnd.h
+++ b/libnautilus-private/nautilus-canvas-dnd.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-canvas-dnd.h - Drag & drop handling for the canvas container widget.
diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c
index 6eebea182..accee93f8 100644
--- a/libnautilus-private/nautilus-canvas-item.c
+++ b/libnautilus-private/nautilus-canvas-item.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Canvas item class for canvas container.
*
diff --git a/libnautilus-private/nautilus-canvas-item.h b/libnautilus-private/nautilus-canvas-item.h
index 76059d582..89dfe8709 100644
--- a/libnautilus-private/nautilus-canvas-item.h
+++ b/libnautilus-private/nautilus-canvas-item.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Canvas item class for canvas container.
*
diff --git a/libnautilus-private/nautilus-canvas-private.h b/libnautilus-private/nautilus-canvas-private.h
index 2e693aa09..3a25806f8 100644
--- a/libnautilus-private/nautilus-canvas-private.h
+++ b/libnautilus-private/nautilus-canvas-private.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* gnome-canvas-container-private.h
Copyright (C) 1999, 2000 Free Software Foundation
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c b/libnautilus-private/nautilus-clipboard-monitor.c
index 891401a4a..4d164723c 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-clipboard-monitor.c: catch clipboard changes.
Copyright (C) 2004 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-clipboard-monitor.h b/libnautilus-private/nautilus-clipboard-monitor.h
index 7d1e6faf4..cb7a948b4 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.h
+++ b/libnautilus-private/nautilus-clipboard-monitor.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-clipboard-monitor.h: lets you notice clipboard changes.
Copyright (C) 2004 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c
index d194cf346..36e68002d 100644
--- a/libnautilus-private/nautilus-clipboard.c
+++ b/libnautilus-private/nautilus-clipboard.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-clipboard.c
*
diff --git a/libnautilus-private/nautilus-clipboard.h b/libnautilus-private/nautilus-clipboard.h
index eee64ef97..1452b0f0d 100644
--- a/libnautilus-private/nautilus-clipboard.h
+++ b/libnautilus-private/nautilus-clipboard.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-directory-view.h
*
diff --git a/libnautilus-private/nautilus-column-chooser.c b/libnautilus-private/nautilus-column-chooser.c
index 47d4f1526..f6e3d65d6 100644
--- a/libnautilus-private/nautilus-column-chooser.c
+++ b/libnautilus-private/nautilus-column-chooser.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-column-chooser.h - A column chooser widget
diff --git a/libnautilus-private/nautilus-column-chooser.h b/libnautilus-private/nautilus-column-chooser.h
index 4d3d4900f..b0dee94b0 100644
--- a/libnautilus-private/nautilus-column-chooser.h
+++ b/libnautilus-private/nautilus-column-chooser.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-column-choose.h - A column chooser widget
diff --git a/libnautilus-private/nautilus-column-utilities.c b/libnautilus-private/nautilus-column-utilities.c
index 57fbbd492..262a2ad4c 100644
--- a/libnautilus-private/nautilus-column-utilities.c
+++ b/libnautilus-private/nautilus-column-utilities.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-column-utilities.h - Utilities related to column specifications
diff --git a/libnautilus-private/nautilus-column-utilities.h b/libnautilus-private/nautilus-column-utilities.h
index c6bda95d8..e5c5aa415 100644
--- a/libnautilus-private/nautilus-column-utilities.h
+++ b/libnautilus-private/nautilus-column-utilities.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-column-utilities.h - Utilities related to column specifications
diff --git a/libnautilus-private/nautilus-default-file-icon.c b/libnautilus-private/nautilus-default-file-icon.c
index 75435187a..cceaf0deb 100644
--- a/libnautilus-private/nautilus-default-file-icon.c
+++ b/libnautilus-private/nautilus-default-file-icon.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Default file icon used by the icon factory.
Copyright (C) 2000 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-default-file-icon.h b/libnautilus-private/nautilus-default-file-icon.h
index 2d3fd08b8..6ac08257f 100644
--- a/libnautilus-private/nautilus-default-file-icon.h
+++ b/libnautilus-private/nautilus-default-file-icon.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Default file icon used by the icon factory.
Copyright (C) 2000 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-desktop-directory-file.c b/libnautilus-private/nautilus-desktop-directory-file.c
index 586fd1b63..e990de218 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/libnautilus-private/nautilus-desktop-directory-file.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-directory-file.c: Subclass of NautilusFile to help implement the
virtual desktop.
diff --git a/libnautilus-private/nautilus-desktop-directory-file.h b/libnautilus-private/nautilus-desktop-directory-file.h
index bf542db03..2a5097980 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.h
+++ b/libnautilus-private/nautilus-desktop-directory-file.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-directory-file.h: Subclass of NautilusFile to implement the
the case of the desktop directory
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/libnautilus-private/nautilus-desktop-directory.c
index d39022150..4064ed84a 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-directory.c: Subclass of NautilusDirectory to implement
a virtual directory consisting of the desktop directory and the desktop
icons
diff --git a/libnautilus-private/nautilus-desktop-directory.h b/libnautilus-private/nautilus-desktop-directory.h
index bf34230c6..bd7c173f7 100644
--- a/libnautilus-private/nautilus-desktop-directory.h
+++ b/libnautilus-private/nautilus-desktop-directory.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-directory.h: Subclass of NautilusDirectory to implement
a virtual directory consisting of the desktop directory and the desktop
icons
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c
index dbdc72ffe..bac8d3bf7 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
+++ b/libnautilus-private/nautilus-desktop-icon-file.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-icon-file.c: Subclass of NautilusFile to help implement the
virtual desktop icons.
@@ -369,7 +368,7 @@ nautilus_desktop_icon_file_class_init (NautilusDesktopIconFileClass *klass)
file_class = NAUTILUS_FILE_CLASS (klass);
file_class->default_file_type = G_FILE_TYPE_DIRECTORY;
-
+
file_class->monitor_add = desktop_icon_file_monitor_add;
file_class->monitor_remove = desktop_icon_file_monitor_remove;
file_class->call_when_ready = desktop_icon_file_call_when_ready;
diff --git a/libnautilus-private/nautilus-desktop-icon-file.h b/libnautilus-private/nautilus-desktop-icon-file.h
index 9d8f4385c..8fe802796 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.h
+++ b/libnautilus-private/nautilus-desktop-icon-file.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-file.h: Subclass of NautilusFile to implement the
the case of a desktop icon file
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 1684ec055..21b0cd69f 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-link-monitor.c: singleton thatn manages the links
Copyright (C) 2003 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.h b/libnautilus-private/nautilus-desktop-link-monitor.h
index 4172f8b6d..dc47aea0c 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.h
+++ b/libnautilus-private/nautilus-desktop-link-monitor.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-link-monitor.h: singleton that manages the desktop links
Copyright (C) 2003 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index bdef52cf6..f6decb6f9 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-link.c: Class that handles the links on the desktop
Copyright (C) 2003 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-desktop-link.h b/libnautilus-private/nautilus-desktop-link.h
index b9d82e63a..7c1025b40 100644
--- a/libnautilus-private/nautilus-desktop-link.h
+++ b/libnautilus-private/nautilus-desktop-link.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-desktop-link.h: Class that handles the links on the desktop
Copyright (C) 2003 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-desktop-metadata.c b/libnautilus-private/nautilus-desktop-metadata.c
index 09cca7482..e9ef2d6b5 100644
--- a/libnautilus-private/nautilus-desktop-metadata.c
+++ b/libnautilus-private/nautilus-desktop-metadata.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-desktop-metadata.h b/libnautilus-private/nautilus-desktop-metadata.h
index 22e729905..f8c67d3cf 100644
--- a/libnautilus-private/nautilus-desktop-metadata.h
+++ b/libnautilus-private/nautilus-desktop-metadata.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 358dfb40c..ea97da61f 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-directory-async.c: Nautilus directory model state machine.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-directory-notify.h b/libnautilus-private/nautilus-directory-notify.h
index 01f1efc92..c00fc5a38 100644
--- a/libnautilus-private/nautilus-directory-notify.h
+++ b/libnautilus-private/nautilus-directory-notify.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-directory-notify.h: Nautilus directory notify calls.
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index 08fc6dc02..ad4fa26d0 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-directory-private.h: Nautilus directory model.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index d9b257591..201ab23aa 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-directory.c: Nautilus directory model.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 38662ecda..dd467a2c3 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-directory.h: Nautilus directory model.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
index dce90cce0..d2f7ee358 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-dnd.c - Common Drag & drop handling code shared by the icon container
and the list view.
diff --git a/libnautilus-private/nautilus-dnd.h b/libnautilus-private/nautilus-dnd.h
index b92a97f28..52b4e368c 100644
--- a/libnautilus-private/nautilus-dnd.h
+++ b/libnautilus-private/nautilus-dnd.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-dnd.h - Common Drag & drop handling code shared by the icon container
and the list view.
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index f7405e926..1b790a2ab 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* NautilusEntry: one-line text editing widget. This consists of bug fixes
* and other improvements to GtkEntry, and all the changes could be rolled
diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h
index 00149bc46..eb6d9779d 100644
--- a/libnautilus-private/nautilus-entry.h
+++ b/libnautilus-private/nautilus-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* NautilusEntry: one-line text editing widget. This consists of bug fixes
* and other improvements to GtkEntry, and all the changes could be rolled
diff --git a/libnautilus-private/nautilus-file-attributes.h b/libnautilus-private/nautilus-file-attributes.h
index 9a8dbff2e..281de9384 100644
--- a/libnautilus-private/nautilus-file-attributes.h
+++ b/libnautilus-private/nautilus-file-attributes.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-file-attributes.h: #defines and other file-attribute-related info
Copyright (C) 2000 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index 4c83515cf..b637c61e2 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
This program is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-file-changes-queue.h b/libnautilus-private/nautilus-file-changes-queue.h
index cd4054bbb..aa75238c6 100644
--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
This program is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index 4d75f09dd..91b7fb286 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-conflict-dialog: dialog that handles file conflicts
during transfer operations.
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.h b/libnautilus-private/nautilus-file-conflict-dialog.h
index dbac8e10b..b7767ce6d 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.h
+++ b/libnautilus-private/nautilus-file-conflict-dialog.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-conflict-dialog: dialog that handles file conflicts
during transfer operations.
diff --git a/libnautilus-private/nautilus-file-dnd.c b/libnautilus-private/nautilus-file-dnd.c
index 116025555..330f818db 100644
--- a/libnautilus-private/nautilus-file-dnd.c
+++ b/libnautilus-private/nautilus-file-dnd.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-drag.c - Drag & drop handling code that operated on
NautilusFile objects.
diff --git a/libnautilus-private/nautilus-file-dnd.h b/libnautilus-private/nautilus-file-dnd.h
index 59f7b00d0..3b6b91fff 100644
--- a/libnautilus-private/nautilus-file-dnd.h
+++ b/libnautilus-private/nautilus-file-dnd.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-drag.h - Drag & drop handling code that operated on
NautilusFile objects.
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index a34309847..c9469deca 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-operations.c - Nautilus file operations.
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index 38b714fd9..08b11ca95 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-operations: execute file operations.
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index 58eefbb06..ce2cbf359 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-file-private.h:
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-file-queue.c b/libnautilus-private/nautilus-file-queue.c
index 9e849006c..846b1c4df 100644
--- a/libnautilus-private/nautilus-file-queue.c
+++ b/libnautilus-private/nautilus-file-queue.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Copyright (C) 2001 Maciej Stachowiak
This program is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-file-queue.h b/libnautilus-private/nautilus-file-queue.h
index 3de6b4515..a4d0de5b5 100644
--- a/libnautilus-private/nautilus-file-queue.h
+++ b/libnautilus-private/nautilus-file-queue.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
Copyright (C) 2001 Maciej Stachowiak
This program is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-file-undo-manager.c b/libnautilus-private/nautilus-file-undo-manager.c
index 0fb1583e0..e3e915fbd 100644
--- a/libnautilus-private/nautilus-file-undo-manager.c
+++ b/libnautilus-private/nautilus-file-undo-manager.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-undo-manager.c - Manages the undo/redo stack
*
diff --git a/libnautilus-private/nautilus-file-undo-manager.h b/libnautilus-private/nautilus-file-undo-manager.h
index 760bc3d53..777dece4d 100644
--- a/libnautilus-private/nautilus-file-undo-manager.h
+++ b/libnautilus-private/nautilus-file-undo-manager.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-undo-manager.h - Manages the undo/redo stack
*
diff --git a/libnautilus-private/nautilus-file-undo-operations.c b/libnautilus-private/nautilus-file-undo-operations.c
index 316aef09c..30a02e9b7 100644
--- a/libnautilus-private/nautilus-file-undo-operations.c
+++ b/libnautilus-private/nautilus-file-undo-operations.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-undo-operations.c - Manages undo/redo of file operations
*
diff --git a/libnautilus-private/nautilus-file-undo-operations.h b/libnautilus-private/nautilus-file-undo-operations.h
index ffc1fa2db..cec1c7c4e 100644
--- a/libnautilus-private/nautilus-file-undo-operations.h
+++ b/libnautilus-private/nautilus-file-undo-operations.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-undo-operations.h - Manages undo/redo of file operations
*
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index e8def7f32..80303b6ac 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-utilities.c - implementation of file manipulation routines.
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 5e1f2837a..d93c40e57 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-utilities.h - interface for file manipulation routines.
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 1efe626e8..d8dd2ea8a 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-file.c: Nautilus file model.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
@@ -1516,7 +1515,7 @@ gboolean
nautilus_file_can_rename (NautilusFile *file)
{
gboolean can_rename;
-
+
g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
/* Nonexistent files can't be renamed. */
@@ -1831,7 +1830,7 @@ nautilus_file_rename (NautilusFile *file,
gboolean is_renameable_desktop_file;
GFile *location;
GError *error;
-
+
g_return_if_fail (NAUTILUS_IS_FILE (file));
g_return_if_fail (new_name != NULL);
g_return_if_fail (callback != NULL);
@@ -1921,7 +1920,7 @@ nautilus_file_rename (NautilusFile *file,
g_object_unref (link);
return;
}
-
+
if (is_renameable_desktop_file) {
/* Don't actually change the name if the new name is the same.
* This helps for the vfolder method where this can happen and
@@ -3898,7 +3897,7 @@ nautilus_file_get_drop_target_uri (NautilusFile *file)
char *uri, *target_uri;
GFile *location;
NautilusDesktopLink *link;
-
+
g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
if (NAUTILUS_IS_DESKTOP_ICON_FILE (file)) {
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index 363fbff38..1f77534de 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-file.h: Nautilus file model.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 7a0788b1e..19b475f3b 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-global-preferences.c - Nautilus specific preference keys and
functions.
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 3e14d74fd..8597ec19b 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-global-preferences.h - Nautilus specific preference keys and
functions.
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
index ef80d02cf..9c4bc2ad2 100644
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-icon-info.c
* Copyright (C) 2007 Red Hat, Inc., Alexander Larsson <alexl@redhat.com>
*
diff --git a/libnautilus-private/nautilus-keyfile-metadata.c b/libnautilus-private/nautilus-keyfile-metadata.c
index 6658ee7ad..e74711a40 100644
--- a/libnautilus-private/nautilus-keyfile-metadata.c
+++ b/libnautilus-private/nautilus-keyfile-metadata.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-keyfile-metadata.h b/libnautilus-private/nautilus-keyfile-metadata.h
index d8d5b45c6..b8a14ee5e 100644
--- a/libnautilus-private/nautilus-keyfile-metadata.h
+++ b/libnautilus-private/nautilus-keyfile-metadata.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.c b/libnautilus-private/nautilus-lib-self-check-functions.c
index 1ed804eac..5793fca0a 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.c
+++ b/libnautilus-private/nautilus-lib-self-check-functions.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-lib-self-check-functions.c: Wrapper for all self check functions
in Nautilus proper.
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h b/libnautilus-private/nautilus-lib-self-check-functions.h
index 4d841943f..c326c60fd 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.h
+++ b/libnautilus-private/nautilus-lib-self-check-functions.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-lib-self-check-functions.h: Wrapper and prototypes for all
self-check functions in libnautilus.
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 30f221758..b02aa9237 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-link.c: .desktop link files.
Copyright (C) 2001 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-link.h b/libnautilus-private/nautilus-link.h
index 9945f3d9c..72d9c1743 100644
--- a/libnautilus-private/nautilus-link.h
+++ b/libnautilus-private/nautilus-link.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-link.h: .
Copyright (C) 2001 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-metadata.c b/libnautilus-private/nautilus-metadata.c
index 4032a0848..3147f0c8b 100644
--- a/libnautilus-private/nautilus-metadata.c
+++ b/libnautilus-private/nautilus-metadata.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-*/
/* nautilus-metadata.c - metadata utils
*
diff --git a/libnautilus-private/nautilus-metadata.h b/libnautilus-private/nautilus-metadata.h
index 511160de9..7a734af31 100644
--- a/libnautilus-private/nautilus-metadata.h
+++ b/libnautilus-private/nautilus-metadata.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-metadata.h: #defines and other metadata-related info
Copyright (C) 2000 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-mime-application-chooser.c b/libnautilus-private/nautilus-mime-application-chooser.c
index fed969e05..ebe069fa3 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.c
+++ b/libnautilus-private/nautilus-mime-application-chooser.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-mime-application-chooser.c: an mime-application chooser
diff --git a/libnautilus-private/nautilus-mime-application-chooser.h b/libnautilus-private/nautilus-mime-application-chooser.h
index 219836028..fd7ae1e0a 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.h
+++ b/libnautilus-private/nautilus-mime-application-chooser.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
nautilus-mime-application-chooser.c: Manages applications for mime types
diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
index 6273a7619..7e52243fd 100644
--- a/libnautilus-private/nautilus-module.c
+++ b/libnautilus-private/nautilus-module.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-module.h - Interface to nautilus extensions
*
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index e0c43646a..38e63d6d1 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-monitor.c: file and directory change monitoring for nautilus
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-monitor.h b/libnautilus-private/nautilus-monitor.h
index 00f053b79..29faa2318 100644
--- a/libnautilus-private/nautilus-monitor.h
+++ b/libnautilus-private/nautilus-monitor.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-monitor.h: file and directory change monitoring for nautilus
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-profile.c b/libnautilus-private/nautilus-profile.c
index e1a9491c7..444fdc061 100644
--- a/libnautilus-private/nautilus-profile.c
+++ b/libnautilus-private/nautilus-profile.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
+/*
* Copyright (C) 2005 William Jon McCann <mccann@jhu.edu>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/libnautilus-private/nautilus-profile.h b/libnautilus-private/nautilus-profile.h
index 2ca53741e..583d2963e 100644
--- a/libnautilus-private/nautilus-profile.h
+++ b/libnautilus-private/nautilus-profile.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
+/*
* Copyright (C) 2005 William Jon McCann <mccann@jhu.edu>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index 7160214d8..93c1bdf27 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-program-choosing.c - functions for selecting and activating
programs for opening/viewing particular files.
diff --git a/libnautilus-private/nautilus-program-choosing.h b/libnautilus-private/nautilus-program-choosing.h
index c1d8b7bad..93c207023 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-program-choosing.h - functions for selecting and activating
programs for opening/viewing particular files.
diff --git a/libnautilus-private/nautilus-progress-info-manager.c b/libnautilus-private/nautilus-progress-info-manager.c
index d2a7e8ae3..5dc26d1b0 100644
--- a/libnautilus-private/nautilus-progress-info-manager.c
+++ b/libnautilus-private/nautilus-progress-info-manager.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-progress-info-manager.h b/libnautilus-private/nautilus-progress-info-manager.h
index 73bae1679..ef91d3d95 100644
--- a/libnautilus-private/nautilus-progress-info-manager.h
+++ b/libnautilus-private/nautilus-progress-info-manager.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
*
diff --git a/libnautilus-private/nautilus-progress-info.c b/libnautilus-private/nautilus-progress-info.c
index 95e7512bc..4ae3b5d6b 100644
--- a/libnautilus-private/nautilus-progress-info.c
+++ b/libnautilus-private/nautilus-progress-info.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-progress-info.h: file operation progress info.
Copyright (C) 2007 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-progress-info.h b/libnautilus-private/nautilus-progress-info.h
index ae5a20b92..522dc18ba 100644
--- a/libnautilus-private/nautilus-progress-info.h
+++ b/libnautilus-private/nautilus-progress-info.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-progress-info.h: file operation progress info.
Copyright (C) 2007 Red Hat, Inc.
diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
index eb66ff561..3444b1e59 100644
--- a/libnautilus-private/nautilus-query.c
+++ b/libnautilus-private/nautilus-query.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Novell, Inc.
*
diff --git a/libnautilus-private/nautilus-query.h b/libnautilus-private/nautilus-query.h
index c872ea911..2264f505f 100644
--- a/libnautilus-private/nautilus-query.h
+++ b/libnautilus-private/nautilus-query.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Novell, Inc.
*
diff --git a/libnautilus-private/nautilus-recent.c b/libnautilus-private/nautilus-recent.c
index ded4ea5d0..1e23a58dc 100644
--- a/libnautilus-private/nautilus-recent.c
+++ b/libnautilus-private/nautilus-recent.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2002 James Willcox
*
diff --git a/libnautilus-private/nautilus-search-directory-file.c b/libnautilus-private/nautilus-search-directory-file.c
index a027df03b..177494509 100644
--- a/libnautilus-private/nautilus-search-directory-file.c
+++ b/libnautilus-private/nautilus-search-directory-file.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-search-directory-file.c: Subclass of NautilusFile to help implement the
searches
diff --git a/libnautilus-private/nautilus-search-directory-file.h b/libnautilus-private/nautilus-search-directory-file.h
index 4294d1982..ddc8f0205 100644
--- a/libnautilus-private/nautilus-search-directory-file.h
+++ b/libnautilus-private/nautilus-search-directory-file.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-search-directory-file.h: Subclass of NautilusFile to implement the
the case of the search directory
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index b6c3ea6de..01d07ce9b 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
Copyright (C) 2005 Novell, Inc
diff --git a/libnautilus-private/nautilus-search-directory.h b/libnautilus-private/nautilus-search-directory.h
index b14e82834..dd67f2d04 100644
--- a/libnautilus-private/nautilus-search-directory.h
+++ b/libnautilus-private/nautilus-search-directory.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-search-directory.h: Subclass of NautilusDirectory to implement
a virtual directory consisting of the search directory and the search
icons
diff --git a/libnautilus-private/nautilus-search-engine-model.c b/libnautilus-private/nautilus-search-engine-model.c
index 8e847be6d..3294bd077 100644
--- a/libnautilus-private/nautilus-search-engine-model.c
+++ b/libnautilus-private/nautilus-search-engine-model.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc
*
diff --git a/libnautilus-private/nautilus-search-engine-model.h b/libnautilus-private/nautilus-search-engine-model.h
index 9439d80ff..e32a8c24c 100644
--- a/libnautilus-private/nautilus-search-engine-model.h
+++ b/libnautilus-private/nautilus-search-engine-model.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc
*
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 9ce05de2b..253185aac 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc
*
diff --git a/libnautilus-private/nautilus-search-engine-simple.h b/libnautilus-private/nautilus-search-engine-simple.h
index 9f93f43aa..b1f162f71 100644
--- a/libnautilus-private/nautilus-search-engine-simple.h
+++ b/libnautilus-private/nautilus-search-engine-simple.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc
*
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
index 1590ee2c8..680acf250 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Mr Jamie McCracken
*
diff --git a/libnautilus-private/nautilus-search-engine-tracker.h b/libnautilus-private/nautilus-search-engine-tracker.h
index 0377c50f8..b636c2ecc 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.h
+++ b/libnautilus-private/nautilus-search-engine-tracker.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Mr Jamie McCracken
*
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index 1526b8636..79404f0a1 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Novell, Inc.
*
diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
index a1a8d0be0..d9921a611 100644
--- a/libnautilus-private/nautilus-search-engine.h
+++ b/libnautilus-private/nautilus-search-engine.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Novell, Inc.
*
diff --git a/libnautilus-private/nautilus-search-hit.c b/libnautilus-private/nautilus-search-hit.c
index 78704377d..5658872c8 100644
--- a/libnautilus-private/nautilus-search-hit.c
+++ b/libnautilus-private/nautilus-search-hit.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*
* Nautilus is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-search-hit.h b/libnautilus-private/nautilus-search-hit.h
index 9ba43e439..d77040092 100644
--- a/libnautilus-private/nautilus-search-hit.h
+++ b/libnautilus-private/nautilus-search-hit.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*
* Nautilus is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-search-provider.c b/libnautilus-private/nautilus-search-provider.c
index 67404fb07..2c471049d 100644
--- a/libnautilus-private/nautilus-search-provider.c
+++ b/libnautilus-private/nautilus-search-provider.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/libnautilus-private/nautilus-selection-canvas-item.c b/libnautilus-private/nautilus-selection-canvas-item.c
index b1ebea6b0..c1619ca8d 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.c
+++ b/libnautilus-private/nautilus-selection-canvas-item.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Canvas item for floating selection.
*
diff --git a/libnautilus-private/nautilus-selection-canvas-item.h b/libnautilus-private/nautilus-selection-canvas-item.h
index bb82c0311..c5c2778dd 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.h
+++ b/libnautilus-private/nautilus-selection-canvas-item.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Canvas item for floating selection.
*
diff --git a/libnautilus-private/nautilus-signaller.c b/libnautilus-private/nautilus-signaller.c
index 22fc7b5ba..b35877266 100644
--- a/libnautilus-private/nautilus-signaller.c
+++ b/libnautilus-private/nautilus-signaller.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/libnautilus-private/nautilus-signaller.h b/libnautilus-private/nautilus-signaller.h
index 7502b1d61..fee17195a 100644
--- a/libnautilus-private/nautilus-signaller.h
+++ b/libnautilus-private/nautilus-signaller.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index c8f7bb04a..5295df47e 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-thumbnails.h: Thumbnail code for icon factory.
Copyright (C) 2000, 2001 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h
index 69bbbbc93..9edaec5d2 100644
--- a/libnautilus-private/nautilus-thumbnails.h
+++ b/libnautilus-private/nautilus-thumbnails.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-thumbnails.h: Thumbnail code for icon factory.
Copyright (C) 2000 Eazel, Inc.
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 41745b96d..695b87e82 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
nautilus-trash-monitor.c: Nautilus trash state watcher.
diff --git a/libnautilus-private/nautilus-trash-monitor.h b/libnautilus-private/nautilus-trash-monitor.h
index ff0c4856b..a5282819a 100644
--- a/libnautilus-private/nautilus-trash-monitor.h
+++ b/libnautilus-private/nautilus-trash-monitor.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
nautilus-trash-monitor.h: Nautilus trash state watcher.
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index dd638513f..72268ee4a 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.h b/libnautilus-private/nautilus-tree-view-drag-dest.h
index e415f4162..92d2f70cc 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.h
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c
index 3099883e6..c0eaab40b 100644
--- a/libnautilus-private/nautilus-ui-utilities.c
+++ b/libnautilus-private/nautilus-ui-utilities.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* nautilus-ui-utilities.c - helper functions for GtkUIManager stuff
diff --git a/libnautilus-private/nautilus-ui-utilities.h b/libnautilus-private/nautilus-ui-utilities.h
index 936898c42..46e820372 100644
--- a/libnautilus-private/nautilus-ui-utilities.h
+++ b/libnautilus-private/nautilus-ui-utilities.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-ui-utilities.h - helper functions for GtkUIManager stuff
diff --git a/libnautilus-private/nautilus-undo-private.h b/libnautilus-private/nautilus-undo-private.h
index 625fcc63d..9cdc0aa86 100644
--- a/libnautilus-private/nautilus-undo-private.h
+++ b/libnautilus-private/nautilus-undo-private.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* xxx
*
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index a51c192f9..778102b98 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-vfs-directory.c: Subclass of NautilusDirectory to help implement the
virtual trash directory.
diff --git a/libnautilus-private/nautilus-vfs-directory.h b/libnautilus-private/nautilus-vfs-directory.h
index da63b0916..0e5b2ef76 100644
--- a/libnautilus-private/nautilus-vfs-directory.h
+++ b/libnautilus-private/nautilus-vfs-directory.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-vfs-directory.h: Subclass of NautilusDirectory to implement the
the case of a VFS directory.
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index 5fa15e25a..0a37be573 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-vfs-file.c: Subclass of NautilusFile to help implement the
virtual trash directory.
diff --git a/libnautilus-private/nautilus-vfs-file.h b/libnautilus-private/nautilus-vfs-file.h
index fdb0a41f0..5147d745c 100644
--- a/libnautilus-private/nautilus-vfs-file.h
+++ b/libnautilus-private/nautilus-vfs-file.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-vfs-file.h: Subclass of NautilusFile to implement the
the case of a VFS file.
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 24afe978f..3abd0833c 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-application: main Nautilus application class.
*
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 0e5007114..71f1d7516 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-application: main Nautilus application class.
*
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 3d8844479..e23d46fe8 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index e01125427..d22662056 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h
index b5bab0b67..e8b2d7361 100644
--- a/src/nautilus-bookmark-list.h
+++ b/src/nautilus-bookmark-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index 55b498007..03c6ecfa3 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-icon-container.h - the container widget for file manager icons
diff --git a/src/nautilus-canvas-view-container.h b/src/nautilus-canvas-view-container.h
index c588517a3..b7a1cc4a0 100644
--- a/src/nautilus-canvas-view-container.h
+++ b/src/nautilus-canvas-view-container.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-icon-container.h - the container widget for file manager icons
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 5e31bc825..bf4139e71 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-canvas-view.c - implementation of canvas view of directory.
diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
index 361d2052a..674304e9c 100644
--- a/src/nautilus-desktop-canvas-view.c
+++ b/src/nautilus-desktop-canvas-view.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-desktop-canvas-view.c - implementation of canvas view for managing the desktop.
diff --git a/src/nautilus-desktop-canvas-view.h b/src/nautilus-desktop-canvas-view.h
index 0c9d0dd6d..e40d80ff4 100644
--- a/src/nautilus-desktop-canvas-view.h
+++ b/src/nautilus-desktop-canvas-view.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-icon-view.h - interface for icon view of directory.
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 72467a621..7398aaaef 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h
index 506dd6222..589d2b48b 100644
--- a/src/nautilus-desktop-window.h
+++ b/src/nautilus-desktop-window.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c
index 5f4262031..a600c88c8 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-empty-view.c - implementation of empty view of directory.
diff --git a/src/nautilus-empty-view.h b/src/nautilus-empty-view.h
index a8c573bb5..2d95c32af 100644
--- a/src/nautilus-empty-view.h
+++ b/src/nautilus-empty-view.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-empty-view.h - interface for empty view of directory.
diff --git a/src/nautilus-error-reporting.c b/src/nautilus-error-reporting.c
index ef714dd2d..d64499f83 100644
--- a/src/nautilus-error-reporting.c
+++ b/src/nautilus-error-reporting.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-error-reporting.h - implementation of file manager functions that report
errors to the user.
diff --git a/src/nautilus-error-reporting.h b/src/nautilus-error-reporting.h
index 3f2aa13e8..e588b9c45 100644
--- a/src/nautilus-error-reporting.h
+++ b/src/nautilus-error-reporting.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-error-reporting.h - interface for file manager functions that report
errors to the user.
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c
index 317f2534c..addd87243 100644
--- a/src/nautilus-files-view-dnd.c
+++ b/src/nautilus-files-view-dnd.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-view-dnd.c: DnD helpers for NautilusFilesView
diff --git a/src/nautilus-files-view-dnd.h b/src/nautilus-files-view-dnd.h
index 1f123582b..1680e0a19 100644
--- a/src/nautilus-files-view-dnd.h
+++ b/src/nautilus-files-view-dnd.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-view-dnd.h: DnD helpers for NautilusFilesView
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index 4fb1c5229..5378a146c 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-view.h
*
* Copyright (C) 1999, 2000 Free Software Foundaton
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index 0595ddbd9..5ab1527cd 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Floating status bar.
*
diff --git a/src/nautilus-floating-bar.h b/src/nautilus-floating-bar.h
index 59fd1abe1..f0b08a97a 100644
--- a/src/nautilus-floating-bar.h
+++ b/src/nautilus-floating-bar.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* Nautilus - Floating status bar.
*
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 263b09795..bac8b7cc9 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2004 Red Hat, Inc
diff --git a/src/nautilus-image-properties-page.h b/src/nautilus-image-properties-page.h
index 210e9ee00..ccc4d599f 100644
--- a/src/nautilus-image-properties-page.h
+++ b/src/nautilus-image-properties-page.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2004 Red Hat, Inc
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index 14656d821..6fc715bec 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-list-model.h - a GtkTreeModel for file lists.
diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h
index 0a1b4d65e..2f3fe19ea 100644
--- a/src/nautilus-list-model.h
+++ b/src/nautilus-list-model.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-list-model.h - a GtkTreeModel for file lists.
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 1c2f996da..6f896527c 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-list-view.c - implementation of list view of directory.
diff --git a/src/nautilus-list-view.h b/src/nautilus-list-view.h
index 03f027e82..f77543100 100644
--- a/src/nautilus-list-view.h
+++ b/src/nautilus-list-view.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-list-view.h - interface for list view of directory.
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 4c738bed2..53d6ef277 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-location-entry.h b/src/nautilus-location-entry.h
index d4c826bac..eeaafe6cd 100644
--- a/src/nautilus-location-entry.h
+++ b/src/nautilus-location-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index b71900725..ce3c5910e 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 215e8e87f..a0b25e7ac 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* nautilus-mime-actions.c - uri-specific versions of mime action functions
diff --git a/src/nautilus-mime-actions.h b/src/nautilus-mime-actions.h
index f1439e0a4..72c782a26 100644
--- a/src/nautilus-mime-actions.h
+++ b/src/nautilus-mime-actions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-mime-actions.h - uri-specific versions of mime action functions
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index 84998ff27..31dde3173 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Copyright © 2002 Christophe Fergeau
* Copyright © 2003, 2004 Marco Pesenti Gritti
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 926cdb335..693fcb513 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-pathbar.c
* Copyright (C) 2004 Red Hat, Inc., Jonathan Blandford <jrb@gnome.org>
*
diff --git a/src/nautilus-pathbar.h b/src/nautilus-pathbar.h
index 3f89785cc..a7dc054ab 100644
--- a/src/nautilus-pathbar.h
+++ b/src/nautilus-pathbar.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-pathbar.h
*
* This library is free software; you can redistribute it and/or
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 687f6910e..899139134 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* nautilus-preferences-window.c - Functions to create and show the nautilus
preference window.
diff --git a/src/nautilus-preferences-window.h b/src/nautilus-preferences-window.h
index 81be54e2a..b8069ef6a 100644
--- a/src/nautilus-preferences-window.h
+++ b/src/nautilus-preferences-window.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-preferences-window.h - Function to show the nautilus preference
window.
diff --git a/src/nautilus-progress-info-widget.c b/src/nautilus-progress-info-widget.c
index 9edb1c0fa..a2d711c0b 100644
--- a/src/nautilus-progress-info-widget.c
+++ b/src/nautilus-progress-info-widget.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-progress-info-widget.h: file operation progress user interface.
*
diff --git a/src/nautilus-progress-info-widget.h b/src/nautilus-progress-info-widget.h
index f1c99c0db..d57e38d7e 100644
--- a/src/nautilus-progress-info-widget.h
+++ b/src/nautilus-progress-info-widget.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-progress-info-widget.h: file operation progress user interface.
*
diff --git a/src/nautilus-progress-persistence-handler.c b/src/nautilus-progress-persistence-handler.c
index e312bc02a..9f07909f5 100644
--- a/src/nautilus-progress-persistence-handler.c
+++ b/src/nautilus-progress-persistence-handler.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-progress-persistence-handler.c: file operation progress systray icon and notification handler.
*
diff --git a/src/nautilus-progress-persistence-handler.h b/src/nautilus-progress-persistence-handler.h
index 924255cba..88c948288 100644
--- a/src/nautilus-progress-persistence-handler.h
+++ b/src/nautilus-progress-persistence-handler.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* nautilus-progress-persistence-handler.h: file operation progress systray icon or notification handler.
*
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 1214752c5..74fcea8ba 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-properties-window.c - window that lets user modify file properties
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index f9f39fbdd..34ac4dae8 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* fm-properties-window.h - interface for window that lets user modify
icon properties
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index a9e452adb..26f601dd5 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc.
*
diff --git a/src/nautilus-query-editor.h b/src/nautilus-query-editor.h
index 11aa8aca1..f3bab150c 100644
--- a/src/nautilus-query-editor.h
+++ b/src/nautilus-query-editor.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Copyright (C) 2005 Red Hat, Inc.
*
diff --git a/src/nautilus-self-check-functions.c b/src/nautilus-self-check-functions.c
index 21798ab28..1f54a242f 100644
--- a/src/nautilus-self-check-functions.c
+++ b/src/nautilus-self-check-functions.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-self-check-functions.h b/src/nautilus-self-check-functions.h
index 0110aed47..9cb08fec2 100644
--- a/src/nautilus-self-check-functions.h
+++ b/src/nautilus-self-check-functions.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-special-location-bar.c b/src/nautilus-special-location-bar.c
index e28bbc9d8..391570488 100644
--- a/src/nautilus-special-location-bar.c
+++ b/src/nautilus-special-location-bar.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/nautilus-special-location-bar.h b/src/nautilus-special-location-bar.h
index c72aaa511..9867ccdd5 100644
--- a/src/nautilus-special-location-bar.h
+++ b/src/nautilus-special-location-bar.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index b968aed7a..ac4221f97 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-toolbar.h b/src/nautilus-toolbar.h
index 3e0266fc7..573c7c218 100644
--- a/src/nautilus-toolbar.h
+++ b/src/nautilus-toolbar.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index d7c62f52e..9eeed44f6 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006 Paolo Borelli <pborelli@katamail.com>
*
diff --git a/src/nautilus-trash-bar.h b/src/nautilus-trash-bar.h
index 234cc84d0..18e8b1573 100644
--- a/src/nautilus-trash-bar.h
+++ b/src/nautilus-trash-bar.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006 Paolo Borelli <pborelli@katamail.com>
*
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 5af90d626..fd42ca7f7 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-window-slot.c: Nautilus window slot
Copyright (C) 2008 Free Software Foundation, Inc.
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 1c4b4af79..b9ddfa9d9 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
+/*
nautilus-window-slot.h: Nautilus window slot
Copyright (C) 2008 Free Software Foundation, Inc.
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 69823b6fd..0ca4f301e 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 12b755c62..ce39b7f70 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Nautilus
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index 71723fe96..137eb2413 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2008 Red Hat, Inc.
* Copyright (C) 2006 Paolo Borelli <pborelli@katamail.com>
diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h
index 9065e5119..5af4d4337 100644
--- a/src/nautilus-x-content-bar.h
+++ b/src/nautilus-x-content-bar.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2008 Red Hat, Inc.
* Copyright (C) 2006 Paolo Borelli <pborelli@katamail.com>