[epiphany] Standardize modelines



commit 63059ce3181c637d2af26e323a11998c06eb2cd4
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Sep 11 09:22:02 2016 -0500

    Standardize modelines

 embed/ephy-download.c                           |    1 -
 embed/ephy-download.h                           |    1 -
 embed/ephy-embed-container.h                    |    1 +
 embed/ephy-embed-prefs.c                        |    1 -
 embed/ephy-embed.c                              |    1 -
 embed/ephy-file-monitor.c                       |    1 -
 embed/ephy-file-monitor.h                       |    1 -
 embed/ephy-find-toolbar.h                       |   21 ++--
 embed/ephy-web-view.c                           |    1 -
 embed/ephy-web-view.h                           |    1 -
 embed/web-extension/ephy-uri-tester.c           |    1 +
 embed/web-extension/ephy-uri-tester.h           |    1 +
 embed/web-extension/ephy-web-dom-utils.c        |    1 -
 embed/web-extension/ephy-web-dom-utils.h        |    1 +
 embed/web-extension/ephy-web-extension-main.c   |    1 -
 embed/web-extension/ephy-web-extension-names.h  |    1 +
 embed/web-extension/ephy-web-extension.c        |    1 -
 embed/web-extension/ephy-web-extension.h        |    1 +
 lib/egg/eggtreemultidnd.c                       |    1 +
 lib/egg/eggtreemultidnd.h                       |    1 +
 lib/ephy-dbus-util.c                            |    1 +
 lib/ephy-dbus-util.h                            |    1 +
 lib/ephy-debug.c                                |    1 +
 lib/ephy-debug.h                                |    1 +
 lib/ephy-dnd.c                                  |    1 +
 lib/ephy-dnd.h                                  |    1 +
 lib/ephy-favicon-helpers.c                      |    1 +
 lib/ephy-favicon-helpers.h                      |    1 +
 lib/ephy-file-helpers.c                         |    2 +-
 lib/ephy-file-helpers.h                         |   21 ++--
 lib/ephy-form-auth-data.c                       |    1 -
 lib/ephy-form-auth-data.h                       |    1 +
 lib/ephy-gui.c                                  |    1 +
 lib/ephy-gui.h                                  |   51 +++++-----
 lib/ephy-langs.c                                |    1 +
 lib/ephy-langs.h                                |    9 +-
 lib/ephy-node-common.h                          |   31 +++---
 lib/ephy-node-db.c                              |    1 +
 lib/ephy-node-db.h                              |   47 ++++----
 lib/ephy-node-filter.c                          |    1 +
 lib/ephy-node-filter.h                          |   37 ++++---
 lib/ephy-node.c                                 |    1 +
 lib/ephy-node.h                                 |  124 +++++++++++-----------
 lib/ephy-profile-migrator.c                     |    1 -
 lib/ephy-profile-utils.c                        |    1 -
 lib/ephy-profile-utils.h                        |    1 +
 lib/ephy-security-levels.c                      |    1 -
 lib/ephy-security-levels.h                      |    1 -
 lib/ephy-settings.c                             |    1 -
 lib/ephy-settings.h                             |    1 -
 lib/ephy-signal-accumulator.c                   |    1 +
 lib/ephy-signal-accumulator.h                   |   15 ++--
 lib/ephy-sqlite-connection.c                    |    1 +
 lib/ephy-sqlite-connection.h                    |    1 +
 lib/ephy-sqlite-statement.c                     |    1 +
 lib/ephy-sqlite-statement.h                     |    1 +
 lib/ephy-sqlite.h                               |    1 +
 lib/ephy-string.h                               |   17 ++--
 lib/ephy-time-helpers.c                         |    4 +-
 lib/ephy-time-helpers.h                         |    7 +-
 lib/ephy-web-app-utils.c                        |    1 -
 lib/ephy-web-app-utils.h                        |    1 +
 lib/history/ephy-history-service-hosts-table.c  |    1 -
 lib/history/ephy-history-service-urls-table.c   |    1 -
 lib/history/ephy-history-service-visits-table.c |    1 +
 lib/history/ephy-history-service.h              |    1 -
 lib/history/ephy-history-types.c                |    1 -
 lib/history/ephy-history-types.h                |    1 -
 lib/widgets/ephy-certificate-dialog.c           |    1 +
 lib/widgets/ephy-certificate-dialog.h           |    1 +
 lib/widgets/ephy-download-widget.c              |    1 -
 lib/widgets/ephy-download-widget.h              |    1 -
 lib/widgets/ephy-file-chooser.c                 |    1 +
 lib/widgets/ephy-file-chooser.h                 |   37 ++++---
 lib/widgets/ephy-location-entry.c               |    2 +-
 lib/widgets/ephy-location-entry.h               |   63 ++++++------
 lib/widgets/ephy-node-view.c                    |    2 +-
 lib/widgets/ephy-node-view.h                    |  129 ++++++++++++-----------
 lib/widgets/ephy-tree-model-node.c              |    1 +
 lib/widgets/ephy-tree-model-node.h              |   27 +++---
 lib/widgets/ephy-tree-model-sort.c              |    1 +
 lib/widgets/ephy-tree-model-sort.h              |   11 +-
 lib/widgets/nautilus-floating-bar.c             |    2 +-
 lib/widgets/nautilus-floating-bar.h             |    2 +-
 src/bookmarks/ephy-bookmark-action-group.c      |    1 +
 src/bookmarks/ephy-bookmark-action-group.h      |    1 +
 src/bookmarks/ephy-bookmark-action.c            |    1 +
 src/bookmarks/ephy-bookmark-action.h            |   47 ++++----
 src/bookmarks/ephy-bookmark-properties.c        |    1 +
 src/bookmarks/ephy-bookmark-properties.h        |    9 +-
 src/bookmarks/ephy-bookmarks-editor.c           |    1 +
 src/bookmarks/ephy-bookmarks-editor.h           |    7 +-
 src/bookmarks/ephy-bookmarks-export.c           |    1 +
 src/bookmarks/ephy-bookmarks-export.h           |    5 +-
 src/bookmarks/ephy-bookmarks-import.c           |    2 +-
 src/bookmarks/ephy-bookmarks-import.h           |   21 ++--
 src/bookmarks/ephy-bookmarks-menu.c             |    1 +
 src/bookmarks/ephy-bookmarks-menu.h             |    1 +
 src/bookmarks/ephy-bookmarks-ui.c               |    2 +-
 src/bookmarks/ephy-bookmarks-ui.h               |   47 ++++----
 src/bookmarks/ephy-bookmarks.c                  |    2 +-
 src/bookmarks/ephy-bookmarks.h                  |  118 +++++++++++----------
 src/bookmarks/ephy-link-action.c                |    2 +-
 src/bookmarks/ephy-link-action.h                |   51 +++++-----
 src/bookmarks/ephy-nodes-cover.c                |    1 +
 src/bookmarks/ephy-nodes-cover.h                |    3 +-
 src/bookmarks/ephy-open-tabs-action.c           |    1 +
 src/bookmarks/ephy-open-tabs-action.h           |    3 +-
 src/bookmarks/ephy-topic-action-group.c         |    1 +
 src/bookmarks/ephy-topic-action-group.h         |    5 +-
 src/bookmarks/ephy-topic-action.c               |    1 +
 src/bookmarks/ephy-topic-action.h               |   43 ++++----
 src/bookmarks/ephy-topics-entry.c               |    1 +
 src/bookmarks/ephy-topics-entry.h               |    1 +
 src/bookmarks/ephy-topics-palette.c             |    1 +
 src/bookmarks/ephy-topics-palette.h             |    9 +-
 src/clear-data-dialog.c                         |    2 +-
 src/clear-data-dialog.h                         |    1 +
 src/cookies-dialog.c                            |    2 +-
 src/cookies-dialog.h                            |    1 +
 src/ephy-action-helper.c                        |    1 +
 src/ephy-action-helper.h                        |    5 +-
 src/ephy-completion-model.h                     |   19 ++--
 src/ephy-encoding-dialog.c                      |    2 +-
 src/ephy-encoding-dialog.h                      |    3 +-
 src/ephy-encoding-row.c                         |    2 +-
 src/ephy-encoding-row.h                         |    1 +
 src/ephy-history-window.c                       |    2 +-
 src/ephy-history-window.h                       |    3 +-
 src/ephy-link.c                                 |    1 +
 src/ephy-link.h                                 |   35 +++---
 src/ephy-location-controller.c                  |    2 +-
 src/ephy-location-controller.h                  |    7 +-
 src/ephy-notebook.c                             |    2 +-
 src/ephy-notebook.h                             |   15 ++--
 src/ephy-search-provider-main.c                 |    1 +
 src/ephy-search-provider.c                      |    1 +
 src/ephy-search-provider.h                      |    1 +
 src/ephy-session.c                              |    2 +-
 src/ephy-session.h                              |    3 +-
 src/ephy-window.c                               |    2 +-
 src/ephy-window.h                               |   11 +-
 src/languages.h                                 |    1 +
 src/passwords-dialog.c                          |    2 +-
 src/passwords-dialog.h                          |    1 +
 src/popup-commands.c                            |    2 +-
 src/popup-commands.h                            |    1 +
 src/prefs-dialog.c                              |    2 +-
 src/prefs-dialog.h                              |    1 +
 src/window-commands.c                           |    3 +-
 src/window-commands.h                           |    1 +
 151 files changed, 666 insertions(+), 589 deletions(-)
---
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 7b071b1..804ac55 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -1,4 +1,3 @@
-/* vim: set sw=2 ts=2 sts=2 et: */
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * ephy-download.c
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index a387816..fac826a 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -1,4 +1,3 @@
-/* vim: set sw=2 ts=2 sts=2 et: */
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * ephy-download.h
diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h
index 8f986bd..e361dbe 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2007 Xan Lopez
  *
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 702483a..d82e4f3 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*  Copyright © 2008 Xan Lopez <xan gnome org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 4e5ce46..cc09421 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2007 Xan Lopez
  *  Copyright © 2008 Jan Alonzo
diff --git a/embed/ephy-file-monitor.c b/embed/ephy-file-monitor.c
index 7bd377d..ee70e7f 100644
--- a/embed/ephy-file-monitor.c
+++ b/embed/ephy-file-monitor.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/embed/ephy-file-monitor.h b/embed/ephy-file-monitor.h
index 81285d9..e3bf6a6 100644
--- a/embed/ephy-file-monitor.h
+++ b/embed/ephy-file-monitor.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index a9cb672..c8320f0 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004  Tommi Komulainen
  *  Copyright © 2004, 2005  Christian Persch
@@ -28,22 +29,22 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyFindToolbar, ephy_find_toolbar, EPHY, FIND_TOOLBAR, GtkSearchBar)
 
-EphyFindToolbar *ephy_find_toolbar_new          (WebKitWebView *web_view);
+EphyFindToolbar *ephy_find_toolbar_new           (WebKitWebView *web_view);
 
-const char     *ephy_find_toolbar_get_text      (EphyFindToolbar *toolbar);
+const char      *ephy_find_toolbar_get_text      (EphyFindToolbar *toolbar);
 
-void            ephy_find_toolbar_find_next     (EphyFindToolbar *toolbar);
+void             ephy_find_toolbar_find_next     (EphyFindToolbar *toolbar);
 
-void            ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar);
+void             ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar);
 
-void            ephy_find_toolbar_open          (EphyFindToolbar *toolbar,
-                                                 gboolean links_only,
-                                                 gboolean clear_search);
+void             ephy_find_toolbar_open          (EphyFindToolbar *toolbar,
+                                                  gboolean links_only,
+                                                  gboolean clear_search);
 
-void            ephy_find_toolbar_close         (EphyFindToolbar *toolbar);
+void             ephy_find_toolbar_close         (EphyFindToolbar *toolbar);
 
-void            ephy_find_toolbar_request_close (EphyFindToolbar *toolbar);
+void             ephy_find_toolbar_request_close (EphyFindToolbar *toolbar);
 
-void            ephy_find_toolbar_toggle_state  (EphyFindToolbar *toolbar);
+void             ephy_find_toolbar_toggle_state  (EphyFindToolbar *toolbar);
 
 G_END_DECLS
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 99a69e7..e21982c 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2008, 2009 Gustavo Noronha Silva
  *  Copyright © 2009, 2010, 2014 Igalia S.L.
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 3b2b104..bf1fae0 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2008 Gustavo Noronha Silva
  *  Copyright © 2012 Igalia S.L.
diff --git a/embed/web-extension/ephy-uri-tester.c b/embed/web-extension/ephy-uri-tester.c
index c2c97ab..d578c80 100644
--- a/embed/web-extension/ephy-uri-tester.c
+++ b/embed/web-extension/ephy-uri-tester.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-uri-tester.h b/embed/web-extension/ephy-uri-tester.h
index 753673f..38d4a85 100644
--- a/embed/web-extension/ephy-uri-tester.h
+++ b/embed/web-extension/ephy-uri-tester.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-dom-utils.c b/embed/web-extension/ephy-web-dom-utils.c
index cc79509..3a2997c 100644
--- a/embed/web-extension/ephy-web-dom-utils.c
+++ b/embed/web-extension/ephy-web-dom-utils.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2013 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-dom-utils.h b/embed/web-extension/ephy-web-dom-utils.h
index 262e65f..4cf6bf2 100644
--- a/embed/web-extension/ephy-web-dom-utils.h
+++ b/embed/web-extension/ephy-web-dom-utils.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c
index 0dd2409..7f5cf4c 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-extension/ephy-web-extension-main.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-extension-names.h b/embed/web-extension/ephy-web-extension-names.h
index a4cccdd..862c739 100644
--- a/embed/web-extension/ephy-web-extension-names.h
+++ b/embed/web-extension/ephy-web-extension-names.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2014 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
index 75524fc..3dcd94e 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-extension/ephy-web-extension.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2014 Igalia S.L.
  *
diff --git a/embed/web-extension/ephy-web-extension.h b/embed/web-extension/ephy-web-extension.h
index 502251c..7d5515f 100644
--- a/embed/web-extension/ephy-web-extension.h
+++ b/embed/web-extension/ephy-web-extension.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2014 Igalia S.L.
  *
diff --git a/lib/egg/eggtreemultidnd.c b/lib/egg/eggtreemultidnd.c
index cb58485..150588c 100644
--- a/lib/egg/eggtreemultidnd.c
+++ b/lib/egg/eggtreemultidnd.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* eggtreemultidnd.c
  * Copyright (C) 2001  Red Hat, Inc.
  *
diff --git a/lib/egg/eggtreemultidnd.h b/lib/egg/eggtreemultidnd.h
index e61a434..ddd1b48 100644
--- a/lib/egg/eggtreemultidnd.h
+++ b/lib/egg/eggtreemultidnd.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* eggtreednd.h
  * Copyright (C) 2001  Red Hat, Inc.
  *
diff --git a/lib/ephy-dbus-util.c b/lib/ephy-dbus-util.c
index 961c805..fe835ef 100644
--- a/lib/ephy-dbus-util.c
+++ b/lib/ephy-dbus-util.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2016 Igalia S.L.
  *
diff --git a/lib/ephy-dbus-util.h b/lib/ephy-dbus-util.h
index b22e26d..a5dc76a 100644
--- a/lib/ephy-dbus-util.h
+++ b/lib/ephy-dbus-util.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2016 Igalia S.L.
  *
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index 43ffc90..ab43f55 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 259fac7..096e86e 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index fe4289f..fff0074 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2001, 2002 Marco Pesenti Gritti
  *
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index ac4b030..05b3edd 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2003 Marco Pesenti Gritti
  *
diff --git a/lib/ephy-favicon-helpers.c b/lib/ephy-favicon-helpers.c
index d6ecf85..80a18da 100644
--- a/lib/ephy-favicon-helpers.c
+++ b/lib/ephy-favicon-helpers.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/lib/ephy-favicon-helpers.h b/lib/ephy-favicon-helpers.h
index 514a408..a4d7484 100644
--- a/lib/ephy-favicon-helpers.h
+++ b/lib/ephy-favicon-helpers.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 699f0ae..b5bea5e 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index 1ccf06f..3658756 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
@@ -24,24 +25,24 @@
 #include <gtk/gtk.h>
 
 extern GQuark ephy_file_helpers_error_quark;
-#define EPHY_FILE_HELPERS_ERROR_QUARK  (ephy_file_helpers_error_quark)
+#define EPHY_FILE_HELPERS_ERROR_QUARK        (ephy_file_helpers_error_quark)
 
 G_BEGIN_DECLS
 
 typedef enum
 {
-       EPHY_MIME_PERMISSION_SAFE       = 1,
-       EPHY_MIME_PERMISSION_UNSAFE     = 2,
-       EPHY_MIME_PERMISSION_UNKNOWN    = 3
+  EPHY_MIME_PERMISSION_SAFE    = 1,
+  EPHY_MIME_PERMISSION_UNSAFE  = 2,
+  EPHY_MIME_PERMISSION_UNKNOWN = 3
 } EphyMimePermission;
 
 typedef enum
 {
-       EPHY_FILE_HELPERS_NONE             = 0,
-       EPHY_FILE_HELPERS_KEEP_DIR         = 1 << 1,
-       EPHY_FILE_HELPERS_PRIVATE_PROFILE  = 1 << 2,
-       EPHY_FILE_HELPERS_ENSURE_EXISTS    = 1 << 3,
-       EPHY_FILE_HELPERS_STEAL_DATA       = 1 << 4
+  EPHY_FILE_HELPERS_NONE             = 0,
+  EPHY_FILE_HELPERS_KEEP_DIR         = 1 << 1,
+  EPHY_FILE_HELPERS_PRIVATE_PROFILE  = 1 << 2,
+  EPHY_FILE_HELPERS_ENSURE_EXISTS    = 1 << 3,
+  EPHY_FILE_HELPERS_STEAL_DATA       = 1 << 4
 } EphyFileHelpersFlags;
 
 gboolean           ephy_file_helpers_init                   (const char            *profile_dir,
@@ -52,7 +53,7 @@ const char *       ephy_dot_dir                             (void);
 gboolean           ephy_dot_dir_is_default                  (void);
 char       *       ephy_default_dot_dir                     (void);
 void               ephy_file_helpers_shutdown               (void);
-char      *          ephy_file_get_downloads_dir              (void);
+char       *       ephy_file_get_downloads_dir              (void);
 char       *       ephy_file_desktop_dir                    (void);
 const char *       ephy_file_tmp_dir                        (void);
 char       *       ephy_file_tmp_filename                   (const char            *base,
diff --git a/lib/ephy-form-auth-data.c b/lib/ephy-form-auth-data.c
index 7985e31..ddd28e3 100644
--- a/lib/ephy-form-auth-data.c
+++ b/lib/ephy-form-auth-data.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2013 Igalia S.L.
  *
diff --git a/lib/ephy-form-auth-data.h b/lib/ephy-form-auth-data.h
index b89def3..3094df6 100644
--- a/lib/ephy-form-auth-data.h
+++ b/lib/ephy-form-auth-data.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Igalia S.L.
  *
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index bc5bc77..169cebe 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti
  *
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index 7748422..66bccd6 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti
  *
@@ -23,38 +24,38 @@
 
 G_BEGIN_DECLS
 
-void           ephy_gui_sanitise_popup_position         (GtkMenu *menu,
-                                                         GtkWidget *parent_widget,
-                                                         gint *x,
-                                                         gint *y);
+void            ephy_gui_sanitise_popup_position         (GtkMenu *menu,
+                                                          GtkWidget *parent_widget,
+                                                          gint *x,
+                                                          gint *y);
 
-void           ephy_gui_menu_position_tree_selection    (GtkMenu   *menu,
-                                                         gint      *x,
-                                                         gint      *y,
-                                                         gboolean  *push_in,
-                                                         gpointer  user_data);
+void            ephy_gui_menu_position_tree_selection    (GtkMenu   *menu,
+                                                          gint      *x,
+                                                          gint      *y,
+                                                          gboolean  *push_in,
+                                                          gpointer  user_data);
 
-void           ephy_gui_menu_position_under_widget      (GtkMenu   *menu,
-                                                         gint      *x,
-                                                         gint      *y,
-                                                         gboolean  *push_in,
-                                                         gpointer  user_data);
+void            ephy_gui_menu_position_under_widget      (GtkMenu   *menu,
+                                                          gint      *x,
+                                                          gint      *y,
+                                                          gboolean  *push_in,
+                                                          gpointer  user_data);
 
-GtkWindowGroup *ephy_gui_ensure_window_group            (GtkWindow *window);
+GtkWindowGroup *ephy_gui_ensure_window_group             (GtkWindow *window);
 
-void           ephy_gui_get_current_event               (GdkEventType *type,
-                                                         guint *state,
-                                                         guint *button);
+void            ephy_gui_get_current_event               (GdkEventType *type,
+                                                          guint *state,
+                                                          guint *button);
 
-gboolean       ephy_gui_is_middle_click                 (void);
+gboolean        ephy_gui_is_middle_click                 (void);
 
-gboolean       ephy_gui_check_location_writable         (GtkWidget *parent,
-                                                         const char *filename);
+gboolean        ephy_gui_check_location_writable         (GtkWidget *parent,
+                                                          const char *filename);
 
-void           ephy_gui_help                            (GtkWidget *parent,
-                                                         const char *page);
+void            ephy_gui_help                            (GtkWidget *parent,
+                                                          const char *page);
 
-void           ephy_gui_window_update_user_time         (GtkWidget *window,
-                                                         guint32 user_time);
+void            ephy_gui_window_update_user_time         (GtkWidget *window,
+                                                          guint32 user_time);
 
 G_END_DECLS
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 01135a1..8ddcc79 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Christian Persch
  *
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 8f494a3..2736eba 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2003 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
@@ -27,12 +28,12 @@ G_BEGIN_DECLS
 
 void                        ephy_langs_append_languages (GArray *array);
 
-void                        ephy_langs_sanitise         (GArray *array);
+void                        ephy_langs_sanitise               (GArray *array);
 
-char                      **ephy_langs_get_languages    (void);
+char                      **ephy_langs_get_languages      (void);
 
-GHashTable                 *ephy_langs_iso_639_table    (void);
+GHashTable             *ephy_langs_iso_639_table          (void);
 
-GHashTable                 *ephy_langs_iso_3166_table   (void);
+GHashTable             *ephy_langs_iso_3166_table   (void);
 
 G_END_DECLS
diff --git a/lib/ephy-node-common.h b/lib/ephy-node-common.h
index 8fb7fbd..4c93613 100644
--- a/lib/ephy-node-common.h
+++ b/lib/ephy-node-common.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Xan Lopez <xan masilla org>
  * 
@@ -20,31 +21,31 @@
 G_BEGIN_DECLS
 
 /* Databases */
-#define EPHY_NODE_DB_HISTORY "EphyHistory"
+#define EPHY_NODE_DB_HISTORY   "EphyHistory"
 #define EPHY_NODE_DB_BOOKMARKS "EphyBookmarks"
 #define EPHY_NODE_DB_SITEICONS "EphySiteIcons"
-#define EPHY_NODE_DB_STATES "EphyStates"
+#define EPHY_NODE_DB_STATES    "EphyStates"
 
 /* Root nodes */
 enum
 {
-       BOOKMARKS_NODE_ID = 0,
-       KEYWORDS_NODE_ID = 1,
-       FAVORITES_NODE_ID = 2,
-       BMKS_NOTCATEGORIZED_NODE_ID = 3,
-       STATES_NODE_ID = 4,
-       HOSTS_NODE_ID = 5,
-       PAGES_NODE_ID = 6,
-       ICONS_NODE_ID = 9,
-       SMARTBOOKMARKS_NODE_ID = 10,
-       BMKS_LOCAL_NODE_ID = 11,
+  BOOKMARKS_NODE_ID = 0,
+  KEYWORDS_NODE_ID = 1,
+  FAVORITES_NODE_ID = 2,
+  BMKS_NOTCATEGORIZED_NODE_ID = 3,
+  STATES_NODE_ID = 4,
+  HOSTS_NODE_ID = 5,
+  PAGES_NODE_ID = 6,
+  ICONS_NODE_ID = 9,
+  SMARTBOOKMARKS_NODE_ID = 10,
+  BMKS_LOCAL_NODE_ID = 11,
 };
 
 typedef enum
 {
-       EPHY_NODE_ALL_PRIORITY,
-       EPHY_NODE_SPECIAL_PRIORITY,
-       EPHY_NODE_NORMAL_PRIORITY
+  EPHY_NODE_ALL_PRIORITY,
+  EPHY_NODE_SPECIAL_PRIORITY,
+  EPHY_NODE_NORMAL_PRIORITY
 } EphyNodePriority;
 
 G_END_DECLS
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 7847724..08613e9 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *  Copyright © 2003 Marco Pesenti Gritti
diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h
index cf3a63c..5b73de0 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *  Copyright © 2003 Marco Pesenti Gritti
@@ -27,39 +28,39 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyNodeDb, ephy_node_db, EPHY, NODE_DB, GObject)
 
-EphyNodeDb   *ephy_node_db_new                 (const char *name);
+EphyNodeDb   *ephy_node_db_new                   (const char *name);
 
 #include "ephy-node.h"
 
-gboolean      ephy_node_db_load_from_file      (EphyNodeDb *db,
-                                                const char *xml_file,
-                                                const xmlChar *xml_root,
-                                                const xmlChar *xml_version);
+gboolean      ephy_node_db_load_from_file        (EphyNodeDb *db,
+                                                  const char *xml_file,
+                                                  const xmlChar *xml_root,
+                                                  const xmlChar *xml_version);
 
-int           ephy_node_db_write_to_xml_safe   (EphyNodeDb *db,
-                                                const xmlChar *filename,
-                                                const xmlChar *root,
-                                                const xmlChar *version,
-                                                const xmlChar *comment,
-                                                EphyNode *node, ...);
+int           ephy_node_db_write_to_xml_safe     (EphyNodeDb *db,
+                                                  const xmlChar *filename,
+                                                  const xmlChar *root,
+                                                  const xmlChar *version,
+                                                  const xmlChar *comment,
+                                                  EphyNode *node, ...);
 
-const char   *ephy_node_db_get_name            (EphyNodeDb *db);
+const char   *ephy_node_db_get_name              (EphyNodeDb *db);
 
-gboolean      ephy_node_db_is_immutable                (EphyNodeDb *db);
+gboolean      ephy_node_db_is_immutable          (EphyNodeDb *db);
 
-void         ephy_node_db_set_immutable        (EphyNodeDb *db,
-                                                gboolean immutable);
+void          ephy_node_db_set_immutable         (EphyNodeDb *db,
+                                                  gboolean immutable);
 
-EphyNode     *ephy_node_db_get_node_from_id    (EphyNodeDb *db,
-                                                guint id);
+EphyNode     *ephy_node_db_get_node_from_id      (EphyNodeDb *db,
+                                                  guint id);
 
-guint        _ephy_node_db_new_id              (EphyNodeDb *db);
+guint         _ephy_node_db_new_id               (EphyNodeDb *db);
 
-void         _ephy_node_db_add_id              (EphyNodeDb *db,
-                                                guint id,
-                                                EphyNode *node);
+void          _ephy_node_db_add_id               (EphyNodeDb *db,
+                                                  guint id,
+                                                  EphyNode *node);
 
-void         _ephy_node_db_remove_id           (EphyNodeDb *db,
-                                                guint id);
+void          _ephy_node_db_remove_id            (EphyNodeDb *db,
+                                                  guint id);
 
 G_END_DECLS
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 3ba8bc3..12c09ea 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Olivier Martin <omartin ifrance com>
  *            (C) 2002 Jorn Baayen <jorn nl linux org>
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index 639015d..2d6aef0 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Olivier Martin <omartin ifrance com>
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
@@ -30,20 +31,20 @@ G_DECLARE_FINAL_TYPE (EphyNodeFilter, ephy_node_filter, EPHY, NODE_FILTER, GObje
 
 typedef enum
 {
-       EPHY_NODE_FILTER_EXPRESSION_ALWAYS_TRUE,           /* args: none */
-       EPHY_NODE_FILTER_EXPRESSION_NODE_EQUALS,           /* args: EphyNode *a, EphyNode *b */
-       EPHY_NODE_FILTER_EXPRESSION_EQUALS,                /* args: EphyNode *node */
-       EPHY_NODE_FILTER_EXPRESSION_HAS_PARENT,            /* args: EphyNode *parent */
-       EPHY_NODE_FILTER_EXPRESSION_HAS_CHILD,             /* args: EphyNode *child */
-       EPHY_NODE_FILTER_EXPRESSION_NODE_PROP_EQUALS,      /* args: int prop_id, EphyNode *node */
-       EPHY_NODE_FILTER_EXPRESSION_CHILD_PROP_EQUALS,     /* args: int prop_id, EphyNode *node */
-       EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_CONTAINS,  /* args: int prop_id, const char *string */
-       EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_EQUALS,    /* args: int prop_id, const char *string */
-       EPHY_NODE_FILTER_EXPRESSION_KEY_PROP_CONTAINS,     /* args: int prop_id, const char *string */
-       EPHY_NODE_FILTER_EXPRESSION_KEY_PROP_EQUALS,       /* args: int prop_id, const char *string */
-       EPHY_NODE_FILTER_EXPRESSION_INT_PROP_EQUALS,       /* args: int prop_id, int int */
-       EPHY_NODE_FILTER_EXPRESSION_INT_PROP_BIGGER_THAN,  /* args: int prop_id, int int */
-       EPHY_NODE_FILTER_EXPRESSION_INT_PROP_LESS_THAN     /* args: int prop_id, int int */
+  EPHY_NODE_FILTER_EXPRESSION_ALWAYS_TRUE,           /* args: none */
+  EPHY_NODE_FILTER_EXPRESSION_NODE_EQUALS,           /* args: EphyNode *a, EphyNode *b */
+  EPHY_NODE_FILTER_EXPRESSION_EQUALS,                /* args: EphyNode *node */
+  EPHY_NODE_FILTER_EXPRESSION_HAS_PARENT,            /* args: EphyNode *parent */
+  EPHY_NODE_FILTER_EXPRESSION_HAS_CHILD,             /* args: EphyNode *child */
+  EPHY_NODE_FILTER_EXPRESSION_NODE_PROP_EQUALS,      /* args: int prop_id, EphyNode *node */
+  EPHY_NODE_FILTER_EXPRESSION_CHILD_PROP_EQUALS,     /* args: int prop_id, EphyNode *node */
+  EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_CONTAINS,  /* args: int prop_id, const char *string */
+  EPHY_NODE_FILTER_EXPRESSION_STRING_PROP_EQUALS,    /* args: int prop_id, const char *string */
+  EPHY_NODE_FILTER_EXPRESSION_KEY_PROP_CONTAINS,     /* args: int prop_id, const char *string */
+  EPHY_NODE_FILTER_EXPRESSION_KEY_PROP_EQUALS,       /* args: int prop_id, const char *string */
+  EPHY_NODE_FILTER_EXPRESSION_INT_PROP_EQUALS,       /* args: int prop_id, int int */
+  EPHY_NODE_FILTER_EXPRESSION_INT_PROP_BIGGER_THAN,  /* args: int prop_id, int int */
+  EPHY_NODE_FILTER_EXPRESSION_INT_PROP_LESS_THAN     /* args: int prop_id, int int */
 } EphyNodeFilterExpressionType;
 
 typedef struct _EphyNodeFilterExpression EphyNodeFilterExpression;
@@ -57,18 +58,18 @@ typedef struct _EphyNodeFilterExpression EphyNodeFilterExpression;
 EphyNodeFilter *ephy_node_filter_new            (void);
 
 void            ephy_node_filter_add_expression (EphyNodeFilter *filter,
-                                                EphyNodeFilterExpression *expression,
-                                                int level);
+                                                 EphyNodeFilterExpression *expression,
+                                                 int level);
 
 void            ephy_node_filter_empty          (EphyNodeFilter *filter);
 
 void            ephy_node_filter_done_changing  (EphyNodeFilter *filter);
 
 gboolean        ephy_node_filter_evaluate       (EphyNodeFilter *filter,
-                                                EphyNode *node);
+                                                 EphyNode *node);
 
 EphyNodeFilterExpression *ephy_node_filter_expression_new  (EphyNodeFilterExpressionType,
-                                                           ...);
+                                                            ...);
 /* no need to free unless you didn't add the expression to a filter */
 void                      ephy_node_filter_expression_free (EphyNodeFilterExpression *expression);
 
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 0303fda..008e6ad 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *  Copyright © 2003 Marco Pesenti Gritti
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index 3c1cd42..5832ec2 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *  Copyright © 2003 Marco Pesenti Gritti
@@ -24,20 +25,20 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_NODE (ephy_node_get_type ())
-#define EPHY_IS_NODE(o)        (o != NULL)
+#define EPHY_TYPE_NODE        (ephy_node_get_type ())
+#define EPHY_IS_NODE(o)        (o != NULL)
 
 typedef struct _EphyNode EphyNode;
 
 typedef enum
 {
-       EPHY_NODE_DESTROY,           /* EphyNode *node */
-       EPHY_NODE_RESTORED,          /* EphyNode *node */
-       EPHY_NODE_CHANGED,           /* EphyNode *node, guint property_id */
-       EPHY_NODE_CHILD_ADDED,       /* EphyNode *node, EphyNode *child */
-       EPHY_NODE_CHILD_CHANGED,     /* EphyNode *node, EphyNode *child, guint property_id */
-       EPHY_NODE_CHILD_REMOVED,     /* EphyNode *node, EphyNode *child, guint old_index */
-       EPHY_NODE_CHILDREN_REORDERED /* EphyNode *node, int *new_order */
+  EPHY_NODE_DESTROY,           /* EphyNode *node */
+  EPHY_NODE_RESTORED,          /* EphyNode *node */
+  EPHY_NODE_CHANGED,           /* EphyNode *node, guint property_id */
+  EPHY_NODE_CHILD_ADDED,       /* EphyNode *node, EphyNode *child */
+  EPHY_NODE_CHILD_CHANGED,     /* EphyNode *node, EphyNode *child, guint property_id */
+  EPHY_NODE_CHILD_REMOVED,     /* EphyNode *node, EphyNode *child, guint old_index */
+  EPHY_NODE_CHILDREN_REORDERED /* EphyNode *node, int *new_order */
 } EphyNodeSignalType;
 
 #include "ephy-node-db.h"
@@ -45,14 +46,14 @@ typedef enum
 typedef void (*EphyNodeCallback) (EphyNode *node, ...);
 typedef gboolean (*EphyNodeFilterFunc) (EphyNode *, gpointer);
 
-GType      ephy_node_get_type              (void) G_GNUC_CONST;
+GType       ephy_node_get_type              (void) G_GNUC_CONST;
 
 EphyNode   *ephy_node_new                   (EphyNodeDb *db);
 
 EphyNode   *ephy_node_new_with_id           (EphyNodeDb *db,
-                                            guint reserved_id);
+                                             guint reserved_id);
 
-EphyNodeDb *ephy_node_get_db               (EphyNode *node);
+EphyNodeDb *ephy_node_get_db                (EphyNode *node);
 
 /* unique node ID */
 guint       ephy_node_get_id                (EphyNode *node);
@@ -63,91 +64,92 @@ void        ephy_node_unref                 (EphyNode *node);
 
 /* signals */
 int         ephy_node_signal_connect_object (EphyNode *node,
-                                            EphyNodeSignalType type,
-                                            EphyNodeCallback callback,
-                                            GObject *object);
+                                             EphyNodeSignalType type,
+                                             EphyNodeCallback callback,
+                                             GObject *object);
 
-guint       ephy_node_signal_disconnect_object (EphyNode *node,
-                                            EphyNodeSignalType type,
-                                            EphyNodeCallback callback,
-                                            GObject *object);
+guint       ephy_node_signal_disconnect_object
+                                            (EphyNode *node,
+                                             EphyNodeSignalType type,
+                                             EphyNodeCallback callback,
+                                             GObject *object);
 
 void        ephy_node_signal_disconnect     (EphyNode *node,
-                                            int signal_id);
+                                             int signal_id);
 
 /* properties */
 void        ephy_node_set_property          (EphyNode *node,
-                                            guint property_id,
-                                            const GValue *value);
+                                             guint property_id,
+                                             const GValue *value);
 gboolean    ephy_node_get_property          (EphyNode *node,
-                                            guint property_id,
-                                            GValue *value);
+                                             guint property_id,
+                                             GValue *value);
 
 const char *ephy_node_get_property_string   (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_string   (EphyNode *node,
-                                            guint property_id,
-                                            const char *value);
+                                             guint property_id,
+                                             const char *value);
 gboolean    ephy_node_get_property_boolean  (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_boolean  (EphyNode *node,
-                                            guint property_id,
-                                            gboolean value);
+                                             guint property_id,
+                                             gboolean value);
 long        ephy_node_get_property_long     (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_long     (EphyNode *node,
-                                            guint property_id,
-                                            long value);
+                                             guint property_id,
+                                             long value);
 int         ephy_node_get_property_int      (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_int      (EphyNode *node,
-                                            guint property_id,
-                                            int value);
+                                             guint property_id,
+                                             int value);
 double      ephy_node_get_property_double   (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_double   (EphyNode *node,
-                                            guint property_id,
-                                            double value);
+                                             guint property_id,
+                                             double value);
 float       ephy_node_get_property_float    (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 void        ephy_node_set_property_float    (EphyNode *node,
-                                            guint property_id,
-                                            float value);
+                                             guint property_id,
+                                             float value);
 EphyNode   *ephy_node_get_property_node     (EphyNode *node,
-                                            guint property_id);
+                                             guint property_id);
 
 /* xml storage */
-int           ephy_node_write_to_xml       (EphyNode *node,
-                                            xmlTextWriterPtr writer);
+int           ephy_node_write_to_xml        (EphyNode *node,
+                                             xmlTextWriterPtr writer);
 EphyNode     *ephy_node_new_from_xml        (EphyNodeDb *db,
-                                            xmlNodePtr xml_node);
+                                             xmlNodePtr xml_node);
 
 /* DAG structure */
 void          ephy_node_add_child           (EphyNode *node,
-                                            EphyNode *child);
+                                             EphyNode *child);
 void          ephy_node_remove_child        (EphyNode *node,
-                                            EphyNode *child);
-void         ephy_node_sort_children       (EphyNode *node,
-                                            GCompareFunc compare_func);
+                                             EphyNode *child);
+void          ephy_node_sort_children       (EphyNode *node,
+                                             GCompareFunc compare_func);
 gboolean      ephy_node_has_child           (EphyNode *node,
-                                            EphyNode *child);
-void         ephy_node_reorder_children    (EphyNode *node,
-                                            int *new_order);
+                                             EphyNode *child);
+void          ephy_node_reorder_children    (EphyNode *node,
+                                             int *new_order);
 GPtrArray    *ephy_node_get_children        (EphyNode *node);
 int           ephy_node_get_n_children      (EphyNode *node);
 EphyNode     *ephy_node_get_nth_child       (EphyNode *node,
-                                            guint n);
+                                             guint n);
 int           ephy_node_get_child_index     (EphyNode *node,
-                                            EphyNode *child);
+                                             EphyNode *child);
 EphyNode     *ephy_node_get_next_child      (EphyNode *node,
-                                            EphyNode *child);
+                                             EphyNode *child);
 EphyNode     *ephy_node_get_previous_child  (EphyNode *node,
-                                            EphyNode *child);
-void         ephy_node_set_is_drag_source  (EphyNode *node,
-                                            gboolean allow);
+                                             EphyNode *child);
+void          ephy_node_set_is_drag_source  (EphyNode *node,
+                                             gboolean allow);
 gboolean      ephy_node_get_is_drag_source  (EphyNode *node);
-void         ephy_node_set_is_drag_dest    (EphyNode *node,
-                                            gboolean allow);
+void          ephy_node_set_is_drag_dest    (EphyNode *node,
+                                             gboolean allow);
 gboolean      ephy_node_get_is_drag_dest    (EphyNode *node);
 
 G_END_DECLS
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 97ea554..86f5438 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2009 Xan López
  *
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index e86ec92..b026ae7 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2009 Xan López
  *
diff --git a/lib/ephy-profile-utils.h b/lib/ephy-profile-utils.h
index 105496c..3a9b662 100644
--- a/lib/ephy-profile-utils.h
+++ b/lib/ephy-profile-utils.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2009 Xan López
  *
diff --git a/lib/ephy-security-levels.c b/lib/ephy-security-levels.c
index 8782fb5..7629369 100644
--- a/lib/ephy-security-levels.c
+++ b/lib/ephy-security-levels.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2014 Igalia S.L.
  *
diff --git a/lib/ephy-security-levels.h b/lib/ephy-security-levels.h
index 78e0ce8..fc77d06 100644
--- a/lib/ephy-security-levels.h
+++ b/lib/ephy-security-levels.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2014 Igalia S.L.
  *
diff --git a/lib/ephy-settings.c b/lib/ephy-settings.c
index f68fbba..4ec8207 100644
--- a/lib/ephy-settings.c
+++ b/lib/ephy-settings.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2010 Igalia S.L.
  *
diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h
index e5d33db..6f4848d 100644
--- a/lib/ephy-settings.h
+++ b/lib/ephy-settings.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2010 Igalia S.L.
  *
diff --git a/lib/ephy-signal-accumulator.c b/lib/ephy-signal-accumulator.c
index 17831fb..e4c02a1 100644
--- a/lib/ephy-signal-accumulator.c
+++ b/lib/ephy-signal-accumulator.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
index 4225678..9d7ea8f 100644
--- a/lib/ephy-signal-accumulator.h
+++ b/lib/ephy-signal-accumulator.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *
@@ -22,13 +23,13 @@
 G_BEGIN_DECLS
 
 gboolean ephy_signal_accumulator_object (GSignalInvocationHint *ihint,
-                                        GValue *return_accu,
-                                        const GValue *handler_return,
-                                        gpointer accu_data);
+                                         GValue *return_accu,
+                                         const GValue *handler_return,
+                                         gpointer accu_data);
 
-gboolean ephy_signal_accumulator_string        (GSignalInvocationHint *ihint,
-                                        GValue *return_accu,
-                                        const GValue *handler_return,
-                                        gpointer accu_data);
+gboolean ephy_signal_accumulator_string (GSignalInvocationHint *ihint,
+                                         GValue *return_accu,
+                                         const GValue *handler_return,
+                                         gpointer accu_data);
 
 G_END_DECLS
diff --git a/lib/ephy-sqlite-connection.c b/lib/ephy-sqlite-connection.c
index 90266a4..ec748d0 100644
--- a/lib/ephy-sqlite-connection.c
+++ b/lib/ephy-sqlite-connection.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-sqlite-connection.h b/lib/ephy-sqlite-connection.h
index f84c644..229849f 100644
--- a/lib/ephy-sqlite-connection.h
+++ b/lib/ephy-sqlite-connection.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-sqlite-statement.c b/lib/ephy-sqlite-statement.c
index 41f2748..983a2b5 100644
--- a/lib/ephy-sqlite-statement.c
+++ b/lib/ephy-sqlite-statement.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-sqlite-statement.h b/lib/ephy-sqlite-statement.h
index 8b83254..cb8100d 100644
--- a/lib/ephy-sqlite-statement.h
+++ b/lib/ephy-sqlite-statement.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-sqlite.h b/lib/ephy-sqlite.h
index 6813da1..8a5e854 100644
--- a/lib/ephy-sqlite.h
+++ b/lib/ephy-sqlite.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index fe67fb4..474775b 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti
  *
@@ -22,18 +23,18 @@
 
 G_BEGIN_DECLS
 
-gboolean  ephy_string_to_int   (const char *string,
-                                gulong *integer);
+gboolean  ephy_string_to_int                   (const char *string,
+                                                gulong *integer);
 
-char    *ephy_string_blank_chr (char *source);
+char     *ephy_string_blank_chr                (char *source);
 
-char    *ephy_string_shorten   (char *str,
-                                gsize target_length);
+char     *ephy_string_shorten                  (char *str,
+                                                gsize target_length);
 
-char    *ephy_string_collate_key_for_domain    (const char *host,
-                                                gssize len);
+char     *ephy_string_collate_key_for_domain   (const char *host,
+                                                gssize len);
 
-char     *ephy_string_get_host_name (const char *url);
+char     *ephy_string_get_host_name            (const char *url);
 
 char    **ephy_string_commandline_args_to_uris (char **arguments, GError **error);
 
diff --git a/lib/ephy-time-helpers.c b/lib/ephy-time-helpers.c
index 8586330..48a473f 100644
--- a/lib/ephy-time-helpers.c
+++ b/lib/ephy-time-helpers.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
  *  arch-tag: File containing code cut and pasted from elsewhere
  *
  *  Copyright © 2000 Eazel, Inc.
diff --git a/lib/ephy-time-helpers.h b/lib/ephy-time-helpers.h
index 922f222..ddb1261 100644
--- a/lib/ephy-time-helpers.h
+++ b/lib/ephy-time-helpers.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  arch-tag: Header file for code cut and pasted from elsewhere
  *
@@ -25,9 +26,9 @@
 
 G_BEGIN_DECLS
 
-char      *eel_strdup_strftime                 (const char *format,
-                                                struct tm *time_pieces);
+char      *eel_strdup_strftime                        (const char *format,
+                                                       struct tm *time_pieces);
 
-char *     ephy_time_helpers_utf_friendly_time (time_t date);
+char *     ephy_time_helpers_utf_friendly_time        (time_t date);
 
 G_END_DECLS
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index 5e7e178..fd7b71b 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index e31db88..970b129 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-service-hosts-table.c b/lib/history/ephy-history-service-hosts-table.c
index ad27403..bef2793 100644
--- a/lib/history/ephy-history-service-hosts-table.c
+++ b/lib/history/ephy-history-service-hosts-table.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-service-urls-table.c b/lib/history/ephy-history-service-urls-table.c
index 56675bd..6b307a5 100644
--- a/lib/history/ephy-history-service-urls-table.c
+++ b/lib/history/ephy-history-service-urls-table.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-service-visits-table.c b/lib/history/ephy-history-service-visits-table.c
index 75c052b..1bb89d1 100644
--- a/lib/history/ephy-history-service-visits-table.c
+++ b/lib/history/ephy-history-service-visits-table.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-service.h b/lib/history/ephy-history-service.h
index dc760a3..07f8e5b 100644
--- a/lib/history/ephy-history-service.h
+++ b/lib/history/ephy-history-service.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-types.c b/lib/history/ephy-history-types.c
index 693052c..bd34bc6 100644
--- a/lib/history/ephy-history-types.c
+++ b/lib/history/ephy-history-types.c
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/history/ephy-history-types.h b/lib/history/ephy-history-types.h
index 74a2029..534e6b7 100644
--- a/lib/history/ephy-history-types.h
+++ b/lib/history/ephy-history-types.h
@@ -1,5 +1,4 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
 /*
  *  Copyright © 2011 Igalia S.L.
  *
diff --git a/lib/widgets/ephy-certificate-dialog.c b/lib/widgets/ephy-certificate-dialog.c
index ab21ae1..2bd6f5e 100644
--- a/lib/widgets/ephy-certificate-dialog.c
+++ b/lib/widgets/ephy-certificate-dialog.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/lib/widgets/ephy-certificate-dialog.h b/lib/widgets/ephy-certificate-dialog.h
index b663beb..634fb9f 100644
--- a/lib/widgets/ephy-certificate-dialog.h
+++ b/lib/widgets/ephy-certificate-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
diff --git a/lib/widgets/ephy-download-widget.c b/lib/widgets/ephy-download-widget.c
index 5ad18cd..0043f05 100644
--- a/lib/widgets/ephy-download-widget.c
+++ b/lib/widgets/ephy-download-widget.c
@@ -1,4 +1,3 @@
-/* vim: set sw=2 ts=2 sts=2 et: */
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * ephy-download.c
diff --git a/lib/widgets/ephy-download-widget.h b/lib/widgets/ephy-download-widget.h
index 10db352..bb59bee 100644
--- a/lib/widgets/ephy-download-widget.h
+++ b/lib/widgets/ephy-download-widget.h
@@ -1,4 +1,3 @@
-/* vim: set foldmethod=marker sw=2 ts=2 sts=2 et: */
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * ephy-download.c
diff --git a/lib/widgets/ephy-file-chooser.c b/lib/widgets/ephy-file-chooser.c
index 171ab69..1f2e714 100644
--- a/lib/widgets/ephy-file-chooser.c
+++ b/lib/widgets/ephy-file-chooser.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/lib/widgets/ephy-file-chooser.h b/lib/widgets/ephy-file-chooser.h
index fc277ec..22c47f1 100644
--- a/lib/widgets/ephy-file-chooser.h
+++ b/lib/widgets/ephy-file-chooser.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Christian Persch
  *  
@@ -29,27 +30,27 @@ G_DECLARE_FINAL_TYPE (EphyFileChooser, ephy_file_chooser, EPHY, FILE_CHOOSER, Gt
 
 typedef enum
 {
-       EPHY_FILE_FILTER_ALL_SUPPORTED,
-       EPHY_FILE_FILTER_WEBPAGES,
-       EPHY_FILE_FILTER_IMAGES,
-       EPHY_FILE_FILTER_ALL,
-       EPHY_FILE_FILTER_NONE,
-       EPHY_FILE_FILTER_LAST = EPHY_FILE_FILTER_NONE
+        EPHY_FILE_FILTER_ALL_SUPPORTED,
+        EPHY_FILE_FILTER_WEBPAGES,
+        EPHY_FILE_FILTER_IMAGES,
+        EPHY_FILE_FILTER_ALL,
+        EPHY_FILE_FILTER_NONE,
+        EPHY_FILE_FILTER_LAST = EPHY_FILE_FILTER_NONE
 } EphyFileFilterDefault;
 
-EphyFileChooser        *ephy_file_chooser_new                  (const char *title,
-                                                        GtkWidget *parent,
-                                                        GtkFileChooserAction action,
-                                                        EphyFileFilterDefault default_filter);
+EphyFileChooser        *ephy_file_chooser_new              (const char *title,
+                                                            GtkWidget *parent,
+                                                            GtkFileChooserAction action,
+                                                            EphyFileFilterDefault default_filter);
 
-GtkFileFilter  *ephy_file_chooser_add_pattern_filter   (EphyFileChooser *dialog,
-                                                        const char *title,
-                                                        const char *first_pattern,
-                                                        ...);
+GtkFileFilter        *ephy_file_chooser_add_pattern_filter (EphyFileChooser *dialog,
+                                                            const char *title,
+                                                            const char *first_pattern,
+                                                            ...);
 
-GtkFileFilter  *ephy_file_chooser_add_mime_filter      (EphyFileChooser *dialog,
-                                                        const char *title,
-                                                        const char *first_mimetype,
-                                                        ...);
+GtkFileFilter        *ephy_file_chooser_add_mime_filter    (EphyFileChooser *dialog,
+                                                            const char *title,
+                                                            const char *first_mimetype,
+                                                            ...);
 
 G_END_DECLS
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 5ef8eb2..bd57aca 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002  Ricardo Fernández Pascual
  *  Copyright © 2003, 2004  Marco Pesenti Gritti
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 9aa5c28..b7b2771 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002  Ricardo Fernández Pascual
  *  Copyright © 2003, 2004  Marco Pesenti Gritti
@@ -29,50 +30,50 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyLocationEntry, ephy_location_entry, EPHY, LOCATION_ENTRY, GtkEntry)
 
-GtkWidget      *ephy_location_entry_new                        (void);
+GtkWidget      *ephy_location_entry_new                 (void);
 
-void           ephy_location_entry_set_completion      (EphyLocationEntry *entry,
-                                                        GtkTreeModel *model,
-                                                        guint text_col,
-                                                        guint action_col,
-                                                        guint keywords_col,
-                                                        guint relevance_col,
-                                                        guint url_col,
-                                                        guint extra_col,
-                                                        guint favicon_col);
+void            ephy_location_entry_set_completion      (EphyLocationEntry *entry,
+                                                         GtkTreeModel *model,
+                                                         guint text_col,
+                                                         guint action_col,
+                                                         guint keywords_col,
+                                                         guint relevance_col,
+                                                         guint url_col,
+                                                         guint extra_col,
+                                                         guint favicon_col);
 
-void           ephy_location_entry_set_location        (EphyLocationEntry *entry,
-                                                        const char *address);
+void            ephy_location_entry_set_location        (EphyLocationEntry *entry,
+                                                         const char *address);
 
-void           ephy_location_entry_set_match_func      (EphyLocationEntry *entry, 
-                                                        GtkEntryCompletionMatchFunc match_func,
-                                                        gpointer user_data,
-                                                        GDestroyNotify notify);
-                                       
-const char     *ephy_location_entry_get_location       (EphyLocationEntry *entry);
+void            ephy_location_entry_set_match_func      (EphyLocationEntry *entry,
+                                                         GtkEntryCompletionMatchFunc match_func,
+                                                         gpointer user_data,
+                                                         GDestroyNotify notify);
 
-gboolean       ephy_location_entry_get_can_undo        (EphyLocationEntry *entry);
+const char     *ephy_location_entry_get_location        (EphyLocationEntry *entry);
 
-gboolean       ephy_location_entry_get_can_redo        (EphyLocationEntry *entry);
+gboolean        ephy_location_entry_get_can_undo        (EphyLocationEntry *entry);
 
-GSList         *ephy_location_entry_get_search_terms   (EphyLocationEntry *entry);
+gboolean        ephy_location_entry_get_can_redo        (EphyLocationEntry *entry);
 
-gboolean       ephy_location_entry_reset               (EphyLocationEntry *entry);
+GSList         *ephy_location_entry_get_search_terms    (EphyLocationEntry *entry);
 
-void           ephy_location_entry_undo_reset          (EphyLocationEntry *entry);
+gboolean        ephy_location_entry_reset               (EphyLocationEntry *entry);
 
-void           ephy_location_entry_activate            (EphyLocationEntry *entry);
+void            ephy_location_entry_undo_reset          (EphyLocationEntry *entry);
 
-void           ephy_location_entry_set_favicon         (EphyLocationEntry *entry,
-                                                        GdkPixbuf *pixbuf);
+void            ephy_location_entry_activate            (EphyLocationEntry *entry);
+
+void            ephy_location_entry_set_favicon         (EphyLocationEntry *entry,
+                                                         GdkPixbuf *pixbuf);
 
 void            ephy_location_entry_set_show_favicon    (EphyLocationEntry *entry,
-                                                        gboolean show_favicon);
+                                                         gboolean show_favicon);
 
-void           ephy_location_entry_set_security_level  (EphyLocationEntry *entry,
-                                                        EphySecurityLevel security_level);
+void            ephy_location_entry_set_security_level  (EphyLocationEntry *entry,
+                                                         EphySecurityLevel security_level);
 
-void           ephy_location_entry_set_lock_tooltip    (EphyLocationEntry *entry,
-                                                        const char *tooltip);
+void            ephy_location_entry_set_lock_tooltip    (EphyLocationEntry *entry,
+                                                         const char *tooltip);
 
 G_END_DECLS
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index f9361f5..eb92b64 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 7910449..2d07bee 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *
@@ -30,86 +31,86 @@ G_DECLARE_FINAL_TYPE (EphyNodeView, ephy_node_view, EPHY, NODE_VIEW, GtkTreeView
 
 typedef enum
 {
-       EPHY_NODE_VIEW_ALL_PRIORITY,
-       EPHY_NODE_VIEW_SPECIAL_PRIORITY,
-       EPHY_NODE_VIEW_NORMAL_PRIORITY
+        EPHY_NODE_VIEW_ALL_PRIORITY,
+        EPHY_NODE_VIEW_SPECIAL_PRIORITY,
+        EPHY_NODE_VIEW_NORMAL_PRIORITY
 } EphyNodeViewPriority;
 
 typedef enum
 {
-       EPHY_NODE_VIEW_SHOW_PRIORITY = 1 << 0,
-       EPHY_NODE_VIEW_SORTABLE = 1 << 1,
-       EPHY_NODE_VIEW_EDITABLE = 1 << 2,
-       EPHY_NODE_VIEW_SEARCHABLE = 1 << 3,
-       EPHY_NODE_VIEW_ELLIPSIZED = 1 << 4
+        EPHY_NODE_VIEW_SHOW_PRIORITY = 1 << 0,
+        EPHY_NODE_VIEW_SORTABLE = 1 << 1,
+        EPHY_NODE_VIEW_EDITABLE = 1 << 2,
+        EPHY_NODE_VIEW_SEARCHABLE = 1 << 3,
+        EPHY_NODE_VIEW_ELLIPSIZED = 1 << 4
 } EphyNodeViewFlags;
 
 GtkWidget *ephy_node_view_new                 (EphyNode *root,
-                                              EphyNodeFilter *filter);
-
-void      ephy_node_view_add_toggle          (EphyNodeView *view,
-                                              EphyTreeModelNodeValueFunc value_func,
-                                              gpointer data);
-
-int       ephy_node_view_add_column_full     (EphyNodeView *view,
-                                              const char *title,
-                                              GType value_type,
-                                              guint prop_id,
-                                              EphyNodeViewFlags flags,
-                                              EphyTreeModelNodeValueFunc func,
-                                              gpointer user_data,
-                                              EphyTreeModelNodeValueFunc icon_func,
-                                              GtkTreeViewColumn **ret);
-
-int       ephy_node_view_add_column          (EphyNodeView *view,
-                                              const char  *title,
-                                              GType value_type,
-                                              guint prop_id,
-                                              EphyNodeViewFlags flags,
-                                              EphyTreeModelNodeValueFunc icon_func,
-                                              GtkTreeViewColumn **ret);
-
-int       ephy_node_view_add_data_column     (EphyNodeView *view,
-                                              GType value_type,
-                                              guint prop_id,
-                                              EphyTreeModelNodeValueFunc func,
-                                              gpointer data);
-
-void      ephy_node_view_set_sort            (EphyNodeView *view,
-                                              GType value_type,
-                                              guint prop_id,
-                                              GtkSortType sort_type);
-
-void      ephy_node_view_set_priority        (EphyNodeView *view,
-                                              EphyNodeViewPriority priority_prop_id);
-
-void      ephy_node_view_remove              (EphyNodeView *view);
+                                               EphyNodeFilter *filter);
+
+void       ephy_node_view_add_toggle          (EphyNodeView *view,
+                                               EphyTreeModelNodeValueFunc value_func,
+                                               gpointer data);
+
+int        ephy_node_view_add_column_full     (EphyNodeView *view,
+                                               const char *title,
+                                               GType value_type,
+                                               guint prop_id,
+                                               EphyNodeViewFlags flags,
+                                               EphyTreeModelNodeValueFunc func,
+                                               gpointer user_data,
+                                               EphyTreeModelNodeValueFunc icon_func,
+                                               GtkTreeViewColumn **ret);
+
+int        ephy_node_view_add_column          (EphyNodeView *view,
+                                               const char  *title,
+                                               GType value_type,
+                                               guint prop_id,
+                                               EphyNodeViewFlags flags,
+                                               EphyTreeModelNodeValueFunc icon_func,
+                                               GtkTreeViewColumn **ret);
+
+int        ephy_node_view_add_data_column     (EphyNodeView *view,
+                                               GType value_type,
+                                               guint prop_id,
+                                               EphyTreeModelNodeValueFunc func,
+                                               gpointer data);
+
+void       ephy_node_view_set_sort            (EphyNodeView *view,
+                                               GType value_type,
+                                               guint prop_id,
+                                               GtkSortType sort_type);
+
+void       ephy_node_view_set_priority        (EphyNodeView *view,
+                                               EphyNodeViewPriority priority_prop_id);
+
+void       ephy_node_view_remove              (EphyNodeView *view);
 
 GList     *ephy_node_view_get_selection       (EphyNodeView *view);
 
-void      ephy_node_view_select_node         (EphyNodeView *view,
-                                              EphyNode *node);
+void       ephy_node_view_select_node         (EphyNodeView *view,
+                                               EphyNode *node);
 
-void      ephy_node_view_enable_drag_source  (EphyNodeView *view,
-                                              const GtkTargetEntry *types,
-                                              int n_types,
-                                              int base_drag_column_id,
-                                              int extra_drag_column_id);
+void       ephy_node_view_enable_drag_source  (EphyNodeView *view,
+                                               const GtkTargetEntry *types,
+                                               int n_types,
+                                               int base_drag_column_id,
+                                               int extra_drag_column_id);
 
-void      ephy_node_view_enable_drag_dest    (EphyNodeView *view,
-                                              const GtkTargetEntry *types,
-                                              int n_types);
+void       ephy_node_view_enable_drag_dest    (EphyNodeView *view,
+                                               const GtkTargetEntry *types,
+                                               int n_types);
 
-void      ephy_node_view_edit                (EphyNodeView *view,
-                                              gboolean remove_if_cancelled);
+void       ephy_node_view_edit                (EphyNodeView *view,
+                                               gboolean remove_if_cancelled);
 
-gboolean   ephy_node_view_is_target          (EphyNodeView *view);
+gboolean   ephy_node_view_is_target           (EphyNodeView *view);
 
-void      ephy_node_view_popup               (EphyNodeView *view,
-                                              GtkWidget *menu);
+void       ephy_node_view_popup               (EphyNodeView *view,
+                                               GtkWidget *menu);
 
 gboolean   ephy_node_view_get_iter_for_node   (EphyNodeView *view,
-                                              GtkTreeIter *iter,
-                                              EphyNode *node);
+                                               GtkTreeIter *iter,
+                                               EphyNode *node);
 
 G_END_DECLS
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index d43c453..b8113e0 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 894cca1..a6d8585 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *
@@ -31,26 +32,26 @@ typedef void (*EphyTreeModelNodeValueFunc) (EphyNode *node, GValue *value, gpoin
 
 EphyTreeModelNode *ephy_tree_model_node_new              (EphyNode *root);
 
-int               ephy_tree_model_node_add_column_full  (EphyTreeModelNode* model,
-                                                         GType value_type,
-                                                         int prop_id,
-                                                         EphyTreeModelNodeValueFunc func,
-                                                         gpointer user_data);
+int                ephy_tree_model_node_add_column_full  (EphyTreeModelNode* model,
+                                                          GType value_type,
+                                                          int prop_id,
+                                                          EphyTreeModelNodeValueFunc func,
+                                                          gpointer user_data);
 
 int                ephy_tree_model_node_add_prop_column  (EphyTreeModelNode *model,
-                                                         GType value_type,
-                                                         int prop_id);
+                                                          GType value_type,
+                                                          int prop_id);
 
 int                ephy_tree_model_node_add_func_column  (EphyTreeModelNode *model,
-                                                         GType value_type,
-                                                         EphyTreeModelNodeValueFunc func,
-                                                         gpointer user_data);
+                                                          GType value_type,
+                                                          EphyTreeModelNodeValueFunc func,
+                                                          gpointer user_data);
 
 EphyNode          *ephy_tree_model_node_node_from_iter   (EphyTreeModelNode *model,
-                                                         GtkTreeIter *iter);
+                                                          GtkTreeIter *iter);
 
 void               ephy_tree_model_node_iter_from_node   (EphyTreeModelNode *model,
-                                                         EphyNode *node,
-                                                         GtkTreeIter *iter);
+                                                          EphyNode *node,
+                                                          GtkTreeIter *iter);
 
 G_END_DECLS
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index 96037f4..5cb422d 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*  Rhythmbox.
  *  Copyright © 2002 Olivier Martin <omartin ifrance com>
  *
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index 942c35a..fcab9c0 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*  Copyright © 2002 Olivier Martin <omartin ifrance com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,11 +27,11 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyTreeModelSort, ephy_tree_model_sort, EPHY, TREE_MODEL_SORT, GtkTreeModelSort)
 
-GtkTreeModel   *ephy_tree_model_sort_new                     (GtkTreeModel *child_model);
+GtkTreeModel   *ephy_tree_model_sort_new                                 (GtkTreeModel *child_model);
 
-void           ephy_tree_model_sort_set_base_drag_column_id  (EphyTreeModelSort *ms,
-                                                              int id);
-void           ephy_tree_model_sort_set_extra_drag_column_id (EphyTreeModelSort *ms,
-                                                              int id);
+void                   ephy_tree_model_sort_set_base_drag_column_id  (EphyTreeModelSort *ms,
+                                                                                                        int 
id);
+void                   ephy_tree_model_sort_set_extra_drag_column_id (EphyTreeModelSort *ms,
+                                                                                                        int 
id);
 
 G_END_DECLS
diff --git a/lib/widgets/nautilus-floating-bar.c b/lib/widgets/nautilus-floating-bar.c
index 586dcd0..712033d 100644
--- a/lib/widgets/nautilus-floating-bar.c
+++ b/lib/widgets/nautilus-floating-bar.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /* Nautilus - Floating status bar.
  *
diff --git a/lib/widgets/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h
index 2406527..c280404 100644
--- a/lib/widgets/nautilus-floating-bar.h
+++ b/lib/widgets/nautilus-floating-bar.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /* Nautilus - Floating status bar.
  *
diff --git a/src/bookmarks/ephy-bookmark-action-group.c b/src/bookmarks/ephy-bookmark-action-group.c
index c96be07..afb7468 100644
--- a/src/bookmarks/ephy-bookmark-action-group.c
+++ b/src/bookmarks/ephy-bookmark-action-group.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index 31e94ca..d8c5a60 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index f323ecd..f699467 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index c27440f..44e50bd 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
@@ -26,45 +27,45 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_BOOKMARK_ACTION              (ephy_bookmark_action_get_type ())
-#define EPHY_BOOKMARK_ACTION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkAction))
-#define EPHY_BOOKMARK_ACTION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_BOOKMARK_ACTION, 
EphyBookmarkActionClass))
-#define EPHY_IS_BOOKMARK_ACTION(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
EPHY_TYPE_BOOKMARK_ACTION))
-#define EPHY_IS_BOOKMARK_ACTION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_BOOKMARK_ACTION))
-#define EPHY_BOOKMARK_ACTION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARK_ACTION, 
EphyBookmarkActionClass))
+#define EPHY_TYPE_BOOKMARK_ACTION                (ephy_bookmark_action_get_type ())
+#define EPHY_BOOKMARK_ACTION(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkAction))
+#define EPHY_BOOKMARK_ACTION_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), 
EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkActionClass))
+#define EPHY_IS_BOOKMARK_ACTION(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
EPHY_TYPE_BOOKMARK_ACTION))
+#define EPHY_IS_BOOKMARK_ACTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_BOOKMARK_ACTION))
+#define EPHY_BOOKMARK_ACTION_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS((obj), 
EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkActionClass))
 
-typedef struct _EphyBookmarkAction             EphyBookmarkAction;
-typedef struct _EphyBookmarkActionPrivate      EphyBookmarkActionPrivate;
-typedef struct _EphyBookmarkActionClass                EphyBookmarkActionClass;
+typedef struct _EphyBookmarkAction               EphyBookmarkAction;
+typedef struct _EphyBookmarkActionPrivate        EphyBookmarkActionPrivate;
+typedef struct _EphyBookmarkActionClass          EphyBookmarkActionClass;
 
 struct _EphyBookmarkAction
 {
-       EphyLinkAction parent_instance;
+  EphyLinkAction parent_instance;
 
-       /*< private >*/
-       EphyBookmarkActionPrivate *priv;
+  /*< private >*/
+  EphyBookmarkActionPrivate *priv;
 };
 
 struct _EphyBookmarkActionClass
 {
-       EphyLinkActionClass parent_class;
+  EphyLinkActionClass parent_class;
 };
 
 
-GType          ephy_bookmark_action_get_type           (void);
+GType           ephy_bookmark_action_get_type           (void);
 
-GtkAction      *ephy_bookmark_action_new               (EphyNode *node,
-                                                        const char *name);
+GtkAction      *ephy_bookmark_action_new                (EphyNode *node,
+                                                         const char *name);
 
-void           ephy_bookmark_action_set_bookmark       (EphyBookmarkAction *action,
-                                                        EphyNode *node);
+void            ephy_bookmark_action_set_bookmark       (EphyBookmarkAction *action,
+                                                         EphyNode *node);
 
-EphyNode       *ephy_bookmark_action_get_bookmark      (EphyBookmarkAction *action);
+EphyNode       *ephy_bookmark_action_get_bookmark       (EphyBookmarkAction *action);
 
-void           ephy_bookmark_action_updated            (EphyBookmarkAction *action);
+void            ephy_bookmark_action_updated            (EphyBookmarkAction *action);
 
-void           ephy_bookmark_action_activate           (EphyBookmarkAction *action,
-                                                        GtkWidget *widget,
-                                                        EphyLinkFlags flags);
+void            ephy_bookmark_action_activate           (EphyBookmarkAction *action,
+                                                         GtkWidget *widget,
+                                                         EphyLinkFlags flags);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 43aa168..563fbcc 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti <mpeseng tin it>
  *  Copyright © 2005, 2006 Peter A. Harvey
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 2283be8..63328c2 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti <mpeseng tin it>
  *  Copyright © 2005, 2006 Peter A. Harvey
@@ -28,10 +29,10 @@ G_BEGIN_DECLS
 #define EPHY_TYPE_BOOKMARK_PROPERTIES (ephy_bookmark_properties_get_type ())
 G_DECLARE_FINAL_TYPE (EphyBookmarkProperties, ephy_bookmark_properties, EPHY, BOOKMARK_PROPERTIES, 
GtkDialog);
 
-GtkWidget      *ephy_bookmark_properties_new           (EphyBookmarks *bookmarks,
-                                                        EphyNode *bookmark,
-                                                        gboolean creating);
+GtkWidget        *ephy_bookmark_properties_new          (EphyBookmarks *bookmarks,
+                                                         EphyNode *bookmark,
+                                                         gboolean creating);
 
-EphyNode       *ephy_bookmark_properties_get_node      (EphyBookmarkProperties *properties);
+EphyNode        *ephy_bookmark_properties_get_node      (EphyBookmarkProperties *properties);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 7b2bdbc..82c8711 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti <mpeseng tin it>
  *
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index f39ec3c..4b3e83c 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen <jorn nl linux org>
  *
@@ -28,9 +29,9 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyBookmarksEditor, ephy_bookmarks_editor, EPHY, BOOKMARKS_EDITOR, GtkWindow)
 
-GtkWidget          *ephy_bookmarks_editor_new        (EphyBookmarks *bookmarks);
+GtkWidget            *ephy_bookmarks_editor_new        (EphyBookmarks *bookmarks);
 
-void                ephy_bookmarks_editor_set_parent (EphyBookmarksEditor *ebe,
-                                                      GtkWidget *window);
+void                  ephy_bookmarks_editor_set_parent (EphyBookmarksEditor *ebe,
+                                                        GtkWidget *window);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 8dd6c44..d2a88e2 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *  Copyright © 2003 Christian Persch
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index 4083248..fd9bc4a 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *
@@ -22,9 +23,9 @@
 G_BEGIN_DECLS
 
 void ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
-                               const char *filename);
+                                const char *filename);
 
 void ephy_bookmarks_export_mozilla (EphyBookmarks *bookmarks,
-                                   const char *filename);
+                                    const char *filename);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 7447d71..4941eb7 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004, 2005 Christian Persch
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index e10fac9..bb2cca6 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004, 2005 Christian Persch
@@ -22,23 +23,23 @@
 
 G_BEGIN_DECLS
 
-#define MOZILLA_BOOKMARKS_DIR  ".mozilla"
-#define FIREFOX_BOOKMARKS_DIR_0        ".phoenix"
-#define FIREFOX_BOOKMARKS_DIR_1        ".firefox"
-#define FIREFOX_BOOKMARKS_DIR_2        ".mozilla/firefox"
-#define GALEON_BOOKMARKS_DIR   ".galeon"
-#define KDE_BOOKMARKS_DIR      ".kde/share/apps/konqueror"
+#define MOZILLA_BOOKMARKS_DIR        ".mozilla"
+#define FIREFOX_BOOKMARKS_DIR_0      ".phoenix"
+#define FIREFOX_BOOKMARKS_DIR_1      ".firefox"
+#define FIREFOX_BOOKMARKS_DIR_2      ".mozilla/firefox"
+#define GALEON_BOOKMARKS_DIR         ".galeon"
+#define KDE_BOOKMARKS_DIR            ".kde/share/apps/konqueror"
 
 gboolean ephy_bookmarks_import         (EphyBookmarks *bookmarks,
-                                       const char *filename);
+                                        const char *filename);
 
 gboolean ephy_bookmarks_import_mozilla (EphyBookmarks *bookmarks,
-                                       const char *filename);
+                                        const char *filename);
 
 gboolean ephy_bookmarks_import_xbel    (EphyBookmarks *bookmarks,
-                                       const char *filename);
+                                        const char *filename);
 
 gboolean ephy_bookmarks_import_rdf     (EphyBookmarks *bookmarks,
-                                       const char *filename);
+                                        const char *filename);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index e1464fe..1ef812b 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index a1331ea..a76a17e 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002  Ricardo Fernández Pascual
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index 49466f1..f9e239b 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *  Copyright © 2006 Christian Persch
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index 148ccfe..6e38123 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *
@@ -24,35 +25,35 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE      32
+#define EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE        32
 
-#define EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE          EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
-#define EPHY_BOOKMARK_ACTION_NAME_FORMAT               "Bmk%u"
-#define EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG(node)     (ephy_node_get_id (node))
-#define EPHY_BOOKMARK_ACTION_NAME_PRINTF(buffer,node)  (g_snprintf (buffer, sizeof (buffer), 
EPHY_BOOKMARK_ACTION_NAME_FORMAT, EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node)))
-#define EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF(node)  (g_strdup_printf (EPHY_BOOKMARK_ACTION_NAME_FORMAT, 
EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE            EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
+#define EPHY_BOOKMARK_ACTION_NAME_FORMAT                 "Bmk%u"
+#define EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG(node)       (ephy_node_get_id (node))
+#define EPHY_BOOKMARK_ACTION_NAME_PRINTF(buffer,node)    (g_snprintf (buffer, sizeof (buffer), 
EPHY_BOOKMARK_ACTION_NAME_FORMAT, EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF(node)    (g_strdup_printf (EPHY_BOOKMARK_ACTION_NAME_FORMAT, 
EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node)))
 
-#define EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE             EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
-#define EPHY_TOPIC_ACTION_NAME_FORMAT                  "Tp%u"
-#define EPHY_TOPIC_ACTION_NAME_FORMAT_ARG(node)                (ephy_node_get_id (node))
-#define EPHY_TOPIC_ACTION_NAME_PRINTF(buffer,node)     (g_snprintf (buffer, sizeof (buffer), 
EPHY_TOPIC_ACTION_NAME_FORMAT, EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node)))
-#define EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF(node)     (g_strdup_printf (EPHY_TOPIC_ACTION_NAME_FORMAT, 
EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE               EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
+#define EPHY_TOPIC_ACTION_NAME_FORMAT                    "Tp%u"
+#define EPHY_TOPIC_ACTION_NAME_FORMAT_ARG(node)          (ephy_node_get_id (node))
+#define EPHY_TOPIC_ACTION_NAME_PRINTF(buffer,node)       (g_snprintf (buffer, sizeof (buffer), 
EPHY_TOPIC_ACTION_NAME_FORMAT, EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF(node)       (g_strdup_printf (EPHY_TOPIC_ACTION_NAME_FORMAT, 
EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node)))
 
-#define EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE         EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
-#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT              "OpTb%u"
-#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG(node)    (ephy_node_get_id (node))
-#define EPHY_OPEN_TABS_ACTION_NAME_PRINTF(buffer,node) (g_snprintf (buffer, sizeof (buffer), 
EPHY_OPEN_TABS_ACTION_NAME_FORMAT, EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node)))
-#define EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF(node) (g_strdup_printf (EPHY_OPEN_TABS_ACTION_NAME_FORMAT, 
EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE           EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE
+#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT                "OpTb%u"
+#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG(node)      (ephy_node_get_id (node))
+#define EPHY_OPEN_TABS_ACTION_NAME_PRINTF(buffer,node)   (g_snprintf (buffer, sizeof (buffer), 
EPHY_OPEN_TABS_ACTION_NAME_FORMAT, EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node)))
+#define EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF(node)   (g_strdup_printf 
(EPHY_OPEN_TABS_ACTION_NAME_FORMAT, EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node)))
 
-void   ephy_bookmarks_ui_attach_window         (EphyWindow *window);
+void        ephy_bookmarks_ui_attach_window                (EphyWindow *window);
 
-void   ephy_bookmarks_ui_detach_window         (EphyWindow *window);
+void        ephy_bookmarks_ui_detach_window                (EphyWindow *window);
 
-void   ephy_bookmarks_ui_add_bookmark          (GtkWindow *parent,
-                                                const char *location,
-                                                const char *title);
+void        ephy_bookmarks_ui_add_bookmark                (GtkWindow *parent,
+                                                           const char *location,
+                                                           const char *title);
 
-void   ephy_bookmarks_ui_show_bookmark         (GtkWindow *parent,
-                                                                                        EphyNode  *bookmark);
+void        ephy_bookmarks_ui_show_bookmark                (GtkWindow *parent,
+                                                            EphyNode  *bookmark);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index debfeda..cdbec7f 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002-2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 8c5bbad..2a5a110 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
@@ -27,7 +28,7 @@ G_BEGIN_DECLS
 /* Name of a default smart bookmark, to NOT be displayed in the search engine
  * combo in the preferences dialog. This should exactly match the smart bookmark
  * in default-bookmarks.rdf. */
-#define DEFAULT_SMART_BOOKMARK_TEXT    _("Search the web")
+#define DEFAULT_SMART_BOOKMARK_TEXT        _("Search the web")
 
 #define EPHY_TYPE_BOOKMARKS (ephy_bookmarks_get_type ())
 
@@ -35,93 +36,94 @@ G_DECLARE_FINAL_TYPE (EphyBookmarks, ephy_bookmarks, EPHY, BOOKMARKS, GObject)
 
 typedef enum
 {
-       EPHY_NODE_BMK_PROP_TITLE        = 2,
-       EPHY_NODE_BMK_PROP_LOCATION     = 3,
-       EPHY_NODE_BMK_PROP_KEYWORDS     = 4,
-       EPHY_NODE_KEYWORD_PROP_NAME     = 5,
-       EPHY_NODE_BMK_PROP_USERICON     = 6,
-       EPHY_NODE_BMK_PROP_ICON         = 7,
-       EPHY_NODE_KEYWORD_PROP_PRIORITY = 8,
-       EPHY_NODE_BMK_PROP_SERVICE_ID   = 14,
-       EPHY_NODE_BMK_PROP_IMMUTABLE    = 15
+  EPHY_NODE_BMK_PROP_TITLE           = 2,
+  EPHY_NODE_BMK_PROP_LOCATION        = 3,
+  EPHY_NODE_BMK_PROP_KEYWORDS        = 4,
+  EPHY_NODE_KEYWORD_PROP_NAME        = 5,
+  EPHY_NODE_BMK_PROP_USERICON        = 6,
+  EPHY_NODE_BMK_PROP_ICON            = 7,
+  EPHY_NODE_KEYWORD_PROP_PRIORITY    = 8,
+  EPHY_NODE_BMK_PROP_SERVICE_ID      = 14,
+  EPHY_NODE_BMK_PROP_IMMUTABLE       = 15
 } EphyBookmarkProperty;
 
-EphyBookmarks    *ephy_bookmarks_new                   (void);
+EphyBookmarks    *ephy_bookmarks_new                    (void);
 
-EphyNode        *ephy_bookmarks_get_from_id            (EphyBookmarks *eb,
-                                                        long id);
+EphyNode         *ephy_bookmarks_get_from_id            (EphyBookmarks *eb,
+                                                         long id);
 
 /* Bookmarks */
 
-EphyNode        *ephy_bookmarks_add                    (EphyBookmarks *eb,
-                                                        const char *title,
-                                                        const char *url);
+EphyNode         *ephy_bookmarks_add                    (EphyBookmarks *eb,
+                                                         const char *title,
+                                                         const char *url);
 
-EphyNode*        ephy_bookmarks_find_bookmark          (EphyBookmarks *eb,
-                                                        const char *url);
+EphyNode*         ephy_bookmarks_find_bookmark          (EphyBookmarks *eb,
+                                                         const char *url);
 
-gint              ephy_bookmarks_get_similar           (EphyBookmarks *eb,
-                                                        EphyNode *bookmark,
-                                                        GPtrArray *identical,
-                                                        GPtrArray *similar);
+gint              ephy_bookmarks_get_similar            (EphyBookmarks *eb,
+                                                         EphyNode *bookmark,
+                                                         GPtrArray *identical,
+                                                         GPtrArray *similar);
     
-void             ephy_bookmarks_set_icon               (EphyBookmarks *eb,
-                                                        const char *url,
-                                                        const char *icon);
+void              ephy_bookmarks_set_icon               (EphyBookmarks *eb,
+                                                         const char *url,
+                                                         const char *icon);
 
-void             ephy_bookmarks_set_usericon           (EphyBookmarks *eb,
-                                                        const char *url,
-                                                        const char *icon);
+void              ephy_bookmarks_set_usericon           (EphyBookmarks *eb,
+                                                         const char *url,
+                                                         const char *icon);
 
-void             ephy_bookmarks_set_address            (EphyBookmarks *eb,
-                                                        EphyNode *bookmark,
-                                                        const char *address);
+void              ephy_bookmarks_set_address            (EphyBookmarks *eb,
+                                                         EphyNode *bookmark,
+                                                         const char *address);
 
-char            *ephy_bookmarks_resolve_address        (EphyBookmarks *eb,
-                                                        const char *address,
-                                                        const char *parameter);
+char             *ephy_bookmarks_resolve_address        (EphyBookmarks *eb,
+                                                         const char *address,
+                                                         const char *parameter);
 
-guint          ephy_bookmarks_get_smart_bookmark_width (EphyNode *bookmark);
+guint             ephy_bookmarks_get_smart_bookmark_width
+                                                        (EphyNode *bookmark);
 
 
 /* Keywords */
 
-EphyNode        *ephy_bookmarks_add_keyword            (EphyBookmarks *eb,
-                                                        const char *name);
+EphyNode         *ephy_bookmarks_add_keyword            (EphyBookmarks *eb,
+                                                         const char *name);
 
-EphyNode        *ephy_bookmarks_find_keyword           (EphyBookmarks *eb,
-                                                        const char *name,
-                                                        gboolean partial_match);
+EphyNode         *ephy_bookmarks_find_keyword           (EphyBookmarks *eb,
+                                                         const char *name,
+                                                         gboolean partial_match);
 
-void             ephy_bookmarks_remove_keyword         (EphyBookmarks *eb,
-                                                        EphyNode *keyword);
+void              ephy_bookmarks_remove_keyword         (EphyBookmarks *eb,
+                                                         EphyNode *keyword);
 
-gboolean         ephy_bookmarks_has_keyword            (EphyBookmarks *eb,
-                                                        EphyNode *keyword,
-                                                        EphyNode *bookmark);
+gboolean          ephy_bookmarks_has_keyword            (EphyBookmarks *eb,
+                                                         EphyNode *keyword,
+                                                         EphyNode *bookmark);
 
-void             ephy_bookmarks_set_keyword            (EphyBookmarks *eb,
-                                                        EphyNode *keyword,
-                                                        EphyNode *bookmark);
+void              ephy_bookmarks_set_keyword            (EphyBookmarks *eb,
+                                                         EphyNode *keyword,
+                                                         EphyNode *bookmark);
 
-void             ephy_bookmarks_unset_keyword          (EphyBookmarks *eb,
-                                                        EphyNode *keyword,
-                                                        EphyNode *bookmark);
+void              ephy_bookmarks_unset_keyword          (EphyBookmarks *eb,
+                                                         EphyNode *keyword,
+                                                         EphyNode *bookmark);
 
-char            *ephy_bookmarks_get_topic_uri          (EphyBookmarks *eb,
-                                                        EphyNode *node);
+char             *ephy_bookmarks_get_topic_uri          (EphyBookmarks *eb,
+                                                         EphyNode *node);
 
 /* Root */
 
-EphyNode        *ephy_bookmarks_get_keywords           (EphyBookmarks *eb);
+EphyNode         *ephy_bookmarks_get_keywords           (EphyBookmarks *eb);
 
-EphyNode        *ephy_bookmarks_get_bookmarks          (EphyBookmarks *eb);
+EphyNode         *ephy_bookmarks_get_bookmarks          (EphyBookmarks *eb);
 
-EphyNode        *ephy_bookmarks_get_not_categorized    (EphyBookmarks *eb);
+EphyNode         *ephy_bookmarks_get_not_categorized    (EphyBookmarks *eb);
 
-EphyNode        *ephy_bookmarks_get_smart_bookmarks    (EphyBookmarks *eb);
+EphyNode         *ephy_bookmarks_get_smart_bookmarks    (EphyBookmarks *eb);
 
-EphyNode        *ephy_bookmarks_get_local              (EphyBookmarks *eb);
+EphyNode         *ephy_bookmarks_get_local              (EphyBookmarks *eb);
 
 /* Comparison functions, useful for sorting lists and arrays. */
 int            ephy_bookmarks_compare_topics            (gconstpointer a, gconstpointer b);
diff --git a/src/bookmarks/ephy-link-action.c b/src/bookmarks/ephy-link-action.c
index 980e1b1..00e3bfb 100644
--- a/src/bookmarks/ephy-link-action.c
+++ b/src/bookmarks/ephy-link-action.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *  Copyright © 2005 Philip Langdale
diff --git a/src/bookmarks/ephy-link-action.h b/src/bookmarks/ephy-link-action.h
index 1a6e1fd..5c3d250 100644
--- a/src/bookmarks/ephy-link-action.h
+++ b/src/bookmarks/ephy-link-action.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *
@@ -23,54 +24,54 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_LINK_ACTION                  (ephy_link_action_get_type ())
-#define EPHY_LINK_ACTION(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK_ACTION, 
EphyLinkAction))
-#define EPHY_LINK_ACTION_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK_ACTION, 
EphyLinkActionClass))
-#define EPHY_IS_LINK_ACTION(o)                 (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK_ACTION))
-#define EPHY_IS_LINK_ACTION_CLASS(k)           (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION))
-#define EPHY_LINK_ACTION_GET_CLASS(o)          (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION, 
EphyLinkActionClass))
+#define EPHY_TYPE_LINK_ACTION                    (ephy_link_action_get_type ())
+#define EPHY_LINK_ACTION(o)                      (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK_ACTION, 
EphyLinkAction))
+#define EPHY_LINK_ACTION_CLASS(k)                (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK_ACTION, 
EphyLinkActionClass))
+#define EPHY_IS_LINK_ACTION(o)                   (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK_ACTION))
+#define EPHY_IS_LINK_ACTION_CLASS(k)             (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION))
+#define EPHY_LINK_ACTION_GET_CLASS(o)            (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION, 
EphyLinkActionClass))
 
-#define EPHY_TYPE_LINK_ACTION_GROUP            (ephy_link_action_group_get_type ())
-#define EPHY_LINK_ACTION_GROUP(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), 
EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroup))
-#define EPHY_LINK_ACTION_GROUP_CLASS(k)                (G_TYPE_CHECK_CLASS_CAST((k), 
EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroupClass))
-#define EPHY_IS_LINK_ACTION_GROUP(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), 
EPHY_TYPE_LINK_ACTION_GROUP))
-#define EPHY_IS_LINK_ACTION_GROUP_CLASS(k)     (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION_GROUP))
-#define EPHY_LINK_ACTION_GROUP_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION_GROUP, 
EphyLinkActionGroupClass))
+#define EPHY_TYPE_LINK_ACTION_GROUP              (ephy_link_action_group_get_type ())
+#define EPHY_LINK_ACTION_GROUP(o)                (G_TYPE_CHECK_INSTANCE_CAST ((o), 
EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroup))
+#define EPHY_LINK_ACTION_GROUP_CLASS(k)          (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK_ACTION_GROUP, 
EphyLinkActionGroupClass))
+#define EPHY_IS_LINK_ACTION_GROUP(o)             (G_TYPE_CHECK_INSTANCE_TYPE ((o), 
EPHY_TYPE_LINK_ACTION_GROUP))
+#define EPHY_IS_LINK_ACTION_GROUP_CLASS(k)       (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION_GROUP))
+#define EPHY_LINK_ACTION_GROUP_GET_CLASS(o)      (G_TYPE_INSTANCE_GET_CLASS ((o), 
EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroupClass))
 
-typedef struct _EphyLinkAction                 EphyLinkAction;
-typedef struct _EphyLinkActionClass            EphyLinkActionClass;
-typedef struct _EphyLinkActionPrivate          EphyLinkActionPrivate;
+typedef struct _EphyLinkAction                   EphyLinkAction;
+typedef struct _EphyLinkActionClass              EphyLinkActionClass;
+typedef struct _EphyLinkActionPrivate            EphyLinkActionPrivate;
 
-typedef struct _EphyLinkActionGroup            EphyLinkActionGroup;
-typedef struct _EphyLinkActionGroupClass       EphyLinkActionGroupClass;
+typedef struct _EphyLinkActionGroup              EphyLinkActionGroup;
+typedef struct _EphyLinkActionGroupClass         EphyLinkActionGroupClass;
 
 struct _EphyLinkAction
 {
-       EphyWindowAction parent_instance;
+  EphyWindowAction parent_instance;
 
-       EphyLinkActionPrivate *priv;
+  EphyLinkActionPrivate *priv;
 };
 
 struct _EphyLinkActionClass
 {
-       EphyWindowActionClass parent_class;
+  EphyWindowActionClass parent_class;
 };
 
 struct _EphyLinkActionGroup
 {
-       GtkActionGroup parent_instance;
+  GtkActionGroup parent_instance;
 };
 
 struct _EphyLinkActionGroupClass
 {
-       GtkActionGroupClass parent_class;
+  GtkActionGroupClass parent_class;
 };
 
-GType ephy_link_action_get_type          (void);
-guint ephy_link_action_get_button (EphyLinkAction *action);
+GType ephy_link_action_get_type       (void);
+guint ephy_link_action_get_button     (EphyLinkAction *action);
 
 GType ephy_link_action_group_get_type (void);
 
-EphyLinkActionGroup * ephy_link_action_group_new (const char *name);
+EphyLinkActionGroup *ephy_link_action_group_new (const char *name);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-nodes-cover.c b/src/bookmarks/ephy-nodes-cover.c
index 0abbc3a..2ab08ef 100644
--- a/src/bookmarks/ephy-nodes-cover.c
+++ b/src/bookmarks/ephy-nodes-cover.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Peter Harvey <pah06 uow edu au>
  *
diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h
index 9de73e3..459a1ba 100644
--- a/src/bookmarks/ephy-nodes-cover.h
+++ b/src/bookmarks/ephy-nodes-cover.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Peter Harvey <pah06 uow edu au>
  *
@@ -32,6 +33,6 @@ gboolean ephy_nodes_covered (EphyNode *parent, const GPtrArray *children);
 GPtrArray * ephy_nodes_get_covered (EphyNode *parent, const GPtrArray *children, GPtrArray *_covered);
 
 GPtrArray * ephy_nodes_get_covering (const GPtrArray *parents, const GPtrArray *children,
-                                    GPtrArray *_covering, GPtrArray *_uncovered, GArray *_sizes);
+                                     GPtrArray *_covering, GPtrArray *_uncovered, GArray *_sizes);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-open-tabs-action.c b/src/bookmarks/ephy-open-tabs-action.c
index 51b2972..5dfb475 100644
--- a/src/bookmarks/ephy-open-tabs-action.c
+++ b/src/bookmarks/ephy-open-tabs-action.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Peter Harvey <pah06 uow edu au>
  *
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index fc6cffb..9b300b9 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Peter Harvey
  *
@@ -23,6 +24,6 @@
 
 G_BEGIN_DECLS
 
-GtkActionGroup *ephy_open_tabs_group_new       (EphyNode *node);
+GtkActionGroup        *ephy_open_tabs_group_new        (EphyNode *node);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-topic-action-group.c b/src/bookmarks/ephy-topic-action-group.c
index 18c428d..86cfa08 100644
--- a/src/bookmarks/ephy-topic-action-group.c
+++ b/src/bookmarks/ephy-topic-action-group.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index 2f71e87..c67c0dd 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Peter Harvey
  *
@@ -24,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-GtkActionGroup *ephy_topic_action_group_new    (EphyNode *node,
-                                                GtkUIManager *manager);
+GtkActionGroup        *ephy_topic_action_group_new        (EphyNode *node,
+                                                           GtkUIManager *manager);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 57eff2a..077bf00 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 269a40c..aa5a2ac 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
@@ -25,42 +26,42 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_TOPIC_ACTION                 (ephy_topic_action_get_type ())
-#define EPHY_TOPIC_ACTION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_TOPIC_ACTION, 
EphyTopicAction))
-#define EPHY_TOPIC_ACTION_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_TOPIC_ACTION, 
EphyTopicActionClass))
-#define EPHY_IS_TOPIC_ACTION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_TOPIC_ACTION))
-#define EPHY_IS_TOPIC_ACTION_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_TOPIC_ACTION))
-#define EPHY_TOPIC_ACTION_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_TOPIC_ACTION, 
EphyTopicActionClass))
+#define EPHY_TYPE_TOPIC_ACTION                        (ephy_topic_action_get_type ())
+#define EPHY_TOPIC_ACTION(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
EPHY_TYPE_TOPIC_ACTION, EphyTopicAction))
+#define EPHY_TOPIC_ACTION_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), 
EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
+#define EPHY_IS_TOPIC_ACTION(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
EPHY_TYPE_TOPIC_ACTION))
+#define EPHY_IS_TOPIC_ACTION_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((obj), 
EPHY_TYPE_TOPIC_ACTION))
+#define EPHY_TOPIC_ACTION_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS((obj), 
EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
 
-typedef struct _EphyTopicAction                        EphyTopicAction;
-typedef struct _EphyTopicActionPrivate         EphyTopicActionPrivate;
-typedef struct _EphyTopicActionClass           EphyTopicActionClass;
+typedef struct _EphyTopicAction                     EphyTopicAction;
+typedef struct _EphyTopicActionPrivate              EphyTopicActionPrivate;
+typedef struct _EphyTopicActionClass                EphyTopicActionClass;
 
 struct _EphyTopicAction
 {
-       GtkAction parent_instance;
+  GtkAction parent_instance;
 
-       /*< private >*/
-       EphyTopicActionPrivate *priv;
+  /*< private >*/
+  EphyTopicActionPrivate *priv;
 };
 
 struct _EphyTopicActionClass
 {
-       EphyLinkActionClass parent_class;
+  EphyLinkActionClass parent_class;
 };
 
 
-GType          ephy_topic_action_get_type      (void);
+GType           ephy_topic_action_get_type       (void);
 
-GtkAction      *ephy_topic_action_new          (EphyNode *node,
-                                                GtkUIManager *manager,
-                                                const char *name);
+GtkAction      *ephy_topic_action_new            (EphyNode *node,
+                                                  GtkUIManager *manager,
+                                                  const char *name);
 
-void           ephy_topic_action_set_topic     (EphyTopicAction *action,
-                                                EphyNode *node);
+void            ephy_topic_action_set_topic      (EphyTopicAction *action,
+                                                  EphyNode *node);
 
-EphyNode       *ephy_topic_action_get_topic    (EphyTopicAction *action);
+EphyNode       *ephy_topic_action_get_topic      (EphyTopicAction *action);
 
-void           ephy_topic_action_updated       (EphyTopicAction *action);
+void            ephy_topic_action_updated        (EphyTopicAction *action);
 
 G_END_DECLS
diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c
index ae43a26..1c04e37 100644
--- a/src/bookmarks/ephy-topics-entry.c
+++ b/src/bookmarks/ephy-topics-entry.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002-2004 Marco Pesenti Gritti <mpeseng tin it>
  *  Copyright © 2005, 2006 Peter Harvey <pah06 uow edu au>
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index 6237b2a..4da377d 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti <mpeseng tin it>
  *
diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c
index 19a3443..ab439ad 100644
--- a/src/bookmarks/ephy-topics-palette.c
+++ b/src/bookmarks/ephy-topics-palette.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002-2004 Marco Pesenti Gritti <mpeseng tin it>
  *  Copyright © 2005 Peter Harvey <pah06 uow edu au>
diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h
index 21b91a8..76a7e2c 100644
--- a/src/bookmarks/ephy-topics-palette.h
+++ b/src/bookmarks/ephy-topics-palette.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Marco Pesenti Gritti <mpeseng tin it>
  *
@@ -27,10 +28,10 @@ G_DECLARE_FINAL_TYPE (EphyTopicsPalette, ephy_topics_palette, EPHY, TOPICS_PALET
 
 enum
 {
-       EPHY_TOPICS_PALETTE_COLUMN_TITLE,
-       EPHY_TOPICS_PALETTE_COLUMN_NODE,
-       EPHY_TOPICS_PALETTE_COLUMN_SELECTED,
-       EPHY_TOPICS_PALETTE_COLUMNS
+  EPHY_TOPICS_PALETTE_COLUMN_TITLE,
+  EPHY_TOPICS_PALETTE_COLUMN_NODE,
+  EPHY_TOPICS_PALETTE_COLUMN_SELECTED,
+  EPHY_TOPICS_PALETTE_COLUMNS
 };
 
 EphyTopicsPalette *ephy_topics_palette_new         (EphyBookmarks     *bookmarks,
diff --git a/src/clear-data-dialog.c b/src/clear-data-dialog.c
index 8bba234..7b20f9a 100644
--- a/src/clear-data-dialog.c
+++ b/src/clear-data-dialog.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/clear-data-dialog.h b/src/clear-data-dialog.h
index 91921ed..e63f1e8 100644
--- a/src/clear-data-dialog.h
+++ b/src/clear-data-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index 7399d84..7b6dac8 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/cookies-dialog.h b/src/cookies-dialog.h
index 42f645e..8a444cd 100644
--- a/src/cookies-dialog.h
+++ b/src/cookies-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/ephy-action-helper.c b/src/ephy-action-helper.c
index 13877de..1ecfc24 100644
--- a/src/ephy-action-helper.c
+++ b/src/ephy-action-helper.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Christian Persch
  *
diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h
index ad9e303..eedb13e 100644
--- a/src/ephy-action-helper.h
+++ b/src/ephy-action-helper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2005 Christian Persch
  *
@@ -23,11 +24,11 @@ G_BEGIN_DECLS
 
 enum
 {
-       SENS_FLAG = 1 << 0
+  SENS_FLAG = 1 << 0
 };
 
 void ephy_action_change_sensitivity_flags (GSimpleAction *action,
-                                           guint         flags,
+                                           guint        flags,
                                            gboolean       set);
 
 G_END_DECLS
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index 5735044..8df4e45 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2012 Igalia S.L.
  *
@@ -30,17 +31,17 @@ G_DECLARE_FINAL_TYPE (EphyCompletionModel, ephy_completion_model, EPHY, COMPLETI
 
 typedef enum
 {
-       EPHY_COMPLETION_TEXT_COL,
-       EPHY_COMPLETION_ACTION_COL,
-       EPHY_COMPLETION_KEYWORDS_COL,
-       EPHY_COMPLETION_RELEVANCE_COL,
-       EPHY_COMPLETION_URL_COL,
-       EPHY_COMPLETION_EXTRA_COL,
-       EPHY_COMPLETION_FAVICON_COL,
-       N_COL
+  EPHY_COMPLETION_TEXT_COL,
+  EPHY_COMPLETION_ACTION_COL,
+  EPHY_COMPLETION_KEYWORDS_COL,
+  EPHY_COMPLETION_RELEVANCE_COL,
+  EPHY_COMPLETION_URL_COL,
+  EPHY_COMPLETION_EXTRA_COL,
+  EPHY_COMPLETION_FAVICON_COL,
+  N_COL
 } EphyCompletionColumn;
 
-EphyCompletionModel *ephy_completion_model_new              (EphyHistoryService *history_service,
+EphyCompletionModel *ephy_completion_model_new               (EphyHistoryService *history_service,
                                                               EphyBookmarks *bookmarks);
 
 void                 ephy_completion_model_update_for_string (EphyCompletionModel *model,
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index d614442..a0c94ae 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2001, 2002, 2003 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h
index aac354a..8d47822 100644
--- a/src/ephy-encoding-dialog.h
+++ b/src/ephy-encoding-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2001, 2002, 2003 Marco Pesenti Gritti
  *  Copyright © 2003 Christian Persch
@@ -26,6 +27,6 @@ G_BEGIN_DECLS
 #define EPHY_TYPE_ENCODING_DIALOG (ephy_encoding_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (EphyEncodingDialog, ephy_encoding_dialog, EPHY, ENCODING_DIALOG, GtkDialog);
 
-EphyEncodingDialog     *ephy_encoding_dialog_new       (EphyWindow *window);
+EphyEncodingDialog  *ephy_encoding_dialog_new  (EphyWindow *window);
 
 G_END_DECLS
diff --git a/src/ephy-encoding-row.c b/src/ephy-encoding-row.c
index d82f780..ad5894f 100644
--- a/src/ephy-encoding-row.c
+++ b/src/ephy-encoding-row.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2015 Arnaud Bonatti
  *
diff --git a/src/ephy-encoding-row.h b/src/ephy-encoding-row.h
index 819ff0a..0112819 100644
--- a/src/ephy-encoding-row.h
+++ b/src/ephy-encoding-row.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2015 Arnaud Bonatti
  *
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 6aced0f..1f8502e 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti <mpeseng tin it>
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 9c7988c..29eac8b 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti <mpeseng tin it>
  *
@@ -27,6 +28,6 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyHistoryWindow, ephy_history_window, EPHY, HISTORY_WINDOW, GtkDialog)
 
-GtkWidget          *ephy_history_window_new        (EphyHistoryService *history_service);
+GtkWidget      *ephy_history_window_new        (EphyHistoryService *history_service);
 
 G_END_DECLS
diff --git a/src/ephy-link.c b/src/ephy-link.c
index 262bdb4..05888e3 100644
--- a/src/ephy-link.c
+++ b/src/ephy-link.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *
diff --git a/src/ephy-link.h b/src/ephy-link.h
index 10d12d8..68f3183 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2004 Christian Persch
  *
@@ -30,30 +31,30 @@ G_DECLARE_INTERFACE (EphyLink, ephy_link, EPHY, LINK, GObject)
 
 typedef enum
 {
-       EPHY_LINK_NEW_WINDOW           = 1 << 0,
-       EPHY_LINK_NEW_TAB              = 1 << 1,
-       EPHY_LINK_JUMP_TO              = 1 << 2,
-       EPHY_LINK_NEW_TAB_APPEND_AFTER = 1 << 3,
-       EPHY_LINK_HOME_PAGE            = 1 << 4,
-       EPHY_LINK_TYPED                = 1 << 5,
-       EPHY_LINK_BOOKMARK             = 1 << 6
+  EPHY_LINK_NEW_WINDOW             = 1 << 0,
+  EPHY_LINK_NEW_TAB                = 1 << 1,
+  EPHY_LINK_JUMP_TO                = 1 << 2,
+  EPHY_LINK_NEW_TAB_APPEND_AFTER   = 1 << 3,
+  EPHY_LINK_HOME_PAGE              = 1 << 4,
+  EPHY_LINK_TYPED                  = 1 << 5,
+  EPHY_LINK_BOOKMARK               = 1 << 6
 } EphyLinkFlags;
 
 struct _EphyLinkInterface
 {
-       GTypeInterface base_iface;
+  GTypeInterface base_iface;
 
-       /* Signals */
-       EphyEmbed * (* open_link) (EphyLink *link,
-                                  const char *address,
-                                  EphyEmbed *embed,
-                                  EphyLinkFlags flags);
+  /* Signals */
+  EphyEmbed * (* open_link) (EphyLink *link,
+                             const char *address,
+                             EphyEmbed *embed,
+                             EphyLinkFlags flags);
 };
 
-EphyEmbed *ephy_link_open              (EphyLink *link,
-                                        const char *address,
-                                        EphyEmbed *embed,
-                                        EphyLinkFlags flags);
+EphyEmbed *ephy_link_open (EphyLink *link,
+                           const char *address,
+                           EphyEmbed *embed,
+                           EphyLinkFlags flags);
 
 EphyLinkFlags ephy_link_flags_from_current_event (void);
 
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index 61cff0d..98c4c10 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/ephy-location-controller.h b/src/ephy-location-controller.h
index 644ead9..420d7ee 100644
--- a/src/ephy-location-controller.h
+++ b/src/ephy-location-controller.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2003 Marco Pesenti Gritti
  *
@@ -25,9 +26,9 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyLocationController, ephy_location_controller, EPHY, LOCATION_CONTROLLER, GObject)
 
-const char     *ephy_location_controller_get_address   (EphyLocationController *controller);
+const char     *ephy_location_controller_get_address        (EphyLocationController *controller);
 
-void           ephy_location_controller_set_address    (EphyLocationController *controller,
-                                                        const char *address);
+void            ephy_location_controller_set_address        (EphyLocationController *controller,
+                                                             const char *address);
 
 G_END_DECLS
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 0768dee..e599319 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Christophe Fergeau
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index a94a214..801889a 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Christophe Fergeau
  *  Copyright © 2003 Marco Pesenti Gritti
@@ -30,13 +31,13 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphyNotebook, ephy_notebook, EPHY, NOTEBOOK, GtkNotebook)
 
-int            ephy_notebook_add_tab           (EphyNotebook *nb,
-                                                EphyEmbed *embed,
-                                                int position,
-                                                gboolean jump_to);
-       
-void           ephy_notebook_set_tabs_allowed  (EphyNotebook *nb,
-                                                gboolean tabs_allowed);
+int             ephy_notebook_add_tab           (EphyNotebook *nb,
+                                                 EphyEmbed *embed,
+                                                 int position,
+                                                 gboolean jump_to);
+
+void            ephy_notebook_set_tabs_allowed  (EphyNotebook *nb,
+                                                 gboolean tabs_allowed);
 
 void            ephy_notebook_next_page         (EphyNotebook *notebook);
 
diff --git a/src/ephy-search-provider-main.c b/src/ephy-search-provider-main.c
index a2b2d40..3908028 100644
--- a/src/ephy-search-provider-main.c
+++ b/src/ephy-search-provider-main.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Copyright (c) 2013 Igalia S.L.
  *
diff --git a/src/ephy-search-provider.c b/src/ephy-search-provider.c
index e1231dc..824ca73 100644
--- a/src/ephy-search-provider.c
+++ b/src/ephy-search-provider.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Copyright (c) 2013 Giovanni Campagna <scampa giovanni gmail com>
  *
diff --git a/src/ephy-search-provider.h b/src/ephy-search-provider.h
index 2b5bc14..b55a673 100644
--- a/src/ephy-search-provider.h
+++ b/src/ephy-search-provider.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Copyright (c) 2013 Giovanni Campagna <scampa giovanni gmail com>
  *
diff --git a/src/ephy-session.c b/src/ephy-session.c
index ce3438a..dadd0f4 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen
  *  Copyright © 2003, 2004 Marco Pesenti Gritti
diff --git a/src/ephy-session.h b/src/ephy-session.h
index 49e2da6..8dcb639 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2002 Jorn Baayen
  *  Copyright © 2003 Marco Pesenti Gritti
@@ -29,7 +30,7 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (EphySession, ephy_session, EPHY, SESSION, GObject)
 
-void            ephy_session_save                    (EphySession *session);
+void             ephy_session_save                    (EphySession *session);
 void             ephy_session_load                    (EphySession *session,
                                                        const char *filename,
                                                        guint32 user_time,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index be5f993..79b76d3 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004 Christian Persch
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 569d227..a760559 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2003 Marco Pesenti Gritti
  *
@@ -36,17 +37,17 @@ typedef enum
         EPHY_WINDOW_CHROME_DEFAULT       = (EPHY_WINDOW_CHROME_HEADER_BAR | EPHY_WINDOW_CHROME_MENU | 
EPHY_WINDOW_CHROME_LOCATION | EPHY_WINDOW_CHROME_TABSBAR)
 } EphyWindowChrome;
 
-EphyWindow      *ephy_window_new                 (void);
+EphyWindow       *ephy_window_new                 (void);
 
-GtkWidget       *ephy_window_get_notebook        (EphyWindow *window);
+GtkWidget        *ephy_window_get_notebook        (EphyWindow *window);
 
-void             ephy_window_load_url            (EphyWindow *window,
-                                                  const char *url);
+void              ephy_window_load_url            (EphyWindow *window,
+                                                   const char *url);
 
 void              ephy_window_set_zoom            (EphyWindow *window,
                                                    double zoom);
 
-void             ephy_window_activate_location   (EphyWindow *window);
+void              ephy_window_activate_location   (EphyWindow *window);
 const char       *ephy_window_get_location        (EphyWindow *window);
 
 GtkWidget        *ephy_window_get_header_bar      (EphyWindow *window);
diff --git a/src/languages.h b/src/languages.h
index 0c081df..2d88f66 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 
  *  Copyright © 2005 Christian Persch
  *
diff --git a/src/passwords-dialog.c b/src/passwords-dialog.c
index 649f043..e3b1e1a 100644
--- a/src/passwords-dialog.c
+++ b/src/passwords-dialog.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/passwords-dialog.h b/src/passwords-dialog.h
index 9a156ea..49e7b5e 100644
--- a/src/passwords-dialog.h
+++ b/src/passwords-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2013 Red Hat, Inc.
  *
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 61b542e..5004a31 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2003 Marco Pesenti Gritti
  *
diff --git a/src/popup-commands.h b/src/popup-commands.h
index 1b6e37c..411b7b2 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000, 2001, 2002 Marco Pesenti Gritti
  *
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index f4ab10e..0c73f26 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 200-2003 Marco Pesenti Gritti
  *  Copyright © 2003, 2004, 2005 Christian Persch
diff --git a/src/prefs-dialog.h b/src/prefs-dialog.h
index ff43a78..89f60d7 100644
--- a/src/prefs-dialog.h
+++ b/src/prefs-dialog.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2004 Marco Pesenti Gritti
  *  Copyright © 2003-2004 Christian Persch
diff --git a/src/window-commands.c b/src/window-commands.c
index fd423c8..feb7a88 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim: set sw=8 ts=8 sts=8 noet: */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2004 Marco Pesenti Gritti
  *  Copyright © 2009 Collabora Ltd.
diff --git a/src/window-commands.h b/src/window-commands.h
index 66359cb..bbd8f29 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2003 Marco Pesenti Gritti
  *



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