Remove subversion $Id$ tags

Remove them or replace them with vim modelines where appropriate.

50 files changed, 43 insertions, 58 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 53cb3eff..628355f3 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 if THUNAR_PLUGIN_APR
 THUNAR_APR_SUBDIRS = thunar-apr
 endif
diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
index 472228a1..b0ed555f 100644
--- a/plugins/thunar-apr/Makefile.am
+++ b/plugins/thunar-apr/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
@@ -50,7 +48,7 @@ thunar_apr_la_LIBADD =							\
 
 thunar_apr_la_DEPENDENCIES =						\
 	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
-	
+
 
 EXTRA_DIST =								\
 	README
diff --git a/plugins/thunar-apr/thunar-apr-abstract-page.c b/plugins/thunar-apr/thunar-apr-abstract-page.c
index e16075ea..2fd53f80 100644
--- a/plugins/thunar-apr/thunar-apr-abstract-page.c
+++ b/plugins/thunar-apr/thunar-apr-abstract-page.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-abstract-page.h b/plugins/thunar-apr/thunar-apr-abstract-page.h
index d5de8567..85ce26a7 100644
--- a/plugins/thunar-apr/thunar-apr-abstract-page.h
+++ b/plugins/thunar-apr/thunar-apr-abstract-page.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c b/plugins/thunar-apr/thunar-apr-desktop-page.c
index 069cd4b1..5dc00d55 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.h b/plugins/thunar-apr/thunar-apr-desktop-page.h
index 627712ba..79e1d137 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.h
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-image-page.c b/plugins/thunar-apr/thunar-apr-image-page.c
index 50be5ebb..bd4dc487 100644
--- a/plugins/thunar-apr/thunar-apr-image-page.c
+++ b/plugins/thunar-apr/thunar-apr-image-page.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-image-page.h b/plugins/thunar-apr/thunar-apr-image-page.h
index e2065b46..5d484ab1 100644
--- a/plugins/thunar-apr/thunar-apr-image-page.h
+++ b/plugins/thunar-apr/thunar-apr-image-page.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-plugin.c b/plugins/thunar-apr/thunar-apr-plugin.c
index 11cf9555..21106b4d 100644
--- a/plugins/thunar-apr/thunar-apr-plugin.c
+++ b/plugins/thunar-apr/thunar-apr-plugin.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-private.c b/plugins/thunar-apr/thunar-apr-private.c
index 756bac13..bad12d16 100644
--- a/plugins/thunar-apr/thunar-apr-private.c
+++ b/plugins/thunar-apr/thunar-apr-private.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-private.h b/plugins/thunar-apr/thunar-apr-private.h
index 2fea12a0..9783facf 100644
--- a/plugins/thunar-apr/thunar-apr-private.h
+++ b/plugins/thunar-apr/thunar-apr-private.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-provider.c b/plugins/thunar-apr/thunar-apr-provider.c
index 66c3b0a6..fff3028e 100644
--- a/plugins/thunar-apr/thunar-apr-provider.c
+++ b/plugins/thunar-apr/thunar-apr-provider.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-apr/thunar-apr-provider.h b/plugins/thunar-apr/thunar-apr-provider.h
index 11a0e6a3..c54bd461 100644
--- a/plugins/thunar-apr/thunar-apr-provider.h
+++ b/plugins/thunar-apr/thunar-apr-provider.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
index e905c9e5..a05b014a 100644
--- a/plugins/thunar-sbr/Makefile.am
+++ b/plugins/thunar-sbr/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
diff --git a/plugins/thunar-sbr/thunar-sbr-case-renamer.c b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
index a2ca8bd1..7185be4b 100644
--- a/plugins/thunar-sbr/thunar-sbr-case-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-case-renamer.h b/plugins/thunar-sbr/thunar-sbr-case-renamer.h
index 7739c70f..0da9735c 100644
--- a/plugins/thunar-sbr/thunar-sbr-case-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-case-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.c b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
index 69fe7e80..68602208 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2007 Nick Schermer <nick@xfce.org>
  * Copyright (c) 2007 Benedikt Meurer <benny@xfce.org>
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.h b/plugins/thunar-sbr/thunar-sbr-date-renamer.h
index 047d07e8..924c6d78 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2007 Nick Schermer <nick@xfce.org>
  * Copyright (c) 2007 Benedikt Meurer <benny@xfce.org>
diff --git a/plugins/thunar-sbr/thunar-sbr-enum-types.c b/plugins/thunar-sbr/thunar-sbr-enum-types.c
index 3260be93..6e4eb2ff 100644
--- a/plugins/thunar-sbr/thunar-sbr-enum-types.c
+++ b/plugins/thunar-sbr/thunar-sbr-enum-types.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-enum-types.h b/plugins/thunar-sbr/thunar-sbr-enum-types.h
index c69a3b25..66936748 100644
--- a/plugins/thunar-sbr/thunar-sbr-enum-types.h
+++ b/plugins/thunar-sbr/thunar-sbr-enum-types.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
index 88d49a80..6e33fd46 100644
--- a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-insert-renamer.h b/plugins/thunar-sbr/thunar-sbr-insert-renamer.h
index 0813d71b..54e35f60 100644
--- a/plugins/thunar-sbr/thunar-sbr-insert-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-insert-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-number-renamer.c b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
index 5cec044a..90de3303 100644
--- a/plugins/thunar-sbr/thunar-sbr-number-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-number-renamer.h b/plugins/thunar-sbr/thunar-sbr-number-renamer.h
index cd0aa473..d4663de9 100644
--- a/plugins/thunar-sbr/thunar-sbr-number-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-number-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-plugin.c b/plugins/thunar-sbr/thunar-sbr-plugin.c
index 5ae8f720..bae2190a 100644
--- a/plugins/thunar-sbr/thunar-sbr-plugin.c
+++ b/plugins/thunar-sbr/thunar-sbr-plugin.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-provider.c b/plugins/thunar-sbr/thunar-sbr-provider.c
index 57ecf9b5..818b5feb 100644
--- a/plugins/thunar-sbr/thunar-sbr-provider.c
+++ b/plugins/thunar-sbr/thunar-sbr-provider.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-provider.h b/plugins/thunar-sbr/thunar-sbr-provider.h
index 8a905114..347c898e 100644
--- a/plugins/thunar-sbr/thunar-sbr-provider.h
+++ b/plugins/thunar-sbr/thunar-sbr-provider.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
index 4738abc8..4f1795fb 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.h b/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
index 6c79891c..b5e6e182 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
index 0b2aca45..f62b8ae0 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.h b/plugins/thunar-sbr/thunar-sbr-replace-renamer.h
index d626eba4..09c859b8 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-sendto-email/Makefile.am b/plugins/thunar-sendto-email/Makefile.am
index f8247391..a9fdf446 100644
--- a/plugins/thunar-sendto-email/Makefile.am
+++ b/plugins/thunar-sendto-email/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index eea70f97..467dacd4 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
diff --git a/plugins/thunar-tpa/Makefile.am b/plugins/thunar-tpa/Makefile.am
index 75002aed..b77e8c99 100644
--- a/plugins/thunar-tpa/Makefile.am
+++ b/plugins/thunar-tpa/Makefile.am
@@ -1,4 +1,3 @@
-
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
diff --git a/plugins/thunar-tpa/thunar-tpa-bindings.xml b/plugins/thunar-tpa/thunar-tpa-bindings.xml
index 8d95699d..edc65e1c 100644
--- a/plugins/thunar-tpa/thunar-tpa-bindings.xml
+++ b/plugins/thunar-tpa/thunar-tpa-bindings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-   $Id$
-   
    Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
   
    This program is free software; you can redistribute it and/or modify it
diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
index 5f966e06..98be9aa3 100644
--- a/plugins/thunar-uca/Makefile.am
+++ b/plugins/thunar-uca/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
diff --git a/plugins/thunar-uca/thunar-uca-chooser.c b/plugins/thunar-uca/thunar-uca-chooser.c
index aef90142..2ad97717 100644
--- a/plugins/thunar-uca/thunar-uca-chooser.c
+++ b/plugins/thunar-uca/thunar-uca-chooser.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-chooser.h b/plugins/thunar-uca/thunar-uca-chooser.h
index e8d260ca..0c36c664 100644
--- a/plugins/thunar-uca/thunar-uca-chooser.h
+++ b/plugins/thunar-uca/thunar-uca-chooser.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-context.c b/plugins/thunar-uca/thunar-uca-context.c
index c86969d2..25656f43 100644
--- a/plugins/thunar-uca/thunar-uca-context.c
+++ b/plugins/thunar-uca/thunar-uca-context.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-context.h b/plugins/thunar-uca/thunar-uca-context.h
index c09b1ed7..8605e467 100644
--- a/plugins/thunar-uca/thunar-uca-context.h
+++ b/plugins/thunar-uca/thunar-uca-context.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index ea32a462..b940604a 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
  * Copyright (c) 2011 Jannis Pohlmann <jannis@xfce.org>
diff --git a/plugins/thunar-uca/thunar-uca-editor.h b/plugins/thunar-uca/thunar-uca-editor.h
index 978e2202..c5ae792c 100644
--- a/plugins/thunar-uca/thunar-uca-editor.h
+++ b/plugins/thunar-uca/thunar-uca-editor.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c
index 642a3445..023245ac 100644
--- a/plugins/thunar-uca/thunar-uca-model.c
+++ b/plugins/thunar-uca/thunar-uca-model.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  * Copyright (c) 2009-2012 Jannis Pohlmann <jannis@xfce.org>
diff --git a/plugins/thunar-uca/thunar-uca-model.h b/plugins/thunar-uca/thunar-uca-model.h
index fd128ffd..2b4272bc 100644
--- a/plugins/thunar-uca/thunar-uca-model.h
+++ b/plugins/thunar-uca/thunar-uca-model.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-plugin.c b/plugins/thunar-uca/thunar-uca-plugin.c
index 5ee6d212..9d9264d5 100644
--- a/plugins/thunar-uca/thunar-uca-plugin.c
+++ b/plugins/thunar-uca/thunar-uca-plugin.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-private.c b/plugins/thunar-uca/thunar-uca-private.c
index 89d1ad5a..7fbacb0d 100644
--- a/plugins/thunar-uca/thunar-uca-private.c
+++ b/plugins/thunar-uca/thunar-uca-private.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-private.h b/plugins/thunar-uca/thunar-uca-private.h
index d59a290a..9e349bcb 100644
--- a/plugins/thunar-uca/thunar-uca-private.h
+++ b/plugins/thunar-uca/thunar-uca-private.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/thunar-uca-provider.c b/plugins/thunar-uca/thunar-uca-provider.c
index b24952e9..60a5b190 100644
--- a/plugins/thunar-uca/thunar-uca-provider.c
+++ b/plugins/thunar-uca/thunar-uca-provider.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
diff --git a/plugins/thunar-uca/thunar-uca-provider.h b/plugins/thunar-uca/thunar-uca-provider.h
index 45d21745..145dd266 100644
--- a/plugins/thunar-uca/thunar-uca-provider.h
+++ b/plugins/thunar-uca/thunar-uca-provider.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
  *
diff --git a/plugins/thunar-uca/uca.xml.in b/plugins/thunar-uca/uca.xml.in
index 65efa380..175b4bcb 100644
--- a/plugins/thunar-uca/uca.xml.in
+++ b/plugins/thunar-uca/uca.xml.in
@@ -27,8 +27,6 @@
 ]>
 
 <!--
-  $Id$
-
   Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
 
   Default thunar-uca configuration file, which gets installed system-wide.