[nautilus] general: remove vim modelines
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: remove vim modelines
- Date: Mon, 4 Apr 2016 16:08:51 +0000 (UTC)
commit 1ffb8ca593a91c7de71ab296ffa3ee1f570ebeda
Author: Carlos Soriano <csoriano gnome org>
Date: Mon Apr 4 18:05:03 2016 +0200
general: remove vim modelines
Vim and emacs modelines are used to specify some of the code style in the code.
However, this is misleading and poorly supported since nautilus had a mix of
code style for some time.
Also, the mode lines doesn't specify the whole code style, so we will need to
use a different tool as well to specify the whole code style.
For that, we can just use a different tool for everything.
So remove the mode lines, and in a short future we will reestyle the nautilus
code to have a single code style, and use a tool like editorconfig to specify
the whole code style.
eel/check-program.c | 1 -
eel/eel-accessibility.c | 1 -
eel/eel-accessibility.h | 1 -
eel/eel-art-extensions.c | 1 -
eel/eel-art-extensions.h | 1 -
eel/eel-canvas.c | 1 -
eel/eel-canvas.h | 1 -
eel/eel-debug.c | 3 +--
eel/eel-debug.h | 3 +--
eel/eel-gdk-extensions.c | 1 -
eel/eel-gdk-extensions.h | 1 -
eel/eel-glib-extensions.c | 1 -
eel/eel-glib-extensions.h | 1 -
eel/eel-gnome-extensions.c | 1 -
eel/eel-gnome-extensions.h | 1 -
eel/eel-graphic-effects.c | 1 -
eel/eel-graphic-effects.h | 3 +--
eel/eel-gtk-extensions.c | 1 -
eel/eel-gtk-extensions.h | 1 -
eel/eel-lib-self-check-functions.c | 3 +--
eel/eel-lib-self-check-functions.h | 3 +--
eel/eel-self-checks.c | 3 +--
eel/eel-self-checks.h | 3 +--
eel/eel-stock-dialogs.c | 1 -
eel/eel-stock-dialogs.h | 1 -
eel/eel-string.c | 3 +--
eel/eel-string.h | 3 +--
eel/eel-vfs-extensions.c | 1 -
eel/eel-vfs-extensions.h | 1 -
eel/eel.h | 1 -
libnautilus-private/nautilus-bookmark.c | 1 -
libnautilus-private/nautilus-bookmark.h | 1 -
libnautilus-private/nautilus-canvas-container.c | 1 -
libnautilus-private/nautilus-canvas-container.h | 1 -
libnautilus-private/nautilus-canvas-dnd.c | 1 -
libnautilus-private/nautilus-canvas-dnd.h | 1 -
libnautilus-private/nautilus-canvas-item.c | 1 -
libnautilus-private/nautilus-canvas-item.h | 1 -
libnautilus-private/nautilus-canvas-private.h | 1 -
libnautilus-private/nautilus-clipboard-monitor.c | 3 +--
libnautilus-private/nautilus-clipboard-monitor.h | 3 +--
libnautilus-private/nautilus-clipboard.c | 1 -
libnautilus-private/nautilus-clipboard.h | 1 -
libnautilus-private/nautilus-column-chooser.c | 1 -
libnautilus-private/nautilus-column-chooser.h | 1 -
libnautilus-private/nautilus-column-utilities.c | 1 -
libnautilus-private/nautilus-column-utilities.h | 1 -
libnautilus-private/nautilus-default-file-icon.c | 3 +--
libnautilus-private/nautilus-default-file-icon.h | 3 +--
.../nautilus-desktop-directory-file.c | 3 +--
.../nautilus-desktop-directory-file.h | 3 +--
libnautilus-private/nautilus-desktop-directory.c | 3 +--
libnautilus-private/nautilus-desktop-directory.h | 3 +--
libnautilus-private/nautilus-desktop-icon-file.c | 5 ++---
libnautilus-private/nautilus-desktop-icon-file.h | 3 +--
.../nautilus-desktop-link-monitor.c | 3 +--
.../nautilus-desktop-link-monitor.h | 3 +--
libnautilus-private/nautilus-desktop-link.c | 3 +--
libnautilus-private/nautilus-desktop-link.h | 3 +--
libnautilus-private/nautilus-desktop-metadata.c | 1 -
libnautilus-private/nautilus-desktop-metadata.h | 1 -
libnautilus-private/nautilus-directory-async.c | 3 +--
libnautilus-private/nautilus-directory-notify.h | 3 +--
libnautilus-private/nautilus-directory-private.h | 3 +--
libnautilus-private/nautilus-directory.c | 3 +--
libnautilus-private/nautilus-directory.h | 3 +--
libnautilus-private/nautilus-dnd.c | 1 -
libnautilus-private/nautilus-dnd.h | 1 -
libnautilus-private/nautilus-entry.c | 1 -
libnautilus-private/nautilus-entry.h | 1 -
libnautilus-private/nautilus-file-attributes.h | 3 +--
libnautilus-private/nautilus-file-changes-queue.c | 3 +--
libnautilus-private/nautilus-file-changes-queue.h | 3 +--
.../nautilus-file-conflict-dialog.c | 1 -
.../nautilus-file-conflict-dialog.h | 1 -
libnautilus-private/nautilus-file-dnd.c | 1 -
libnautilus-private/nautilus-file-dnd.h | 1 -
libnautilus-private/nautilus-file-operations.c | 1 -
libnautilus-private/nautilus-file-operations.h | 1 -
libnautilus-private/nautilus-file-private.h | 3 +--
libnautilus-private/nautilus-file-queue.c | 3 +--
libnautilus-private/nautilus-file-queue.h | 3 +--
libnautilus-private/nautilus-file-undo-manager.c | 1 -
libnautilus-private/nautilus-file-undo-manager.h | 1 -
.../nautilus-file-undo-operations.c | 1 -
.../nautilus-file-undo-operations.h | 1 -
libnautilus-private/nautilus-file-utilities.c | 1 -
libnautilus-private/nautilus-file-utilities.h | 1 -
libnautilus-private/nautilus-file.c | 11 +++++------
libnautilus-private/nautilus-file.h | 3 +--
libnautilus-private/nautilus-global-preferences.c | 1 -
libnautilus-private/nautilus-global-preferences.h | 1 -
libnautilus-private/nautilus-icon-info.c | 1 -
libnautilus-private/nautilus-keyfile-metadata.c | 1 -
libnautilus-private/nautilus-keyfile-metadata.h | 1 -
.../nautilus-lib-self-check-functions.c | 3 +--
.../nautilus-lib-self-check-functions.h | 3 +--
libnautilus-private/nautilus-link.c | 3 +--
libnautilus-private/nautilus-link.h | 3 +--
libnautilus-private/nautilus-metadata.c | 1 -
libnautilus-private/nautilus-metadata.h | 3 +--
.../nautilus-mime-application-chooser.c | 1 -
.../nautilus-mime-application-chooser.h | 1 -
libnautilus-private/nautilus-module.c | 1 -
libnautilus-private/nautilus-monitor.c | 3 +--
libnautilus-private/nautilus-monitor.h | 3 +--
libnautilus-private/nautilus-profile.c | 3 +--
libnautilus-private/nautilus-profile.h | 3 +--
libnautilus-private/nautilus-program-choosing.c | 1 -
libnautilus-private/nautilus-program-choosing.h | 1 -
.../nautilus-progress-info-manager.c | 1 -
.../nautilus-progress-info-manager.h | 1 -
libnautilus-private/nautilus-progress-info.c | 3 +--
libnautilus-private/nautilus-progress-info.h | 3 +--
libnautilus-private/nautilus-query.c | 1 -
libnautilus-private/nautilus-query.h | 1 -
libnautilus-private/nautilus-recent.c | 1 -
.../nautilus-search-directory-file.c | 3 +--
.../nautilus-search-directory-file.h | 3 +--
libnautilus-private/nautilus-search-directory.c | 1 -
libnautilus-private/nautilus-search-directory.h | 3 +--
libnautilus-private/nautilus-search-engine-model.c | 1 -
libnautilus-private/nautilus-search-engine-model.h | 1 -
.../nautilus-search-engine-simple.c | 1 -
.../nautilus-search-engine-simple.h | 1 -
.../nautilus-search-engine-tracker.c | 1 -
.../nautilus-search-engine-tracker.h | 1 -
libnautilus-private/nautilus-search-engine.c | 1 -
libnautilus-private/nautilus-search-engine.h | 1 -
libnautilus-private/nautilus-search-hit.c | 3 +--
libnautilus-private/nautilus-search-hit.h | 3 +--
libnautilus-private/nautilus-search-provider.c | 3 +--
.../nautilus-selection-canvas-item.c | 1 -
.../nautilus-selection-canvas-item.h | 1 -
libnautilus-private/nautilus-signaller.c | 1 -
libnautilus-private/nautilus-signaller.h | 1 -
libnautilus-private/nautilus-thumbnails.c | 3 +--
libnautilus-private/nautilus-thumbnails.h | 3 +--
libnautilus-private/nautilus-trash-monitor.c | 1 -
libnautilus-private/nautilus-trash-monitor.h | 1 -
libnautilus-private/nautilus-tree-view-drag-dest.c | 1 -
libnautilus-private/nautilus-tree-view-drag-dest.h | 1 -
libnautilus-private/nautilus-ui-utilities.c | 1 -
libnautilus-private/nautilus-ui-utilities.h | 1 -
libnautilus-private/nautilus-undo-private.h | 1 -
libnautilus-private/nautilus-vfs-directory.c | 3 +--
libnautilus-private/nautilus-vfs-directory.h | 3 +--
libnautilus-private/nautilus-vfs-file.c | 3 +--
libnautilus-private/nautilus-vfs-file.h | 3 +--
src/nautilus-application.c | 1 -
src/nautilus-application.h | 1 -
src/nautilus-autorun-software.c | 1 -
src/nautilus-bookmark-list.c | 1 -
src/nautilus-bookmark-list.h | 1 -
src/nautilus-canvas-view-container.c | 1 -
src/nautilus-canvas-view-container.h | 1 -
src/nautilus-canvas-view.c | 1 -
src/nautilus-desktop-canvas-view.c | 1 -
src/nautilus-desktop-canvas-view.h | 1 -
src/nautilus-desktop-window.c | 1 -
src/nautilus-desktop-window.h | 1 -
src/nautilus-empty-view.c | 1 -
src/nautilus-empty-view.h | 1 -
src/nautilus-error-reporting.c | 1 -
src/nautilus-error-reporting.h | 1 -
src/nautilus-files-view-dnd.c | 1 -
src/nautilus-files-view-dnd.h | 1 -
src/nautilus-files-view.h | 1 -
src/nautilus-floating-bar.c | 1 -
src/nautilus-floating-bar.h | 1 -
src/nautilus-image-properties-page.c | 1 -
src/nautilus-image-properties-page.h | 1 -
src/nautilus-list-model.c | 1 -
src/nautilus-list-model.h | 1 -
src/nautilus-list-view.c | 1 -
src/nautilus-list-view.h | 1 -
src/nautilus-location-entry.c | 1 -
src/nautilus-location-entry.h | 1 -
src/nautilus-main.c | 1 -
src/nautilus-mime-actions.c | 1 -
src/nautilus-mime-actions.h | 1 -
src/nautilus-notebook.c | 1 -
src/nautilus-pathbar.c | 1 -
src/nautilus-pathbar.h | 1 -
src/nautilus-preferences-window.c | 1 -
src/nautilus-preferences-window.h | 1 -
src/nautilus-progress-info-widget.c | 1 -
src/nautilus-progress-info-widget.h | 1 -
src/nautilus-progress-persistence-handler.c | 1 -
src/nautilus-progress-persistence-handler.h | 1 -
src/nautilus-properties-window.c | 1 -
src/nautilus-properties-window.h | 1 -
src/nautilus-query-editor.c | 1 -
src/nautilus-query-editor.h | 1 -
src/nautilus-self-check-functions.c | 1 -
src/nautilus-self-check-functions.h | 1 -
src/nautilus-special-location-bar.c | 3 +--
src/nautilus-special-location-bar.h | 3 +--
src/nautilus-toolbar.c | 1 -
src/nautilus-toolbar.h | 1 -
src/nautilus-trash-bar.c | 1 -
src/nautilus-trash-bar.h | 1 -
src/nautilus-window-slot.c | 3 +--
src/nautilus-window-slot.h | 3 +--
src/nautilus-window.c | 1 -
src/nautilus-window.h | 1 -
src/nautilus-x-content-bar.c | 1 -
src/nautilus-x-content-bar.h | 1 -
208 files changed, 68 insertions(+), 276 deletions(-)
---
diff --git a/eel/check-program.c b/eel/check-program.c
index b291802..ca10974 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 40ffd53..83b88ac 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 9dc26e4..bed9b4c 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 8178fb4..38072b5 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 e030872..8f40d56 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 cbc4372..45f3665 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 56db0b7..adff7f7 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 7de786e..df3f51d 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 d475119..0abc1a0 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 49ff0d2..dc06f9d 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 9be06ab..d65d2b1 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 709c37a..5564eda 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 f233024..56f23c2 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 3005958..fe5efef 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 d6bd8a7..3465906 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 3ffeb76..820435a 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 d7cbf15..850ba76 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 a68ff46..d694ad4 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 67e811b..53a326a 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 bb789e7..2c180e8 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 11386e8..da8fd43 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 d5b9ff4..8de01a4 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 6a0eef0..ba5d076 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 12da1b5..2de5767 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 016128d..25ab1ca 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 178af36..28c7e50 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 8119c16..202eec2 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 cf6a6c1..5dd6225 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 e44546f..f64af0a 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 d9f1b46..e028d7d 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 e4bb5db..bd15452 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 135c3eb..b716beb 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 a562ac0..6b292c4 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 711b3ea..4618040 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 2b6d2a3..f4b63e6 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 c015f76..473faeb 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 6eebea1..accee93 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 76059d5..89dfe87 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 2e693aa..3a25806 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 891401a..4d16472 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 7d1e6fa..cb7a948 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 d194cf3..36e6800 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 eee64ef..1452b0f 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 47d4f15..f6e3d65 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 4d3d490..b0dee94 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 57fbbd4..262a2ad 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 c6bda95..e5c5aa4 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 7543518..cceaf0d 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 2d3fd08..6ac0825 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 586fd1b..e990de2 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 bf542db..2a50979 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 d390221..4064ed8 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 bf34230..bd7c173 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 dbdc72f..bac8d3b 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 9d8f438..8fe8027 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 1684ec0..21b0cd6 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 4172f8b..dc47aea 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 bdef52c..f6decb6 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 b9d82e6..7c1025b 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 09cca74..e9ef2d6 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 22e7299..f8c67d3 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 358dfb4..ea97da6 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 01f1efc..c00fc5a 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 08fc6dc..ad4fa26 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 d9b2575..201ab23 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 38662ec..dd467a2 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 dce90cc..d2f7ee3 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 b92a97f..52b4e36 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 f7405e9..1b790a2 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 00149bc..eb6d977 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 9a8dbff..281de93 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 4c83515..b637c61 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 cd4054b..aa75238 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 4d75f09..91b7fb2 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 dbac8e1..b7767ce 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 1160255..330f818 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 59f7b00..3b6b91f 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 a343098..c9469de 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 38b714f..08b11ca 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 58eefbb..ce2cbf3 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 9e84900..846b1c4 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 3de6b45..a4d0de5 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 0fb1583..e3e915f 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 760bc3d..777dece 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 316aef0..30a02e9 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 ffc1fa2..cec1c7c 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 e8def7f..80303b6 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 5e1f283..d93c40e 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 1efe626..d8dd2ea 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 363fbff..1f77534 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 7a0788b..19b475f 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 3e14d74..8597ec1 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 ef80d02..9c4bc2a 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 6658ee7..e74711a 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 d8d5b45..b8a14ee 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 1ed804e..5793fca 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 4d84194..c326c60 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 30f2217..b02aa92 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 9945f3d..72d9c17 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 4032a08..3147f0c 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 511160d..7a734af 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 fed969e..ebe069f 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 2198360..fd7ae1e 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 6273a76..7e52243 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 e0c4364..38e63d6 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 00f053b..29faa23 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 e1a9491..444fdc0 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 2ca5374..583d296 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 7160214..93c1bdf 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 c1d8b7b..93c2070 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 d2a7e8a..5dc26d1 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 73bae16..ef91d3d 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 95e7512..4ae3b5d 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 ae5a20b..522dc18 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 eb66ff5..3444b1e 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 c872ea9..2264f50 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 ded4ea5..1e23a58 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 a027df0..1774945 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 4294d19..ddc8f02 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 b6c3ea6..01d07ce 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 b14e828..dd67f2d 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 8e847be..3294bd0 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 9439d80..e32a8c2 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 9ce05de..253185a 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 9f93f43..b1f162f 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 1590ee2..680acf2 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 0377c50..b636c2e 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 1526b86..79404f0 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 a1a8d0b..d9921a6 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 7870437..5658872 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 9ba43e4..d770400 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 67404fb..2c47104 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 b1ebea6..c1619ca 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 bb82c03..c5c2778 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 22fc7b5..b358772 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 7502b1d..fee1719 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 c8f7bb0..5295df4 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 69bbbbc..9edaec5 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 41745b9..695b87e 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 ff0c485..a528281 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 dd63851..72268ee 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 e415f41..92d2f70 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 3099883..c0eaab4 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 936898c..46e8203 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 625fcc6..9cdc0aa 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 a51c192..778102b 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 da63b09..0e5b2ef 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 5fa15e2..0a37be5 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 fdb0a41..5147d74 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 24afe97..3abd083 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 0e50071..71f1d75 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 3d88444..e23d46f 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 e011254..d226620 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 b5bab0b..e8b2d73 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 55b4980..03c6ecf 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 c588517..b7a1cc4 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 5e31bc8..bf4139e 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 361d205..674304e 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 0c9d0dd..e40d80f 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 72467a6..7398aaa 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 506dd62..589d2b4 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 5f42620..a600c88 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 a8c573b..2d95c32 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 ef714dd..d64499f 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 3f2aa13..e588b9c 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 317f253..addd872 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 1f12358..1680e0a 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 4fb1c52..5378a14 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 0595ddb..5ab1527 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 59fd1ab..f0b08a9 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 263b097..bac8b7c 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 210e9ee..ccc4d59 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 14656d8..6fc715b 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 0a1b4d6..2f3fe19 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 1c2f996..6f89652 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 03f027e..f775431 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 4c738be..53d6ef2 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 d4c826b..eeaafe6 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 b719007..ce3c591 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 215e8e8..a0b25e7 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 f1439e0..72c782a 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 84998ff..31dde31 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 926cdb3..693fcb5 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 3f89785..a7dc054 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 687f691..8991391 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 81be54e..b8069ef 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 9edb1c0..a2d711c 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 f1c99c0..d57e38d 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 e312bc0..9f07909 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 924255c..88c9482 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 1214752..74fcea8 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 f9f39fb..34ac4da 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 a9e452a..26f601d 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 11aa8ac..f3bab15 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 21798ab..1f54a24 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 0110aed..9cb08fe 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 e28bbc9..3915704 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 c72aaa5..9867ccd 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 b968aed..ac4221f 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 3e0266f..573c7c2 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 d7c62f5..9eeed44 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 234cc84..18e8b15 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 5af90d6..fd42ca7 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 1c4b4af..b9ddfa9 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 69823b6..0ca4f30 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 12b755c..ce39b7f 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 71723fe..137eb24 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 9065e51..5af4d43 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
