[tracker/whitespace: 3/3] Fixed all tabulation and indentation for non-imported *.[ch] code



commit c98032f6320ce5daa5cad97eefac19e390f570aa
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Dec 11 10:48:29 2009 +0000

    Fixed all tabulation and indentation for non-imported *.[ch] code

 examples/libtracker-miner/tracker-main.c           |  106 ++--
 examples/libtracker-miner/tracker-miner-test.c     |    6 +-
 examples/libtracker-miner/tracker-miner-test.h     |    4 +-
 src/libtracker-client/tracker.c                    |  374 +++++-----
 src/libtracker-client/tracker.h                    |   30 +-
 src/libtracker-common/tracker-class.c              |   78 +-
 src/libtracker-common/tracker-class.h              |   16 +-
 src/libtracker-common/tracker-config-file.c        |  106 ++--
 src/libtracker-common/tracker-config-file.h        |    8 +-
 src/libtracker-common/tracker-dbus.c               |   94 ++--
 src/libtracker-common/tracker-dbus.h               |  146 ++--
 src/libtracker-common/tracker-file-utils.c         |  142 ++--
 src/libtracker-common/tracker-file-utils.h         |   12 +-
 src/libtracker-common/tracker-ioprio.c             |   40 +-
 src/libtracker-common/tracker-keyfile-object.c     |  102 ++--
 src/libtracker-common/tracker-keyfile-object.h     |   76 +-
 src/libtracker-common/tracker-language.c           |  138 ++--
 src/libtracker-common/tracker-language.h           |   16 +-
 src/libtracker-common/tracker-log.c                |   68 +-
 src/libtracker-common/tracker-log.h                |   28 +-
 src/libtracker-common/tracker-namespace.c          |   62 +-
 src/libtracker-common/tracker-namespace.h          |   12 +-
 src/libtracker-common/tracker-ontology.c           |   36 +-
 src/libtracker-common/tracker-ontology.h           |   34 +-
 src/libtracker-common/tracker-os-dependant-unix.c  |  110 ++--
 src/libtracker-common/tracker-os-dependant-win.c   |   74 +-
 src/libtracker-common/tracker-os-dependant.h       |   20 +-
 src/libtracker-common/tracker-power-devicekit.c    |   64 +-
 src/libtracker-common/tracker-power-hal.c          |  190 +++---
 src/libtracker-common/tracker-power.h              |   10 +-
 src/libtracker-common/tracker-property.c           |  248 ++++----
 src/libtracker-common/tracker-property.h           |   44 +-
 src/libtracker-common/tracker-statement-list.c     |   34 +-
 src/libtracker-common/tracker-statement-list.h     |   38 +-
 src/libtracker-common/tracker-storage-hal.c        |  342 +++++-----
 src/libtracker-common/tracker-storage.h            |   20 +-
 src/libtracker-common/tracker-type-utils.c         |   40 +-
 src/libtracker-common/tracker-type-utils.h         |   46 +-
 src/libtracker-common/tracker-utils.c              |  534 +++++++-------
 src/libtracker-common/tracker-utils.h              |   34 +-
 src/libtracker-data/tracker-data-backup.c          |   12 +-
 src/libtracker-data/tracker-data-backup.h          |   16 +-
 src/libtracker-data/tracker-data-manager.c         |  168 +++---
 src/libtracker-data/tracker-data-manager.h         |    8 +-
 src/libtracker-data/tracker-data-query.c           |   18 +-
 src/libtracker-data/tracker-data-query.h           |    2 +-
 src/libtracker-data/tracker-data-update.c          |  152 ++--
 src/libtracker-data/tracker-data-update.h          |    8 +-
 src/libtracker-db/tracker-db-backup.c              |   14 +-
 src/libtracker-db/tracker-db-backup.h              |   12 +-
 src/libtracker-db/tracker-db-dbus.c                |   88 ++--
 src/libtracker-db/tracker-db-dbus.h                |   14 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |  274 ++++----
 src/libtracker-db/tracker-db-interface-sqlite.h    |   26 +-
 src/libtracker-db/tracker-db-interface.c           |  168 +++---
 src/libtracker-db/tracker-db-interface.h           |  150 ++--
 src/libtracker-db/tracker-db-journal.c             |    2 +-
 src/libtracker-db/tracker-db-manager.c             |  346 +++++-----
 src/libtracker-db/tracker-db-manager.h             |    8 +-
 src/libtracker-fts/tracker-fts-config.c            |  156 ++--
 src/libtracker-fts/tracker-fts-config.h            |   12 +-
 src/libtracker-fts/tracker-parser.c                |  158 +++---
 src/libtracker-fts/tracker-parser.h                |   40 +-
 src/libtracker-gtk/tracker-keyword-store.c         |   70 +-
 src/libtracker-gtk/tracker-keyword-store.h         |   26 +-
 src/libtracker-gtk/tracker-metadata-tile.c         |  262 ++++----
 src/libtracker-gtk/tracker-metadata-tile.h         |   26 +-
 src/libtracker-gtk/tracker-tag-bar.c               |   66 +-
 src/libtracker-gtk/tracker-tag-bar.h               |   28 +-
 src/libtracker-gtk/tracker-ui.c                    |   10 +-
 src/libtracker-gtk/tracker-ui.h                    |   10 +-
 src/libtracker-gtk/tracker-utils.c                 |   30 +-
 src/libtracker-gtk/tracker-utils.h                 |   10 +-
 src/libtracker-miner/tracker-crawler.c             |  242 ++++----
 src/libtracker-miner/tracker-crawler.h             |   38 +-
 src/libtracker-miner/tracker-miner-dbus.h          |   40 +-
 src/libtracker-miner/tracker-miner-fs.c            |  734 ++++++++++----------
 src/libtracker-miner/tracker-miner-fs.h            |   34 +-
 src/libtracker-miner/tracker-miner-manager.c       |  242 ++++----
 src/libtracker-miner/tracker-miner-manager.h       |   46 +-
 src/libtracker-miner/tracker-miner.c               |  374 +++++-----
 src/libtracker-miner/tracker-miner.h               |   88 ++--
 src/libtracker-miner/tracker-monitor.c             |  532 +++++++-------
 src/libtracker-miner/tracker-monitor.h             |   30 +-
 src/libtracker-miner/tracker-utils.c               |   14 +-
 src/libtracker-miner/tracker-utils.h               |    6 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |  194 +++---
 src/plugins/kmail/tracker-kmail-common.h           |   82 ++--
 src/plugins/kmail/tracker-kmail-registrar.c        |  136 ++--
 src/plugins/kmail/tracker-kmail-registrar.h        |   46 +-
 src/tracker-control/tracker-control.c              |  110 ++--
 src/tracker-extract/dummy.c                        |    8 +-
 src/tracker-extract/tracker-albumart-pixbuf.c      |    2 +-
 src/tracker-extract/tracker-albumart.c             |  310 ++++----
 src/tracker-extract/tracker-albumart.h             |   10 +-
 src/tracker-extract/tracker-config.c               |  108 ++--
 src/tracker-extract/tracker-config.h               |   12 +-
 src/tracker-extract/tracker-dbus.c                 |   50 +-
 src/tracker-extract/tracker-exif.c                 |   34 +-
 src/tracker-extract/tracker-exif.h                 |    6 +-
 src/tracker-extract/tracker-extract-abw.c          |    4 +-
 .../tracker-extract-gstreamer-helix.c              |  210 +++---
 src/tracker-extract/tracker-extract-gstreamer.c    |  184 +++---
 src/tracker-extract/tracker-extract-html.c         |   22 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |    4 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   38 +-
 src/tracker-extract/tracker-extract-libxine.c      |  140 ++--
 src/tracker-extract/tracker-extract-mockup.c       |    4 +-
 src/tracker-extract/tracker-extract-mp3.c          |  368 +++++-----
 src/tracker-extract/tracker-extract-mplayer.c      |   72 +-
 src/tracker-extract/tracker-extract-msoffice.c     |  404 ++++++------
 src/tracker-extract/tracker-extract-oasis.c        |   68 +-
 src/tracker-extract/tracker-extract-pdf.c          |   18 +-
 src/tracker-extract/tracker-extract-playlist.c     |   12 +-
 src/tracker-extract/tracker-extract-png.c          |   48 +-
 src/tracker-extract/tracker-extract-ps.c           |   48 +-
 src/tracker-extract/tracker-extract-text.c         |   90 ++--
 src/tracker-extract/tracker-extract-tiff.c         |  140 ++--
 src/tracker-extract/tracker-extract-totem.c        |   40 +-
 src/tracker-extract/tracker-extract-vorbis.c       |  136 ++--
 src/tracker-extract/tracker-extract.c              |  140 ++--
 src/tracker-extract/tracker-extract.h              |   28 +-
 src/tracker-extract/tracker-fts-config.c           |  156 ++--
 src/tracker-extract/tracker-fts-config.h           |   12 +-
 src/tracker-extract/tracker-iptc.c                 |   76 +-
 src/tracker-extract/tracker-iptc.h                 |    2 +-
 src/tracker-extract/tracker-main.c                 |   52 +-
 src/tracker-extract/tracker-main.h                 |    2 +-
 src/tracker-extract/tracker-topanalyzer.h          |    2 +-
 src/tracker-extract/tracker-xmp.c                  |  210 +++---
 src/tracker-extract/tracker-xmp.h                  |    8 +-
 src/tracker-miner-fs/tracker-config.c              |  566 ++++++++--------
 src/tracker-miner-fs/tracker-config.h              |   54 +-
 src/tracker-miner-fs/tracker-main.c                |  132 ++--
 src/tracker-miner-fs/tracker-miner-applications.c  |   84 ++--
 src/tracker-miner-fs/tracker-miner-applications.h  |    4 +-
 src/tracker-miner-fs/tracker-miner-files.c         |  486 +++++++-------
 src/tracker-miner-fs/tracker-miner-files.h         |    4 +-
 src/tracker-miner-fs/tracker-thumbnailer.c         |  112 ++--
 src/tracker-miner-fs/tracker-thumbnailer.h         |    8 +-
 src/tracker-miner-fs/tracker-volume-cleanup.c      |   22 +-
 src/tracker-search-bar/tracker-aligned-window.c    |  286 ++++----
 src/tracker-search-bar/tracker-aligned-window.h    |   18 +-
 src/tracker-search-bar/tracker-applet.c            |  120 ++--
 src/tracker-search-bar/tracker-results-window.c    |  562 ++++++++--------
 src/tracker-search-bar/tracker-results-window.h    |    2 +-
 src/tracker-search-bar/tracker-utils.c             |   28 +-
 src/tracker-status-icon/tomboykeybinder.c          |   84 ++--
 src/tracker-status-icon/tomboykeybinder.h          |    6 +-
 src/tracker-status-icon/tracker-icon-config.c      |  114 ++--
 src/tracker-status-icon/tracker-icon-config.h      |   12 +-
 src/tracker-status-icon/tracker-main.c             |   28 +-
 src/tracker-status-icon/tracker-status-icon.c      |  284 ++++----
 src/tracker-status-icon/tracker-status-icon.h      |    4 +-
 src/tracker-store/mingw-compat.h                   |   58 +-
 src/tracker-store/tracker-backup.h                 |   26 +-
 src/tracker-store/tracker-config.c                 |  154 ++--
 src/tracker-store/tracker-config.h                 |   12 +-
 src/tracker-store/tracker-dbus.c                   |   88 ++--
 src/tracker-store/tracker-events.c                 |   12 +-
 src/tracker-store/tracker-events.h                 |    8 +-
 src/tracker-store/tracker-main.c                   |   44 +-
 src/tracker-store/tracker-push-registrar.c         |   84 ++--
 src/tracker-store/tracker-push-registrar.h         |   18 +-
 src/tracker-store/tracker-push.c                   |   70 +-
 src/tracker-store/tracker-resource-class.c         |  120 ++--
 src/tracker-store/tracker-resource-class.h         |   10 +-
 src/tracker-store/tracker-resources.c              |  138 ++--
 src/tracker-store/tracker-resources.h              |   54 +-
 src/tracker-store/tracker-statistics.c             |   50 +-
 src/tracker-store/tracker-statistics.h             |    8 +-
 src/tracker-store/tracker-store.c                  |   48 +-
 src/tracker-store/tracker-store.h                  |    8 +-
 src/tracker-store/tracker-writeback.h              |    8 +-
 src/tracker-utils/tracker-import.c                 |   50 +-
 src/tracker-utils/tracker-info.c                   |   54 +-
 src/tracker-utils/tracker-search.c                 |  546 ++++++++--------
 src/tracker-utils/tracker-sparql.c                 |  128 ++--
 src/tracker-utils/tracker-stats.c                  |   36 +-
 src/tracker-utils/tracker-status.c                 |  182 +++---
 src/tracker-utils/tracker-tag.c                    |  390 ++++++------
 src/tracker-writeback/tracker-config.c             |  136 ++--
 src/tracker-writeback/tracker-config.h             |   12 +-
 src/tracker-writeback/tracker-main.c               |   32 +-
 src/tracker-writeback/tracker-writeback-consumer.c |    6 +-
 .../tracker-writeback-dispatcher.c                 |    6 +-
 src/tracker-writeback/tracker-writeback-mp3.c      |   12 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |   68 +-
 tests/common/tracker-test-helpers.c                |    2 +-
 tests/common/tracker-test-helpers.h                |    4 +-
 tests/libtracker-common/mock-thumbnailer-dbus.c    |   32 +-
 tests/libtracker-common/tracker-dbus-test.c        |    4 +-
 tests/libtracker-common/tracker-field-test.c       |    8 +-
 tests/libtracker-common/tracker-file-utils-test.c  |    8 +-
 tests/libtracker-common/tracker-type-utils-test.c  |   50 +-
 tests/libtracker-data/tracker-ontology-test.c      |    4 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |   10 +-
 tests/libtracker-data/tracker-sparql-test.c        |    4 +-
 tests/libtracker-db/tracker-db-dbus-test.c         |   20 +-
 tests/libtracker-db/tracker-db-manager-common.c    |    4 +-
 .../libtracker-db/tracker-db-manager-test-attach.c |   10 +-
 .../libtracker-db/tracker-db-manager-test-custom.c |   10 +-
 .../tracker-db-manager-test-unattach.c             |   14 +-
 tests/libtracker-fts/tracker-fts-test.c            |    4 +-
 .../tracker-extract-gstreamer-test.c               |   18 +-
 tests/tracker-extract/tracker-extract-jpeg-test.c  |   22 +-
 tests/tracker-extract/tracker-extract-mp3-test.c   |   18 +-
 tests/tracker-extract/tracker-extract-png-test.c   |   16 +-
 tests/tracker-extract/tracker-extract-test-utils.c |   28 +-
 tests/tracker-extract/tracker-extract-test-utils.h |   14 +-
 .../tracker-extract-testsuite-avi.c                |    4 +-
 .../tracker-extract-testsuite-jpeg.c               |   20 +-
 .../tracker-extract-testsuite-mp3.c                |   28 +-
 .../tracker-extract-testsuite-png.c                |    8 +-
 .../tracker-extract-testsuite-tiff.c               |   12 +-
 tests/tracker-extract/tracker-extract-tiff-test.c  |   16 +-
 .../tracker-miner-fs/tracker-metadata-utils-test.c |   14 +-
 tests/tracker-store/tracker-events-test.c          |  156 ++--
 utils/playlists/playlist2ttl.c                     |   96 ++--
 utils/services/data-validator.c                    |  146 ++--
 utils/services/ontology-validator.c                |  260 ++++----
 utils/services/qname-test.c                        |  146 ++--
 utils/services/qname.c                             |  350 +++++-----
 utils/services/ttl2graphviz.c                      |   66 +-
 utils/services/ttl2html.c                          |   82 ++--
 utils/services/ttl_graphviz.c                      |  100 ++--
 utils/services/ttl_html.c                          |  456 ++++++------
 utils/services/ttl_loader.c                        |  480 +++++++-------
 utils/services/ttl_model.c                         |  156 ++--
 utils/services/ttl_model.h                         |   60 +-
 utils/tracker-fts/tracker-fts-test.c               |   30 +-
 231 files changed, 10462 insertions(+), 10462 deletions(-)
---
diff --git a/examples/libtracker-miner/tracker-main.c b/examples/libtracker-miner/tracker-main.c
index f682241..3afa313 100644
--- a/examples/libtracker-miner/tracker-main.c
+++ b/examples/libtracker-miner/tracker-main.c
@@ -36,16 +36,16 @@ miner_finished_cb (TrackerMiner *miner,
                    guint         total_directories_ignored,
                    guint         total_files_found,
                    guint         total_files_ignored,
-		   gpointer      user_data)
+                   gpointer      user_data)
 {
-        GMainLoop *main_loop = user_data;
+	GMainLoop *main_loop = user_data;
 
 	g_message ("Finished mining in seconds:%f, total directories:%d, total files:%d",
-                   seconds_elapsed,
-                   total_directories_found + total_directories_ignored,
-                   total_files_found + total_files_ignored);
+	           seconds_elapsed,
+	           total_directories_found + total_directories_ignored,
+	           total_files_found + total_files_ignored);
 
-        g_main_loop_quit (main_loop);
+	g_main_loop_quit (main_loop);
 }
 
 static gboolean
@@ -61,8 +61,8 @@ miner_start_cb (gpointer user_data)
 
 static gboolean
 check_directory_cb (TrackerMinerFS *fs,
-		    GFile	   *file,
-		    gpointer        user_data)
+                    GFile          *file,
+                    gpointer        user_data)
 {
 	gchar *path;
 	gchar *basename;
@@ -111,7 +111,7 @@ check_directory_cb (TrackerMinerFS *fs,
 	/* Check module directory ignore patterns */
 	should_process = TRUE;
 
-done:
+ done:
 	g_free (path);
 	g_free (basename);
 
@@ -120,8 +120,8 @@ done:
 
 static gboolean
 check_file_cb (TrackerMinerFS *fs,
-	       GFile	      *file,
-	       gpointer	       user_data)
+               GFile          *file,
+               gpointer                user_data)
 {
 	gchar *path;
 	gchar *basename;
@@ -149,7 +149,7 @@ check_file_cb (TrackerMinerFS *fs,
 
 	should_process = TRUE;
 
-done:
+ done:
 	g_free (path);
 	g_free (basename);
 
@@ -158,8 +158,8 @@ done:
 
 static void
 process_file_cb (TrackerMinerFS *fs,
-		 GFile	        *file,
-		 gpointer        user_data)
+                 GFile          *file,
+                 gpointer        user_data)
 {
 	gchar *path;
 
@@ -170,16 +170,16 @@ process_file_cb (TrackerMinerFS *fs,
 
 static gboolean
 monitor_directory_cb (TrackerMinerFS *fs,
-		      GFile	     *file,
-		      gpointer        user_data)
+                      GFile          *file,
+                      gpointer        user_data)
 {
 	return TRUE;
 }
 
 static void
 add_directory_path (TrackerMinerFS *fs,
-		    const gchar    *path,
-		    gboolean        recurse)
+                    const gchar    *path,
+                    gboolean        recurse)
 {
 	GFile *file;
 
@@ -191,63 +191,63 @@ add_directory_path (TrackerMinerFS *fs,
 int
 main (int argc, char *argv[])
 {
-        TrackerMiner *miner;
-        GMainLoop *main_loop;
+	TrackerMiner *miner;
+	GMainLoop *main_loop;
 
-        g_type_init ();
+	g_type_init ();
 
-        if (!g_thread_supported ()) {
+	if (!g_thread_supported ()) {
 		g_thread_init (NULL);
 	}
 
-        main_loop = g_main_loop_new (NULL, FALSE);
+	main_loop = g_main_loop_new (NULL, FALSE);
 
-        miner = tracker_miner_test_new ("test");
+	miner = tracker_miner_test_new ("test");
 
 	g_signal_connect (TRACKER_MINER_FS (miner), "check-file",
-			  G_CALLBACK (check_file_cb),
-			  NULL);
+	                  G_CALLBACK (check_file_cb),
+	                  NULL);
 	g_signal_connect (TRACKER_MINER_FS (miner), "check-directory",
-			  G_CALLBACK (check_directory_cb),
-			  NULL);
+	                  G_CALLBACK (check_directory_cb),
+	                  NULL);
 	g_signal_connect (TRACKER_MINER_FS (miner), "process-file",
-			  G_CALLBACK (process_file_cb),
-			  NULL);
+	                  G_CALLBACK (process_file_cb),
+	                  NULL);
 	g_signal_connect (TRACKER_MINER_FS (miner), "monitor-directory",
-			  G_CALLBACK (monitor_directory_cb),
-			  NULL);
+	                  G_CALLBACK (monitor_directory_cb),
+	                  NULL);
 
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_home_dir (),
-			    FALSE);
+	                    g_get_home_dir (),
+	                    FALSE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_tmp_dir (),
-			    TRUE);
+	                    g_get_tmp_dir (),
+	                    TRUE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_PICTURES),
-			    TRUE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_PICTURES),
+	                    TRUE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_MUSIC),
-			    TRUE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_MUSIC),
+	                    TRUE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS),
-			    TRUE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS),
+	                    TRUE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD),
-			    FALSE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD),
+	                    FALSE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS),
-			    TRUE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS),
+	                    TRUE);
 	add_directory_path (TRACKER_MINER_FS (miner),
-			    g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP),
-			    TRUE);
+	                    g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP),
+	                    TRUE);
 
-        g_signal_connect (miner, "finished",
-                          G_CALLBACK (miner_finished_cb),
-			  main_loop);
+	g_signal_connect (miner, "finished",
+	                  G_CALLBACK (miner_finished_cb),
+	                  main_loop);
 	g_timeout_add_seconds (1, miner_start_cb, miner);
 
-        g_main_loop_run (main_loop);
+	g_main_loop_run (main_loop);
 
-        return EXIT_SUCCESS;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/libtracker-miner/tracker-miner-test.c b/examples/libtracker-miner/tracker-miner-test.c
index ce84bbb..235d1fa 100644
--- a/examples/libtracker-miner/tracker-miner-test.c
+++ b/examples/libtracker-miner/tracker-miner-test.c
@@ -37,7 +37,7 @@ tracker_miner_test_init (TrackerMinerTest *miner)
 TrackerMiner *
 tracker_miner_test_new (const gchar *name)
 {
-        return g_object_new (TRACKER_TYPE_MINER_TEST,
-			     "name", name,
-			     NULL);
+	return g_object_new (TRACKER_TYPE_MINER_TEST,
+	                     "name", name,
+	                     NULL);
 }
diff --git a/examples/libtracker-miner/tracker-miner-test.h b/examples/libtracker-miner/tracker-miner-test.h
index e1d59a6..9eca8e7 100644
--- a/examples/libtracker-miner/tracker-miner-test.h
+++ b/examples/libtracker-miner/tracker-miner-test.h
@@ -38,11 +38,11 @@ typedef struct TrackerMinerTest      TrackerMinerTest;
 typedef struct TrackerMinerTestClass TrackerMinerTestClass;
 
 struct TrackerMinerTest {
-        TrackerMinerFS parent_instance;
+	TrackerMinerFS parent_instance;
 };
 
 struct TrackerMinerTestClass {
-        TrackerMinerFSClass parent_class;
+	TrackerMinerFSClass parent_class;
 };
 
 GType          tracker_miner_test_get_type (void) G_GNUC_CONST;
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index 826a323..2305ced 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -28,10 +28,10 @@
 #include "tracker-resources-glue.h"
 #include "tracker-statistics-glue.h"
 
-#define TRACKER_SERVICE			"org.freedesktop.Tracker1"
-#define TRACKER_OBJECT			"/org/freedesktop/Tracker1"
-#define TRACKER_INTERFACE_RESOURCES	"org.freedesktop.Tracker1.Resources"
-#define TRACKER_INTERFACE_STATISTICS	"org.freedesktop.Tracker1.Statistics"
+#define TRACKER_SERVICE                         "org.freedesktop.Tracker1"
+#define TRACKER_OBJECT                  "/org/freedesktop/Tracker1"
+#define TRACKER_INTERFACE_RESOURCES     "org.freedesktop.Tracker1.Resources"
+#define TRACKER_INTERFACE_STATISTICS    "org.freedesktop.Tracker1.Statistics"
 
 /**
  * SECTION:tracker
@@ -92,29 +92,29 @@
  **/
 
 typedef struct {
-        DBusGProxy     *proxy;
-        DBusGProxyCall *pending_call;
+	DBusGProxy     *proxy;
+	DBusGProxyCall *pending_call;
 } PendingCallData;
 
 typedef struct {
 	TrackerReplyArray  callback;
 	gpointer           data;
-        TrackerClient     *client;
-        guint              id;
+	TrackerClient     *client;
+	guint              id;
 } CallbackArray;
 
 typedef struct {
 	TrackerReplyGPtrArray  callback;
-	gpointer	       data;
-        TrackerClient         *client;
-        guint                  id;
+	gpointer               data;
+	TrackerClient         *client;
+	guint                  id;
 } CallbackGPtrArray;
 
 typedef struct {
 	TrackerReplyVoid  callback;
-	gpointer	  data;
-        TrackerClient    *client;
-        guint             id;
+	gpointer          data;
+	TrackerClient    *client;
+	guint             id;
 } CallbackVoid;
 
 static guint pending_call_id = 0;
@@ -130,12 +130,12 @@ tracker_GPtrArray_reply (DBusGProxy *proxy,
 
 	s = user_data;
 
-        g_hash_table_remove (s->client->pending_calls,
-                             GUINT_TO_POINTER (s->id));
+	g_hash_table_remove (s->client->pending_calls,
+	                     GUINT_TO_POINTER (s->id));
 
 	(*(TrackerReplyGPtrArray) s->callback) (OUT_result,
-                                                error,
-                                                s->data);
+	                                        error,
+	                                        s->data);
 
 	g_free (s);
 }
@@ -150,11 +150,11 @@ tracker_void_reply (DBusGProxy *proxy,
 
 	s = user_data;
 
-        g_hash_table_remove (s->client->pending_calls,
-                             GUINT_TO_POINTER (s->id));
+	g_hash_table_remove (s->client->pending_calls,
+	                     GUINT_TO_POINTER (s->id));
 
 	(*(TrackerReplyVoid) s->callback) (error,
-                                           s->data);
+	                                   s->data);
 
 	g_free (s);
 }
@@ -236,7 +236,7 @@ start_service (DBusConnection     *connection,
 	request = dbus_message_new_method_call (DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "StartServiceByName");
 	dbus_message_append_args (request, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &flags, DBUS_TYPE_INVALID);
 
-	reply =	dbus_connection_send_with_reply_and_block (connection, request, -1, &error);
+	reply =         dbus_connection_send_with_reply_and_block (connection, request, -1, &error);
 	dbus_message_unref (request);
 
 	if (reply == NULL) {
@@ -259,28 +259,28 @@ pending_call_new (TrackerClient  *client,
                   DBusGProxy     *proxy,
                   DBusGProxyCall *pending_call)
 {
-        PendingCallData *data;
-        guint id;
+	PendingCallData *data;
+	guint id;
 
-        id = ++pending_call_id;
+	id = ++pending_call_id;
 
-        data = g_slice_new (PendingCallData);
-        data->proxy = proxy;
-        data->pending_call = pending_call;
+	data = g_slice_new (PendingCallData);
+	data->proxy = proxy;
+	data->pending_call = pending_call;
 
-        g_hash_table_insert (client->pending_calls,
-                             GUINT_TO_POINTER (id),
-                             data);
+	g_hash_table_insert (client->pending_calls,
+	                     GUINT_TO_POINTER (id),
+	                     data);
 
-        client->last_call = id;
+	client->last_call = id;
 
-        return id;
+	return id;
 }
 
 static void
 pending_call_free (PendingCallData *data)
 {
-        g_slice_free (PendingCallData, data);
+	g_slice_free (PendingCallData, data);
 }
 
 /**
@@ -313,7 +313,7 @@ tracker_connect (gboolean enable_warnings,
 	if (connection == NULL || error != NULL) {
 		if (enable_warnings) {
 			g_warning ("Unable to connect to dbus: %s\n",
-                                   error->message);
+			           error->message);
 		}
 		g_error_free (error);
 		return NULL;
@@ -327,20 +327,20 @@ tracker_connect (gboolean enable_warnings,
 
 	client = g_new0 (TrackerClient, 1);
 
-        client->pending_calls = g_hash_table_new_full (NULL, NULL, NULL,
-                                                       (GDestroyNotify) pending_call_free);
+	client->pending_calls = g_hash_table_new_full (NULL, NULL, NULL,
+	                                               (GDestroyNotify) pending_call_free);
 
 	client->proxy_statistics =
-                dbus_g_proxy_new_for_name (connection,
-                                           TRACKER_SERVICE,
-                                           TRACKER_OBJECT "/Statistics",
-                                           TRACKER_INTERFACE_STATISTICS);
+		dbus_g_proxy_new_for_name (connection,
+		                           TRACKER_SERVICE,
+		                           TRACKER_OBJECT "/Statistics",
+		                           TRACKER_INTERFACE_STATISTICS);
 
 	client->proxy_resources =
-                dbus_g_proxy_new_for_name (connection,
-                                           TRACKER_SERVICE,
-                                           TRACKER_OBJECT "/Resources",
-                                           TRACKER_INTERFACE_RESOURCES);
+		dbus_g_proxy_new_for_name (connection,
+		                           TRACKER_SERVICE,
+		                           TRACKER_OBJECT "/Resources",
+		                           TRACKER_INTERFACE_RESOURCES);
 
 	if (timeout > 0) {
 		dbus_g_proxy_set_default_timeout (client->proxy_resources, timeout);
@@ -359,17 +359,17 @@ tracker_connect (gboolean enable_warnings,
 void
 tracker_disconnect (TrackerClient *client)
 {
-        if (client->proxy_statistics) {
-                g_object_unref (client->proxy_statistics);
-        }
+	if (client->proxy_statistics) {
+		g_object_unref (client->proxy_statistics);
+	}
 
-        if (client->proxy_resources) {
-                g_object_unref (client->proxy_resources);
-        }
+	if (client->proxy_resources) {
+		g_object_unref (client->proxy_resources);
+	}
 
-        if (client->pending_calls) {
-                g_hash_table_unref (client->pending_calls);
-        }
+	if (client->pending_calls) {
+		g_hash_table_unref (client->pending_calls);
+	}
 
 	g_free (client);
 }
@@ -389,20 +389,20 @@ gboolean
 tracker_cancel_call (TrackerClient *client,
                      guint          call_id)
 {
-        PendingCallData *data;
+	PendingCallData *data;
 
-        data = g_hash_table_lookup (client->pending_calls,
-                                    GUINT_TO_POINTER (call_id));
+	data = g_hash_table_lookup (client->pending_calls,
+	                            GUINT_TO_POINTER (call_id));
 
-        if (!data) {
-                return FALSE;
-        }
+	if (!data) {
+		return FALSE;
+	}
 
-        dbus_g_proxy_cancel_call (data->proxy, data->pending_call);
-        g_hash_table_remove (client->pending_calls,
-                             GUINT_TO_POINTER (call_id));
+	dbus_g_proxy_cancel_call (data->proxy, data->pending_call);
+	g_hash_table_remove (client->pending_calls,
+	                     GUINT_TO_POINTER (call_id));
 
-        return TRUE;
+	return TRUE;
 }
 
 /**
@@ -418,16 +418,16 @@ tracker_cancel_call (TrackerClient *client,
 gboolean
 tracker_cancel_last_call (TrackerClient *client)
 {
-        if (client->last_call != 0) {
-                gboolean cancelled;
+	if (client->last_call != 0) {
+		gboolean cancelled;
 
-                cancelled = tracker_cancel_call (client, client->last_call);
-                client->last_call = 0;
+		cancelled = tracker_cancel_call (client, client->last_call);
+		client->last_call = 0;
 
-                return cancelled;
-        }
+		return cancelled;
+	}
 
-        return TRUE;
+	return TRUE;
 }
 
 /**
@@ -455,8 +455,8 @@ tracker_statistics_get (TrackerClient  *client,
 	GPtrArray *table;
 
 	if (!org_freedesktop_Tracker1_Statistics_get (client->proxy_statistics,
-                                                     &table,
-                                                     &*error)) {
+	                                              &table,
+	                                              &*error)) {
 		return NULL;
 	}
 
@@ -469,8 +469,8 @@ tracker_resources_load (TrackerClient  *client,
                         GError        **error)
 {
 	org_freedesktop_Tracker1_Resources_load (client->proxy_resources,
-                                                uri,
-                                                &*error);
+	                                         uri,
+	                                         &*error);
 }
 
 /**
@@ -534,9 +534,9 @@ tracker_resources_sparql_query (TrackerClient  *client,
 	GPtrArray *table;
 
 	if (!org_freedesktop_Tracker1_Resources_sparql_query (client->proxy_resources,
-                                                             query,
-                                                             &table,
-                                                             &*error)) {
+	                                                      query,
+	                                                      &table,
+	                                                      &*error)) {
 		return NULL;
 	}
 
@@ -563,8 +563,8 @@ tracker_resources_sparql_update (TrackerClient  *client,
                                  GError        **error)
 {
 	org_freedesktop_Tracker1_Resources_sparql_update (client->proxy_resources,
-                                                         query,
-                                                         &*error);
+	                                                  query,
+	                                                  &*error);
 }
 
 GPtrArray *
@@ -575,9 +575,9 @@ tracker_resources_sparql_update_blank (TrackerClient  *client,
 	GPtrArray *result;
 
 	if (!org_freedesktop_Tracker1_Resources_sparql_update_blank (client->proxy_resources,
-                                                                     query,
-                                                                     &result,
-                                                                     &*error)) {
+	                                                             query,
+	                                                             &result,
+	                                                             &*error)) {
 		return NULL;
 	}
 
@@ -601,8 +601,8 @@ tracker_resources_batch_sparql_update (TrackerClient  *client,
                                        GError        **error)
 {
 	org_freedesktop_Tracker1_Resources_batch_sparql_update (client->proxy_resources,
-                                                               query,
-                                                               &*error);
+	                                                        query,
+	                                                        &*error);
 }
 
 /**
@@ -618,7 +618,7 @@ tracker_resources_batch_commit (TrackerClient  *client,
                                 GError        **error)
 {
 	org_freedesktop_Tracker1_Resources_batch_commit (client->proxy_resources,
-                                                        &*error);
+	                                                 &*error);
 }
 
 /**
@@ -639,22 +639,22 @@ tracker_statistics_get_async (TrackerClient         *client,
                               gpointer               user_data)
 {
 	CallbackGPtrArray *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackGPtrArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Statistics_get_async (client->proxy_statistics,
-                                                              tracker_GPtrArray_reply,
-                                                              s);
+	                                                      tracker_GPtrArray_reply,
+	                                                      s);
 
-        id = pending_call_new (client, client->proxy_statistics, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_statistics, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 guint
@@ -664,23 +664,23 @@ tracker_resources_load_async (TrackerClient     *client,
                               gpointer user_data)
 {
 	CallbackVoid *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackVoid, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_load_async (client->proxy_resources,
-                                                              uri,
-                                                              tracker_void_reply,
-                                                              s);
+	                                                      uri,
+	                                                      tracker_void_reply,
+	                                                      s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 /**
@@ -702,23 +702,23 @@ tracker_resources_sparql_query_async (TrackerClient         *client,
                                       gpointer               user_data)
 {
 	CallbackGPtrArray *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackGPtrArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources,
-                                                                      query,
-                                                                      tracker_GPtrArray_reply,
-                                                                      s);
+	                                                              query,
+	                                                              tracker_GPtrArray_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 /**
@@ -739,23 +739,23 @@ tracker_resources_sparql_update_async (TrackerClient    *client,
                                        gpointer          user_data)
 {
 	CallbackVoid *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackVoid, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_sparql_update_async (client->proxy_resources,
-                                                                       query,
-                                                                       tracker_void_reply,
-                                                                       s);
+	                                                               query,
+	                                                               tracker_void_reply,
+	                                                               s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 guint
@@ -765,23 +765,23 @@ tracker_resources_sparql_update_blank_async (TrackerClient         *client,
                                              gpointer               user_data)
 {
 	CallbackGPtrArray *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackGPtrArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_sparql_update_blank_async (client->proxy_resources,
-                                                                             query,
-                                                                             tracker_GPtrArray_reply,
-                                                                             s);
+	                                                                     query,
+	                                                                     tracker_GPtrArray_reply,
+	                                                                     s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 /**
@@ -802,23 +802,23 @@ tracker_resources_batch_sparql_update_async (TrackerClient    *client,
                                              gpointer          user_data)
 {
 	CallbackVoid *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackVoid, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_batch_sparql_update_async (client->proxy_resources,
-                                                                             query,
-                                                                             tracker_void_reply,
-                                                                             s);
+	                                                                     query,
+	                                                                     tracker_void_reply,
+	                                                                     s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 /**
@@ -837,22 +837,22 @@ tracker_resources_batch_commit_async (TrackerClient    *client,
                                       gpointer          user_data)
 {
 	CallbackVoid *s;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	s = g_new0 (CallbackVoid, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	call = org_freedesktop_Tracker1_Resources_batch_commit_async (client->proxy_resources,
-                                                                      tracker_void_reply,
-                                                                      s);
+	                                                              tracker_void_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
-        return id;
+	return id;
 }
 
 /* tracker_search_metadata_by_text_async is used by GTK+ */
@@ -870,8 +870,8 @@ tracker_search_reply (DBusGProxy *proxy,
 
 	s = user_data;
 
-        g_hash_table_remove (s->client->pending_calls,
-                             GUINT_TO_POINTER (s->id));
+	g_hash_table_remove (s->client->pending_calls,
+	                     GUINT_TO_POINTER (s->id));
 
 	uris = g_new0 (gchar *, OUT_result->len + 1);
 	for (i = 0; i < OUT_result->len; i++) {
@@ -879,8 +879,8 @@ tracker_search_reply (DBusGProxy *proxy,
 	}
 
 	(*(TrackerReplyArray) s->callback) (uris,
-                                            error,
-                                            s->data);
+	                                    error,
+	                                    s->data);
 
 	g_ptr_array_foreach (OUT_result, (GFunc) g_free, NULL);
 	g_ptr_array_free (OUT_result, TRUE);
@@ -930,8 +930,8 @@ tracker_search_metadata_by_text_async (TrackerClient         *client,
 {
 	CallbackArray *s;
 	GString *sparql;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	g_return_val_if_fail (client != NULL, 0);
 	g_return_val_if_fail (query != NULL, 0);
@@ -940,23 +940,23 @@ tracker_search_metadata_by_text_async (TrackerClient         *client,
 	s = g_new0 (CallbackArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	sparql = g_string_new ("SELECT ?file WHERE { ?file a nfo:FileDataObject ; fts:match ");
 	sparql_append_string_literal (sparql, query);
 	g_string_append (sparql, " }");
 
 	call = org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources,
-                                                                      sparql->str,
-                                                                      tracker_search_reply,
-                                                                      s);
+	                                                              sparql->str,
+	                                                              tracker_search_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
 	g_string_free (sparql, TRUE);
 
-        return id;
+	return id;
 }
 
 guint
@@ -968,8 +968,8 @@ tracker_search_metadata_by_text_and_location_async (TrackerClient         *clien
 {
 	CallbackArray *s;
 	GString *sparql;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 
 	g_return_val_if_fail (client != NULL, 0);
 	g_return_val_if_fail (query != NULL, 0);
@@ -979,7 +979,7 @@ tracker_search_metadata_by_text_and_location_async (TrackerClient         *clien
 	s = g_new0 (CallbackArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	sparql = g_string_new ("SELECT ?file WHERE { ?file a nfo:FileDataObject ; fts:match ");
 	sparql_append_string_literal (sparql, query);
@@ -988,16 +988,16 @@ tracker_search_metadata_by_text_and_location_async (TrackerClient         *clien
 	g_string_append (sparql, ")) }");
 
 	call = org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources,
-                                                                      sparql->str,
-                                                                      tracker_search_reply,
-                                                                      s);
+	                                                              sparql->str,
+	                                                              tracker_search_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
 	g_string_free (sparql, TRUE);
 
-        return id;
+	return id;
 }
 
 guint
@@ -1009,8 +1009,8 @@ tracker_search_metadata_by_text_and_mime_async (TrackerClient         *client,
 {
 	CallbackArray *s;
 	GString *sparql;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 	gint i;
 
 	g_return_val_if_fail (client != NULL, 0);
@@ -1021,7 +1021,7 @@ tracker_search_metadata_by_text_and_mime_async (TrackerClient         *client,
 	s = g_new0 (CallbackArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	sparql = g_string_new ("SELECT ?file WHERE { ?file a nfo:FileDataObject ; nie:mimeType ?mime ; fts:match ");
 	sparql_append_string_literal (sparql, query);
@@ -1036,16 +1036,16 @@ tracker_search_metadata_by_text_and_mime_async (TrackerClient         *client,
 	g_string_append (sparql, ") }");
 
 	call = org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources,
-                                                                      sparql->str,
-                                                                      tracker_search_reply,
-                                                                      s);
+	                                                              sparql->str,
+	                                                              tracker_search_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
 	g_string_free (sparql, TRUE);
 
-        return id;
+	return id;
 }
 
 guint
@@ -1058,8 +1058,8 @@ tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient
 {
 	CallbackArray *s;
 	GString *sparql;
-        DBusGProxyCall *call;
-        guint id;
+	DBusGProxyCall *call;
+	guint id;
 	gint i;
 
 	g_return_val_if_fail (client != NULL, 0);
@@ -1071,7 +1071,7 @@ tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient
 	s = g_new0 (CallbackArray, 1);
 	s->callback = callback;
 	s->data = user_data;
-        s->client = client;
+	s->client = client;
 
 	sparql = g_string_new ("SELECT ?file WHERE { ?file a nfo:FileDataObject ; nie:mimeType ?mime ; fts:match ");
 	sparql_append_string_literal (sparql, query);
@@ -1090,15 +1090,15 @@ tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient
 	g_string_append (sparql, ") }");
 
 	call = org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources,
-                                                                      sparql->str,
-                                                                      tracker_search_reply,
-                                                                      s);
+	                                                              sparql->str,
+	                                                              tracker_search_reply,
+	                                                              s);
 
-        id = pending_call_new (client, client->proxy_resources, call);
-        s->id = id;
+	id = pending_call_new (client, client->proxy_resources, call);
+	s->id = id;
 
 	g_string_free (sparql, TRUE);
 
-        return id;
+	return id;
 }
 
diff --git a/src/libtracker-client/tracker.h b/src/libtracker-client/tracker.h
index 0468fb6..5e8985d 100644
--- a/src/libtracker-client/tracker.h
+++ b/src/libtracker-client/tracker.h
@@ -41,8 +41,8 @@ typedef struct {
 	DBusGProxy *proxy_statistics;
 	DBusGProxy *proxy_resources;
 
-        GHashTable *pending_calls;
-        guint last_call;
+	GHashTable *pending_calls;
+	guint last_call;
 } TrackerClient;
 
 /**
@@ -143,21 +143,21 @@ guint          tracker_search_metadata_by_text_async       (TrackerClient
                                                             TrackerReplyArray       callback,
                                                             gpointer                user_data);
 guint          tracker_search_metadata_by_text_and_location_async (TrackerClient   *client,
-                                                            const gchar            *query,
-                                                            const gchar            *location,
-                                                            TrackerReplyArray       callback,
-                                                            gpointer                user_data);
+                                                                   const gchar            *query,
+                                                                   const gchar            *location,
+                                                                   TrackerReplyArray       callback,
+                                                                   gpointer                user_data);
 guint          tracker_search_metadata_by_text_and_mime_async (TrackerClient   *client,
-                                                            const gchar            *query,
-                                                            const gchar           **mimes,
-                                                            TrackerReplyArray       callback,
-                                                            gpointer                user_data);
+                                                               const gchar            *query,
+                                                               const gchar           **mimes,
+                                                               TrackerReplyArray       callback,
+                                                               gpointer                user_data);
 guint          tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient   *client,
-                                                            const gchar            *query,
-                                                            const gchar           **mimes,
-                                                            const gchar            *location,
-                                                            TrackerReplyArray       callback,
-                                                            gpointer                user_data);
+	      const gchar            *query,
+	      const gchar           **mimes,
+	      const gchar            *location,
+	      TrackerReplyArray       callback,
+	      gpointer                user_data);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-class.c b/src/libtracker-common/tracker-class.c
index 548f7bd..2db139c 100644
--- a/src/libtracker-common/tracker-class.c
+++ b/src/libtracker-common/tracker-class.c
@@ -44,13 +44,13 @@ struct _TrackerClassPriv {
 
 static void class_finalize     (GObject      *object);
 static void class_get_property (GObject      *object,
-				guint         param_id,
-				GValue       *value,
-				GParamSpec   *pspec);
+                                guint         param_id,
+                                GValue       *value,
+                                GParamSpec   *pspec);
 static void class_set_property (GObject      *object,
-				guint         param_id,
-				const GValue *value,
-				GParamSpec   *pspec);
+                                guint         param_id,
+                                const GValue *value,
+                                GParamSpec   *pspec);
 
 enum {
 	PROP_0,
@@ -66,33 +66,33 @@ tracker_class_class_init (TrackerClassClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = class_finalize;
+	object_class->finalize     = class_finalize;
 	object_class->get_property = class_get_property;
 	object_class->set_property = class_set_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_URI,
-					 g_param_spec_string ("uri",
-							      "uri",
-							      "URI",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_URI,
+	                                 g_param_spec_string ("uri",
+	                                                      "uri",
+	                                                      "URI",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_NAME,
-					 g_param_spec_string ("name",
-							      "name",
-							      "Service name",
-							      NULL,
-							      G_PARAM_READABLE));
+	                                 PROP_NAME,
+	                                 g_param_spec_string ("name",
+	                                                      "name",
+	                                                      "Service name",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
-					 PROP_NAME,
-					 g_param_spec_int ("count",
-							      "count",
-							      "Count",
-							      0,
-							      INT_MAX,
-							      0,
-							      G_PARAM_READABLE | G_PARAM_WRITABLE));
+	                                 PROP_NAME,
+	                                 g_param_spec_int ("count",
+	                                                   "count",
+	                                                   "Count",
+	                                                   0,
+	                                                   INT_MAX,
+	                                                   0,
+	                                                   G_PARAM_READABLE | G_PARAM_WRITABLE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerClassPriv));
 }
@@ -124,9 +124,9 @@ class_finalize (GObject *object)
 
 static void
 class_get_property (GObject    *object,
-		    guint       param_id,
-		    GValue     *value,
-		    GParamSpec *pspec)
+                    guint       param_id,
+                    GValue     *value,
+                    GParamSpec *pspec)
 {
 	TrackerClassPriv *priv;
 
@@ -150,18 +150,18 @@ class_get_property (GObject    *object,
 
 static void
 class_set_property (GObject      *object,
-		    guint         param_id,
-		    const GValue *value,
-		    GParamSpec   *pspec)
+                    guint         param_id,
+                    const GValue *value,
+                    GParamSpec   *pspec)
 {
 	switch (param_id) {
 	case PROP_URI:
 		tracker_class_set_uri (TRACKER_CLASS (object),
-					  g_value_get_string (value));
+		                       g_value_get_string (value));
 		break;
 	case PROP_COUNT:
 		tracker_class_set_count (TRACKER_CLASS (object),
-					  g_value_get_int (value));
+		                         g_value_get_int (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -229,7 +229,7 @@ tracker_class_get_super_classes (TrackerClass *service)
 
 void
 tracker_class_set_uri (TrackerClass *service,
-		       const gchar  *value)
+                       const gchar  *value)
 {
 	TrackerClassPriv *priv;
 
@@ -272,7 +272,7 @@ tracker_class_set_uri (TrackerClass *service,
 
 void
 tracker_class_set_count (TrackerClass *service,
-			 gint	       value)
+                         gint          value)
 {
 	TrackerClassPriv *priv;
 
@@ -285,7 +285,7 @@ tracker_class_set_count (TrackerClass *service,
 
 void
 tracker_class_set_super_classes (TrackerClass  *service,
-			         TrackerClass **value)
+                                 TrackerClass **value)
 {
 	TrackerClassPriv *priv;
 	TrackerClass     **super_class;
@@ -304,7 +304,7 @@ tracker_class_set_super_classes (TrackerClass  *service,
 
 void
 tracker_class_add_super_class (TrackerClass *service,
-			       TrackerClass *value)
+                               TrackerClass *value)
 {
 	TrackerClassPriv *priv;
 
diff --git a/src/libtracker-common/tracker-class.h b/src/libtracker-common/tracker-class.h
index 6900373..288f700 100644
--- a/src/libtracker-common/tracker-class.h
+++ b/src/libtracker-common/tracker-class.h
@@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_CLASS	   (tracker_class_get_type ())
-#define TRACKER_CLASS(o)	   (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLASS, TrackerClass))
+#define TRACKER_TYPE_CLASS         (tracker_class_get_type ())
+#define TRACKER_CLASS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLASS, TrackerClass))
 #define TRACKER_CLASS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CLASS, TrackerClassClass))
-#define TRACKER_IS_CLASS(o)	   (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CLASS))
+#define TRACKER_IS_CLASS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CLASS))
 #define TRACKER_IS_CLASS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CLASS))
 #define TRACKER_CLASS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CLASS, TrackerClassClass))
 
@@ -48,20 +48,20 @@ struct _TrackerClassClass {
 	GObjectClass parent_class;
 };
 
-GType		tracker_class_get_type		(void) G_GNUC_CONST;
+GType           tracker_class_get_type          (void) G_GNUC_CONST;
 TrackerClass *  tracker_class_new               (void);
 const gchar *   tracker_class_get_uri           (TrackerClass  *service);
 const gchar *   tracker_class_get_name          (TrackerClass  *service);
 gint            tracker_class_get_count         (TrackerClass  *service);
 TrackerClass  **tracker_class_get_super_classes (TrackerClass  *service);
 void            tracker_class_set_uri           (TrackerClass  *service,
-						 const gchar   *value);
+                                                 const gchar   *value);
 void            tracker_class_set_count         (TrackerClass  *service,
-						 gint           value);
+                                                 gint           value);
 void            tracker_class_set_super_classes (TrackerClass  *self,
-						 TrackerClass **super_classes);
+                                                 TrackerClass **super_classes);
 void            tracker_class_add_super_class   (TrackerClass  *self,
-						 TrackerClass  *value);
+                                                 TrackerClass  *value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-config-file.c b/src/libtracker-common/tracker-config-file.c
index 5354bda..48b519a 100644
--- a/src/libtracker-common/tracker-config-file.c
+++ b/src/libtracker-common/tracker-config-file.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -47,13 +47,13 @@ static void     config_finalize     (GObject              *object);
 static void     config_load         (TrackerConfigFile *config);
 static gboolean config_save         (TrackerConfigFile *config);
 static void     config_get_property (GObject              *object,
-				     guint                 param_id,
-				     GValue               *value,
-				     GParamSpec           *pspec);
+                                     guint                 param_id,
+                                     GValue               *value,
+                                     GParamSpec           *pspec);
 static void     config_set_property (GObject              *object,
-				     guint                 param_id,
-				     const GValue         *value,
-				     GParamSpec           *pspec);
+                                     guint                 param_id,
+                                     const GValue         *value,
+                                     GParamSpec           *pspec);
 static void     config_constructed  (GObject              *object);
 
 enum {
@@ -77,7 +77,7 @@ tracker_config_file_class_init (TrackerConfigFileClass *klass)
 
 	object_class->get_property = config_get_property;
 	object_class->set_property = config_set_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	/**
@@ -89,23 +89,23 @@ tracker_config_file_class_init (TrackerConfigFileClass *klass)
 	 **/
 	signals[CHANGED] =
 		g_signal_new ("changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerConfigFileClass, changed),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0,
-			      G_TYPE_NONE);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerConfigFileClass, changed),
+		              NULL,
+		              NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE,
+		              0,
+		              G_TYPE_NONE);
 
 	g_object_class_install_property (object_class,
-					 PROP_DOMAIN,
-					 g_param_spec_string ("domain",
-							      "Config domain",
-							      "The prefix before .cfg for the filename",
-							      g_get_application_name (),
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_DOMAIN,
+	                                 g_param_spec_string ("domain",
+	                                                      "Config domain",
+	                                                      "The prefix before .cfg for the filename",
+	                                                      g_get_application_name (),
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigFilePrivate));
 }
@@ -118,9 +118,9 @@ tracker_config_file_init (TrackerConfigFile *file)
 
 static void
 config_get_property (GObject       *object,
-		     guint          param_id,
-		     GValue        *value,
-		     GParamSpec    *pspec)
+                     guint          param_id,
+                     GValue        *value,
+                     GParamSpec    *pspec)
 {
 	TrackerConfigFilePrivate *priv;
 
@@ -138,10 +138,10 @@ config_get_property (GObject       *object,
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	TrackerConfigFilePrivate *priv;
 	const gchar *domain;
@@ -207,8 +207,8 @@ config_dir_ensure_exists_and_return (void)
 	gchar *directory;
 
 	directory = g_build_filename (g_get_user_config_dir (),
-				      "tracker",
-				      NULL);
+	                              "tracker",
+	                              NULL);
 
 	if (!g_file_test (directory, G_FILE_TEST_EXISTS)) {
 		g_print ("Creating config directory:'%s'\n", directory);
@@ -225,13 +225,13 @@ config_dir_ensure_exists_and_return (void)
 
 static void
 config_changed_cb (GFileMonitor     *monitor,
-		   GFile	    *this_file,
-		   GFile	    *other_file,
-		   GFileMonitorEvent event_type,
-		   gpointer	     user_data)
+                   GFile            *this_file,
+                   GFile            *other_file,
+                   GFileMonitorEvent event_type,
+                   gpointer          user_data)
 {
 	TrackerConfigFile *file;
-	gchar	          *filename;
+	gchar             *filename;
 
 	file = TRACKER_CONFIG_FILE (user_data);
 
@@ -244,7 +244,7 @@ config_changed_cb (GFileMonitor     *monitor,
 
 		filename = g_file_get_path (this_file);
 		g_message ("Config file changed:'%s', reloading settings...",
-			   filename);
+		           filename);
 		g_free (filename);
 
 		config_load (file);
@@ -297,23 +297,23 @@ config_load (TrackerConfigFile *file)
 
 	if (!file->monitor) {
 		g_message ("Setting up monitor for changes to config file:'%s'",
-			   filename);
+		           filename);
 
 		file->monitor = g_file_monitor_file (file->file,
-						       G_FILE_MONITOR_NONE,
-						       NULL,
-						       NULL);
+		                                     G_FILE_MONITOR_NONE,
+		                                     NULL,
+		                                     NULL);
 
 		g_signal_connect (file->monitor, "changed",
-				  G_CALLBACK (config_changed_cb),
-				  file);
+		                  G_CALLBACK (config_changed_cb),
+		                  file);
 	}
 
 	/* Load options */
 	g_key_file_load_from_file (file->key_file,
-				   filename,
-				   G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
-				   &error);
+	                           filename,
+	                           G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
+	                           &error);
 
 	/* We force an overwrite in cases of error */
 	file->file_exists = error ? FALSE : TRUE;
@@ -349,7 +349,7 @@ config_save (TrackerConfigFile *file)
 	data = g_key_file_to_data (file->key_file, &size, &error);
 	if (error) {
 		g_warning ("Could not get config data to write to file, %s",
-			   error->message);
+		           error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -362,9 +362,9 @@ config_save (TrackerConfigFile *file)
 
 	if (error) {
 		g_warning ("Could not write %" G_GSIZE_FORMAT " bytes to file '%s', %s",
-			   size,
-			   filename,
-			   error->message);
+		           size,
+		           filename,
+		           error->message);
 		g_free (filename);
 		g_error_free (error);
 
@@ -372,8 +372,8 @@ config_save (TrackerConfigFile *file)
 	}
 
 	g_message ("Wrote config to '%s' (%" G_GSIZE_FORMAT " bytes)",
-		   filename,
-		   size);
+	           filename,
+	           size);
 
 	g_free (filename);
 
diff --git a/src/libtracker-common/tracker-config-file.h b/src/libtracker-common/tracker-config-file.h
index 0f2af4c..982b139 100644
--- a/src/libtracker-common/tracker-config-file.h
+++ b/src/libtracker-common/tracker-config-file.h
@@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_CONFIG_FILE	 (tracker_config_file_get_type ())
-#define TRACKER_CONFIG_FILE(o)	         (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFile))
+#define TRACKER_TYPE_CONFIG_FILE         (tracker_config_file_get_type ())
+#define TRACKER_CONFIG_FILE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFile))
 #define TRACKER_CONFIG_FILE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
-#define TRACKER_IS_CONFIG_FILE(o)	 (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG_FILE))
+#define TRACKER_IS_CONFIG_FILE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG_FILE))
 #define TRACKER_IS_CONFIG_FILE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG_FILE))
 #define TRACKER_CONFIG_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
 
@@ -57,7 +57,7 @@ struct _TrackerConfigFileClass {
 	void (* changed) (TrackerConfigFile *file);
 };
 
-GType	           tracker_config_file_get_type (void) G_GNUC_CONST;
+GType              tracker_config_file_get_type (void) G_GNUC_CONST;
 
 gboolean           tracker_config_file_save     (TrackerConfigFile *config);
 
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-common/tracker-dbus.c
index b63bdc9..f98612e 100644
--- a/src/libtracker-common/tracker-dbus.c
+++ b/src/libtracker-common/tracker-dbus.c
@@ -28,7 +28,7 @@
 struct TrackerDBusRequestHandler {
 	TrackerDBusRequestFunc new;
 	TrackerDBusRequestFunc done;
-	gpointer	       user_data;
+	gpointer               user_data;
 };
 
 static GSList   *hooks;
@@ -100,7 +100,7 @@ tracker_dbus_error_quark (void)
 
 TrackerDBusData *
 tracker_dbus_data_new (const gpointer arg1,
-		       const gpointer arg2)
+                       const gpointer arg2)
 {
 	TrackerDBusData *data;
 
@@ -117,16 +117,16 @@ tracker_dbus_data_new (const gpointer arg1,
 gchar **
 tracker_dbus_slist_to_strv (GSList *list)
 {
-	GSList	*l;
+	GSList  *l;
 	gchar  **strv;
-	gint	 i = 0;
+	gint     i = 0;
 
 	strv = g_new0 (gchar*, g_slist_length (list) + 1);
 
 	for (l = list; l != NULL; l = l->next) {
 		if (!g_utf8_validate (l->data, -1, NULL)) {
 			g_message ("Could not add string:'%s' to GStrv, invalid UTF-8",
-				   (gchar*) l->data);
+			           (gchar*) l->data);
 			continue;
 		}
 
@@ -142,22 +142,22 @@ gchar **
 tracker_dbus_str_to_strv (const gchar *str)
 {
 	gchar **strv;
-	
+        
 	strv = g_new (gchar*, 2);
 	strv[0] = g_strdup (str);
 	strv[1] = NULL;
-	
+        
 	return strv;
 }
 
 gchar **
 tracker_dbus_queue_str_to_strv (GQueue *queue,
-				gint	max)
+                                gint    max)
 {
 	gchar **strv;
 	gchar  *str;
-	gint	i, j;
-	gint	length;
+	gint    i, j;
+	gint    length;
 
 	length = g_queue_get_length (queue);
 
@@ -190,13 +190,13 @@ tracker_dbus_queue_str_to_strv (GQueue *queue,
 
 gchar **
 tracker_dbus_queue_gfile_to_strv (GQueue *queue,
-				  gint	  max)
+                                  gint    max)
 {
 	gchar **strv;
 	gchar  *str;
 	GFile  *file;
-	gint	i, j;
-	gint	length;
+	gint    i, j;
+	gint    length;
 
 	length = g_queue_get_length (queue);
 
@@ -252,8 +252,8 @@ tracker_dbus_get_next_request_id (void)
 
 TrackerDBusRequestHandler *
 tracker_dbus_request_add_hook (TrackerDBusRequestFunc new,
-			       TrackerDBusRequestFunc done,
-			       gpointer		      user_data)
+                               TrackerDBusRequestFunc done,
+                               gpointer                       user_data)
 {
 	TrackerDBusRequestHandler *handler;
 
@@ -277,11 +277,11 @@ tracker_dbus_request_remove_hook (TrackerDBusRequestHandler *handler)
 }
 
 void
-tracker_dbus_request_new (gint		request_id,
-			  const gchar  *format,
-			  ...)
+tracker_dbus_request_new (gint          request_id,
+                          const gchar  *format,
+                          ...)
 {
-	gchar	*str;
+	gchar   *str;
 	va_list  args;
 
 	va_start (args, format);
@@ -289,8 +289,8 @@ tracker_dbus_request_new (gint		request_id,
 	va_end (args);
 
 	g_debug ("<--- [%d] %s",
-		   request_id,
-		   str);
+	         request_id,
+	         str);
 
 	g_free (str);
 
@@ -303,16 +303,16 @@ tracker_dbus_request_success (gint request_id)
 	request_handler_call_for_done (request_id);
 
 	g_debug ("---> [%d] Success, no error given",
-		   request_id);
+	         request_id);
 }
 
 void
-tracker_dbus_request_failed (gint	   request_id,
-			     GError	 **error,
-			     const gchar  *format,
-			     ...)
+tracker_dbus_request_failed (gint          request_id,
+                             GError      **error,
+                             const gchar  *format,
+                             ...)
 {
-	gchar	*str;
+	gchar   *str;
 	va_list  args;
 
 	request_handler_call_for_done (request_id);
@@ -331,17 +331,17 @@ tracker_dbus_request_failed (gint	   request_id,
 	}
 
 	g_message ("---> [%d] Failed, %s",
-		   request_id,
-		   str);
+	           request_id,
+	           str);
 	g_free (str);
 }
 
 void
-tracker_dbus_request_info (gint	        request_id,
-			   const gchar *format,
-			   ...)
+tracker_dbus_request_info (gint                 request_id,
+                           const gchar *format,
+                           ...)
 {
-	gchar	*str;
+	gchar   *str;
 	va_list  args;
 
 	va_start (args, format);
@@ -349,17 +349,17 @@ tracker_dbus_request_info (gint	        request_id,
 	va_end (args);
 
 	tracker_info ("---- [%d] %s",
-		      request_id,
-		      str);
+	              request_id,
+	              str);
 	g_free (str);
 }
 
 void
-tracker_dbus_request_comment (gint	   request_id,
-			      const gchar *format,
-			      ...)
+tracker_dbus_request_comment (gint         request_id,
+                              const gchar *format,
+                              ...)
 {
-	gchar	*str;
+	gchar   *str;
 	va_list  args;
 
 	va_start (args, format);
@@ -367,17 +367,17 @@ tracker_dbus_request_comment (gint	   request_id,
 	va_end (args);
 
 	g_message ("---- [%d] %s",
-		   request_id,
-		   str);
+	           request_id,
+	           str);
 	g_free (str);
 }
 
 void
-tracker_dbus_request_debug (gint	 request_id,
-			    const gchar *format,
-			    ...)
+tracker_dbus_request_debug (gint         request_id,
+                            const gchar *format,
+                            ...)
 {
-	gchar	*str;
+	gchar   *str;
 	va_list  args;
 
 	va_start (args, format);
@@ -385,8 +385,8 @@ tracker_dbus_request_debug (gint	 request_id,
 	va_end (args);
 
 	g_debug ("---- [%d] %s",
-		 request_id,
-		 str);
+	         request_id,
+	         str);
 	g_free (str);
 }
 
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index 65f69d2..8c0b2d3 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -36,56 +36,56 @@ G_BEGIN_DECLS
 #endif
 
 #define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
-#define TRACKER_DBUS_ERROR	  tracker_dbus_error_quark()
-
-#define TRACKER_TYPE_EVENT_ARRAY					        \
-	dbus_g_type_get_collection ("GPtrArray",			        \
-				    dbus_g_type_get_struct ("GValueArray",      \
-							    G_TYPE_STRING,      \
-							    G_TYPE_STRING,      \
-							    G_TYPE_INT,         \
-							    G_TYPE_INVALID))
-#define TRACKER_TYPE_G_STRV_ARRAY 				                \
+#define TRACKER_DBUS_ERROR        tracker_dbus_error_quark()
+
+#define TRACKER_TYPE_EVENT_ARRAY	  \
+	dbus_g_type_get_collection ("GPtrArray", \
+	                            dbus_g_type_get_struct ("GValueArray", \
+	                                                    G_TYPE_STRING, \
+	                                                    G_TYPE_STRING, \
+	                                                    G_TYPE_INT, \
+	                                                    G_TYPE_INVALID))
+#define TRACKER_TYPE_G_STRV_ARRAY	  \
 	dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV)
 
-#define tracker_dbus_async_return_if_fail(expr,context)				\
-	G_STMT_START {								\
-		if G_LIKELY(expr) { } else {					\
-			GError *assert_error = NULL;				\
-										\
-			g_set_error (&assert_error,				\
-				     TRACKER_DBUS_ERROR,			\
-				     0,						\
-				     _("Assertion `%s' failed"),		\
-				     #expr);					\
-										\
-			dbus_g_method_return_error (context, assert_error);	\
-			g_clear_error (&assert_error);				\
-										\
-			return;							\
-		};								\
+#define tracker_dbus_async_return_if_fail(expr,context)	  \
+	G_STMT_START { \
+		if G_LIKELY(expr) { } else { \
+			GError *assert_error = NULL; \
+	  \
+			g_set_error (&assert_error, \
+			             TRACKER_DBUS_ERROR, \
+			             0, \
+			             _("Assertion `%s' failed"), \
+			             #expr); \
+	  \
+			dbus_g_method_return_error (context, assert_error); \
+			g_clear_error (&assert_error); \
+	  \
+			return; \
+		}; \
 	} G_STMT_END
 
-#define tracker_dbus_return_val_if_fail(expr,val,error)			        \
-	G_STMT_START {							        \
-		if G_LIKELY(expr) { } else {				        \
-			g_set_error (error,				        \
-				     TRACKER_DBUS_ERROR,	   	        \
-				     0,					        \
-				     _("Assertion `%s' failed"),	        \
-				     #expr);				        \
-									        \
-			return val;					        \
-		};							        \
+#define tracker_dbus_return_val_if_fail(expr,val,error)	  \
+	G_STMT_START { \
+		if G_LIKELY(expr) { } else { \
+			g_set_error (error, \
+			             TRACKER_DBUS_ERROR, \
+			             0, \
+			             _("Assertion `%s' failed"), \
+			             #expr); \
+	  \
+			return val; \
+		}; \
 	} G_STMT_END
 
 typedef struct TrackerDBusRequestHandler TrackerDBusRequestHandler;
 
 typedef void (*TrackerDBusRequestFunc) (guint    request_id,
-					gpointer user_data);
+                                        gpointer user_data);
 
 typedef struct {
-	guint	 id;
+	guint    id;
 	gpointer data1;
 	gpointer data2;
 } TrackerDBusData;
@@ -96,47 +96,47 @@ typedef enum {
 	TRACKER_DBUS_EVENTS_TYPE_DELETE
 } TrackerDBusEventsType;
 
-GQuark		 tracker_dbus_error_quark	     (void);
-TrackerDBusData *tracker_dbus_data_new		     (const gpointer		  arg1,
-						      const gpointer		  arg2);
+GQuark           tracker_dbus_error_quark            (void);
+TrackerDBusData *tracker_dbus_data_new               (const gpointer              arg1,
+                                                      const gpointer              arg2);
 
 /* Utils */
-GValue *	 tracker_dbus_gvalue_slice_new	     (GType			  type);
-void		 tracker_dbus_gvalue_slice_free      (GValue			 *value);
-gchar **	 tracker_dbus_slist_to_strv	     (GSList			 *list);
+GValue *         tracker_dbus_gvalue_slice_new       (GType                       type);
+void             tracker_dbus_gvalue_slice_free      (GValue                     *value);
+gchar **         tracker_dbus_slist_to_strv          (GSList                     *list);
 gchar **         tracker_dbus_str_to_strv            (const gchar                *str);
-gchar **	 tracker_dbus_queue_str_to_strv      (GQueue			 *queue,
-						      gint			  max);
-gchar **	 tracker_dbus_queue_gfile_to_strv    (GQueue			 *queue,
-						      gint			  max);
-void		 tracker_dbus_results_ptr_array_free (GPtrArray			**ptr_array);
+gchar **         tracker_dbus_queue_str_to_strv      (GQueue                     *queue,
+                                                      gint                        max);
+gchar **         tracker_dbus_queue_gfile_to_strv    (GQueue                     *queue,
+                                                      gint                        max);
+void             tracker_dbus_results_ptr_array_free (GPtrArray                         **ptr_array);
 
 /* Requests */
-guint		 tracker_dbus_get_next_request_id    (void);
+guint            tracker_dbus_get_next_request_id    (void);
 
 TrackerDBusRequestHandler *
-		 tracker_dbus_request_add_hook	     (TrackerDBusRequestFunc	  new,
-						      TrackerDBusRequestFunc	  done,
-						      gpointer			  user_data);
-void		 tracker_dbus_request_remove_hook    (TrackerDBusRequestHandler  *handler);
-
-void		 tracker_dbus_request_new	     (gint			  request_id,
-						      const gchar		 *format,
-						      ...);
-void		 tracker_dbus_request_success	     (gint			  request_id);
-void		 tracker_dbus_request_failed	     (gint			  request_id,
-						      GError			**error,
-						      const gchar		 *format,
-						      ...);
-void		 tracker_dbus_request_comment	     (gint			  request_id,
-						      const gchar		 *format,
-						      ...);
-void		 tracker_dbus_request_info	     (gint			  request_id,
-						      const gchar		 *format,
-						      ...);
-void		 tracker_dbus_request_debug	     (gint			  request_id,
-						      const gchar		 *format,
-						      ...);
+tracker_dbus_request_add_hook       (TrackerDBusRequestFunc      new,
+                                     TrackerDBusRequestFunc      done,
+                                     gpointer                    user_data);
+void             tracker_dbus_request_remove_hook    (TrackerDBusRequestHandler  *handler);
+
+void             tracker_dbus_request_new            (gint                        request_id,
+                                                      const gchar                *format,
+                                                      ...);
+void             tracker_dbus_request_success        (gint                        request_id);
+void             tracker_dbus_request_failed         (gint                        request_id,
+                                                      GError                    **error,
+                                                      const gchar                *format,
+                                                      ...);
+void             tracker_dbus_request_comment        (gint                        request_id,
+                                                      const gchar                *format,
+                                                      ...);
+void             tracker_dbus_request_info           (gint                        request_id,
+                                                      const gchar                *format,
+                                                      ...);
+void             tracker_dbus_request_debug          (gint                        request_id,
+                                                      const gchar                *format,
+                                                      ...);
 void             tracker_dbus_request_block_hooks    (void);
 void             tracker_dbus_request_unblock_hooks  (void);
 
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-common/tracker-file-utils.c
index 3000eee..177da4f 100644
--- a/src/libtracker-common/tracker-file-utils.c
+++ b/src/libtracker-common/tracker-file-utils.c
@@ -49,10 +49,10 @@ static GHashTable *file_locks = NULL;
 
 FILE *
 tracker_file_open (const gchar *uri,
-		   const gchar *how,
-		   gboolean	sequential)
+                   const gchar *how,
+                   gboolean     sequential)
 {
- 	FILE     *file;
+	FILE     *file;
 	gboolean  readonly;
 	int       flags;
 
@@ -64,7 +64,7 @@ tracker_file_open (const gchar *uri,
 		return NULL;
 	}
 
- 	/* Are we opening for readonly? */
+	/* Are we opening for readonly? */
 	readonly = !strstr (uri, "r+") && strchr (uri, 'r');
 
 	if (readonly) {
@@ -85,7 +85,7 @@ tracker_file_open (const gchar *uri,
 
 void
 tracker_file_close (FILE     *file,
-		    gboolean  need_again_soon)
+                    gboolean  need_again_soon)
 {
 	g_return_if_fail (file != NULL);
 
@@ -96,23 +96,23 @@ goffset
 tracker_file_get_size (const gchar *path)
 {
 	GFileInfo *info;
-	GFile	  *file;
-	GError	  *error = NULL;
+	GFile     *file;
+	GError    *error = NULL;
 	goffset    size;
 
 	g_return_val_if_fail (path != NULL, 0);
 
 	file = g_file_new_for_path (path);
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_STANDARD_SIZE,
-				  G_FILE_QUERY_INFO_NONE,
-				  NULL,
-				  &error);
+	                          G_FILE_ATTRIBUTE_STANDARD_SIZE,
+	                          G_FILE_QUERY_INFO_NONE,
+	                          NULL,
+	                          &error);
 
 	if (G_UNLIKELY (error)) {
 		g_message ("Could not get size for '%s', %s",
-			   path,
-			   error->message);
+		           path,
+		           error->message);
 		g_error_free (error);
 		size = 0;
 	} else {
@@ -129,23 +129,23 @@ guint64
 tracker_file_get_mtime (const gchar *path)
 {
 	GFileInfo *info;
-	GFile	  *file;
-	GError	  *error = NULL;
+	GFile     *file;
+	GError    *error = NULL;
 	guint64    mtime;
 
 	g_return_val_if_fail (path != NULL, 0);
 
 	file = g_file_new_for_path (path);
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_TIME_MODIFIED,
-				  G_FILE_QUERY_INFO_NONE,
-				  NULL,
-				  &error);
+	                          G_FILE_ATTRIBUTE_TIME_MODIFIED,
+	                          G_FILE_QUERY_INFO_NONE,
+	                          NULL,
+	                          &error);
 
 	if (G_UNLIKELY (error)) {
 		g_message ("Could not get mtime for '%s', %s",
-			   path,
-			   error->message);
+		           path,
+		           error->message);
 		g_error_free (error);
 		mtime = 0;
 	} else {
@@ -162,20 +162,20 @@ gchar *
 tracker_file_get_mime_type (GFile *file)
 {
 	GFileInfo *info;
-	GError	  *error = NULL;
-	gchar	  *content_type;
+	GError    *error = NULL;
+	gchar     *content_type;
 
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-				  G_FILE_QUERY_INFO_NONE,
-				  NULL,
-				  &error);
+	                          G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+	                          G_FILE_QUERY_INFO_NONE,
+	                          NULL,
+	                          &error);
 
 	if (G_UNLIKELY (error)) {
 		g_message ("Could not guess mimetype, %s",
-			   error->message);
+		           error->message);
 		g_error_free (error);
 		content_type = NULL;
 	} else {
@@ -188,7 +188,7 @@ tracker_file_get_mime_type (GFile *file)
 
 gboolean
 tracker_file_system_has_enough_space (const gchar *path,
-				      gulong       required_bytes)
+                                      gulong       required_bytes)
 {
 	struct statvfs st;
 	gchar *str1;
@@ -209,14 +209,14 @@ tracker_file_system_has_enough_space (const gchar *path,
 
 	if (!enough) {
 		g_critical ("Not enough disk space to create databases, "
-			    "%s remaining, %s required as a minimum",
-			    str2,
-			    str1);
+		            "%s remaining, %s required as a minimum",
+		            str2,
+		            str1);
 	} else {
 		g_message ("Checking for adequate disk space to create databases, "
-			   "%s remaining, %s required as a minimum",
-			   str2,
-			   str1);
+		           "%s remaining, %s required as a minimum",
+		           str2,
+		           str1);
 	}
 
 	g_free (str2);
@@ -274,10 +274,10 @@ tracker_path_remove (const gchar *path)
 
 gboolean
 tracker_path_is_in_path (const gchar *path,
-			 const gchar *in_path)
+                         const gchar *in_path)
 {
-	gchar	 *new_path;
-	gchar	 *new_in_path;
+	gchar    *new_path;
+	gchar    *new_in_path;
 	gboolean  is_in_path = FALSE;
 
 	g_return_val_if_fail (path != NULL, FALSE);
@@ -330,14 +330,14 @@ tracker_path_hash_table_filter_duplicates (GHashTable *roots)
 
 			if (tracker_path_is_in_path (path, in_path)) {
 				g_debug ("Removing path:'%s', it is in path:'%s'",
-					 path, in_path);
+				         path, in_path);
 
 				g_hash_table_iter_remove (&iter1);
 				g_hash_table_iter_init (&iter1, roots);
 				break;
 			} else if (tracker_path_is_in_path (in_path, path)) {
 				g_debug ("Removing path:'%s', it is in path:'%s'",
-					 in_path, path);
+				         in_path, path);
 
 				g_hash_table_iter_remove (&iter2);
 				g_hash_table_iter_init (&iter1, roots);
@@ -374,7 +374,7 @@ tracker_path_hash_table_filter_duplicates (GHashTable *roots)
 
 GSList *
 tracker_path_list_filter_duplicates (GSList      *roots,
-				     const gchar *basename_exception_prefix)
+                                     const gchar *basename_exception_prefix)
 {
 	GSList *l1, *l2;
 	GSList *new_list;
@@ -431,7 +431,7 @@ tracker_path_list_filter_duplicates (GSList      *roots,
 
 			if (tracker_path_is_in_path (path, in_path)) {
 				g_debug ("Removing path:'%s', it is in path:'%s'",
-					 path, in_path);
+				         path, in_path);
 
 				g_free (l1->data);
 				new_list = g_slist_delete_link (new_list, l1);
@@ -443,7 +443,7 @@ tracker_path_list_filter_duplicates (GSList      *roots,
 			}
 			else if (tracker_path_is_in_path (in_path, path)) {
 				g_debug ("Removing path:'%s', it is in path:'%s'",
-					 in_path, path);
+				         in_path, path);
 
 				g_free (l2->data);
 				new_list = g_slist_delete_link (new_list, l2);
@@ -490,13 +490,13 @@ tracker_path_list_filter_duplicates (GSList      *roots,
 gchar *
 tracker_path_evaluate_name (const gchar *path)
 {
-	gchar	     *final_path;
-	gchar	    **tokens;
-	gchar	    **token;
-	gchar	     *start;
-	gchar	     *end;
+	gchar        *final_path;
+	gchar       **tokens;
+	gchar       **token;
+	gchar        *start;
+	gchar        *end;
 	const gchar  *env;
-	gchar	     *expanded;
+	gchar        *expanded;
 
 	if (!path || path[0] == '\0') {
 		return NULL;
@@ -516,9 +516,9 @@ tracker_path_evaluate_name (const gchar *path)
 		}
 
 		return g_build_path (G_DIR_SEPARATOR_S,
-				     home,
-				     path + 1,
-				     NULL);
+		                     home,
+		                     path + 1,
+		                     NULL);
 	}
 
 	/* Second try to find any environment variables and expand
@@ -578,11 +578,11 @@ tracker_path_evaluate_name (const gchar *path)
 
 static gboolean
 path_has_write_access (const gchar *path,
-		       gboolean    *exists)
+                       gboolean    *exists)
 {
-	GFile	  *file;
+	GFile     *file;
 	GFileInfo *info;
-	GError	  *error = NULL;
+	GError    *error = NULL;
 	gboolean   writable;
 
 	g_return_val_if_fail (path != NULL, FALSE);
@@ -590,10 +590,10 @@ path_has_write_access (const gchar *path,
 
 	file = g_file_new_for_path (path);
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
-				  0,
-				  NULL,
-				  &error);
+	                          G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
+	                          0,
+	                          NULL,
+	                          &error);
 	g_object_unref (file);
 
 	if (G_UNLIKELY (error)) {
@@ -603,9 +603,9 @@ path_has_write_access (const gchar *path,
 			}
 		} else {
 			g_warning ("Could not check if we have write access for "
-				   "path '%s', %s",
-				   path,
-				   error->message);
+			           "path '%s', %s",
+			           path,
+			           error->message);
 		}
 
 		g_error_free (error);
@@ -656,7 +656,7 @@ gboolean
 tracker_env_check_xdg_dirs (void)
 {
 	const gchar *user_data_dir;
-	gchar	    *new_dir;
+	gchar       *new_dir;
 	gboolean     success;
 
 	g_message ("Checking XDG_DATA_HOME is writable and exists");
@@ -702,9 +702,9 @@ tracker_file_lock (GFile *file)
 
 	if (G_UNLIKELY (!file_locks)) {
 		file_locks = g_hash_table_new_full ((GHashFunc) g_file_hash,
-						    (GEqualFunc) g_file_equal,
-						    (GDestroyNotify) g_object_unref,
-						    NULL);
+		                                    (GEqualFunc) g_file_equal,
+		                                    (GDestroyNotify) g_object_unref,
+		                                    NULL);
 	}
 
 	/* Don't try to lock twice */
@@ -725,7 +725,7 @@ tracker_file_lock (GFile *file)
 	fd = open (path, O_RDONLY);
 
 	if (fd < 0) {
- 		g_warning ("Could not open '%s'", path);
+		g_warning ("Could not open '%s'", path);
 		g_free (path);
 
 		return FALSE;
@@ -735,11 +735,11 @@ tracker_file_lock (GFile *file)
 
 	if (retval == 0) {
 		g_hash_table_insert (file_locks,
-				     g_object_ref (file),
-				     GINT_TO_POINTER (fd));
+		                     g_object_ref (file),
+		                     GINT_TO_POINTER (fd));
 	} else {
 		g_warning ("Could not lock file '%s'", path);
- 		close (fd);
+		close (fd);
 	}
 
 	g_free (path);
@@ -756,7 +756,7 @@ tracker_file_unlock (GFile *file)
 
 	if (!file_locks) {
 		return TRUE;
- 	}
+	}
 
 	fd = GPOINTER_TO_INT (g_hash_table_lookup (file_locks, file));
 
diff --git a/src/libtracker-common/tracker-file-utils.h b/src/libtracker-common/tracker-file-utils.h
index 174adbf..973c24b 100644
--- a/src/libtracker-common/tracker-file-utils.h
+++ b/src/libtracker-common/tracker-file-utils.h
@@ -33,21 +33,21 @@ G_BEGIN_DECLS
 #endif
 
 FILE*    tracker_file_open                         (const gchar  *uri,
-						    const gchar  *how,
-						    gboolean      sequential);
+                                                    const gchar  *how,
+                                                    gboolean      sequential);
 void     tracker_file_close                        (FILE         *file,
-						    gboolean      need_again_soon);
+                                                    gboolean      need_again_soon);
 goffset  tracker_file_get_size                     (const gchar  *uri);
 guint64  tracker_file_get_mtime                    (const gchar  *uri);
 gchar *  tracker_file_get_mime_type                (GFile        *file);
 gboolean tracker_file_system_has_enough_space      (const gchar  *path,
-						    gulong        required_bytes);
+                                                    gulong        required_bytes);
 void     tracker_path_remove                       (const gchar  *uri);
 gboolean tracker_path_is_in_path                   (const gchar  *path,
-						    const gchar  *in_path);
+                                                    const gchar  *in_path);
 void     tracker_path_hash_table_filter_duplicates (GHashTable   *roots);
 GSList * tracker_path_list_filter_duplicates       (GSList       *roots,
-						    const gchar  *basename_exception_prefix);
+                                                    const gchar  *basename_exception_prefix);
 gchar *  tracker_path_evaluate_name                (const gchar  *uri);
 
 gboolean tracker_env_check_xdg_dirs                (void);
diff --git a/src/libtracker-common/tracker-ioprio.c b/src/libtracker-common/tracker-ioprio.c
index 8ef7f6e..f85b193 100644
--- a/src/libtracker-common/tracker-ioprio.c
+++ b/src/libtracker-common/tracker-ioprio.c
@@ -48,35 +48,35 @@
 #ifndef __NR_ioprio_set
 
 #if defined(__i386__)
-#define __NR_ioprio_set		289
-#define __NR_ioprio_get		290
+#define __NR_ioprio_set                 289
+#define __NR_ioprio_get                 290
 #elif defined(__powerpc__) || defined(__powerpc64__)
-#define __NR_ioprio_set		273
-#define __NR_ioprio_get		274
+#define __NR_ioprio_set                 273
+#define __NR_ioprio_get                 274
 #elif defined(__x86_64__)
-#define __NR_ioprio_set		251
-#define __NR_ioprio_get		252
+#define __NR_ioprio_set                 251
+#define __NR_ioprio_get                 252
 #elif defined(__ia64__)
-#define __NR_ioprio_set		1274
-#define __NR_ioprio_get		1275
+#define __NR_ioprio_set                 1274
+#define __NR_ioprio_get                 1275
 #elif defined(__alpha__)
-#define __NR_ioprio_set		442
-#define __NR_ioprio_get		443
+#define __NR_ioprio_set                 442
+#define __NR_ioprio_get                 443
 #elif defined(__s390x__) || defined(__s390__)
-#define __NR_ioprio_set		282
-#define __NR_ioprio_get		283
+#define __NR_ioprio_set                 282
+#define __NR_ioprio_get                 283
 #elif defined(__SH4__)
-#define __NR_ioprio_set		288
-#define __NR_ioprio_get		289
+#define __NR_ioprio_set                 288
+#define __NR_ioprio_get                 289
 #elif defined(__SH5__)
-#define __NR_ioprio_set		316
-#define __NR_ioprio_get		317
+#define __NR_ioprio_set                 316
+#define __NR_ioprio_get                 317
 #elif defined(__sparc__) || defined(__sparc64__)
-#define __NR_ioprio_set		196
-#define __NR_ioprio_get		218
+#define __NR_ioprio_set                 196
+#define __NR_ioprio_get                 218
 #elif defined(__arm__)
-#define __NR_ioprio_set		314
-#define __NR_ioprio_get		315
+#define __NR_ioprio_set                 314
+#define __NR_ioprio_get                 315
 #else
 #error "Unsupported architecture!"
 #endif
diff --git a/src/libtracker-common/tracker-keyfile-object.c b/src/libtracker-common/tracker-keyfile-object.c
index 194a1d7..1ebdf12 100644
--- a/src/libtracker-common/tracker-keyfile-object.c
+++ b/src/libtracker-common/tracker-keyfile-object.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -29,7 +29,7 @@ static GSList *
 directory_string_list_to_gslist (const gchar **value)
 {
 	GSList *list = NULL;
-	gint	i;
+	gint    i;
 
 	if (!value) {
 		return NULL;
@@ -37,7 +37,7 @@ directory_string_list_to_gslist (const gchar **value)
 
 	for (i = 0; value[i]; i++) {
 		const gchar *str;
-		gchar	    *validated;
+		gchar       *validated;
 
 		str = value[i];
 		if (!str || str[0] == '\0') {
@@ -58,7 +58,7 @@ directory_string_list_to_gslist (const gchar **value)
 
 const gchar *
 tracker_keyfile_object_blurb (gpointer     object,
-			      const gchar *property)
+                              const gchar *property)
 {
 	GObjectClass *klass;
 	GParamSpec *spec;
@@ -75,7 +75,7 @@ tracker_keyfile_object_blurb (gpointer     object,
 
 gboolean
 tracker_keyfile_object_default_boolean (gpointer     object,
-					const gchar *property)
+                                        const gchar *property)
 {
 	GObjectClass *klass;
 	GParamSpec *spec;
@@ -96,7 +96,7 @@ tracker_keyfile_object_default_boolean (gpointer     object,
 
 gint
 tracker_keyfile_object_default_int (gpointer     object,
-				    const gchar *property)
+                                    const gchar *property)
 {
 	GObjectClass *klass;
 	GParamSpec *spec;
@@ -117,15 +117,15 @@ tracker_keyfile_object_default_int (gpointer     object,
 
 gboolean
 tracker_keyfile_object_validate_int (gpointer     object,
-				     const gchar *property,
-				     gint	  value)
+                                     const gchar *property,
+                                     gint         value)
 {
 	g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
 	g_return_val_if_fail (property != NULL, FALSE);
 
 #ifdef G_DISABLE_CHECKS
 	GParamSpec *spec;
-	GValue	    value = { 0 };
+	GValue      value = { 0 };
 	gboolean    valid;
 
 	spec = g_object_class_find_property (G_OBJECT_CLASS (object), property);
@@ -144,13 +144,13 @@ tracker_keyfile_object_validate_int (gpointer     object,
 
 void
 tracker_keyfile_object_load_int (gpointer     object,
-				 const gchar *property,
-				 GKeyFile    *key_file,
-				 const gchar *group,
-				 const gchar *key)
+                                 const gchar *property,
+                                 GKeyFile    *key_file,
+                                 const gchar *group,
+                                 const gchar *key)
 {
 	GError *error = NULL;
-	gint	value;
+	gint    value;
 
 	g_return_if_fail (G_IS_OBJECT (object));
 	g_return_if_fail (property != NULL);
@@ -163,19 +163,19 @@ tracker_keyfile_object_load_int (gpointer     object,
 		g_object_set (G_OBJECT (object), property, value, NULL);
 	} else {
 		g_message ("Couldn't load object property '%s' (int) in group '%s', %s",
-			   property, group, error->message);
+		           property, group, error->message);
 		g_error_free (error);
 	}
 }
 
 void
 tracker_keyfile_object_load_boolean (gpointer     object,
-				     const gchar *property,
-				     GKeyFile	 *key_file,
-				     const gchar *group,
-				     const gchar *key)
+                                     const gchar *property,
+                                     GKeyFile    *key_file,
+                                     const gchar *group,
+                                     const gchar *key)
 {
-	GError	 *error = NULL;
+	GError   *error = NULL;
 	gboolean  value;
 
 	g_return_if_fail (G_IS_OBJECT (object));
@@ -189,17 +189,17 @@ tracker_keyfile_object_load_boolean (gpointer     object,
 		g_object_set (G_OBJECT (object), property, value, NULL);
 	} else {
 		g_message ("Couldn't load object property '%s' (bool) in group '%s', %s",
-			   property, group, error->message);
+		           property, group, error->message);
 		g_error_free (error);
 	}
 }
 
 void
 tracker_keyfile_object_load_string (gpointer     object,
-				    const gchar	*property,
-				    GKeyFile    *key_file,
-				    const gchar	*group,
-				    const gchar	*key)
+                                    const gchar         *property,
+                                    GKeyFile    *key_file,
+                                    const gchar         *group,
+                                    const gchar         *key)
 {
 	GError *error = NULL;
 	gchar  *value;
@@ -215,7 +215,7 @@ tracker_keyfile_object_load_string (gpointer     object,
 		g_object_set (G_OBJECT (object), property, value, NULL);
 	} else {
 		g_message ("Couldn't load object property '%s' (string) in group '%s', %s",
-			   property, group, error->message);
+		           property, group, error->message);
 		g_error_free (error);
 	}
 
@@ -224,11 +224,11 @@ tracker_keyfile_object_load_string (gpointer     object,
 
 void
 tracker_keyfile_object_load_string_list (gpointer     object,
-					 const gchar *property,
-					 GKeyFile    *key_file,
-					 const gchar *group,
-					 const gchar *key,
-					 gboolean     is_directory_list)
+                                         const gchar *property,
+                                         GKeyFile    *key_file,
+                                         const gchar *group,
+                                         const gchar *key,
+                                         gboolean     is_directory_list)
 {
 	GSList *l;
 	gchar **value;
@@ -270,10 +270,10 @@ tracker_keyfile_object_load_string_list (gpointer     object,
 
 void
 tracker_keyfile_object_save_int (gpointer     object,
-				 const gchar *property,
-				 GKeyFile    *key_file,
-				 const gchar *group,
-				 const gchar *key)
+                                 const gchar *property,
+                                 GKeyFile    *key_file,
+                                 const gchar *group,
+                                 const gchar *key)
 {
 	gint value;
 
@@ -289,10 +289,10 @@ tracker_keyfile_object_save_int (gpointer     object,
 
 void
 tracker_keyfile_object_save_boolean (gpointer     object,
-				     const gchar *property,
-				     GKeyFile    *key_file,
-				     const gchar *group,
-				     const gchar *key)
+                                     const gchar *property,
+                                     GKeyFile    *key_file,
+                                     const gchar *group,
+                                     const gchar *key)
 {
 	gboolean value;
 
@@ -308,10 +308,10 @@ tracker_keyfile_object_save_boolean (gpointer     object,
 
 void
 tracker_keyfile_object_save_string (gpointer     object,
-				    const gchar *property,
-				    GKeyFile	*key_file,
-				    const gchar *group,
-				    const gchar	*key)
+                                    const gchar *property,
+                                    GKeyFile    *key_file,
+                                    const gchar *group,
+                                    const gchar         *key)
 {
 	gchar *value;
 
@@ -328,10 +328,10 @@ tracker_keyfile_object_save_string (gpointer     object,
 
 void
 tracker_keyfile_object_save_string_list (gpointer     object,
-					 const gchar *property,
-					 GKeyFile    *key_file,
-					 const gchar *group,
-					 const gchar *key)
+                                         const gchar *property,
+                                         GKeyFile    *key_file,
+                                         const gchar *group,
+                                         const gchar *key)
 {
 	GSList *list;
 	gchar **value;
@@ -346,10 +346,10 @@ tracker_keyfile_object_save_string_list (gpointer     object,
 
 	value = tracker_gslist_to_string_list (list);
 	g_key_file_set_string_list (key_file,
-				    group,
-				    key,
-				    (const gchar * const *) value,
-				    (gsize) g_slist_length (list));
+	                            group,
+	                            key,
+	                            (const gchar * const *) value,
+	                            (gsize) g_slist_length (list));
 	g_strfreev (value);
 }
 
diff --git a/src/libtracker-common/tracker-keyfile-object.h b/src/libtracker-common/tracker-keyfile-object.h
index b7b7393..435693d 100644
--- a/src/libtracker-common/tracker-keyfile-object.h
+++ b/src/libtracker-common/tracker-keyfile-object.h
@@ -30,55 +30,55 @@ G_BEGIN_DECLS
 #endif
 
 const gchar *tracker_keyfile_object_blurb            (gpointer     object,
-						      const gchar *property);
+                                                      const gchar *property);
 gboolean     tracker_keyfile_object_default_boolean  (gpointer     object,
-						      const gchar *property);
+                                                      const gchar *property);
 gint         tracker_keyfile_object_default_int      (gpointer     object,
-						      const gchar *property);
+                                                      const gchar *property);
 gboolean     tracker_keyfile_object_validate_int     (gpointer     object,
-						      const gchar *property,
-						      gint         value);
+                                                      const gchar *property,
+                                                      gint         value);
 void         tracker_keyfile_object_load_int         (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_load_boolean     (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_load_string      (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_load_string_list (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key,
-						      gboolean     is_directory_list);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key,
+                                                      gboolean     is_directory_list);
 void         tracker_keyfile_object_save_int         (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_save_boolean     (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_save_string      (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 void         tracker_keyfile_object_save_string_list (gpointer     object,
-						      const gchar *property,
-						      GKeyFile    *key_file,
-						      const gchar *group,
-						      const gchar *key);
+                                                      const gchar *property,
+                                                      GKeyFile    *key_file,
+                                                      const gchar *group,
+                                                      const gchar *key);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index a470615..f2d6ce4 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -33,14 +33,14 @@
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_LANGUAGE, TrackerLanguagePriv))
 
 typedef struct _TrackerLanguagePriv TrackerLanguagePriv;
-typedef struct _Languages	    Languages;
+typedef struct _Languages           Languages;
 
 struct _TrackerLanguagePriv {
 	GHashTable    *stop_words;
 	gboolean       enable_stemmer;
 	gchar         *language_code;
 
-	GMutex	      *stemmer_mutex;
+	GMutex        *stemmer_mutex;
 	gpointer       stemmer;
 };
 
@@ -75,15 +75,15 @@ enum {
 	PROP_LANGUAGE_CODE,
 };
 
-static void	    language_finalize	       (GObject       *object);
-static void	    language_get_property      (GObject       *object,
-						guint	       param_id,
-						GValue	      *value,
-						GParamSpec    *pspec);
-static void	    language_set_property      (GObject       *object,
-						guint	       param_id,
-						const GValue  *value,
-						GParamSpec    *pspec);
+static void         language_finalize          (GObject       *object);
+static void         language_get_property      (GObject       *object,
+                                                guint          param_id,
+                                                GValue        *value,
+                                                GParamSpec    *pspec);
+static void         language_set_property      (GObject       *object,
+                                                guint          param_id,
+                                                const GValue  *value,
+                                                GParamSpec    *pspec);
 
 G_DEFINE_TYPE (TrackerLanguage, tracker_language, G_TYPE_OBJECT);
 
@@ -92,33 +92,33 @@ tracker_language_class_init (TrackerLanguageClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = language_finalize;
+	object_class->finalize     = language_finalize;
 	object_class->get_property = language_get_property;
 	object_class->set_property = language_set_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_ENABLE_STEMMER,
-					 g_param_spec_boolean ("enable-stemmer",
-							       "Enable stemmer",
-							       "Enable stemmer",
-							       TRUE,
-							       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+	                                 PROP_ENABLE_STEMMER,
+	                                 g_param_spec_boolean ("enable-stemmer",
+	                                                       "Enable stemmer",
+	                                                       "Enable stemmer",
+	                                                       TRUE,
+	                                                       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 
 	g_object_class_install_property (object_class,
-					 PROP_STOP_WORDS,
-					 g_param_spec_boxed ("stop-words",
-							     "Stop words",
-							     "Stop words",
-							     g_hash_table_get_type (),
-							     G_PARAM_READABLE));
+	                                 PROP_STOP_WORDS,
+	                                 g_param_spec_boxed ("stop-words",
+	                                                     "Stop words",
+	                                                     "Stop words",
+	                                                     g_hash_table_get_type (),
+	                                                     G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class,
-					 PROP_LANGUAGE_CODE,
-					 g_param_spec_string ("language-code",
-							      "Language code",
-							      "Language code",
-							      "en",
-							      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+	                                 PROP_LANGUAGE_CODE,
+	                                 g_param_spec_string ("language-code",
+	                                                      "Language code",
+	                                                      "Language code",
+	                                                      "en",
+	                                                      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerLanguagePriv));
 }
@@ -127,14 +127,14 @@ static void
 tracker_language_init (TrackerLanguage *language)
 {
 	TrackerLanguagePriv *priv;
-	const gchar	    *stem_language;
+	const gchar         *stem_language;
 
 	priv = GET_PRIV (language);
 
 	priv->stop_words = g_hash_table_new_full (g_str_hash,
-						  g_str_equal,
-						  g_free,
-						  NULL);
+	                                          g_str_equal,
+	                                          g_free,
+	                                          NULL);
 
 	priv->stemmer_mutex = g_mutex_new ();
 
@@ -167,10 +167,10 @@ language_finalize (GObject *object)
 }
 
 static void
-language_get_property (GObject	  *object,
-		       guint	   param_id,
-		       GValue	  *value,
-		       GParamSpec *pspec)
+language_get_property (GObject    *object,
+                       guint       param_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
 	TrackerLanguagePriv *priv;
 
@@ -194,19 +194,19 @@ language_get_property (GObject	  *object,
 }
 
 static void
-language_set_property (GObject	    *object,
-		       guint	     param_id,
-		       const GValue *value,
-		       GParamSpec   *pspec)
+language_set_property (GObject      *object,
+                       guint         param_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
 	switch (param_id) {
 	case PROP_ENABLE_STEMMER:
 		tracker_language_set_enable_stemmer (TRACKER_LANGUAGE (object),
-						     g_value_get_boolean (value));
+		                                     g_value_get_boolean (value));
 		break;
 	case PROP_LANGUAGE_CODE:
 		tracker_language_set_language_code (TRACKER_LANGUAGE (object),
-						    g_value_get_string (value));
+		                                    g_value_get_string (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -222,10 +222,10 @@ language_get_stopword_filename (const gchar *language_code)
 
 	str = g_strconcat ("stopwords.", language_code, NULL);
 	filename = g_build_filename (SHAREDIR,
-				     "tracker",
-				     "languages",
-				     str,
-				     NULL);
+	                             "tracker",
+	                             "languages",
+	                             str,
+	                             NULL);
 	g_free (str);
 
 	return filename;
@@ -233,20 +233,20 @@ language_get_stopword_filename (const gchar *language_code)
 
 static void
 language_add_stopwords (TrackerLanguage *language,
-			const gchar	*filename)
+                        const gchar     *filename)
 {
 	TrackerLanguagePriv  *priv;
-	GMappedFile	     *mapped_file;
-	GError		     *error = NULL;
-	gchar		     *content;
-	gchar		    **words, **p;
+	GMappedFile          *mapped_file;
+	GError               *error = NULL;
+	gchar                *content;
+	gchar               **words, **p;
 
 	priv = GET_PRIV (language);
 
 	mapped_file = g_mapped_file_new (filename, FALSE, &error);
 	if (error) {
 		g_message ("Tracker couldn't read stopword file:'%s', %s",
-			     filename, error->message);
+		           filename, error->message);
 		g_clear_error (&error);
 		return;
 	}
@@ -259,8 +259,8 @@ language_add_stopwords (TrackerLanguage *language,
 	/* FIXME: Shouldn't clear the hash table first? */
 	for (p = words; *p; p++) {
 		g_hash_table_insert (priv->stop_words,
-				     g_strdup (g_strstrip (*p)),
-				     GINT_TO_POINTER (1));
+		                     g_strdup (g_strstrip (*p)),
+		                     GINT_TO_POINTER (1));
 	}
 
 	g_strfreev (words);
@@ -268,10 +268,10 @@ language_add_stopwords (TrackerLanguage *language,
 
 static void
 language_set_stopword_list (TrackerLanguage *language,
-			    const gchar     *language_code)
+                            const gchar     *language_code)
 {
 	TrackerLanguagePriv *priv;
-	gchar		    *stopword_filename;
+	gchar               *stopword_filename;
 	gchar               *stem_language_lower;
 	const gchar         *stem_language;
 
@@ -306,7 +306,7 @@ language_set_stopword_list (TrackerLanguage *language,
 	priv->stemmer = sb_stemmer_new (stem_language_lower, NULL);
 	if (!priv->stemmer) {
 		g_message ("No stemmer could be found for language:'%s'",
-			   stem_language_lower);
+		           stem_language_lower);
 	}
 
 	g_mutex_unlock (priv->stemmer_mutex);
@@ -328,8 +328,8 @@ tracker_language_new (const gchar *language_code)
 	TrackerLanguage *language;
 
 	language = g_object_new (TRACKER_TYPE_LANGUAGE, 
-				 "language-code", language_code,
-				 NULL);
+	                         "language-code", language_code,
+	                         NULL);
 
 	return language;
 }
@@ -405,7 +405,7 @@ tracker_language_get_language_code (TrackerLanguage *language)
  **/
 void
 tracker_language_set_enable_stemmer (TrackerLanguage *language,
-				     gboolean         value)
+                                     gboolean         value)
 {
 	TrackerLanguagePriv *priv;
 
@@ -428,7 +428,7 @@ tracker_language_set_enable_stemmer (TrackerLanguage *language,
  **/
 void
 tracker_language_set_language_code (TrackerLanguage *language,
-				    const gchar     *value)
+                                    const gchar     *value)
 {
 	TrackerLanguagePriv *priv;
 
@@ -463,11 +463,11 @@ tracker_language_set_language_code (TrackerLanguage *language,
  **/
 gchar *
 tracker_language_stem_word (TrackerLanguage *language,
-			    const gchar     *word,
-			    gint	     word_length)
+                            const gchar     *word,
+                            gint             word_length)
 {
 	TrackerLanguagePriv *priv;
-	const gchar	    *stem_word;
+	const gchar         *stem_word;
 
 	g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
 
@@ -484,8 +484,8 @@ tracker_language_stem_word (TrackerLanguage *language,
 	g_mutex_lock (priv->stemmer_mutex);
 
 	stem_word = (const gchar*) sb_stemmer_stem (priv->stemmer,
-						    (guchar*) word,
-						    word_length);
+	                                            (guchar*) word,
+	                                            word_length);
 
 	g_mutex_unlock (priv->stemmer_mutex);
 
@@ -538,7 +538,7 @@ tracker_language_get_default_code (void)
 
 	for (p = local_languages; *p; p++) {
 		const gchar *code;
-		gint	     i = 0;
+		gint         i = 0;
 
 		if (!*p || *p[0] == '\0') {
 			continue;
diff --git a/src/libtracker-common/tracker-language.h b/src/libtracker-common/tracker-language.h
index 5ffc1d1..a9ed943 100644
--- a/src/libtracker-common/tracker-language.h
+++ b/src/libtracker-common/tracker-language.h
@@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_LANGUAGE	      (tracker_language_get_type ())
-#define TRACKER_LANGUAGE(o)	      (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguage))
+#define TRACKER_TYPE_LANGUAGE         (tracker_language_get_type ())
+#define TRACKER_LANGUAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguage))
 #define TRACKER_LANGUAGE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass))
-#define TRACKER_IS_LANGUAGE(o)	      (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_LANGUAGE))
+#define TRACKER_IS_LANGUAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_LANGUAGE))
 #define TRACKER_IS_LANGUAGE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_LANGUAGE))
 #define TRACKER_LANGUAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass))
 
@@ -48,7 +48,7 @@ struct _TrackerLanguageClass {
 	GObjectClass parent_class;
 };
 
-GType		 tracker_language_get_type	     (void) G_GNUC_CONST;
+GType            tracker_language_get_type           (void) G_GNUC_CONST;
 TrackerLanguage *tracker_language_new                (const gchar     *language_code);
 
 gboolean         tracker_language_get_enable_stemmer (TrackerLanguage *language);
@@ -56,13 +56,13 @@ GHashTable *     tracker_language_get_stop_words     (TrackerLanguage *language)
 const gchar *    tracker_language_get_language_code  (TrackerLanguage *language);
 
 void             tracker_language_set_enable_stemmer (TrackerLanguage *language,
-						      gboolean         value);
+                                                      gboolean         value);
 void             tracker_language_set_language_code  (TrackerLanguage *language,
-						      const gchar     *language_code);
+                                                      const gchar     *language_code);
 
 gchar *          tracker_language_stem_word          (TrackerLanguage *language,
-						      const gchar     *word,
-						      gint             word_length);
+                                                      const gchar     *word,
+                                                      gint             word_length);
 
 /* Utility functions */
 gboolean         tracker_language_check_exists       (const gchar     *language_code);
diff --git a/src/libtracker-common/tracker-log.c b/src/libtracker-common/tracker-log.c
index 07e87a3..a848f9a 100644
--- a/src/libtracker-common/tracker-log.c
+++ b/src/libtracker-common/tracker-log.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -36,19 +36,19 @@
 #include "tracker-file-utils.h"
 
 static gboolean  initialized;
-static GMutex	*mutex;
-static FILE	*fd;
-static gint	 verbosity;
-static guint	 log_handler_id;
+static GMutex   *mutex;
+static FILE     *fd;
+static gint      verbosity;
+static guint     log_handler_id;
 
 static inline void
 log_output (const gchar    *domain,
-	    GLogLevelFlags  log_level,
-	    const gchar    *message)
+            GLogLevelFlags  log_level,
+            const gchar    *message)
 {
-	time_t	      now;
-	gchar	      time_str[64];
-	gchar	     *output;
+	time_t        now;
+	gchar         time_str[64];
+	gchar        *output;
 	struct tm    *local_time;
 	GTimeVal      current_time;
 	const gchar  *log_level_str;
@@ -101,11 +101,11 @@ log_output (const gchar    *domain,
 	}
 
 	output = g_strdup_printf ("%s%s %s%s: %s",
-				  log_level_str ? "\n" : "",
-				  time_str,
-				  domain,
-				  log_level_str ? log_level_str : "",
-				  message);
+	                          log_level_str ? "\n" : "",
+	                          time_str,
+	                          domain,
+	                          log_level_str ? log_level_str : "",
+	                          message);
 
 	if (G_UNLIKELY (fd == NULL)) {
 		g_fprintf (stderr, "%s\n", output);
@@ -122,9 +122,9 @@ log_output (const gchar    *domain,
 
 static void
 tracker_log_handler (const gchar    *domain,
-		     GLogLevelFlags  log_level,
-		     const gchar    *message,
-		     gpointer	     user_data)
+                     GLogLevelFlags  log_level,
+                     const gchar    *message,
+                     gpointer        user_data)
 {
 	if (!tracker_log_should_handle (log_level, verbosity)) {
 		return;
@@ -138,7 +138,7 @@ tracker_log_handler (const gchar    *domain,
 
 gboolean
 tracker_log_init (gint    this_verbosity,
-		  gchar **used_filename)
+                  gchar **used_filename)
 {
 	gchar *filename;
 	gchar *basename;
@@ -149,9 +149,9 @@ tracker_log_init (gint    this_verbosity,
 
 	basename = g_strdup_printf ("%s.log", g_get_application_name ());
 	filename = g_build_filename (g_get_user_data_dir (),
-				     "tracker",
-				     basename,
-				     NULL);
+	                             "tracker",
+	                             basename,
+	                             NULL);
 	g_free (basename);
 
 	/* Remove previous log */
@@ -164,11 +164,11 @@ tracker_log_init (gint    this_verbosity,
 
 		error_string = g_strerror (errno);
 		g_fprintf (stderr,
-			   "Could not open log:'%s', %s\n",
-			   filename,
-			   error_string);
+		           "Could not open log:'%s', %s\n",
+		           filename,
+		           error_string);
 		g_fprintf (stderr,
-			   "All logging will go to stderr\n");
+		           "All logging will go to stderr\n");
 	}
 
 	verbosity = CLAMP (this_verbosity, 0, 3);
@@ -176,9 +176,9 @@ tracker_log_init (gint    this_verbosity,
 
 	/* Add log handler function */
 	log_handler_id = g_log_set_handler (NULL,
-					    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
-					    tracker_log_handler,
-					    NULL);
+	                                    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
+	                                    tracker_log_handler,
+	                                    NULL);
 
 	g_log_set_default_handler (tracker_log_handler, NULL);
 
@@ -214,14 +214,14 @@ tracker_log_shutdown (void)
 
 gboolean
 tracker_log_should_handle (GLogLevelFlags log_level,
-			   gint           this_verbosity)
+                           gint           this_verbosity)
 {
 	switch (this_verbosity) {
-	/* Log level 3: EVERYTHING */
+		/* Log level 3: EVERYTHING */
 	case 3:
 		break;
 
-	/* Log level 2: CRITICAL/ERROR/WARNING/INFO/MESSAGE only */
+		/* Log level 2: CRITICAL/ERROR/WARNING/INFO/MESSAGE only */
 	case 2:
 		if (!(log_level & G_LOG_LEVEL_MESSAGE) &&
 		    !(log_level & G_LOG_LEVEL_INFO) &&
@@ -233,7 +233,7 @@ tracker_log_should_handle (GLogLevelFlags log_level,
 
 		break;
 
-	/* Log level 1: CRITICAL/ERROR/WARNING/INFO only */
+		/* Log level 1: CRITICAL/ERROR/WARNING/INFO only */
 	case 1:
 		if (!(log_level & G_LOG_LEVEL_INFO) &&
 		    !(log_level & G_LOG_LEVEL_WARNING) &&
@@ -244,7 +244,7 @@ tracker_log_should_handle (GLogLevelFlags log_level,
 
 		break;
 
-	/* Log level 0: CRITICAL/ERROR/WARNING only (default) */
+		/* Log level 0: CRITICAL/ERROR/WARNING only (default) */
 	default:
 	case 0:
 		if (!(log_level & G_LOG_LEVEL_WARNING) &&
diff --git a/src/libtracker-common/tracker-log.h b/src/libtracker-common/tracker-log.h
index 90d2579..1afe2f3 100644
--- a/src/libtracker-common/tracker-log.h
+++ b/src/libtracker-common/tracker-log.h
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -33,30 +33,30 @@ G_BEGIN_DECLS
  * Add support for G_LOG_LEVEL_INFO through tracker_info().
  */
 #ifdef G_HAVE_ISO_VARARGS
-#define tracker_info(...)         g_log (G_LOG_DOMAIN,		\
-					 G_LOG_LEVEL_INFO,	\
-					 __VA_ARGS__)
+#define tracker_info(...)         g_log (G_LOG_DOMAIN,	\
+                                         G_LOG_LEVEL_INFO,	\
+                                         __VA_ARGS__)
 #elif defined(G_HAVE_GNUC_VARARGS)
-#define tracker_info(format...)   g_log (G_LOG_DOMAIN,		\
-					 G_LOG_LEVEL_INFO,	\
-					 format)
+#define tracker_info(format...)   g_log (G_LOG_DOMAIN,	\
+                                         G_LOG_LEVEL_INFO,	\
+                                         format)
 #else   /* no varargs macros */
 static void
 tracker_info (const gchar *format,
-	      ...)
+              ...)
 {
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format, args);
-  va_end (args);
+	va_list args;
+	va_start (args, format);
+	g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format, args);
+	va_end (args);
 }
 #endif  /* !__GNUC__ */
 
 gboolean tracker_log_init          (gint             verbosity,
-				    gchar          **used_filename);
+                                    gchar          **used_filename);
 void     tracker_log_shutdown      (void);
 gboolean tracker_log_should_handle (GLogLevelFlags   log_level,
-				    gint             verbosity);
+                                    gint             verbosity);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-namespace.c b/src/libtracker-common/tracker-namespace.c
index bcb0789..6f0b035 100644
--- a/src/libtracker-common/tracker-namespace.c
+++ b/src/libtracker-common/tracker-namespace.c
@@ -38,13 +38,13 @@ struct _TrackerNamespacePriv {
 
 static void namespace_finalize     (GObject      *object);
 static void namespace_get_property (GObject      *object,
-				    guint         param_id,
-				    GValue       *value,
-				    GParamSpec   *pspec);
+                                    guint         param_id,
+                                    GValue       *value,
+                                    GParamSpec   *pspec);
 static void namespace_set_property (GObject      *object,
-				    guint         param_id,
-				    const GValue *value,
-				    GParamSpec   *pspec);
+                                    guint         param_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec);
 
 enum {
 	PROP_0,
@@ -59,24 +59,24 @@ tracker_namespace_class_init (TrackerNamespaceClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = namespace_finalize;
+	object_class->finalize     = namespace_finalize;
 	object_class->get_property = namespace_get_property;
 	object_class->set_property = namespace_set_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_URI,
-					 g_param_spec_string ("uri",
-							      "uri",
-							      "URI",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_URI,
+	                                 g_param_spec_string ("uri",
+	                                                      "uri",
+	                                                      "URI",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_PREFIX,
-					 g_param_spec_string ("prefix",
-							      "prefix",
-							      "Prefix",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_PREFIX,
+	                                 g_param_spec_string ("prefix",
+	                                                      "prefix",
+	                                                      "Prefix",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerNamespacePriv));
 }
@@ -100,10 +100,10 @@ namespace_finalize (GObject *object)
 }
 
 static void
-namespace_get_property (GObject	 *object,
-		      guint	  param_id,
-		      GValue	 *value,
-		      GParamSpec *pspec)
+namespace_get_property (GObject          *object,
+                        guint       param_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
 {
 	TrackerNamespacePriv *priv;
 
@@ -123,10 +123,10 @@ namespace_get_property (GObject	 *object,
 }
 
 static void
-namespace_set_property (GObject	   *object,
-		      guint	    param_id,
-		      const GValue *value,
-		      GParamSpec   *pspec)
+namespace_set_property (GObject            *object,
+                        guint         param_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
 {
 	TrackerNamespacePriv *priv;
 
@@ -135,11 +135,11 @@ namespace_set_property (GObject	   *object,
 	switch (param_id) {
 	case PROP_URI:
 		tracker_namespace_set_uri (TRACKER_NAMESPACE (object),
-					  g_value_get_string (value));
+		                           g_value_get_string (value));
 		break;
 	case PROP_PREFIX:
 		tracker_namespace_set_prefix (TRACKER_NAMESPACE (object),
-					  g_value_get_string (value));
+		                              g_value_get_string (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -183,7 +183,7 @@ tracker_namespace_get_prefix (TrackerNamespace *namespace)
 
 void
 tracker_namespace_set_uri (TrackerNamespace *namespace,
-			  const gchar	 *value)
+                           const gchar    *value)
 {
 	TrackerNamespacePriv *priv;
 
@@ -204,7 +204,7 @@ tracker_namespace_set_uri (TrackerNamespace *namespace,
 
 void
 tracker_namespace_set_prefix (TrackerNamespace *namespace,
-			  const gchar	 *value)
+                              const gchar    *value)
 {
 	TrackerNamespacePriv *priv;
 
diff --git a/src/libtracker-common/tracker-namespace.h b/src/libtracker-common/tracker-namespace.h
index 57a6c35..6b1e8b5 100644
--- a/src/libtracker-common/tracker-namespace.h
+++ b/src/libtracker-common/tracker-namespace.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_NAMESPACE	       (tracker_namespace_get_type ())
-#define TRACKER_NAMESPACE(o)	       (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespace))
+#define TRACKER_TYPE_NAMESPACE         (tracker_namespace_get_type ())
+#define TRACKER_NAMESPACE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespace))
 #define TRACKER_NAMESPACE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_NAMESPACE, TrackerNamespaceClass))
-#define TRACKER_IS_NAMESPACE(o)	       (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_NAMESPACE))
+#define TRACKER_IS_NAMESPACE(o)                (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_NAMESPACE))
 #define TRACKER_IS_NAMESPACE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_NAMESPACE))
 #define TRACKER_NAMESPACE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespaceClass))
 
@@ -47,14 +47,14 @@ struct _TrackerNamespaceClass {
 	GObjectClass parent_class;
 };
 
-GType		  tracker_namespace_get_type   (void) G_GNUC_CONST;
+GType             tracker_namespace_get_type   (void) G_GNUC_CONST;
 TrackerNamespace *tracker_namespace_new        (void);
 const gchar *     tracker_namespace_get_uri    (TrackerNamespace *namespace_);
 const gchar *     tracker_namespace_get_prefix (TrackerNamespace *namespace_);
 void              tracker_namespace_set_uri    (TrackerNamespace *namespace_,
-						const gchar      *value);
+                                                const gchar      *value);
 void              tracker_namespace_set_prefix (TrackerNamespace *namespace_,
-						const gchar      *value);
+                                                const gchar      *value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-ontology.c b/src/libtracker-common/tracker-ontology.c
index 2323ba7..c3223c7 100644
--- a/src/libtracker-common/tracker-ontology.c
+++ b/src/libtracker-common/tracker-ontology.c
@@ -64,16 +64,16 @@ tracker_ontology_init (void)
 	namespaces = g_ptr_array_new ();
 
 	namespace_uris = g_hash_table_new_full (g_str_hash,
-					      g_str_equal,
-					      g_free,
-					      g_object_unref);
+	                                        g_str_equal,
+	                                        g_free,
+	                                        g_object_unref);
 
 	classes = g_ptr_array_new ();
 
 	class_uris = g_hash_table_new_full (g_str_hash,
-					      g_str_equal,
-					      g_free,
-					      g_object_unref);
+	                                    g_str_equal,
+	                                    g_free,
+	                                    g_object_unref);
 
 	id_uri_pairs = g_hash_table_new_full (g_direct_hash, g_direct_equal,
 	                                      NULL,
@@ -82,9 +82,9 @@ tracker_ontology_init (void)
 	properties = g_ptr_array_new ();
 
 	property_uris = g_hash_table_new_full (g_str_hash,
-					    g_str_equal,
-					    g_free,
-					    g_object_unref);
+	                                       g_str_equal,
+	                                       g_free,
+	                                       g_object_unref);
 
 	/* We will need the class later in order to match strings to enum values
 	 * when inserting metadata types in the DB, so the enum class needs to be
@@ -141,7 +141,7 @@ void
 tracker_ontology_add_class (TrackerClass *service)
 {
 
-	const gchar	    *uri, *name;
+	const gchar         *uri, *name;
 
 	g_return_if_fail (TRACKER_IS_CLASS (service));
 
@@ -152,8 +152,8 @@ tracker_ontology_add_class (TrackerClass *service)
 
 	if (uri) {
 		g_hash_table_insert (class_uris,
-				     g_strdup (uri),
-				     g_object_ref (service));
+		                     g_strdup (uri),
+		                     g_object_ref (service));
 	}
 }
 
@@ -214,16 +214,16 @@ tracker_ontology_add_property (TrackerProperty *field)
 	g_ptr_array_add (properties, g_object_ref (field));
 
 	g_hash_table_insert (property_uris,
-			     g_strdup (uri),
-			     g_object_ref (field));
+	                     g_strdup (uri),
+	                     g_object_ref (field));
 }
 
 void
 tracker_ontology_add_id_uri_pair (gint id, const gchar *uri)
 {
 	g_hash_table_insert (id_uri_pairs,
-			     GINT_TO_POINTER (id),
-			     g_strdup (uri));
+	                     GINT_TO_POINTER (id),
+	                     g_strdup (uri));
 }
 
 TrackerProperty *
@@ -246,8 +246,8 @@ tracker_ontology_add_namespace (TrackerNamespace *namespace)
 	g_ptr_array_add (namespaces, g_object_ref (namespace));
 
 	g_hash_table_insert (namespace_uris,
-			     g_strdup (uri),
-			     g_object_ref (namespace));
+	                     g_strdup (uri),
+	                     g_object_ref (namespace));
 }
 
 TrackerNamespace *
diff --git a/src/libtracker-common/tracker-ontology.h b/src/libtracker-common/tracker-ontology.h
index 26bd6d6..3c18080 100644
--- a/src/libtracker-common/tracker-ontology.h
+++ b/src/libtracker-common/tracker-ontology.h
@@ -35,29 +35,29 @@ G_BEGIN_DECLS
 #endif
 
 /* Core ontologies */
-#define TRACKER_RDF_PREFIX	"http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-#define TRACKER_RDFS_PREFIX	"http://www.w3.org/2000/01/rdf-schema#";
+#define TRACKER_RDF_PREFIX      "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+#define TRACKER_RDFS_PREFIX     "http://www.w3.org/2000/01/rdf-schema#";
 #define TRACKER_XSD_PREFIX      "http://www.w3.org/2001/XMLSchema#";
-#define TRACKER_TRACKER_PREFIX	"http://www.tracker-project.org/ontologies/tracker#";
-#define TRACKER_DC_PREFIX	"http://purl.org/dc/elements/1.1/";
-#define TRACKER_MAEMO_PREFIX	"http://maemo.org/ontologies/tracker#";
+#define TRACKER_TRACKER_PREFIX  "http://www.tracker-project.org/ontologies/tracker#";
+#define TRACKER_DC_PREFIX       "http://purl.org/dc/elements/1.1/";
+#define TRACKER_MAEMO_PREFIX    "http://maemo.org/ontologies/tracker#";
 
 /* Our Nepomuk selection */
-#define TRACKER_NRL_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#";
-#define TRACKER_NMO_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#";
-#define TRACKER_NIE_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/01/19/nie#";
-#define TRACKER_NCO_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/03/22/nco#";
-#define TRACKER_NAO_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#";
-#define TRACKER_NID3_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#";
-#define TRACKER_NFO_PREFIX	"http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#";
+#define TRACKER_NRL_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#";
+#define TRACKER_NMO_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#";
+#define TRACKER_NIE_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#";
+#define TRACKER_NCO_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#";
+#define TRACKER_NAO_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#";
+#define TRACKER_NID3_PREFIX     "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#";
+#define TRACKER_NFO_PREFIX      "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#";
 
 /* Temporary */
-#define TRACKER_NMM_PREFIX	"http://www.tracker-project.org/temp/nmm#";
+#define TRACKER_NMM_PREFIX      "http://www.tracker-project.org/temp/nmm#";
 
-#define TRACKER_DATASOURCE_URN_PREFIX \
-	                        "urn:nepomuk:datasource:"
-#define TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN \
-	                        TRACKER_DATASOURCE_URN_PREFIX "9291a450-1d49-11de-8c30-0800200c9a66"
+#define TRACKER_DATASOURCE_URN_PREFIX	  \
+	"urn:nepomuk:datasource:"
+#define TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN	  \
+	TRACKER_DATASOURCE_URN_PREFIX "9291a450-1d49-11de-8c30-0800200c9a66"
 
 void               tracker_ontology_init                 (void);
 void               tracker_ontology_shutdown             (void);
diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c
index fd8840e..682689d 100644
--- a/src/libtracker-common/tracker-os-dependant-unix.c
+++ b/src/libtracker-common/tracker-os-dependant-unix.c
@@ -49,11 +49,11 @@
 
 gboolean
 tracker_spawn (gchar **argv,
-	       gint    timeout,
-	       gchar **tmp_stdout,
-	       gint   *exit_status)
+               gint    timeout,
+               gchar **tmp_stdout,
+               gint   *exit_status)
 {
-	GError	    *error = NULL;
+	GError      *error = NULL;
 	GSpawnFlags  flags;
 	gboolean     result;
 
@@ -69,20 +69,20 @@ tracker_spawn (gchar **argv,
 	}
 
 	result = g_spawn_sync (NULL,
-			       argv,
-			       NULL,
-			       flags,
-			       tracker_spawn_child_func,
-			       GINT_TO_POINTER (timeout),
-			       tmp_stdout,
-			       NULL,
-			       exit_status,
-			       &error);
+	                       argv,
+	                       NULL,
+	                       flags,
+	                       tracker_spawn_child_func,
+	                       GINT_TO_POINTER (timeout),
+	                       tmp_stdout,
+	                       NULL,
+	                       exit_status,
+	                       &error);
 
 	if (error) {
 		g_warning ("Could not spawn command:'%s', %s",
-			   argv[0],
-			   error->message);
+		           argv[0],
+		           error->message);
 		g_error_free (error);
 	}
 
@@ -91,15 +91,15 @@ tracker_spawn (gchar **argv,
 
 gboolean
 tracker_spawn_async_with_channels (const gchar **argv,
-				   gint		 timeout,
-				   GPid		*pid,
-				   GIOChannel  **stdin_channel,
-				   GIOChannel  **stdout_channel,
-				   GIOChannel  **stderr_channel)
+                                   gint                  timeout,
+                                   GPid                 *pid,
+                                   GIOChannel  **stdin_channel,
+                                   GIOChannel  **stdout_channel,
+                                   GIOChannel  **stderr_channel)
 {
-	GError	 *error = NULL;
+	GError   *error = NULL;
 	gboolean  result;
-	gint	  tmpstdin, tmpstdout, tmpstderr;
+	gint      tmpstdin, tmpstdout, tmpstderr;
 
 	g_return_val_if_fail (argv != NULL, FALSE);
 	g_return_val_if_fail (argv[0] != NULL, FALSE);
@@ -107,21 +107,21 @@ tracker_spawn_async_with_channels (const gchar **argv,
 	g_return_val_if_fail (pid != NULL, FALSE);
 
 	result = g_spawn_async_with_pipes (NULL,
-					   (gchar **) argv,
-					   NULL,
-					   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-					   tracker_spawn_child_func,
-					   GINT_TO_POINTER (timeout),
-					   pid,
-					   stdin_channel ? &tmpstdin : NULL,
-					   stdout_channel ? &tmpstdout : NULL,
-					   stderr_channel ? &tmpstderr : NULL,
-					   &error);
+	                                   (gchar **) argv,
+	                                   NULL,
+	                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+	                                   tracker_spawn_child_func,
+	                                   GINT_TO_POINTER (timeout),
+	                                   pid,
+	                                   stdin_channel ? &tmpstdin : NULL,
+	                                   stdout_channel ? &tmpstdout : NULL,
+	                                   stderr_channel ? &tmpstderr : NULL,
+	                                   &error);
 
 	if (error) {
 		g_warning ("Could not spawn command:'%s', %s",
-			   argv[0],
-			   error->message);
+		           argv[0],
+		           error->message);
 		g_error_free (error);
 	}
 
@@ -144,14 +144,14 @@ void
 tracker_spawn_child_func (gpointer user_data)
 {
 	struct rlimit cpu_limit;
-	gint	      timeout = GPOINTER_TO_INT (user_data);
+	gint          timeout = GPOINTER_TO_INT (user_data);
 
 	if (timeout > 0) {
 		/* set cpu limit */
 		getrlimit (RLIMIT_CPU, &cpu_limit);
 		cpu_limit.rlim_cur = timeout;
 		cpu_limit.rlim_max = timeout + 1;
-		
+                
 		if (setrlimit (RLIMIT_CPU, &cpu_limit) != 0) {
 			g_critical ("Failed to set resource limit for CPU");
 		}
@@ -187,13 +187,13 @@ tracker_create_permission_string (struct stat finfo)
 	str = g_strdup ("?rwxrwxrwx");
 
 	switch (finfo.st_mode & S_IFMT) {
-		case S_IFSOCK: str[0] = 's'; break;
-		case S_IFIFO:  str[0] = 'p'; break;
-		case S_IFLNK:  str[0] = 'l'; break;
-		case S_IFCHR:  str[0] = 'c'; break;
-		case S_IFBLK:  str[0] = 'b'; break;
-		case S_IFDIR:  str[0] = 'd'; break;
-		case S_IFREG:  str[0] = '-'; break;
+	case S_IFSOCK: str[0] = 's'; break;
+	case S_IFIFO:  str[0] = 'p'; break;
+	case S_IFLNK:  str[0] = 'l'; break;
+	case S_IFCHR:  str[0] = 'c'; break;
+	case S_IFBLK:  str[0] = 'b'; break;
+	case S_IFDIR:  str[0] = 'd'; break;
+	case S_IFREG:  str[0] = '-'; break;
 	default:
 		/* By default a regular file */
 		str[0] = '-';
@@ -233,12 +233,12 @@ get_memory_total (void)
 	filename = "/proc/meminfo";
 
 	if (!g_file_get_contents (filename,
-				  &contents,
-				  NULL,
-				  &error)) {
+	                          &contents,
+	                          NULL,
+	                          &error)) {
 		g_critical ("Couldn't get memory information:'%s', %s",
-			    filename,
-			    error ? error->message : "no error given");
+		            filename,
+		            error ? error->message : "no error given");
 		g_clear_error (&error);
 	} else {
 		gchar *start, *end, *p;
@@ -289,12 +289,12 @@ tracker_memory_setrlimits (void)
 	rl.rlim_cur = limit;
 
 	if (setrlimit (RLIMIT_AS, &rl) == -1) {
-               const gchar *str = g_strerror (errno);
+		const gchar *str = g_strerror (errno);
 
-               g_critical ("Could not set virtual memory limit with setrlimit(RLIMIT_AS), %s",
-			   str ? str : "no error given");
+		g_critical ("Could not set virtual memory limit with setrlimit(RLIMIT_AS), %s",
+		            str ? str : "no error given");
 
-               return FALSE;
+		return FALSE;
 	} else {
 		getrlimit (RLIMIT_DATA, &rl);
 		rl.rlim_cur = limit;
@@ -303,7 +303,7 @@ tracker_memory_setrlimits (void)
 			const gchar *str = g_strerror (errno);
 
 			g_critical ("Could not set heap memory limit with setrlimit(RLIMIT_DATA), %s",
-				    str ? str : "no error given");
+			            str ? str : "no error given");
 
 			return FALSE;
 		} else {
@@ -313,8 +313,8 @@ tracker_memory_setrlimits (void)
 			str2 = g_format_size_for_display (limit);
 
 			g_message ("Setting memory limitations: total is %s, virtual/heap set to %s",
-				   str1,
-				   str2);
+			           str1,
+			           str2);
 
 			g_free (str2);
 			g_free (str1);
diff --git a/src/libtracker-common/tracker-os-dependant-win.c b/src/libtracker-common/tracker-os-dependant-win.c
index 0ccb799..216acdf 100644
--- a/src/libtracker-common/tracker-os-dependant-win.c
+++ b/src/libtracker-common/tracker-os-dependant-win.c
@@ -30,16 +30,16 @@
 
 gboolean
 tracker_spawn (gchar **argv,
-	       gint    timeout,
-	       gchar **tmp_stdout,
-	       gint   *exit_status)
+               gint    timeout,
+               gchar **tmp_stdout,
+               gint   *exit_status)
 {
 	GSpawnFlags   flags;
-	GError	     *error = NULL;
-	gchar	    **new_argv;
+	GError       *error = NULL;
+	gchar       **new_argv;
 	gboolean      result;
-	gint	      length;
-	gint	      i;
+	gint          length;
+	gint          i;
 
 	g_return_val_if_fail (argv != NULL, FALSE);
 	g_return_val_if_fail (argv[0] != NULL, FALSE);
@@ -64,20 +64,20 @@ tracker_spawn (gchar **argv,
 	}
 
 	result = g_spawn_sync (NULL,
-			       new_argv,
-			       NULL,
-			       flags,
-			       NULL,
-			       GINT_TO_POINTER (timeout),
-			       tmp_stdout,
-			       NULL,
-			       exit_status,
-			       &error);
+	                       new_argv,
+	                       NULL,
+	                       flags,
+	                       NULL,
+	                       GINT_TO_POINTER (timeout),
+	                       tmp_stdout,
+	                       NULL,
+	                       exit_status,
+	                       &error);
 
 	if (error) {
 		g_warning ("Could not spawn command:'%s', %s",
-			   argv[0],
-			   error->message);
+		           argv[0],
+		           error->message);
 		g_error_free (error);
 	}
 
@@ -88,15 +88,15 @@ tracker_spawn (gchar **argv,
 
 gboolean
 tracker_spawn_async_with_channels (const gchar **argv,
-				   gint		 timeout,
-				   GPid		*pid,
-				   GIOChannel  **stdin_channel,
-				   GIOChannel  **stdout_channel,
-				   GIOChannel  **strerr_channel)
+                                   gint                  timeout,
+                                   GPid                 *pid,
+                                   GIOChannel  **stdin_channel,
+                                   GIOChannel  **stdout_channel,
+                                   GIOChannel  **strerr_channel)
 {
-	GError	 *error = NULL;
+	GError   *error = NULL;
 	gboolean  result;
-	gint	  stdin, stdout, stderr;
+	gint      stdin, stdout, stderr;
 
 	g_return_val_if_fail (argv != NULL, FALSE);
 	g_return_val_if_fail (argv[0] != NULL, FALSE);
@@ -104,21 +104,21 @@ tracker_spawn_async_with_channels (const gchar **argv,
 	g_return_val_if_fail (pid != NULL, FALSE);
 
 	result = g_spawn_async_with_pipes (NULL,
-					   (gchar **) argv,
-					   NULL,
-					   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-					   tracker_spawn_child_func,
-					   GINT_TO_POINTER (timeout),
-					   pid,
-					   stdin_channel ? &stdin : NULL,
-					   stdout_channel ? &stdout : NULL,
-					   stderr_channel ? &stderr : NULL,
-					   &error);
+	                                   (gchar **) argv,
+	                                   NULL,
+	                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+	                                   tracker_spawn_child_func,
+	                                   GINT_TO_POINTER (timeout),
+	                                   pid,
+	                                   stdin_channel ? &stdin : NULL,
+	                                   stdout_channel ? &stdout : NULL,
+	                                   stderr_channel ? &stderr : NULL,
+	                                   &error);
 
 	if (error) {
 		g_warning ("Could not spawn command:'%s', %s",
-			   argv[0],
-			   error->message);
+		           argv[0],
+		           error->message);
 		g_error_free (error);
 	}
 
diff --git a/src/libtracker-common/tracker-os-dependant.h b/src/libtracker-common/tracker-os-dependant.h
index a225f4d..34b550f 100644
--- a/src/libtracker-common/tracker-os-dependant.h
+++ b/src/libtracker-common/tracker-os-dependant.h
@@ -32,17 +32,17 @@ G_BEGIN_DECLS
 #endif
 
 /* Process spawning */
-gboolean tracker_spawn			   (gchar	**argv,
-					    gint	  timeout,
-					    gchar	**tmp_stdout,
-					    gint	 *exit_status);
+gboolean tracker_spawn                     (gchar       **argv,
+                                            gint          timeout,
+                                            gchar       **tmp_stdout,
+                                            gint         *exit_status);
 gboolean tracker_spawn_async_with_channels (const gchar **argv,
-					    gint	  timeout,
-					    GPid	 *pid,
-					    GIOChannel	**stdin_channel,
-					    GIOChannel	**stdout_channel,
-					    GIOChannel	**stderr_channel);
-void	 tracker_spawn_child_func	   (gpointer	  user_data);
+                                            gint          timeout,
+                                            GPid         *pid,
+                                            GIOChannel  **stdin_channel,
+                                            GIOChannel  **stdout_channel,
+                                            GIOChannel  **stderr_channel);
+void     tracker_spawn_child_func          (gpointer      user_data);
 
 /* File permissions */
 gchar *  tracker_create_permission_string  (struct stat   finfo);
diff --git a/src/libtracker-common/tracker-power-devicekit.c b/src/libtracker-common/tracker-power-devicekit.c
index 83ee59f..b71ac58 100644
--- a/src/libtracker-common/tracker-power-devicekit.c
+++ b/src/libtracker-common/tracker-power-devicekit.c
@@ -35,13 +35,13 @@ typedef struct {
 	gboolean   on_low_battery;
 } TrackerPowerPriv;
 
-static void	tracker_power_finalize		(GObject	 *object);
-static void	tracker_power_get_property	(GObject	 *object,
-						 guint		  param_id,
-						 GValue		 *value,
-						 GParamSpec	 *pspec);
-static void	tracker_power_client_changed_cb (DkpClient	 *client,
-						 TrackerPower	 *power);
+static void     tracker_power_finalize          (GObject         *object);
+static void     tracker_power_get_property      (GObject         *object,
+                                                 guint            param_id,
+                                                 GValue                  *value,
+                                                 GParamSpec      *pspec);
+static void     tracker_power_client_changed_cb (DkpClient       *client,
+                                                 TrackerPower    *power);
 
 enum {
 	PROP_0,
@@ -59,33 +59,33 @@ tracker_power_class_init (TrackerPowerClass *klass)
 
 	object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = tracker_power_finalize;
+	object_class->finalize     = tracker_power_finalize;
 	object_class->get_property = tracker_power_get_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_ON_BATTERY,
-					 g_param_spec_boolean ("on-battery",
-							       "Battery in use",
-							       "Whether the battery is being used",
-							       FALSE,
-							       G_PARAM_READABLE));
+	                                 PROP_ON_BATTERY,
+	                                 g_param_spec_boolean ("on-battery",
+	                                                       "Battery in use",
+	                                                       "Whether the battery is being used",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class,
-					 PROP_ON_LOW_BATTERY,
-					 g_param_spec_boolean ("on-low-battery",
-							      "Battery low",
-							      "Whether the battery is low",
-							      FALSE,
-							      G_PARAM_READABLE));
+	                                 PROP_ON_LOW_BATTERY,
+	                                 g_param_spec_boolean ("on-low-battery",
+	                                                       "Battery low",
+	                                                       "Whether the battery is low",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
-					 PROP_BATTERY_PERCENTAGE,
-					 g_param_spec_double ("battery-percentage",
-							      "Battery percentage",
-							      "Current battery percentage left",
-							      0.0,
-							      1.0,
-							      0.0,
-							      G_PARAM_READABLE));
+	                                 PROP_BATTERY_PERCENTAGE,
+	                                 g_param_spec_double ("battery-percentage",
+	                                                      "Battery percentage",
+	                                                      "Current battery percentage left",
+	                                                      0.0,
+	                                                      1.0,
+	                                                      0.0,
+	                                                      G_PARAM_READABLE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerPowerPriv));
 }
@@ -102,7 +102,7 @@ tracker_power_init (TrackerPower *power)
 	/* connect to a DeviceKit-power instance */
 	priv->client = dkp_client_new ();
 	g_signal_connect (priv->client, "changed",
-			  G_CALLBACK (tracker_power_client_changed_cb), power);
+	                  G_CALLBACK (tracker_power_client_changed_cb), power);
 
 	/* coldplug */
 	priv->on_battery = dkp_client_on_battery (priv->client);
@@ -123,9 +123,9 @@ tracker_power_finalize (GObject *object)
 
 static void
 tracker_power_get_property (GObject    *object,
-			    guint       param_id,
-			    GValue     *value,
-			    GParamSpec *pspec)
+                            guint       param_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
 {
 	TrackerPowerPriv *priv;
 
diff --git a/src/libtracker-common/tracker-power-hal.c b/src/libtracker-common/tracker-power-hal.c
index f16a385..6553e74 100644
--- a/src/libtracker-common/tracker-power-hal.c
+++ b/src/libtracker-common/tracker-power-hal.c
@@ -50,33 +50,33 @@ typedef struct {
 
 	GHashTable    *batteries;
 
-	gchar	      *ac_adapter_udi;
+	gchar         *ac_adapter_udi;
 	gboolean       on_battery;
 	gdouble        battery_percentage;
 } TrackerPowerPriv;
 
-static void	tracker_power_finalize		(GObject	 *object);
-static void	hal_get_property		(GObject	 *object,
-						 guint		  param_id,
-						 GValue		 *value,
-						 GParamSpec	 *pspec);
-static gboolean hal_setup_ac_adapters		(TrackerPower	 *power);
-static gboolean hal_setup_batteries		(TrackerPower	 *power);
+static void     tracker_power_finalize          (GObject         *object);
+static void     hal_get_property                (GObject         *object,
+                                                 guint            param_id,
+                                                 GValue                  *value,
+                                                 GParamSpec      *pspec);
+static gboolean hal_setup_ac_adapters           (TrackerPower    *power);
+static gboolean hal_setup_batteries             (TrackerPower    *power);
 
 static void     hal_battery_modify              (TrackerPower    *power,
-						 const gchar     *udi);
+                                                 const gchar     *udi);
 static void     hal_battery_remove              (TrackerPower    *power,
-						 const gchar     *udi);
-
-static void	hal_device_added_cb		(LibHalContext	 *context,
-						 const gchar	 *udi);
-static void	hal_device_removed_cb		(LibHalContext	 *context,
-						 const gchar	 *udi);
-static void	hal_device_property_modified_cb (LibHalContext	 *context,
-						 const char	 *udi,
-						 const char	 *key,
-						 dbus_bool_t	  is_removed,
-						 dbus_bool_t	  is_added);
+                                                 const gchar     *udi);
+
+static void     hal_device_added_cb             (LibHalContext   *context,
+                                                 const gchar     *udi);
+static void     hal_device_removed_cb           (LibHalContext   *context,
+                                                 const gchar     *udi);
+static void     hal_device_property_modified_cb (LibHalContext   *context,
+                                                 const char      *udi,
+                                                 const char      *key,
+                                                 dbus_bool_t      is_removed,
+                                                 dbus_bool_t      is_added);
 
 enum {
 	PROP_0,
@@ -94,32 +94,32 @@ tracker_power_class_init (TrackerPowerClass *klass)
 
 	object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = tracker_power_finalize;
+	object_class->finalize     = tracker_power_finalize;
 	object_class->get_property = hal_get_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_ON_BATTERY,
-					 g_param_spec_boolean ("on-battery",
-							       "Battery in use",
-							       "Whether the battery is being used",
-							       FALSE,
-							       G_PARAM_READABLE));
+	                                 PROP_ON_BATTERY,
+	                                 g_param_spec_boolean ("on-battery",
+	                                                       "Battery in use",
+	                                                       "Whether the battery is being used",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
-					 PROP_ON_LOW_BATTERY,
-					 g_param_spec_boolean ("on-low-battery",
-							      "Battery low",
-							      "Whether the battery is low",
-							      FALSE,
-							      G_PARAM_READABLE));
+	                                 PROP_ON_LOW_BATTERY,
+	                                 g_param_spec_boolean ("on-low-battery",
+	                                                       "Battery low",
+	                                                       "Whether the battery is low",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
-					 PROP_BATTERY_PERCENTAGE,
-					 g_param_spec_double ("battery-percentage",
-							      "Battery percentage",
-							      "Current battery percentage left",
-							      0.0,
-							      1.0,
-							      0.0,
-							      G_PARAM_READABLE));
+	                                 PROP_BATTERY_PERCENTAGE,
+	                                 g_param_spec_double ("battery-percentage",
+	                                                      "Battery percentage",
+	                                                      "Current battery percentage left",
+	                                                      0.0,
+	                                                      1.0,
+	                                                      0.0,
+	                                                      G_PARAM_READABLE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerPowerPriv));
 }
@@ -128,23 +128,23 @@ static void
 tracker_power_init (TrackerPower *power)
 {
 	TrackerPowerPriv *priv;
-	DBusError	error;
+	DBusError       error;
 
 	g_message ("Initializing HAL Power...");
 
 	priv = GET_PRIV (power);
 
 	priv->batteries = g_hash_table_new_full (g_str_hash,
-						 g_str_equal,
-						 (GDestroyNotify) g_free,
-						 NULL);
+	                                         g_str_equal,
+	                                         (GDestroyNotify) g_free,
+	                                         NULL);
 
 	dbus_error_init (&error);
 
 	priv->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not get the system D-Bus connection, %s",
-			    error.message);
+		            error.message);
 		dbus_error_free (&error);
 		return;
 	}
@@ -165,11 +165,11 @@ tracker_power_init (TrackerPower *power)
 	if (!libhal_ctx_init (priv->context, &error)) {
 		if (dbus_error_is_set (&error)) {
 			g_critical ("Could not initialize the HAL context, %s",
-				    error.message);
+			            error.message);
 			dbus_error_free (&error);
 		} else {
 			g_critical ("Could not initialize the HAL context, "
-				    "no error, is hald running?");
+			            "no error, is hald running?");
 		}
 
 		libhal_ctx_free (priv->context);
@@ -223,9 +223,9 @@ tracker_power_finalize (GObject *object)
 
 static void
 hal_get_property (GObject    *object,
-		  guint       param_id,
-		  GValue     *value,
-		  GParamSpec *pspec)
+                  guint       param_id,
+                  GValue     *value,
+                  GParamSpec *pspec)
 {
 	TrackerPowerPriv *priv;
 
@@ -251,23 +251,23 @@ hal_get_property (GObject    *object,
 static gboolean
 hal_setup_ac_adapters (TrackerPower *power)
 {
-	TrackerPowerPriv	*priv;
-	DBusError	 error;
-	gchar	       **devices, **p;
-	gint		 num;
+	TrackerPowerPriv        *priv;
+	DBusError        error;
+	gchar          **devices, **p;
+	gint             num;
 
 	priv = GET_PRIV (power);
 
 	dbus_error_init (&error);
 
 	devices = libhal_find_device_by_capability (priv->context,
-						    CAPABILITY_AC_ADAPTER,
-						    &num,
-						    &error);
+	                                            CAPABILITY_AC_ADAPTER,
+	                                            &num,
+	                                            &error);
 
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not get AC adapter capable devices, %s",
-			    error.message);
+		            error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
@@ -300,24 +300,24 @@ hal_setup_ac_adapters (TrackerPower *power)
 
 	/* Make sure we watch changes to the battery use */
 	libhal_device_add_property_watch (priv->context,
-					  priv->ac_adapter_udi,
-					  &error);
+	                                  priv->ac_adapter_udi,
+	                                  &error);
 
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not add device:'%s' to property watch, %s",
-			       priv->ac_adapter_udi, error.message);
+		            priv->ac_adapter_udi, error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
 
 	/* Get current state, are we using the battery now? */
 	priv->on_battery = !libhal_device_get_property_bool (priv->context,
-								 priv->ac_adapter_udi,
-								 PROP_AC_ADAPTER_ON,
-								 NULL);
+	                                                     priv->ac_adapter_udi,
+	                                                     PROP_AC_ADAPTER_ON,
+	                                                     NULL);
 
 	g_message ("HAL reports system is currently powered by %s",
-		   priv->on_battery ? "battery" : "AC adapter");
+	           priv->on_battery ? "battery" : "AC adapter");
 
 	g_object_notify (G_OBJECT (power), "on-battery");
 
@@ -327,23 +327,23 @@ hal_setup_ac_adapters (TrackerPower *power)
 static gboolean
 hal_setup_batteries (TrackerPower *power)
 {
-	TrackerPowerPriv	*priv;
-	DBusError	 error;
-	gchar	       **devices, **p;
-	gint		 num;
+	TrackerPowerPriv        *priv;
+	DBusError        error;
+	gchar          **devices, **p;
+	gint             num;
 
 	priv = GET_PRIV (power);
 
 	dbus_error_init (&error);
 
 	devices = libhal_find_device_by_capability (priv->context,
-						    CAPABILITY_BATTERY,
-						    &num,
-						    &error);
+	                                            CAPABILITY_BATTERY,
+	                                            &num,
+	                                            &error);
 
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not get Battery HAL info, %s",
-			    error.message);
+		            error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
@@ -363,7 +363,7 @@ hal_setup_batteries (TrackerPower *power)
 
 		if (dbus_error_is_set (&error)) {
 			g_critical ("Could not add device:'%s' to property watch, %s",
-				    *p, error.message);
+			            *p, error.message);
 			dbus_error_free (&error);
 		}
 	}
@@ -405,38 +405,38 @@ hal_battery_notify (TrackerPower *power)
 	     old_percentage <= BATTERY_LOW_THRESHOLD) ||
 	    (priv->battery_percentage <= BATTERY_LOW_THRESHOLD &&
 	     old_percentage > BATTERY_LOW_THRESHOLD)) {
-		    g_object_notify (G_OBJECT (power), "on-low-battery");
+		g_object_notify (G_OBJECT (power), "on-low-battery");
 	}
 
 	if (old_percentage != priv->battery_percentage) {
 		g_object_notify (G_OBJECT (power), "battery-percentage");
 	}
-	
+        
 	g_list_free (values);
 }
 
 static void
 hal_battery_modify (TrackerPower *power,
-		    const gchar  *udi)
+                    const gchar  *udi)
 {
 	TrackerPowerPriv *priv;
 	gint percentage;
 
 	priv = GET_PRIV (power);
 	percentage = libhal_device_get_property_int (priv->context, udi,
-						     PROP_BATT_PERCENTAGE,
-						     NULL);
+	                                             PROP_BATT_PERCENTAGE,
+	                                             NULL);
 
 	g_hash_table_insert (priv->batteries,
-			     g_strdup (udi),
-			     GINT_TO_POINTER (percentage));
+	                     g_strdup (udi),
+	                     GINT_TO_POINTER (percentage));
 
 	hal_battery_notify (power);
 }
 
 static void
 hal_battery_remove (TrackerPower *power,
-		    const gchar  *udi)
+                    const gchar  *udi)
 {
 	TrackerPowerPriv *priv;
 
@@ -448,7 +448,7 @@ hal_battery_remove (TrackerPower *power,
 
 static void
 hal_device_added_cb (LibHalContext *context,
-		     const gchar   *udi)
+                     const gchar   *udi)
 {
 	TrackerPower   *power;
 
@@ -461,7 +461,7 @@ hal_device_added_cb (LibHalContext *context,
 
 static void
 hal_device_removed_cb (LibHalContext *context,
-		       const gchar   *udi)
+                       const gchar   *udi)
 {
 	TrackerPower     *power;
 	TrackerPowerPriv *priv;
@@ -476,14 +476,14 @@ hal_device_removed_cb (LibHalContext *context,
 
 static void
 hal_device_property_modified_cb (LibHalContext *context,
-				 const char    *udi,
-				 const char    *key,
-				 dbus_bool_t	is_removed,
-				 dbus_bool_t	is_added)
+                                 const char    *udi,
+                                 const char    *key,
+                                 dbus_bool_t    is_removed,
+                                 dbus_bool_t    is_added)
 {
 	TrackerPower     *power;
 	TrackerPowerPriv *priv;
-	DBusError	error;
+	DBusError       error;
 
 	power = (TrackerPower*) libhal_ctx_get_user_data (context);
 	priv = GET_PRIV (power);
@@ -493,17 +493,17 @@ hal_device_property_modified_cb (LibHalContext *context,
 	if (priv->ac_adapter_udi && strcmp (priv->ac_adapter_udi, udi) == 0) {
 		/* Property change is on the AC adapter */
 		priv->on_battery = !libhal_device_get_property_bool (priv->context,
-									 priv->ac_adapter_udi,
-									 PROP_AC_ADAPTER_ON,
-									 &error);
+		                                                     priv->ac_adapter_udi,
+		                                                     PROP_AC_ADAPTER_ON,
+		                                                     &error);
 		g_message ("HAL reports system is now powered by %s",
-			   priv->on_battery ? "battery" : "AC adapter");
+		           priv->on_battery ? "battery" : "AC adapter");
 
 		g_object_notify (G_OBJECT (power), "on-battery");
 
 		if (dbus_error_is_set (&error)) {
 			g_critical ("Could not get device property:'%s' for udi:'%s', %s",
-				    udi, PROP_AC_ADAPTER_ON, error.message);
+			            udi, PROP_AC_ADAPTER_ON, error.message);
 			dbus_error_free (&error);
 			return;
 		}
diff --git a/src/libtracker-common/tracker-power.h b/src/libtracker-common/tracker-power.h
index fb7ef10..9ab8d9c 100644
--- a/src/libtracker-common/tracker-power.h
+++ b/src/libtracker-common/tracker-power.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_POWER	   (tracker_power_get_type ())
-#define TRACKER_POWER(o)	   (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_POWER, TrackerPower))
-#define TRACKER_POWER_CLASS(k)	   (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_POWER, TrackerPowerClass))
-#define TRACKER_IS_POWER(o)	   (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_POWER))
+#define TRACKER_TYPE_POWER         (tracker_power_get_type ())
+#define TRACKER_POWER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_POWER, TrackerPower))
+#define TRACKER_POWER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_POWER, TrackerPowerClass))
+#define TRACKER_IS_POWER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_POWER))
 #define TRACKER_IS_POWER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_POWER))
 #define TRACKER_POWER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_POWER, TrackerPowerClass))
 
@@ -47,7 +47,7 @@ struct _TrackerPowerClass {
 	GObjectClass parent_class;
 };
 
-GType	      tracker_power_get_type		   (void) G_GNUC_CONST;
+GType         tracker_power_get_type               (void) G_GNUC_CONST;
 
 TrackerPower *tracker_power_new                    (void);
 
diff --git a/src/libtracker-common/tracker-property.c b/src/libtracker-common/tracker-property.c
index 39cf82f..cef1ac4 100644
--- a/src/libtracker-common/tracker-property.c
+++ b/src/libtracker-common/tracker-property.c
@@ -41,13 +41,13 @@
 typedef struct _TrackerPropertyPriv TrackerPropertyPriv;
 
 struct _TrackerPropertyPriv {
-	gchar	      *uri;
-	gchar	      *name;
+	gchar         *uri;
+	gchar         *name;
 
 	TrackerPropertyType  data_type;
 	TrackerClass   *domain;
 	TrackerClass   *range;
-	gint	       weight;
+	gint           weight;
 	gboolean       indexed;
 	gboolean       fulltext_indexed;
 	gboolean       embedded;
@@ -61,13 +61,13 @@ struct _TrackerPropertyPriv {
 
 static void property_finalize     (GObject      *object);
 static void property_get_property (GObject      *object,
-				   guint         param_id,
-				   GValue       *value,
-				   GParamSpec   *pspec);
+                                   guint         param_id,
+                                   GValue       *value,
+                                   GParamSpec   *pspec);
 static void property_set_property (GObject      *object,
-				   guint         param_id,
-				   const GValue *value,
-				   GParamSpec   *pspec);
+                                   guint         param_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec);
 
 enum {
 	PROP_0,
@@ -151,104 +151,104 @@ tracker_property_class_init (TrackerPropertyClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = property_finalize;
+	object_class->finalize     = property_finalize;
 	object_class->get_property = property_get_property;
 	object_class->set_property = property_set_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_URI,
-					 g_param_spec_string ("uri",
-							      "uri",
-							      "URI",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_URI,
+	                                 g_param_spec_string ("uri",
+	                                                      "uri",
+	                                                      "URI",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_NAME,
-					 g_param_spec_string ("name",
-							      "name",
-							      "Field name",
-							      NULL,
-							      G_PARAM_READABLE));
+	                                 PROP_NAME,
+	                                 g_param_spec_string ("name",
+	                                                      "name",
+	                                                      "Field name",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
-					 PROP_DATA_TYPE,
-					 g_param_spec_enum ("data-type",
-							    "data-type",
-							    "Field data type",
-							    tracker_property_type_get_type (),
-							    TRACKER_PROPERTY_TYPE_STRING,
-							    G_PARAM_READWRITE));
+	                                 PROP_DATA_TYPE,
+	                                 g_param_spec_enum ("data-type",
+	                                                    "data-type",
+	                                                    "Field data type",
+	                                                    tracker_property_type_get_type (),
+	                                                    TRACKER_PROPERTY_TYPE_STRING,
+	                                                    G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_DOMAIN,
-					 g_param_spec_object ("domain",
-							      "domain",
-							      "Domain of this property",
-							      TRACKER_TYPE_CLASS,
-							      G_PARAM_READWRITE));
+	                                 PROP_DOMAIN,
+	                                 g_param_spec_object ("domain",
+	                                                      "domain",
+	                                                      "Domain of this property",
+	                                                      TRACKER_TYPE_CLASS,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_RANGE,
-					 g_param_spec_object ("range",
-							      "range",
-							      "Range of this property",
-							      TRACKER_TYPE_CLASS,
-							      G_PARAM_READWRITE));
+	                                 PROP_RANGE,
+	                                 g_param_spec_object ("range",
+	                                                      "range",
+	                                                      "Range of this property",
+	                                                      TRACKER_TYPE_CLASS,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_WEIGHT,
-					 g_param_spec_int ("weight",
-							   "weight",
-							   "Boost to the score",
-							   0,
-							   G_MAXINT,
-							   1,
-							   G_PARAM_READWRITE));
+	                                 PROP_WEIGHT,
+	                                 g_param_spec_int ("weight",
+	                                                   "weight",
+	                                                   "Boost to the score",
+	                                                   0,
+	                                                   G_MAXINT,
+	                                                   1,
+	                                                   G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_INDEXED,
-					 g_param_spec_boolean ("indexed",
-							       "indexed",
-							       "Indexed",
-							       TRUE,
-							       G_PARAM_READWRITE));
+	                                 PROP_INDEXED,
+	                                 g_param_spec_boolean ("indexed",
+	                                                       "indexed",
+	                                                       "Indexed",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_FULLTEXT_INDEXED,
-					 g_param_spec_boolean ("fulltext-indexed",
-							       "fulltext-indexed",
-							       "Full-text indexed",
-							       TRUE,
-							       G_PARAM_READWRITE));
+	                                 PROP_FULLTEXT_INDEXED,
+	                                 g_param_spec_boolean ("fulltext-indexed",
+	                                                       "fulltext-indexed",
+	                                                       "Full-text indexed",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_EMBEDDED,
-					 g_param_spec_boolean ("embedded",
-							       "embedded",
-							       "Embedded",
-							       TRUE,
-							       G_PARAM_READWRITE));
+	                                 PROP_EMBEDDED,
+	                                 g_param_spec_boolean ("embedded",
+	                                                       "embedded",
+	                                                       "Embedded",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_MULTIPLE_VALUES,
-					 g_param_spec_boolean ("multiple-values",
-							       "multiple-values",
-							       "Multiple values",
-							       TRUE,
-							       G_PARAM_READWRITE));
+	                                 PROP_MULTIPLE_VALUES,
+	                                 g_param_spec_boolean ("multiple-values",
+	                                                       "multiple-values",
+	                                                       "Multiple values",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_FILTERED,
-					 g_param_spec_boolean ("filtered",
-							       "filtered",
-							       "Filtered",
-							       TRUE,
-							       G_PARAM_READWRITE));
+	                                 PROP_FILTERED,
+	                                 g_param_spec_boolean ("filtered",
+	                                                       "filtered",
+	                                                       "Filtered",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_TRANSIENT,
-					 g_param_spec_boolean ("transient",
-							       "transient",
-							       "Transient",
-							       FALSE,
-							       G_PARAM_READWRITE));
+	                                 PROP_TRANSIENT,
+	                                 g_param_spec_boolean ("transient",
+	                                                       "transient",
+	                                                       "Transient",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_IS_INVERSE_FUNCTIONAL_PROPERTY,
-					 g_param_spec_boolean ("is-inverse-functional-property",
-							       "is-inverse-functional-property",
-							       "Is inverse functional property",
-							       FALSE,
-							       G_PARAM_READWRITE));
+	                                 PROP_IS_INVERSE_FUNCTIONAL_PROPERTY,
+	                                 g_param_spec_boolean ("is-inverse-functional-property",
+	                                                       "is-inverse-functional-property",
+	                                                       "Is inverse functional property",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
 
 
 	g_type_class_add_private (object_class, sizeof (TrackerPropertyPriv));
@@ -294,9 +294,9 @@ property_finalize (GObject *object)
 
 static void
 property_get_property (GObject    *object,
-		       guint	   param_id,
-		       GValue     *value,
-		       GParamSpec *pspec)
+                       guint       param_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
 	TrackerPropertyPriv *priv;
 
@@ -349,55 +349,55 @@ property_get_property (GObject    *object,
 }
 
 static void
-property_set_property (GObject	    *object,
-		       guint	     param_id,
-		       const GValue *value,
-		       GParamSpec   *pspec)
+property_set_property (GObject      *object,
+                       guint         param_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
 	switch (param_id) {
 	case PROP_URI:
 		tracker_property_set_uri (TRACKER_PROPERTY (object),
-				       g_value_get_string (value));
+		                          g_value_get_string (value));
 		break;
 	case PROP_DATA_TYPE:
 		tracker_property_set_data_type (TRACKER_PROPERTY (object),
-					     g_value_get_enum (value));
+		                                g_value_get_enum (value));
 		break;
 	case PROP_DOMAIN:
 		tracker_property_set_domain (TRACKER_PROPERTY (object),
-					   g_value_get_object (value));
+		                             g_value_get_object (value));
 		break;
 	case PROP_RANGE:
 		tracker_property_set_range (TRACKER_PROPERTY (object),
-					   g_value_get_object (value));
+		                            g_value_get_object (value));
 		break;
 	case PROP_WEIGHT:
 		tracker_property_set_weight (TRACKER_PROPERTY (object),
-					  g_value_get_int (value));
+		                             g_value_get_int (value));
 		break;
 	case PROP_INDEXED:
 		tracker_property_set_indexed (TRACKER_PROPERTY (object),
-					   g_value_get_boolean (value));
+		                              g_value_get_boolean (value));
 		break;
 	case PROP_FULLTEXT_INDEXED:
 		tracker_property_set_fulltext_indexed (TRACKER_PROPERTY (object),
-						    g_value_get_boolean (value));
+		                                       g_value_get_boolean (value));
 		break;
 	case PROP_EMBEDDED:
 		tracker_property_set_embedded (TRACKER_PROPERTY (object),
-					    g_value_get_boolean (value));
+		                               g_value_get_boolean (value));
 		break;
 	case PROP_MULTIPLE_VALUES:
 		tracker_property_set_multiple_values (TRACKER_PROPERTY (object),
-						   g_value_get_boolean (value));
+		                                      g_value_get_boolean (value));
 		break;
 	case PROP_FILTERED:
 		tracker_property_set_filtered (TRACKER_PROPERTY (object),
-					    g_value_get_boolean (value));
+		                               g_value_get_boolean (value));
 		break;
 	case PROP_TRANSIENT:
 		tracker_property_set_transient (TRACKER_PROPERTY (object),
-					    g_value_get_boolean (value));
+		                                g_value_get_boolean (value));
 		break;
 	case PROP_IS_INVERSE_FUNCTIONAL_PROPERTY:
 		tracker_property_set_is_inverse_functional_property (TRACKER_PROPERTY (object),
@@ -411,8 +411,8 @@ property_set_property (GObject	    *object,
 
 static gboolean
 field_int_validate (TrackerProperty *field,
-		    const gchar     *property,
-		    gint	     value)
+                    const gchar     *property,
+                    gint             value)
 {
 #ifdef G_DISABLE_CHECKS
 	GParamSpec *spec;
@@ -625,7 +625,7 @@ tracker_property_get_super_properties (TrackerProperty *property)
 
 void
 tracker_property_set_uri (TrackerProperty *field,
-			  const gchar     *value)
+                          const gchar     *value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -668,7 +668,7 @@ tracker_property_set_uri (TrackerProperty *field,
 
 void
 tracker_property_set_transient (TrackerProperty *field,
-			        gboolean         value)
+                                gboolean         value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -684,7 +684,7 @@ tracker_property_set_transient (TrackerProperty *field,
 
 void
 tracker_property_set_data_type (TrackerProperty     *field,
-				TrackerPropertyType  value)
+                                TrackerPropertyType  value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -698,7 +698,7 @@ tracker_property_set_data_type (TrackerProperty     *field,
 
 void
 tracker_property_set_domain (TrackerProperty *field,
-			     TrackerClass    *value)
+                             TrackerClass    *value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -720,7 +720,7 @@ tracker_property_set_domain (TrackerProperty *field,
 
 void
 tracker_property_set_range (TrackerProperty *property,
-			   TrackerClass     *value)
+                            TrackerClass     *value)
 {
 	TrackerPropertyPriv *priv;
 	const gchar *range_uri;
@@ -758,7 +758,7 @@ tracker_property_set_range (TrackerProperty *property,
 
 void
 tracker_property_set_weight (TrackerProperty *field,
-			     gint	      value)
+                             gint             value)
 {
 	TrackerPropertyPriv *priv;
 	g_return_if_fail (TRACKER_IS_PROPERTY (field));
@@ -775,7 +775,7 @@ tracker_property_set_weight (TrackerProperty *field,
 
 void
 tracker_property_set_indexed (TrackerProperty *field,
-			      gboolean         value)
+                              gboolean         value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -789,7 +789,7 @@ tracker_property_set_indexed (TrackerProperty *field,
 
 void
 tracker_property_set_fulltext_indexed (TrackerProperty *field,
-				       gboolean	        value)
+                                       gboolean                 value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -803,7 +803,7 @@ tracker_property_set_fulltext_indexed (TrackerProperty *field,
 
 void
 tracker_property_set_embedded (TrackerProperty *field,
-			       gboolean	        value)
+                               gboolean                 value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -817,7 +817,7 @@ tracker_property_set_embedded (TrackerProperty *field,
 
 void
 tracker_property_set_multiple_values (TrackerProperty *field,
-				      gboolean         value)
+                                      gboolean         value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -836,7 +836,7 @@ tracker_property_set_multiple_values (TrackerProperty *field,
 
 void
 tracker_property_set_filtered (TrackerProperty *field,
-			       gboolean	        value)
+                               gboolean                 value)
 {
 	TrackerPropertyPriv *priv;
 
@@ -864,7 +864,7 @@ tracker_property_set_is_inverse_functional_property (TrackerProperty *property,
 
 void
 tracker_property_set_super_properties (TrackerProperty  *property,
-				       TrackerProperty **value)
+                                       TrackerProperty **value)
 {
 	TrackerPropertyPriv *priv;
 	TrackerProperty **super_property;
@@ -883,7 +883,7 @@ tracker_property_set_super_properties (TrackerProperty  *property,
 
 void
 tracker_property_add_super_property (TrackerProperty *property,
-				     TrackerProperty *value)
+                                     TrackerProperty *value)
 {
 	TrackerPropertyPriv *priv;
 
diff --git a/src/libtracker-common/tracker-property.h b/src/libtracker-common/tracker-property.h
index e6264b7..7b9239b 100644
--- a/src/libtracker-common/tracker-property.h
+++ b/src/libtracker-common/tracker-property.h
@@ -47,21 +47,21 @@ typedef enum {
 	TRACKER_PROPERTY_TYPE_RESOURCE,
 } TrackerPropertyType;
 
-GType	     tracker_property_type_get_type  (void) G_GNUC_CONST;
+GType        tracker_property_type_get_type  (void) G_GNUC_CONST;
 const gchar *tracker_property_type_to_string (TrackerPropertyType fieldtype);
 
 /*
  * TrackerProperty
  */
-#define TRACKER_TYPE_PROPERTY	      (tracker_property_get_type ())
+#define TRACKER_TYPE_PROPERTY         (tracker_property_get_type ())
 #define TRACKER_TYPE_PROPERTY_TYPE    (tracker_property_type_get_type ())
-#define TRACKER_PROPERTY(o)	      (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROPERTY, TrackerProperty))
+#define TRACKER_PROPERTY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROPERTY, TrackerProperty))
 #define TRACKER_PROPERTY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_PROPERTY, TrackerPropertyClass))
-#define TRACKER_IS_PROPERTY(o)	      (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_PROPERTY))
+#define TRACKER_IS_PROPERTY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_PROPERTY))
 #define TRACKER_IS_PROPERTY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_PROPERTY))
 #define TRACKER_PROPERTY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_PROPERTY, TrackerPropertyClass))
 
-typedef struct _TrackerProperty	TrackerProperty;
+typedef struct _TrackerProperty         TrackerProperty;
 typedef struct _TrackerPropertyClass TrackerPropertyClass;
 
 struct _TrackerProperty {
@@ -72,7 +72,7 @@ struct _TrackerPropertyClass {
 	GObjectClass parent_class;
 };
 
-GType		    tracker_property_get_type		  (void) G_GNUC_CONST;
+GType               tracker_property_get_type             (void) G_GNUC_CONST;
 TrackerProperty *   tracker_property_new                  (void);
 const gchar *       tracker_property_get_uri              (TrackerProperty      *property);
 const gchar *       tracker_property_get_name             (TrackerProperty      *property);
@@ -87,37 +87,37 @@ gboolean            tracker_property_get_multiple_values  (TrackerProperty
 gboolean            tracker_property_get_filtered         (TrackerProperty      *property);
 gboolean            tracker_property_get_transient        (TrackerProperty      *property);
 gboolean            tracker_property_get_is_inverse_functional_property
-							  (TrackerProperty      *property);
+(TrackerProperty      *property);
 TrackerProperty **  tracker_property_get_super_properties (TrackerProperty      *property);
 void                tracker_property_set_uri              (TrackerProperty      *property,
-							   const gchar          *value);
+                                                           const gchar          *value);
 void                tracker_property_set_data_type        (TrackerProperty      *property,
-							   TrackerPropertyType   value);
+                                                           TrackerPropertyType   value);
 void                tracker_property_set_domain           (TrackerProperty      *property,
-							   TrackerClass         *value);
+                                                           TrackerClass         *value);
 void                tracker_property_set_range            (TrackerProperty      *property,
-							   TrackerClass         *range);
+                                                           TrackerClass         *range);
 void                tracker_property_set_weight           (TrackerProperty      *property,
-							   gint                  value);
+                                                           gint                  value);
 void                tracker_property_set_indexed          (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_fulltext_indexed (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_embedded         (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_multiple_values  (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_filtered         (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_transient        (TrackerProperty      *property,
-							   gboolean              value);
+                                                           gboolean              value);
 void                tracker_property_set_is_inverse_functional_property
-							  (TrackerProperty      *property,
-							   gboolean              value);
+(TrackerProperty      *property,
+ gboolean              value);
 void                tracker_property_set_super_properties (TrackerProperty      *property,
-							   TrackerProperty     **super_properties);
+                                                           TrackerProperty     **super_properties);
 void                tracker_property_add_super_property   (TrackerProperty      *property,
-							   TrackerProperty      *value);
+                                                           TrackerProperty      *value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-statement-list.c b/src/libtracker-common/tracker-statement-list.c
index 762193a..2386c74 100644
--- a/src/libtracker-common/tracker-statement-list.c
+++ b/src/libtracker-common/tracker-statement-list.c
@@ -61,8 +61,8 @@ tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
 		gchar *valid;
 
 		/* g_message ("Only inserting %ld/%ld (valid UTF8) bytes for statement list", */
-		/* 	   end - value, */
-		/* 	   strlen (value)); */
+		/*         end - value, */
+		/*         strlen (value)); */
 
 		if (value != end) {
 			valid = g_strndup (value, end - value);
@@ -80,9 +80,9 @@ tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
 
 void
 tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
-					  const gchar          *subject,
-					  const gchar          *predicate,
-					  gint64                value)
+                                          const gchar          *subject,
+                                          const gchar          *predicate,
+                                          gint64                value)
 {
 	gchar *value_str;
 
@@ -93,9 +93,9 @@ tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
 
 void
 tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
-					 const gchar          *subject,
-					 const gchar          *predicate,
-					 guint32               value)
+                                         const gchar          *subject,
+                                         const gchar          *predicate,
+                                         guint32               value)
 {
 	gchar *value_str;
 
@@ -106,9 +106,9 @@ tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
 
 void
 tracker_statement_list_insert_with_double  (TrackerSparqlBuilder *statements,
-					    const gchar          *subject,
-					    const gchar          *predicate,
-					    gdouble               value)
+                                            const gchar          *subject,
+                                            const gchar          *predicate,
+                                            gdouble               value)
 {
 	gchar *value_str;
 
@@ -119,9 +119,9 @@ tracker_statement_list_insert_with_double  (TrackerSparqlBuilder *statements,
 
 void
 tracker_statement_list_insert_with_float  (TrackerSparqlBuilder *statements,
-					   const gchar          *subject,
-					   const gchar          *predicate,
-					   gfloat                value)
+                                           const gchar          *subject,
+                                           const gchar          *predicate,
+                                           gfloat                value)
 {
 	gchar *value_str;
 
@@ -132,9 +132,9 @@ tracker_statement_list_insert_with_float  (TrackerSparqlBuilder *statements,
 
 void
 tracker_statement_list_insert_with_int (TrackerSparqlBuilder  *statements,
-					const gchar           *subject,
-					const gchar           *predicate,
-					gint                   value)
+                                        const gchar           *subject,
+                                        const gchar           *predicate,
+                                        gint                   value)
 {
 	gchar *value_str;
 
diff --git a/src/libtracker-common/tracker-statement-list.h b/src/libtracker-common/tracker-statement-list.h
index 42131dd..d42a8cf 100644
--- a/src/libtracker-common/tracker-statement-list.h
+++ b/src/libtracker-common/tracker-statement-list.h
@@ -34,31 +34,31 @@ G_BEGIN_DECLS
 #define SHOULD_VALIDATE_UTF8
 
 void tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
-						const gchar          *value);
+                                                const gchar          *value);
 void tracker_statement_list_insert             (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						const gchar          *value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                const gchar          *value);
 void tracker_statement_list_insert_with_int    (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						gint                  value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                gint                  value);
 void tracker_statement_list_insert_with_int64  (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						gint64                value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                gint64                value);
 void tracker_statement_list_insert_with_uint   (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						guint32               value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                guint32               value);
 void tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						gdouble               value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                gdouble               value);
 void tracker_statement_list_insert_with_float  (TrackerSparqlBuilder *statements,
-						const gchar          *subject,
-						const gchar          *predicate,
-						gfloat                value);
+                                                const gchar          *subject,
+                                                const gchar          *predicate,
+                                                gfloat                value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-common/tracker-storage-hal.c b/src/libtracker-common/tracker-storage-hal.c
index d2765e7..04cdb8b 100644
--- a/src/libtracker-common/tracker-storage-hal.c
+++ b/src/libtracker-common/tracker-storage-hal.c
@@ -56,7 +56,7 @@ typedef struct {
 typedef struct {
 	gchar *mount_point;
 	gchar *udi;
- 	guint removable : 1;
+	guint removable : 1;
 } MountInfo;
 
 typedef struct {
@@ -70,24 +70,24 @@ typedef struct {
 	gboolean only_removable;
 } GetRoots;
 
-static void	tracker_storage_finalize	(GObject	 *object);
-static void	hal_get_property		(GObject	 *object,
-						 guint		  param_id,
-						 GValue		 *value,
-						 GParamSpec	 *pspec);
-static gboolean hal_setup_devices		(TrackerStorage	 *hal);
-
-static gboolean hal_device_add			(TrackerStorage	 *hal,
-						 LibHalVolume	 *volume);
-static void	hal_device_added_cb		(LibHalContext	 *context,
-						 const gchar	 *udi);
-static void	hal_device_removed_cb		(LibHalContext	 *context,
-						 const gchar	 *udi);
-static void	hal_device_property_modified_cb (LibHalContext	 *context,
-						 const char	 *udi,
-						 const char	 *key,
-						 dbus_bool_t	  is_removed,
-						 dbus_bool_t	  is_added);
+static void     tracker_storage_finalize        (GObject         *object);
+static void     hal_get_property                (GObject         *object,
+                                                 guint            param_id,
+                                                 GValue                  *value,
+                                                 GParamSpec      *pspec);
+static gboolean hal_setup_devices               (TrackerStorage          *hal);
+
+static gboolean hal_device_add                  (TrackerStorage          *hal,
+                                                 LibHalVolume    *volume);
+static void     hal_device_added_cb             (LibHalContext   *context,
+                                                 const gchar     *udi);
+static void     hal_device_removed_cb           (LibHalContext   *context,
+                                                 const gchar     *udi);
+static void     hal_device_property_modified_cb (LibHalContext   *context,
+                                                 const char      *udi,
+                                                 const char      *key,
+                                                 dbus_bool_t      is_removed,
+                                                 dbus_bool_t      is_added);
 
 enum {
 	PROP_0,
@@ -110,32 +110,32 @@ tracker_storage_class_init (TrackerStorageClass *klass)
 
 	object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize	   = tracker_storage_finalize;
+	object_class->finalize     = tracker_storage_finalize;
 	object_class->get_property = hal_get_property;
 
 	signals[MOUNT_POINT_ADDED] =
 		g_signal_new ("mount-point-added",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_STRING,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__STRING_STRING,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_STRING,
+		              G_TYPE_STRING);
 
 	signals[MOUNT_POINT_REMOVED] =
 		g_signal_new ("mount-point-removed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_STRING,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__STRING_STRING,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_STRING,
+		              G_TYPE_STRING);
 
 	g_type_class_add_private (object_class, sizeof (TrackerStoragePriv));
 }
@@ -151,22 +151,22 @@ tracker_storage_init (TrackerStorage *storage)
 	priv = GET_PRIV (storage);
 
 	priv->all_devices = g_hash_table_new_full (g_str_hash,
-						   g_str_equal,
-						   (GDestroyNotify) g_free,
-						   (GDestroyNotify) g_free);
+	                                           g_str_equal,
+	                                           (GDestroyNotify) g_free,
+	                                           (GDestroyNotify) g_free);
 	priv->mounts = g_node_new (NULL);
 
 	priv->mounts_by_udi = g_hash_table_new_full (g_str_hash,
-						     g_str_equal,
-						     (GDestroyNotify) g_free,
-						     NULL);
+	                                             g_str_equal,
+	                                             (GDestroyNotify) g_free,
+	                                             NULL);
 
 	dbus_error_init (&error);
 
 	priv->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not get the system D-Bus connection, %s",
-			    error.message);
+		            error.message);
 		dbus_error_free (&error);
 		return;
 	}
@@ -187,11 +187,11 @@ tracker_storage_init (TrackerStorage *storage)
 	if (!libhal_ctx_init (priv->context, &error)) {
 		if (dbus_error_is_set (&error)) {
 			g_critical ("Could not initialize the HAL context, %s",
-				    error.message);
+			            error.message);
 			dbus_error_free (&error);
 		} else {
 			g_critical ("Could not initialize the HAL context, "
-				    "no error, is hald running?");
+			            "no error, is hald running?");
 		}
 
 		libhal_ctx_free (priv->context);
@@ -214,7 +214,7 @@ tracker_storage_init (TrackerStorage *storage)
 
 static gboolean
 free_mount_info (GNode    *node,
-		 gpointer  user_data)
+                 gpointer  user_data)
 {
 	MountInfo *info;
 
@@ -234,11 +234,11 @@ static void
 free_mount_node (GNode *node)
 {
 	g_node_traverse (node,
-			 G_POST_ORDER,
-			 G_TRAVERSE_ALL,
-			 -1,
-			 free_mount_info,
-			 NULL);
+	                 G_POST_ORDER,
+	                 G_TRAVERSE_ALL,
+	                 -1,
+	                 free_mount_info,
+	                 NULL);
 
 	g_node_destroy (node);
 }
@@ -278,9 +278,9 @@ tracker_storage_finalize (GObject *object)
 
 static void
 hal_get_property (GObject    *object,
-		  guint       param_id,
-		  GValue     *value,
-		  GParamSpec *pspec)
+                  guint       param_id,
+                  GValue     *value,
+                  GParamSpec *pspec)
 {
 	TrackerStoragePriv *priv;
 
@@ -306,13 +306,13 @@ hal_setup_devices (TrackerStorage *storage)
 	dbus_error_init (&error);
 
 	devices = libhal_find_device_by_capability (priv->context,
-						    CAPABILITY_VOLUME,
-						    &num,
-						    &error);
+	                                            CAPABILITY_VOLUME,
+	                                            &num,
+	                                            &error);
 
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not get devices with 'volume' capability, %s",
-			    error.message);
+		            error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
@@ -331,19 +331,19 @@ hal_setup_devices (TrackerStorage *storage)
 		}
 
 		g_debug ("HAL device:'%s' found:",
-			   libhal_volume_get_device_file (volume));
-		g_debug ("  UDI	 : %s",
-			   libhal_volume_get_udi (volume));
+		         libhal_volume_get_device_file (volume));
+		g_debug ("  UDI          : %s",
+		         libhal_volume_get_udi (volume));
 		g_debug ("  Mount point: %s",
-			   libhal_volume_get_mount_point (volume));
- 		g_debug ("  UUID	 : %s",
-			   libhal_volume_get_uuid (volume));
+		         libhal_volume_get_mount_point (volume));
+		g_debug ("  UUID         : %s",
+		         libhal_volume_get_uuid (volume));
 		g_debug ("  Mounted    : %s",
-			   libhal_volume_is_mounted (volume) ? "yes" : "no");
+		         libhal_volume_is_mounted (volume) ? "yes" : "no");
 		g_debug ("  File system: %s",
-			   libhal_volume_get_fstype (volume));
-		g_debug ("  Label	 : %s",
-			   libhal_volume_get_label (volume));
+		         libhal_volume_get_fstype (volume));
+		g_debug ("  Label        : %s",
+		         libhal_volume_get_label (volume));
 
 		hal_device_add (storage, volume);
 		libhal_volume_free (volume);
@@ -356,7 +356,7 @@ hal_setup_devices (TrackerStorage *storage)
 
 static gboolean
 mount_point_traverse_func (GNode *node,
-			   gpointer user_data)
+                           gpointer user_data)
 {
 	TraverseData *data;
 	MountInfo *info;
@@ -379,23 +379,23 @@ mount_point_traverse_func (GNode *node,
 
 static GNode *
 find_mount_point (GNode *root,
-		  const gchar *path)
+                  const gchar *path)
 {
 	TraverseData data = { path, NULL };
 
 	g_node_traverse (root,
-			 G_POST_ORDER,
-			 G_TRAVERSE_ALL,
-			 -1,
-			 mount_point_traverse_func,
-			 &data);
+	                 G_POST_ORDER,
+	                 G_TRAVERSE_ALL,
+	                 -1,
+	                 mount_point_traverse_func,
+	                 &data);
 
 	return data.node;
 }
 
 static MountInfo *
 find_mount_point_info (GNode *root,
-		       const gchar *path)
+                       const gchar *path)
 {
 	GNode *node;
 
@@ -405,9 +405,9 @@ find_mount_point_info (GNode *root,
 
 static GNode *
 mount_point_hierarchy_add (GNode *root,
-			   const gchar *mount_point,
-			   const gchar *udi,
-			   gboolean removable)
+                           const gchar *mount_point,
+                           const gchar *udi,
+                           gboolean removable)
 {
 	MountInfo *info;
 	GNode *node;
@@ -437,9 +437,9 @@ mount_point_hierarchy_add (GNode *root,
 
 static void
 hal_mount_point_add (TrackerStorage *storage,
-		     const gchar    *udi,
-		     const gchar    *mount_point,
-		     gboolean	     removable_device)
+                     const gchar    *udi,
+                     const gchar    *mount_point,
+                     gboolean        removable_device)
 {
 	TrackerStoragePriv *priv;
 	GNode *node;
@@ -447,9 +447,9 @@ hal_mount_point_add (TrackerStorage *storage,
 	priv = GET_PRIV (storage);
 
 	g_message ("HAL device:'%s' with mount point:'%s', removable:%s now being tracked",
-		   (const gchar*) g_hash_table_lookup (priv->all_devices, udi),
-		   mount_point,
-		   removable_device ? "yes" : "no");
+	           (const gchar*) g_hash_table_lookup (priv->all_devices, udi),
+	           mount_point,
+	           removable_device ? "yes" : "no");
 
 	node = mount_point_hierarchy_add (priv->mounts, mount_point, udi, removable_device);
 	g_hash_table_insert (priv->mounts_by_udi, g_strdup (udi), node);
@@ -459,7 +459,7 @@ hal_mount_point_add (TrackerStorage *storage,
 
 static void
 hal_mount_point_remove (TrackerStorage *storage,
-			const gchar    *udi)
+                        const gchar    *udi)
 {
 	MountInfo *info;
 	TrackerStoragePriv *priv;
@@ -476,10 +476,10 @@ hal_mount_point_remove (TrackerStorage *storage,
 	info = node->data;
 
 	g_message ("HAL device:'%s' with mount point:'%s' (uuid:'%s'), removable:%s NO LONGER being tracked",
-		   (const gchar*) g_hash_table_lookup (priv->all_devices, udi),
-		   info->mount_point,
-		   udi,
-		   info->removable ? "yes" : "no");
+	           (const gchar*) g_hash_table_lookup (priv->all_devices, udi),
+	           info->mount_point,
+	           udi,
+	           info->removable ? "yes" : "no");
 
 	g_signal_emit (storage, signals[MOUNT_POINT_REMOVED], 0, udi, info->mount_point, NULL);
 
@@ -553,7 +553,7 @@ hal_device_is_user_removable (TrackerStorage *storage,
 		   linux kernel as they do not contain removable media, they
 		   are simply hotpluggable
 		   consider all SD/MMC volumes mounted in /media as user removable
-		 */
+		*/
 		if (g_str_has_prefix (mount_point, "/media/")) {
 			removable = TRUE;
 		}
@@ -566,7 +566,7 @@ hal_device_is_user_removable (TrackerStorage *storage,
 
 static gboolean
 hal_device_should_be_tracked (TrackerStorage *storage,
-			      const gchar    *device_file)
+                              const gchar    *device_file)
 {
 	TrackerStoragePriv *priv;
 	LibHalDrive *drive;
@@ -587,21 +587,21 @@ hal_device_should_be_tracked (TrackerStorage *storage,
 	/* From the list, the first one below seems to be the ONLY one
 	 * to ignore:
 	 *
-	 * LIBHAL_DRIVE_TYPE_REMOVABLE_DISK	   = 0x00,
-	 * LIBHAL_DRIVE_TYPE_DISK		   = 0x01,
-	 * LIBHAL_DRIVE_TYPE_CDROM		   = 0x02,
-	 * LIBHAL_DRIVE_TYPE_FLOPPY		   = 0x03,
-	 * LIBHAL_DRIVE_TYPE_TAPE		   = 0x04,
-	 * LIBHAL_DRIVE_TYPE_COMPACT_FLASH	   = 0x05,
-	 * LIBHAL_DRIVE_TYPE_MEMORY_STICK	   = 0x06,
-	 * LIBHAL_DRIVE_TYPE_SMART_MEDIA	   = 0x07,
-	 * LIBHAL_DRIVE_TYPE_SD_MMC		   = 0x08,
-	 * LIBHAL_DRIVE_TYPE_CAMERA		   = 0x09,
+	 * LIBHAL_DRIVE_TYPE_REMOVABLE_DISK        = 0x00,
+	 * LIBHAL_DRIVE_TYPE_DISK                  = 0x01,
+	 * LIBHAL_DRIVE_TYPE_CDROM                 = 0x02,
+	 * LIBHAL_DRIVE_TYPE_FLOPPY                = 0x03,
+	 * LIBHAL_DRIVE_TYPE_TAPE                  = 0x04,
+	 * LIBHAL_DRIVE_TYPE_COMPACT_FLASH         = 0x05,
+	 * LIBHAL_DRIVE_TYPE_MEMORY_STICK          = 0x06,
+	 * LIBHAL_DRIVE_TYPE_SMART_MEDIA           = 0x07,
+	 * LIBHAL_DRIVE_TYPE_SD_MMC                = 0x08,
+	 * LIBHAL_DRIVE_TYPE_CAMERA                = 0x09,
 	 * LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,
-	 * LIBHAL_DRIVE_TYPE_ZIP		   = 0x0b,
-	 * LIBHAL_DRIVE_TYPE_JAZ		   = 0x0c,
-	 * LIBHAL_DRIVE_TYPE_FLASHKEY		   = 0x0d,
-	 * LIBHAL_DRIVE_TYPE_MO			   = 0x0e
+	 * LIBHAL_DRIVE_TYPE_ZIP                   = 0x0b,
+	 * LIBHAL_DRIVE_TYPE_JAZ                   = 0x0c,
+	 * LIBHAL_DRIVE_TYPE_FLASHKEY              = 0x0d,
+	 * LIBHAL_DRIVE_TYPE_MO                            = 0x0e
 	 *
 	 */
 
@@ -620,12 +620,12 @@ hal_device_should_be_tracked (TrackerStorage *storage,
 
 	if (!eligible) {
 		g_message ("HAL device:'%s' is not eligible for tracking, type is '%s'",
-			   device_file,
-			   hal_drive_type_to_string (drive_type));
+		           device_file,
+		           hal_drive_type_to_string (drive_type));
 	} else {
 		g_message ("HAL device:'%s' is eligible for tracking, type is '%s'",
-			   device_file,
-			   hal_drive_type_to_string (drive_type));
+		           device_file,
+		           hal_drive_type_to_string (drive_type));
 	}
 
 	return eligible;
@@ -633,7 +633,7 @@ hal_device_should_be_tracked (TrackerStorage *storage,
 
 static gboolean
 hal_device_add (TrackerStorage *storage,
-		LibHalVolume   *volume)
+                LibHalVolume   *volume)
 {
 	TrackerStoragePriv *priv;
 	DBusError error;
@@ -663,22 +663,22 @@ hal_device_add (TrackerStorage *storage,
 
 	if (dbus_error_is_set (&error)) {
 		g_critical ("Could not add device:'%s' property watch for udi:'%s', %s",
-			    device_file,
-			    udi,
-			    error.message);
+		            device_file,
+		            udi,
+		            error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
 
 	g_hash_table_insert (priv->all_devices,
-			     g_strdup (udi),
-			     g_strdup (device_file));
+	                     g_strdup (udi),
+	                     g_strdup (device_file));
 
 	if (mount_point) {
 		hal_mount_point_add (storage,
-				     udi,
-				     mount_point,
-				     hal_device_is_user_removable (storage, device_file, mount_point));
+		                     udi,
+		                     mount_point,
+		                     hal_device_is_user_removable (storage, device_file, mount_point));
 	}
 
 	return TRUE;
@@ -686,7 +686,7 @@ hal_device_add (TrackerStorage *storage,
 
 static void
 hal_device_added_cb (LibHalContext *context,
-		     const gchar   *udi)
+                     const gchar   *udi)
 {
 	TrackerStorage *storage;
 	LibHalVolume *volume;
@@ -702,19 +702,19 @@ hal_device_added_cb (LibHalContext *context,
 		}
 
 		g_message ("HAL device:'%s' added:",
-			   libhal_volume_get_device_file (volume));
-		g_message ("  UDI	 : %s",
-			   udi);
+		           libhal_volume_get_device_file (volume));
+		g_message ("  UDI        : %s",
+		           udi);
 		g_message ("  Mount point: %s",
-			   libhal_volume_get_mount_point (volume));
- 		g_message ("  UUID	 : %s",
-			   libhal_volume_get_uuid (volume));
+		           libhal_volume_get_mount_point (volume));
+		g_message ("  UUID       : %s",
+		           libhal_volume_get_uuid (volume));
 		g_message ("  Mounted    : %s",
-			   libhal_volume_is_mounted (volume) ? "yes" : "no");
+		           libhal_volume_is_mounted (volume) ? "yes" : "no");
 		g_message ("  File system: %s",
-			   libhal_volume_get_fstype (volume));
-		g_message ("  Label	 : %s",
-			   libhal_volume_get_label (volume));
+		           libhal_volume_get_fstype (volume));
+		g_message ("  Label      : %s",
+		           libhal_volume_get_label (volume));
 
 		hal_device_add (storage, volume);
 		libhal_volume_free (volume);
@@ -723,7 +723,7 @@ hal_device_added_cb (LibHalContext *context,
 
 static void
 hal_device_removed_cb (LibHalContext *context,
-		       const gchar   *udi)
+                       const gchar   *udi)
 {
 	TrackerStorage *storage;
 	TrackerStoragePriv *priv;
@@ -741,9 +741,9 @@ hal_device_removed_cb (LibHalContext *context,
 		}
 
 		g_message ("HAL device:'%s' removed:",
-			   device_file);
-		g_message ("  UDI	 : %s",
-			   udi);
+		           device_file);
+		g_message ("  UDI        : %s",
+		           udi);
 
 		g_hash_table_remove (priv->all_devices, udi);
 
@@ -753,10 +753,10 @@ hal_device_removed_cb (LibHalContext *context,
 
 static void
 hal_device_property_modified_cb (LibHalContext *context,
-				 const char    *udi,
-				 const char    *key,
-				 dbus_bool_t	is_removed,
-				 dbus_bool_t	is_added)
+                                 const char    *udi,
+                                 const char    *key,
+                                 dbus_bool_t    is_removed,
+                                 dbus_bool_t    is_added)
 {
 	TrackerStorage *storage;
 	TrackerStoragePriv *priv;
@@ -774,27 +774,27 @@ hal_device_property_modified_cb (LibHalContext *context,
 		device_file = g_hash_table_lookup (priv->all_devices, udi);
 
 		g_message ("HAL device:'%s' property change for udi:'%s' and key:'%s'",
-			   device_file,
-			   udi,
-			   key);
+		           device_file,
+		           udi,
+		           key);
 
 		if (strcmp (key, PROP_IS_MOUNTED) != 0) {
 			return;
 		}
 
 		is_mounted = libhal_device_get_property_bool (context,
-							      udi,
-							      key,
-							      &error);
+		                                              udi,
+		                                              key,
+		                                              &error);
 
 		if (dbus_error_is_set (&error)) {
 			g_message ("Could not get device property:'%s' for udi:'%s', %s",
-				   udi, key, error.message);
+			           udi, key, error.message);
 			dbus_error_free (&error);
 
 			g_message ("HAL device:'%s' with udi:'%s' is now unmounted (due to error)",
-				   device_file,
-				   udi);
+			           device_file,
+			           udi);
 			hal_mount_point_remove (storage, udi);
 			return;
 		}
@@ -807,19 +807,19 @@ hal_device_property_modified_cb (LibHalContext *context,
 			mount_point = libhal_volume_get_mount_point (volume);
 
 			g_message ("HAL device:'%s' with udi:'%s' is now mounted",
-				   device_file,
-				   udi);
+			           device_file,
+			           udi);
 
 			hal_mount_point_add (storage,
-					     udi,
-					     mount_point,
-					     hal_device_is_user_removable (storage, device_file, mount_point));
+			                     udi,
+			                     mount_point,
+			                     hal_device_is_user_removable (storage, device_file, mount_point));
 
 			libhal_volume_free (volume);
 		} else {
 			g_message ("HAL device:'%s' with udi:'%s' is now unmounted",
-				   device_file,
-				   udi);
+			           device_file,
+			           udi);
 
 			hal_mount_point_remove (storage, udi);
 		}
@@ -841,8 +841,8 @@ tracker_storage_new (void)
 
 static void
 hal_get_mount_point_by_udi_foreach (gpointer key,
-				    gpointer value,
-				    gpointer user_data)
+                                    gpointer value,
+                                    gpointer user_data)
 {
 	GetRoots *gr;
 	const gchar *udi;
@@ -897,8 +897,8 @@ tracker_storage_get_mounted_directory_roots (TrackerStorage *storage)
 	gr.only_removable = FALSE;
 
 	g_hash_table_foreach (priv->mounts_by_udi,
-			      hal_get_mount_point_by_udi_foreach,
-			      &gr);
+	                      hal_get_mount_point_by_udi_foreach,
+	                      &gr);
 
 	return g_slist_reverse (gr.roots);
 }
@@ -930,8 +930,8 @@ tracker_storage_get_removable_device_roots (TrackerStorage *storage)
 	gr.only_removable = TRUE;
 
 	g_hash_table_foreach (priv->mounts_by_udi,
-			      hal_get_mount_point_by_udi_foreach,
-			      &gr);
+	                      hal_get_mount_point_by_udi_foreach,
+	                      &gr);
 
 	return g_slist_reverse (gr.roots);
 }
@@ -951,9 +951,9 @@ tracker_storage_get_removable_device_roots (TrackerStorage *storage)
  **/
 gboolean
 tracker_storage_uri_is_on_removable_device (TrackerStorage *storage,
-					    const gchar    *uri,
-					    gchar         **mount_point,
-					    gboolean       *available)
+                                            const gchar    *uri,
+                                            gchar         **mount_point,
+                                            gboolean       *available)
 {
 	TrackerStoragePriv *priv;
 	gchar *path;
@@ -1052,7 +1052,7 @@ tracker_storage_get_removable_device_udis (TrackerStorage *storage)
  **/
 const gchar *
 tracker_storage_udi_get_mount_point (TrackerStorage *storage,
-				     const gchar    *udi)
+                                     const gchar    *udi)
 {
 	TrackerStoragePriv *priv;
 	GNode *node;
@@ -1082,7 +1082,7 @@ tracker_storage_udi_get_mount_point (TrackerStorage *storage,
  **/
 gboolean
 tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
-				    const gchar    *udi)
+                                    const gchar    *udi)
 {
 	TrackerStoragePriv *priv;
 	LibHalVolume *volume;
@@ -1097,8 +1097,8 @@ tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
 	volume = libhal_volume_from_udi (priv->context, udi);
 	if (!volume) {
 		g_message ("HAL device with udi:'%s' has no volume, "
-			   "should we delete?",
-			   udi);
+		           "should we delete?",
+		           udi);
 		return FALSE;
 	}
 
@@ -1122,7 +1122,7 @@ tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
  **/
 const gchar *
 tracker_storage_get_volume_udi_for_file (TrackerStorage *storage,
-					 GFile          *file)
+                                         GFile          *file)
 {
 	TrackerStoragePriv *priv;
 	gchar *path;
@@ -1146,7 +1146,7 @@ tracker_storage_get_volume_udi_for_file (TrackerStorage *storage,
 	}
 
 	g_debug ("Mount for path '%s' is '%s' (UDI:'%s')",
-		 path, info->mount_point, info->udi);
+	         path, info->mount_point, info->udi);
 
 	return info->udi;
 }
diff --git a/src/libtracker-common/tracker-storage.h b/src/libtracker-common/tracker-storage.h
index 134ea2c..4d92d08 100644
--- a/src/libtracker-common/tracker-storage.h
+++ b/src/libtracker-common/tracker-storage.h
@@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_STORAGE	     (tracker_storage_get_type ())
-#define TRACKER_STORAGE(o)	     (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_STORAGE, TrackerStorage))
+#define TRACKER_TYPE_STORAGE         (tracker_storage_get_type ())
+#define TRACKER_STORAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_STORAGE, TrackerStorage))
 #define TRACKER_STORAGE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_STORAGE, TrackerStorageClass))
-#define TRACKER_IS_STORAGE(o)	     (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_STORAGE))
+#define TRACKER_IS_STORAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_STORAGE))
 #define TRACKER_IS_STORAGE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_STORAGE))
 #define TRACKER_STORAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_STORAGE, TrackerStorageClass))
 
@@ -50,21 +50,21 @@ struct _TrackerStorageClass {
 
 #ifdef HAVE_HAL
 
-GType	        tracker_storage_get_type		    (void) G_GNUC_CONST;
+GType           tracker_storage_get_type                    (void) G_GNUC_CONST;
 TrackerStorage *tracker_storage_new                         (void);
 GSList *        tracker_storage_get_mounted_directory_roots (TrackerStorage  *storage);
 GSList *        tracker_storage_get_removable_device_roots  (TrackerStorage  *storage);
 GSList *        tracker_storage_get_removable_device_udis   (TrackerStorage  *storage);
 const gchar *   tracker_storage_udi_get_mount_point         (TrackerStorage  *storage,
-							     const gchar     *udi);
+                                                             const gchar     *udi);
 gboolean        tracker_storage_udi_get_is_mounted          (TrackerStorage  *storage,
-							     const gchar     *udi);
+                                                             const gchar     *udi);
 gboolean        tracker_storage_uri_is_on_removable_device  (TrackerStorage  *storage,
-							     const gchar     *uri,
-							     gchar          **mount_point,
-							     gboolean        *available);
+                                                             const gchar     *uri,
+                                                             gchar          **mount_point,
+                                                             gboolean        *available);
 const gchar*    tracker_storage_get_volume_udi_for_file     (TrackerStorage  *storage,
-							     GFile           *file);
+                                                             GFile           *file);
 
 #endif /* HAVE_HAL */
 
diff --git a/src/libtracker-common/tracker-type-utils.c b/src/libtracker-common/tracker-type-utils.c
index 64f5a56..64db456 100644
--- a/src/libtracker-common/tracker-type-utils.c
+++ b/src/libtracker-common/tracker-type-utils.c
@@ -49,7 +49,7 @@ static const char imonths[] = {
 static gboolean
 is_int (const gchar *str)
 {
-	gint	 i, len;
+	gint     i, len;
 
 	if (!str || str[0] == '\0') {
 		return FALSE;
@@ -305,7 +305,7 @@ tracker_date_format (const gchar *date_string)
 
 		return g_strdup (buf);
 	} else if ((len == 28) && (date_string[4] == '-') && (date_string[10] == 'T')
-		   && (date_string[19] == '.') ) {
+	           && (date_string[19] == '.') ) {
 		/* The fraction of seconds ISO 8601 "YYYY-MM-DDThh:mm:ss.ff+zz:zz" */
 		buf[0] = date_string[0];
 		buf[1] = date_string[1];
@@ -342,7 +342,7 @@ tracker_date_format (const gchar *date_string)
 
 gchar *
 tracker_date_format_to_iso8601 (const gchar *date_string,
-				const gchar *format)
+                                const gchar *format)
 {
 	gchar *result;
 	struct tm date_tm = { 0 };
@@ -391,7 +391,7 @@ tracker_string_to_date (const gchar *date_string)
 	GMatchInfo *match_info;
 	gchar      *match;
 	struct tm tm;
-	time_t	  t;
+	time_t    t;
 
 	g_return_val_if_fail (date_string, -1);
 
@@ -479,9 +479,9 @@ tracker_string_to_date (const gchar *date_string)
 gchar *
 tracker_date_to_string (time_t date_time)
 {
-	gchar	  buffer[30];
+	gchar     buffer[30];
 	struct tm utc_time;
-	size_t	  count;
+	size_t    count;
 
 	memset (buffer, '\0', sizeof (buffer));
 	memset (&utc_time, 0, sizeof (struct tm));
@@ -526,10 +526,10 @@ tracker_guint32_to_string (guint32 i)
 
 gboolean
 tracker_string_to_uint (const gchar *s,
-			guint	    *value)
+                        guint       *value)
 {
 	unsigned long int  n;
-	gchar		  *end;
+	gchar             *end;
 
 	g_return_val_if_fail (s != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
@@ -553,10 +553,10 @@ tracker_string_to_uint (const gchar *s,
 
 gint
 tracker_string_in_string_list (const gchar  *str,
-			       gchar	   **strv)
+                               gchar       **strv)
 {
 	gchar **p;
-	gint	i;
+	gint    i;
 
 	g_return_val_if_fail (str != NULL, -1);
 
@@ -575,7 +575,7 @@ tracker_string_in_string_list (const gchar  *str,
 
 gboolean
 tracker_string_in_gslist (const gchar *str,
-			  GSList      *list)
+                          GSList      *list)
 {
 	GSList *l;
 
@@ -592,11 +592,11 @@ tracker_string_in_gslist (const gchar *str,
 
 GSList *
 tracker_string_list_to_gslist (gchar **strv,
-			       gsize   size)
+                               gsize   size)
 {
 	GSList *list;
-	gsize	i;
-	gsize	size_used;
+	gsize   i;
+	gsize   size_used;
 
 	g_return_val_if_fail (strv != NULL, NULL);
 
@@ -621,12 +621,12 @@ tracker_string_list_to_gslist (gchar **strv,
 
 gchar *
 tracker_string_list_to_string (gchar **strv,
-			       gsize   size,
-			       gchar   sep)
+                               gsize   size,
+                               gchar   sep)
 {
 	GString *string;
-	gsize	 i;
-	gsize	 size_used;
+	gsize    i;
+	gsize    size_used;
 
 	g_return_val_if_fail (strv != NULL, NULL);
 
@@ -669,9 +669,9 @@ tracker_string_to_string_list (const gchar *str)
 gchar **
 tracker_gslist_to_string_list (GSList *list)
 {
-	GSList	*l;
+	GSList  *l;
 	gchar  **strv;
-	gint	 i;
+	gint     i;
 
 	strv = g_new0 (gchar*, g_slist_length (list) + 1);
 
diff --git a/src/libtracker-common/tracker-type-utils.h b/src/libtracker-common/tracker-type-utils.h
index aa3f244..9a71799 100644
--- a/src/libtracker-common/tracker-type-utils.h
+++ b/src/libtracker-common/tracker-type-utils.h
@@ -30,31 +30,31 @@ G_BEGIN_DECLS
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-gchar *  tracker_date_format		       (const gchar  *date_string);
+gchar *  tracker_date_format                   (const gchar  *date_string);
 gchar *  tracker_date_format_to_iso8601        (const gchar  *date_string,
-						const gchar  *format);
-gchar *  tracker_date_to_time_string	       (const gchar  *date_string);
-time_t	 tracker_string_to_date		       (const gchar  *date_string);
-gchar *  tracker_date_to_string		       (time_t	      date_time);
-gchar *  tracker_glong_to_string	       (glong	      i);
-gchar *  tracker_gint_to_string		       (gint	      i);
-gchar *  tracker_guint_to_string	       (guint	      i);
-gchar *  tracker_gint32_to_string	       (gint32	      i);
-gchar *  tracker_guint32_to_string	       (guint32       i);
-gboolean tracker_string_to_uint		       (const gchar  *s,
-						guint	     *ret);
-gint	 tracker_string_in_string_list	       (const gchar  *str,
-						gchar	    **strv);
+                                                const gchar  *format);
+gchar *  tracker_date_to_time_string           (const gchar  *date_string);
+time_t   tracker_string_to_date                        (const gchar  *date_string);
+gchar *  tracker_date_to_string                        (time_t        date_time);
+gchar *  tracker_glong_to_string               (glong         i);
+gchar *  tracker_gint_to_string                        (gint          i);
+gchar *  tracker_guint_to_string               (guint         i);
+gchar *  tracker_gint32_to_string              (gint32        i);
+gchar *  tracker_guint32_to_string             (guint32       i);
+gboolean tracker_string_to_uint                        (const gchar  *s,
+                                                        guint        *ret);
+gint     tracker_string_in_string_list         (const gchar  *str,
+                                                gchar       **strv);
 gboolean tracker_string_in_gslist              (const gchar  *str,
-						GSList       *list);
-GSList * tracker_string_list_to_gslist	       (gchar	    **strv,
-						gsize	      length);
-gchar *  tracker_string_list_to_string	       (gchar	    **strv,
-						gsize	      length,
-						gchar	      sep);
-gchar ** tracker_string_to_string_list	       (const gchar  *str);
-gchar ** tracker_gslist_to_string_list	       (GSList	     *list);
-GSList * tracker_gslist_copy_with_string_data  (GSList	     *list);
+                                                GSList       *list);
+GSList * tracker_string_list_to_gslist         (gchar       **strv,
+                                                gsize         length);
+gchar *  tracker_string_list_to_string         (gchar       **strv,
+                                                gsize         length,
+                                                gchar         sep);
+gchar ** tracker_string_to_string_list         (const gchar  *str);
+gchar ** tracker_gslist_to_string_list         (GSList       *list);
+GSList * tracker_gslist_copy_with_string_data  (GSList       *list);
 GList *  tracker_glist_copy_with_string_data   (GList        *list);
 gchar *  tracker_string_boolean_to_string_gint (const gchar  *value);
 
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index 38806d6..4f96ff4 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -44,14 +44,14 @@ tracker_is_blank_string (const char *str)
 		return TRUE;
 	}
 
-        for (p = str; *p; p = g_utf8_next_char (p)) {
+	for (p = str; *p; p = g_utf8_next_char (p)) {
 		register gunichar c;
 
-                c = g_utf8_get_char (p);
+		c = g_utf8_get_char (p);
 
-                if (!g_unichar_isspace (c)) {
-                        return FALSE;
-                }
+		if (!g_unichar_isspace (c)) {
+			return FALSE;
+		}
 	}
 
 	return TRUE;
@@ -59,8 +59,8 @@ tracker_is_blank_string (const char *str)
 
 /* Removes a substring modifing haystack in place */
 gchar *
-tracker_string_remove (gchar	   *haystack,
-		       const gchar *needle)
+tracker_string_remove (gchar       *haystack,
+                       const gchar *needle)
 {
 	gchar *current, *pos, *next, *end;
 	gint len;
@@ -97,11 +97,11 @@ tracker_string_remove (gchar	   *haystack,
 
 gchar *
 tracker_string_replace (const gchar *haystack,
-			const gchar *needle,
-			const gchar *replacement)
+                        const gchar *needle,
+                        const gchar *replacement)
 {
 	GString *str;
-	gint	 pos, needle_len;
+	gint     pos, needle_len;
 
 	g_return_val_if_fail (haystack != NULL, NULL);
 	g_return_val_if_fail (needle != NULL, NULL);
@@ -128,9 +128,9 @@ tracker_string_replace (const gchar *haystack,
 
 gchar *
 tracker_seconds_estimate_to_string (gdouble  seconds_elapsed,
-				    gboolean short_string,
-				    guint    items_done,
-				    guint    items_remaining)
+                                    gboolean short_string,
+                                    guint    items_done,
+                                    guint    items_remaining)
 {
 	gdouble per_item;
 	gdouble total;
@@ -153,23 +153,23 @@ tracker_seconds_estimate_to_string (gdouble  seconds_elapsed,
 
 gchar *
 tracker_seconds_to_string (gdouble  seconds_elapsed,
-			   gboolean short_string)
+                           gboolean short_string)
 {
 	GString *s;
-	gchar	*str;
+	gchar   *str;
 	gdouble  total;
-	gint	 days, hours, minutes, seconds;
+	gint     days, hours, minutes, seconds;
 
 	g_return_val_if_fail (seconds_elapsed >= 0.0, g_strdup (_("less than one second")));
 
-	total	 = seconds_elapsed;
+	total    = seconds_elapsed;
 
 	seconds  = (gint) total % 60;
-	total	/= 60;
+	total   /= 60;
 	minutes  = (gint) total % 60;
-	total	/= 60;
-	hours	 = (gint) total % 24;
-	days	 = (gint) total / 24;
+	total   /= 60;
+	hours    = (gint) total % 24;
+	days     = (gint) total / 24;
 
 	s = g_string_new ("");
 
@@ -223,62 +223,62 @@ tracker_seconds_to_string (gdouble  seconds_elapsed,
 static gboolean
 tracker_dgettext_should_translate (void)
 {
-  static gsize translate = 0;
-  enum {
-    SHOULD_TRANSLATE = 1,
-    SHOULD_NOT_TRANSLATE = 2
-  };
-
-  if (G_UNLIKELY (g_once_init_enter (&translate)))
-    {
-      gboolean should_translate = TRUE;
-
-      const char *default_domain     = textdomain (NULL);
-      const char *translator_comment = gettext ("");
+	static gsize translate = 0;
+	enum {
+		SHOULD_TRANSLATE = 1,
+		SHOULD_NOT_TRANSLATE = 2
+	};
+
+	if (G_UNLIKELY (g_once_init_enter (&translate)))
+		{
+			gboolean should_translate = TRUE;
+
+			const char *default_domain     = textdomain (NULL);
+			const char *translator_comment = gettext ("");
 #ifndef G_OS_WIN32
-      const char *translate_locale   = setlocale (LC_MESSAGES, NULL);
+			const char *translate_locale   = setlocale (LC_MESSAGES, NULL);
 #else
-      const char *translate_locale   = g_win32_getlocale ();
+			const char *translate_locale   = g_win32_getlocale ();
 #endif
-      /* We should NOT translate only if all the following hold:
-       *   - user has called textdomain() and set textdomain to non-default
-       *   - default domain has no translations
-       *   - locale does not start with "en_" and is not "C"
-       *
-       * Rationale:
-       *   - If text domain is still the default domain, maybe user calls
-       *     it later. Continue with old behavior of translating.
-       *   - If locale starts with "en_", we can continue using the
-       *     translations even if the app doesn't have translations for
-       *     this locale.  That is, en_UK and en_CA for example.
-       *   - If locale is "C", maybe user calls setlocale(LC_ALL,"") later.
-       *     Continue with old behavior of translating.
-       */
-      if (0 != strcmp (default_domain, "messages") &&
-          '\0' == *translator_comment &&
-          0 != strncmp (translate_locale, "en_", 3) &&
-          0 != strcmp (translate_locale, "C"))
-        should_translate = FALSE;
-
-      g_once_init_leave (&translate,
-                         should_translate ?
-                         SHOULD_TRANSLATE :
-                         SHOULD_NOT_TRANSLATE);
-    }
-
-  return translate == SHOULD_TRANSLATE;
+			/* We should NOT translate only if all the following hold:
+			 *   - user has called textdomain() and set textdomain to non-default
+			 *   - default domain has no translations
+			 *   - locale does not start with "en_" and is not "C"
+			 *
+			 * Rationale:
+			 *   - If text domain is still the default domain, maybe user calls
+			 *     it later. Continue with old behavior of translating.
+			 *   - If locale starts with "en_", we can continue using the
+			 *     translations even if the app doesn't have translations for
+			 *     this locale.  That is, en_UK and en_CA for example.
+			 *   - If locale is "C", maybe user calls setlocale(LC_ALL,"") later.
+			 *     Continue with old behavior of translating.
+			 */
+			if (0 != strcmp (default_domain, "messages") &&
+			    '\0' == *translator_comment &&
+			    0 != strncmp (translate_locale, "en_", 3) &&
+			    0 != strcmp (translate_locale, "C"))
+				should_translate = FALSE;
+
+			g_once_init_leave (&translate,
+			                   should_translate ?
+			                   SHOULD_TRANSLATE :
+			                   SHOULD_NOT_TRANSLATE);
+		}
+
+	return translate == SHOULD_TRANSLATE;
 }
 
 G_CONST_RETURN gchar *
 tracker_dngettext (const gchar *domain,
-		   const gchar *msgid,
-		   const gchar *msgid_plural,
-		   gulong       n)
+                   const gchar *msgid,
+                   const gchar *msgid_plural,
+                   gulong       n)
 {
-  if (domain && G_UNLIKELY (!tracker_dgettext_should_translate ()))
-    return n == 1 ? msgid : msgid_plural;
+	if (domain && G_UNLIKELY (!tracker_dgettext_should_translate ()))
+		return n == 1 ? msgid : msgid_plural;
 
-  return dngettext (domain, msgid, msgid_plural, n);
+	return dngettext (domain, msgid, msgid_plural, n);
 }
 
 
@@ -286,218 +286,218 @@ static const char *
 find_conversion (const char  *format,
                  const char **after)
 {
-  const char *start = format;
-  const char *cp;
-
-  while (*start != '\0' && *start != '%')
-    start++;
-
-  if (*start == '\0')
-    {
-      *after = start;
-      return NULL;
-    }
-
-  cp = start + 1;
-
-  if (*cp == '\0')
-    {
-      *after = cp;
-      return NULL;
-    }
-
-  /* Test for positional argument.  */
-  if (*cp >= '0' && *cp <= '9')
-    {
-      const char *np;
-
-      for (np = cp; *np >= '0' && *np <= '9'; np++)
-        ;
-      if (*np == '$')
-        cp = np + 1;
-    }
-
-  /* Skip the flags.  */
-  for (;;)
-    {
-      if (*cp == '\'' ||
-          *cp == '-' ||
-          *cp == '+' ||
-          *cp == ' ' ||
-          *cp == '#' ||
-          *cp == '0')
-        cp++;
-      else
-        break;
-    }
-
-  /* Skip the field width.  */
-  if (*cp == '*')
-    {
-      cp++;
-
-      /* Test for positional argument.  */
-      if (*cp >= '0' && *cp <= '9')
-        {
-          const char *np;
-
-          for (np = cp; *np >= '0' && *np <= '9'; np++)
-            ;
-          if (*np == '$')
-            cp = np + 1;
-        }
-    }
-  else
-    {
-      for (; *cp >= '0' && *cp <= '9'; cp++)
-        ;
-    }
-
-  /* Skip the precision.  */
-  if (*cp == '.')
-    {
-      cp++;
-      if (*cp == '*')
-        {
-          /* Test for positional argument.  */
-          if (*cp >= '0' && *cp <= '9')
-            {
-              const char *np;
-
-              for (np = cp; *np >= '0' && *np <= '9'; np++)
-                ;
-              if (*np == '$')
-                cp = np + 1;
-            }
-        }
-      else
-        {
-          for (; *cp >= '0' && *cp <= '9'; cp++)
-            ;
-        }
-    }
-
-  /* Skip argument type/size specifiers.  */
-  while (*cp == 'h' ||
-         *cp == 'L' ||
-         *cp == 'l' ||
-         *cp == 'j' ||
-         *cp == 'z' ||
-         *cp == 'Z' ||
-         *cp == 't')
-    cp++;
-
-  /* Skip the conversion character.  */
-  cp++;
-
-  *after = cp;
-  return start;
+	const char *start = format;
+	const char *cp;
+
+	while (*start != '\0' && *start != '%')
+		start++;
+
+	if (*start == '\0')
+		{
+			*after = start;
+			return NULL;
+		}
+
+	cp = start + 1;
+
+	if (*cp == '\0')
+		{
+			*after = cp;
+			return NULL;
+		}
+
+	/* Test for positional argument.  */
+	if (*cp >= '0' && *cp <= '9')
+		{
+			const char *np;
+
+			for (np = cp; *np >= '0' && *np <= '9'; np++)
+				;
+			if (*np == '$')
+				cp = np + 1;
+		}
+
+	/* Skip the flags.  */
+	for (;;)
+		{
+			if (*cp == '\'' ||
+			    *cp == '-' ||
+			    *cp == '+' ||
+			    *cp == ' ' ||
+			    *cp == '#' ||
+			    *cp == '0')
+				cp++;
+			else
+				break;
+		}
+
+	/* Skip the field width.  */
+	if (*cp == '*')
+		{
+			cp++;
+
+			/* Test for positional argument.  */
+			if (*cp >= '0' && *cp <= '9')
+				{
+					const char *np;
+
+					for (np = cp; *np >= '0' && *np <= '9'; np++)
+						;
+					if (*np == '$')
+						cp = np + 1;
+				}
+		}
+	else
+		{
+			for (; *cp >= '0' && *cp <= '9'; cp++)
+				;
+		}
+
+	/* Skip the precision.  */
+	if (*cp == '.')
+		{
+			cp++;
+			if (*cp == '*')
+				{
+					/* Test for positional argument.  */
+					if (*cp >= '0' && *cp <= '9')
+						{
+							const char *np;
+
+							for (np = cp; *np >= '0' && *np <= '9'; np++)
+								;
+							if (*np == '$')
+								cp = np + 1;
+						}
+				}
+			else
+				{
+					for (; *cp >= '0' && *cp <= '9'; cp++)
+						;
+				}
+		}
+
+	/* Skip argument type/size specifiers.  */
+	while (*cp == 'h' ||
+	       *cp == 'L' ||
+	       *cp == 'l' ||
+	       *cp == 'j' ||
+	       *cp == 'z' ||
+	       *cp == 'Z' ||
+	       *cp == 't')
+		cp++;
+
+	/* Skip the conversion character.  */
+	cp++;
+
+	*after = cp;
+	return start;
 }
 
 gchar *
 tracker_uri_vprintf_escaped (const gchar *format,
                              va_list      args)
 {
-  GString *format1;
-  GString *format2;
-  GString *result = NULL;
-  gchar *output1 = NULL;
-  gchar *output2 = NULL;
-  const char *p;
-  char       *op1, *op2;
-  va_list args2;
-
-  format1 = g_string_new (NULL);
-  format2 = g_string_new (NULL);
-  p = format;
-  while (TRUE)
-    {
-      const char *after;
-      const char *conv = find_conversion (p, &after);
-      if (!conv)
-        break;
-
-      g_string_append_len (format1, conv, after - conv);
-      g_string_append_c (format1, 'X');
-      g_string_append_len (format2, conv, after - conv);
-      g_string_append_c (format2, 'Y');
-
-      p = after;
-    }
-
-  /* Use them to format the arguments
-   */
-  G_VA_COPY (args2, args);
-
-  output1 = g_strdup_vprintf (format1->str, args);
-  va_end (args);
-  if (!output1)
-    goto cleanup;
-
-  output2 = g_strdup_vprintf (format2->str, args2);
-  va_end (args2);
-  if (!output2)
-    goto cleanup;
-
-  result = g_string_new (NULL);
-
-  op1 = output1;
-  op2 = output2;
-  p = format;
-  while (TRUE)
-    {
-      const char *after;
-      const char *output_start;
-      const char *conv = find_conversion (p, &after);
-      char *escaped;
-
-      if (!conv)
-        {
-          g_string_append_len (result, p, after - p);
-          break;
-        }
-
-      g_string_append_len (result, p, conv - p);
-      output_start = op1;
-      while (*op1 == *op2)
-        {
-          op1++;
-          op2++;
-        }
-
-      *op1 = '\0';
-      escaped = g_uri_escape_string (output_start, NULL, FALSE);
-      g_string_append (result, escaped);
-      g_free (escaped);
-
-      p = after;
-      op1++;
-      op2++;
-    }
+	GString *format1;
+	GString *format2;
+	GString *result = NULL;
+	gchar *output1 = NULL;
+	gchar *output2 = NULL;
+	const char *p;
+	char       *op1, *op2;
+	va_list args2;
+
+	format1 = g_string_new (NULL);
+	format2 = g_string_new (NULL);
+	p = format;
+	while (TRUE)
+		{
+			const char *after;
+			const char *conv = find_conversion (p, &after);
+			if (!conv)
+				break;
+
+			g_string_append_len (format1, conv, after - conv);
+			g_string_append_c (format1, 'X');
+			g_string_append_len (format2, conv, after - conv);
+			g_string_append_c (format2, 'Y');
+
+			p = after;
+		}
+
+	/* Use them to format the arguments
+	 */
+	G_VA_COPY (args2, args);
+
+	output1 = g_strdup_vprintf (format1->str, args);
+	va_end (args);
+	if (!output1)
+		goto cleanup;
+
+	output2 = g_strdup_vprintf (format2->str, args2);
+	va_end (args2);
+	if (!output2)
+		goto cleanup;
+
+	result = g_string_new (NULL);
+
+	op1 = output1;
+	op2 = output2;
+	p = format;
+	while (TRUE)
+		{
+			const char *after;
+			const char *output_start;
+			const char *conv = find_conversion (p, &after);
+			char *escaped;
+
+			if (!conv)
+				{
+					g_string_append_len (result, p, after - p);
+					break;
+				}
+
+			g_string_append_len (result, p, conv - p);
+			output_start = op1;
+			while (*op1 == *op2)
+				{
+					op1++;
+					op2++;
+				}
+
+			*op1 = '\0';
+			escaped = g_uri_escape_string (output_start, NULL, FALSE);
+			g_string_append (result, escaped);
+			g_free (escaped);
+
+			p = after;
+			op1++;
+			op2++;
+		}
 
  cleanup:
-  g_string_free (format1, TRUE);
-  g_string_free (format2, TRUE);
-  g_free (output1);
-  g_free (output2);
-
-  if (result)
-    return g_string_free (result, FALSE);
-  else
-    return NULL;
+	g_string_free (format1, TRUE);
+	g_string_free (format2, TRUE);
+	g_free (output1);
+	g_free (output2);
+
+	if (result)
+		return g_string_free (result, FALSE);
+	else
+		return NULL;
 }
 
 gchar *
 tracker_uri_printf_escaped (const gchar *format, ...)
 {
-  char *result;
-  va_list args;
+	char *result;
+	va_list args;
 
-  va_start (args, format);
-  result = tracker_uri_vprintf_escaped (format, args);
-  va_end (args);
+	va_start (args, format);
+	result = tracker_uri_vprintf_escaped (format, args);
+	va_end (args);
 
-  return result;
+	return result;
 }
 
 
@@ -566,8 +566,8 @@ tracker_merge (const gchar *delim, gint n_values,
 
 gchar *
 tracker_text_normalize (const gchar *text,
-			guint        max_words,
-			guint       *n_words)
+                        guint        max_words,
+                        guint       *n_words)
 {
 	GString *string;
 	gboolean in_break = TRUE;
diff --git a/src/libtracker-common/tracker-utils.h b/src/libtracker-common/tracker-utils.h
index dc4f5c6..8f83f50 100644
--- a/src/libtracker-common/tracker-utils.h
+++ b/src/libtracker-common/tracker-utils.h
@@ -33,35 +33,35 @@ G_BEGIN_DECLS
 gboolean tracker_is_empty_string            (const char  *str);
 gboolean tracker_is_blank_string            (const char  *str);
 gchar *  tracker_string_replace             (const gchar *haystack,
-					     const gchar *needle,
-					     const gchar *replacement);
+                                             const gchar *needle,
+                                             const gchar *replacement);
 gchar *  tracker_string_remove              (gchar       *haystack,
-					     const gchar *needle);
+                                             const gchar *needle);
 gchar *  tracker_seconds_estimate_to_string (gdouble      seconds_elapsed,
-					     gboolean     short_string,
-					     guint        items_done,
-					     guint        items_remaining);
+                                             gboolean     short_string,
+                                             guint        items_done,
+                                             guint        items_remaining);
 gchar *  tracker_seconds_to_string          (gdouble      seconds_elapsed,
-					     gboolean     short_string);
+                                             gboolean     short_string);
 gchar*   tracker_uri_vprintf_escaped        (const gchar *format,
-					     va_list      args);
+                                             va_list      args);
 gchar*   tracker_uri_printf_escaped         (const gchar *format,
-					     ...);
+                                             ...);
 gchar *  tracker_coalesce                   (gint n_values,
-					     ...);
+                                             ...);
 gchar *  tracker_merge                      (const gchar *delim, gint n_values,
-					     ...);
+                                             ...);
 
 gchar *  tracker_text_normalize             (const gchar *text,
-					     guint        max_words,
-					     guint       *n_words);
+                                             guint        max_words,
+                                             guint       *n_words);
 
 /* Temporary: Just here until we upgrade to GLib 2.18. */
 G_CONST_RETURN gchar *
-         tracker_dngettext                  (const gchar *domain,
-					     const gchar *msgid,
-					     const gchar *msgid_plural,
-					     gulong       n);
+tracker_dngettext                  (const gchar *domain,
+                                    const gchar *msgid,
+                                    const gchar *msgid_plural,
+                                    gulong       n);
 
 G_END_DECLS
 
diff --git a/src/libtracker-data/tracker-data-backup.c b/src/libtracker-data/tracker-data-backup.c
index b151408..3bd0b71 100644
--- a/src/libtracker-data/tracker-data-backup.c
+++ b/src/libtracker-data/tracker-data-backup.c
@@ -113,11 +113,11 @@ save_copy_procedure (BackupSaveInfo *info)
 
 	if (g_file_query_exists (journal_o, NULL)) {
 		g_file_copy_async (journal_o, info->journal,
-				   G_FILE_COPY_OVERWRITE,
-				   G_PRIORITY_HIGH,
-				   NULL, NULL, NULL,
-				   on_journal_copied,
-				   info);
+		                   G_FILE_COPY_OVERWRITE,
+		                   G_PRIORITY_HIGH,
+		                   NULL, NULL, NULL,
+		                   on_journal_copied,
+		                   info);
 	} else {
 		g_file_copy_async (info->file, info->destination,
 		                   G_FILE_COPY_OVERWRITE,
@@ -220,7 +220,7 @@ restore_copy_procedure (BackupSaveInfo *info)
 		goto error_handle;
 	}
 
-error_handle:
+ error_handle:
 
 	info->error = error;
 }
diff --git a/src/libtracker-data/tracker-data-backup.h b/src/libtracker-data/tracker-data-backup.h
index fba5da7..a19a293 100644
--- a/src/libtracker-data/tracker-data-backup.h
+++ b/src/libtracker-data/tracker-data-backup.h
@@ -35,15 +35,15 @@ typedef void (*TrackerDataBackupFinished) (GError *error, gpointer user_data);
 
 GQuark tracker_data_backup_error_quark (void);
 void   tracker_data_backup_save        (GFile                     *destination,
-					GFile                     *journal,
-					TrackerDataBackupFinished  callback,
-					gpointer                   user_data,
-					GDestroyNotify             destroy);
+                                        GFile                     *journal,
+                                        TrackerDataBackupFinished  callback,
+                                        gpointer                   user_data,
+                                        GDestroyNotify             destroy);
 void   tracker_data_backup_restore     (GFile                     *backup,
-					GFile                     *journal,
-					TrackerDataBackupFinished  callback,
-					gpointer                   user_data,
-					GDestroyNotify             destroy);
+                                        GFile                     *journal,
+                                        TrackerDataBackupFinished  callback,
+                                        gpointer                   user_data,
+                                        GDestroyNotify             destroy);
 
 G_END_DECLS
 
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 5a1bfd3..c1d7926 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -61,11 +61,11 @@
 
 #define ZLIBBUFSIZ 8192
 
-static gchar		  *ontologies_dir;
+static gchar              *ontologies_dir;
 static gboolean            initialized;
 
 static void
-load_ontology_file_from_path (const gchar	 *ontology_file)
+load_ontology_file_from_path (const gchar        *ontology_file)
 {
 	TrackerTurtleReader *reader;
 	GError              *error = NULL;
@@ -280,9 +280,9 @@ load_ontology_file_from_path (const gchar	 *ontology_file)
 }
 
 static void
-load_ontology_file (const gchar	      *filename)
+load_ontology_file (const gchar               *filename)
 {
-	gchar		*ontology_file;
+	gchar           *ontology_file;
 
 	ontology_file = g_build_filename (ontologies_dir, filename, NULL);
 	load_ontology_file_from_path (ontology_file);
@@ -290,9 +290,9 @@ load_ontology_file (const gchar	      *filename)
 }
 
 static void
-import_ontology_file (const gchar	      *filename)
+import_ontology_file (const gchar             *filename)
 {
-	gchar		*ontology_file;
+	gchar           *ontology_file;
 	GError          *error = NULL;
 
 	ontology_file = g_build_filename (ontologies_dir, filename, NULL);
@@ -312,9 +312,9 @@ class_add_super_classes_from_db (TrackerDBInterface *iface, TrackerClass *class)
 	TrackerDBCursor *cursor;
 
 	stmt = tracker_db_interface_create_statement (iface,
-						      "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:subClassOf\") "
-						      "FROM \"rdfs:Class_rdfs:subClassOf\" "
-						      "WHERE ID = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
+	                                              "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:subClassOf\") "
+	                                              "FROM \"rdfs:Class_rdfs:subClassOf\" "
+	                                              "WHERE ID = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
 	tracker_db_statement_bind_text (stmt, 0, tracker_class_get_uri (class));
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
@@ -340,9 +340,9 @@ property_add_super_properties_from_db (TrackerDBInterface *iface, TrackerPropert
 	TrackerDBCursor *cursor;
 
 	stmt = tracker_db_interface_create_statement (iface,
-						      "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:subPropertyOf\") "
-						      "FROM \"rdf:Property_rdfs:subPropertyOf\" "
-						      "WHERE ID = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
+	                                              "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:subPropertyOf\") "
+	                                              "FROM \"rdf:Property_rdfs:subPropertyOf\" "
+	                                              "WHERE ID = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
 	tracker_db_statement_bind_text (stmt, 0, tracker_property_get_uri (property));
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
@@ -369,9 +369,9 @@ db_get_static_data (TrackerDBInterface *iface)
 	TrackerDBResultSet *result_set;
 
 	stmt = tracker_db_interface_create_statement (iface,
-						      "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"tracker:Namespace\".ID), "
-						      "\"tracker:prefix\" "
-						      "FROM \"tracker:Namespace\"");
+	                                              "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"tracker:Namespace\".ID), "
+	                                              "\"tracker:prefix\" "
+	                                              "FROM \"tracker:Namespace\"");
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
 
@@ -397,8 +397,8 @@ db_get_static_data (TrackerDBInterface *iface)
 	}
 
 	stmt = tracker_db_interface_create_statement (iface,
-						      "SELECT \"rdfs:Class\".ID, (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:Class\".ID) "
-						      "FROM \"rdfs:Class\" ORDER BY ID");
+	                                              "SELECT \"rdfs:Class\".ID, (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:Class\".ID) "
+	                                              "FROM \"rdfs:Class\" ORDER BY ID");
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
 
@@ -438,17 +438,17 @@ db_get_static_data (TrackerDBInterface *iface)
 	}
 
 	stmt = tracker_db_interface_create_statement (iface,
-						      "SELECT \"rdf:Property\".ID, (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdf:Property\".ID), "
-						      "(SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:domain\"), "
-						      "(SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:range\"), "
-						      "\"nrl:maxCardinality\", "
-						      "\"tracker:indexed\", "
-						      "\"tracker:fulltextIndexed\", "
-						      "\"tracker:transient\", "
-						      "\"tracker:isAnnotation\", "
-						      "(SELECT 1 FROM \"rdfs:Resource_rdf:type\" WHERE ID = \"rdf:Property\".ID AND "
-						              "\"rdf:type\" = (Select ID FROM \"rdfs:Resource\" WHERE Uri = '" NRL_INVERSE_FUNCTIONAL_PROPERTY "')) "
-						      "FROM \"rdf:Property\" ORDER BY ID");
+	                                              "SELECT \"rdf:Property\".ID, (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdf:Property\".ID), "
+	                                              "(SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:domain\"), "
+	                                              "(SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:range\"), "
+	                                              "\"nrl:maxCardinality\", "
+	                                              "\"tracker:indexed\", "
+	                                              "\"tracker:fulltextIndexed\", "
+	                                              "\"tracker:transient\", "
+	                                              "\"tracker:isAnnotation\", "
+	                                              "(SELECT 1 FROM \"rdfs:Resource_rdf:type\" WHERE ID = \"rdf:Property\".ID AND "
+	                                              "\"rdf:type\" = (Select ID FROM \"rdfs:Resource\" WHERE Uri = '" NRL_INVERSE_FUNCTIONAL_PROPERTY "')) "
+	                                              "FROM \"rdf:Property\" ORDER BY ID");
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
 
@@ -564,7 +564,7 @@ insert_uri_in_resource_table (TrackerDBInterface *iface, const gchar *uri, gint
 	                                              "INSERT  "
 	                                              "INTO \"rdfs:Resource\" "
 	                                              "(ID, Uri, \"tracker:added\", "
-	                                                "\"tracker:modified\", Available) "
+	                                              "\"tracker:modified\", Available) "
 	                                              "VALUES (?, ?, ?, 0, 1)");
 	tracker_db_statement_bind_int (stmt, 0, id);
 	tracker_db_statement_bind_text (stmt, 1, uri);
@@ -583,9 +583,9 @@ insert_uri_in_resource_table (TrackerDBInterface *iface, const gchar *uri, gint
 
 static void
 create_decomposed_metadata_property_table (TrackerDBInterface *iface,
-					   TrackerProperty    *property,
-					   const gchar        *service_name,
-					   const gchar       **sql_type_for_single_value)
+                                           TrackerProperty    *property,
+                                           const gchar        *service_name,
+                                           const gchar       **sql_type_for_single_value)
 {
 	const char *field_name;
 	const char *sql_type;
@@ -624,37 +624,37 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 			/* use different UNIQUE index for properties whose
 			 * value should be indexed to minimize index size */
 			tracker_db_interface_execute_query (iface, NULL,
-				"CREATE %sTABLE \"%s_%s\" ("
-				"ID INTEGER NOT NULL, "
-				"\"%s\" %s NOT NULL, "
-				"UNIQUE (\"%s\", ID))",
-				transient ? "TEMPORARY " : "",
-				service_name,
-				field_name,
-				field_name,
-				sql_type,
-				field_name);
+			                                    "CREATE %sTABLE \"%s_%s\" ("
+			                                    "ID INTEGER NOT NULL, "
+			                                    "\"%s\" %s NOT NULL, "
+			                                    "UNIQUE (\"%s\", ID))",
+			                                    transient ? "TEMPORARY " : "",
+			                                    service_name,
+			                                    field_name,
+			                                    field_name,
+			                                    sql_type,
+			                                    field_name);
 
 			tracker_db_interface_execute_query (iface, NULL,
-				"CREATE INDEX \"%s_%s_ID\" ON \"%s_%s\" (ID)",
-				service_name,
-				field_name,
-				service_name,
-				field_name);
+			                                    "CREATE INDEX \"%s_%s_ID\" ON \"%s_%s\" (ID)",
+			                                    service_name,
+			                                    field_name,
+			                                    service_name,
+			                                    field_name);
 		} else {
 			/* we still have to include the property value in
 			 * the unique index for proper constraints */
 			tracker_db_interface_execute_query (iface, NULL,
-				"CREATE %sTABLE \"%s_%s\" ("
-				"ID INTEGER NOT NULL, "
-				"\"%s\" %s NOT NULL, "
-				"UNIQUE (ID, \"%s\"))",
-				transient ? "TEMPORARY " : "",
-				service_name,
-				field_name,
-				field_name,
-				sql_type,
-				field_name);
+			                                    "CREATE %sTABLE \"%s_%s\" ("
+			                                    "ID INTEGER NOT NULL, "
+			                                    "\"%s\" %s NOT NULL, "
+			                                    "UNIQUE (ID, \"%s\"))",
+			                                    transient ? "TEMPORARY " : "",
+			                                    service_name,
+			                                    field_name,
+			                                    field_name,
+			                                    sql_type,
+			                                    field_name);
 		}
 	} else if (sql_type_for_single_value) {
 		*sql_type_for_single_value = sql_type;
@@ -663,12 +663,12 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 
 static void
 create_decomposed_metadata_tables (TrackerDBInterface *iface,
-				   TrackerClass       *service,
-				   gint               *max_id)
+                                   TrackerClass       *service,
+                                   gint               *max_id)
 {
 	const char *service_name;
 	GString    *sql;
-	TrackerProperty	  **properties, *property;
+	TrackerProperty           **properties, *property;
 	GSList      *class_properties, *field_it;
 	gboolean    main_class;
 	guint       i, n_props;
@@ -697,8 +697,8 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 			const gchar *sql_type_for_single_value = NULL;
 
 			create_decomposed_metadata_property_table (iface, property,
-								   service_name,
-								   &sql_type_for_single_value);
+			                                           service_name,
+			                                           &sql_type_for_single_value);
 
 			if (sql_type_for_single_value) {
 				/* single value */
@@ -706,8 +706,8 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 				class_properties = g_slist_prepend (class_properties, property);
 
 				g_string_append_printf (sql, ", \"%s\" %s",
-							tracker_property_get_name (property),
-							sql_type_for_single_value);
+				                        tracker_property_get_name (property),
+				                        sql_type_for_single_value);
 				if (tracker_property_get_is_inverse_functional_property (property)) {
 					g_string_append (sql, " UNIQUE");
 				}
@@ -734,11 +734,11 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 		    && tracker_property_get_indexed (field)) {
 			field_name = tracker_property_get_name (field);
 			tracker_db_interface_execute_query (iface, NULL,
-							    "CREATE INDEX \"%s_%s\" ON \"%s\" (\"%s\")",
-							    service_name,
-							    field_name,
-							    service_name,
-							    field_name);
+			                                    "CREATE INDEX \"%s_%s\" ON \"%s\" (\"%s\")",
+			                                    service_name,
+			                                    field_name,
+			                                    service_name,
+			                                    field_name);
 		}
 	}
 
@@ -777,8 +777,8 @@ create_decomposed_transient_metadata_tables (TrackerDBInterface *iface)
 
 			/* create the TEMPORARY table */
 			create_decomposed_metadata_property_table (iface, property,
-								   service_name,
-								   NULL);
+			                                           service_name,
+			                                           NULL);
 		}
 	}
 }
@@ -795,9 +795,9 @@ create_fts_table (TrackerDBInterface *iface)
 
 gboolean
 tracker_data_manager_init (TrackerDBManagerFlags  flags,
-			   const gchar           *test_schema,
-			   gboolean              *first_time,
-			   gboolean              *need_journal)
+                           const gchar           *test_schema,
+                           gboolean              *first_time,
+                           gboolean              *need_journal)
 {
 	TrackerDBInterface *iface;
 	gboolean is_first_time_index;
@@ -837,9 +837,9 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 
 		if (G_LIKELY (!env_path)) {
 			ontologies_dir = g_build_filename (SHAREDIR,
-							   "tracker",
-							   "ontologies",
-							   NULL);
+			                                   "tracker",
+			                                   "ontologies",
+			                                   NULL);
 		} else {
 			ontologies_dir = g_strdup (env_path);
 		}
@@ -863,8 +863,8 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 			while (conf_file) {
 				if (g_str_has_suffix (conf_file, ".ontology")) {
 					sorted = g_list_insert_sorted (sorted,
-								       g_strdup (conf_file),
-								       (GCompareFunc) strcmp);
+					                               g_strdup (conf_file),
+					                               (GCompareFunc) strcmp);
 				}
 				conf_file = g_dir_read_name (ontologies);
 			}
@@ -898,7 +898,7 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 
 		for (i = 0; i < n_props; i++) {
 			insert_uri_in_resource_table (iface, tracker_property_get_uri (properties[i]),
-				                      &max_id);
+			                              &max_id);
 		}
 
 		create_fts_table (iface);
@@ -955,8 +955,8 @@ tracker_data_manager_get_db_option_int64 (const gchar *option)
 	TrackerDBInterface *iface;
 	TrackerDBStatement *stmt;
 	TrackerDBResultSet *result_set;
-	gchar		   *str;
-	gint		    value = 0;
+	gchar              *str;
+	gint                value = 0;
 
 	g_return_val_if_fail (option != NULL, 0);
 
@@ -983,11 +983,11 @@ tracker_data_manager_get_db_option_int64 (const gchar *option)
 
 void
 tracker_data_manager_set_db_option_int64 (const gchar *option,
-					  gint64       value)
+                                          gint64       value)
 {
 	TrackerDBInterface *iface;
 	TrackerDBStatement *stmt;
-	gchar		   *str;
+	gchar              *str;
 
 	g_return_if_fail (option != NULL);
 
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h
index 364851a..9f4afe2 100644
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@ -39,13 +39,13 @@ G_BEGIN_DECLS
 #endif
 
 gboolean tracker_data_manager_init                (TrackerDBManagerFlags  flags,
-						   const gchar           *test_schema,
-						   gboolean              *first_time,
-						   gboolean              *need_journal);
+                                                   const gchar           *test_schema,
+                                                   gboolean              *first_time,
+                                                   gboolean              *need_journal);
 void     tracker_data_manager_shutdown            (void);
 gint64   tracker_data_manager_get_db_option_int64 (const gchar           *option);
 void     tracker_data_manager_set_db_option_int64 (const gchar           *option,
-						   gint64                 value);
+                                                   gint64                 value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index cc4d3d0..b2c50c1 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -47,11 +47,11 @@ tracker_data_query_rdf_type (guint32 id)
 	iface = tracker_db_manager_get_db_interface ();
 
 	stmt = tracker_db_interface_create_statement (iface,
-			"SELECT \"rdfs:Resource\".\"Uri\" "
-			"FROM \"rdfs:Resource_rdf:type\" "
-			"INNER JOIN \"rdfs:Resource\" "
-			"ON \"rdfs:Resource_rdf:type\".\"rdf:type\" = \"rdfs:Resource\".\"ID\" "
-			"WHERE \"rdfs:Resource_rdf:type\".\"ID\" = ?");
+	                                              "SELECT \"rdfs:Resource\".\"Uri\" "
+	                                              "FROM \"rdfs:Resource_rdf:type\" "
+	                                              "INNER JOIN \"rdfs:Resource\" "
+	                                              "ON \"rdfs:Resource_rdf:type\".\"rdf:type\" = \"rdfs:Resource\".\"ID\" "
+	                                              "WHERE \"rdfs:Resource_rdf:type\".\"ID\" = ?");
 
 	tracker_db_statement_bind_int (stmt, 0, id);
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
@@ -74,19 +74,19 @@ tracker_data_query_rdf_type (guint32 id)
 }
 
 guint32
-tracker_data_query_resource_id (const gchar	   *uri)
+tracker_data_query_resource_id (const gchar        *uri)
 {
 	TrackerDBCursor *cursor;
 	TrackerDBInterface *iface;
 	TrackerDBStatement *stmt;
-	guint32		    id = 0;
+	guint32                     id = 0;
 
 	g_return_val_if_fail (uri != NULL, 0);
 
 	iface = tracker_db_manager_get_db_interface ();
 
 	stmt = tracker_db_interface_create_statement (iface,
-		"SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?");
+	                                              "SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?");
 	tracker_db_statement_bind_text (stmt, 0, uri);
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
@@ -102,7 +102,7 @@ tracker_data_query_resource_id (const gchar	   *uri)
 
 TrackerDBResultSet *
 tracker_data_query_sparql (const gchar  *query,
-			   GError      **error)
+                           GError      **error)
 {
 	TrackerSparqlQuery *sparql_query;
 	TrackerDBResultSet *result_set;
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index 5d14273..17836bd 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 
 guint32              tracker_data_query_resource_id (const gchar  *uri);
 TrackerDBResultSet  *tracker_data_query_sparql      (const gchar  *query,
-						     GError      **error);
+                                                     GError      **error);
 GPtrArray*           tracker_data_query_rdf_type    (guint32       id);
 
 G_END_DECLS
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 7004b92..f070cd8 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -121,7 +121,7 @@ static GPtrArray *rollback_callbacks = NULL;
 
 void
 tracker_data_add_commit_statement_callback (TrackerCommitCallback    callback,
-					    gpointer                 user_data)
+                                            gpointer                 user_data)
 {
 	TrackerCommitDelegate *delegate = g_new0 (TrackerCommitDelegate, 1);
 
@@ -137,7 +137,7 @@ tracker_data_add_commit_statement_callback (TrackerCommitCallback    callback,
 
 void
 tracker_data_add_rollback_statement_callback (TrackerCommitCallback    callback,
-					      gpointer                 user_data)
+                                              gpointer                 user_data)
 {
 	TrackerCommitDelegate *delegate = g_new0 (TrackerCommitDelegate, 1);
 
@@ -153,7 +153,7 @@ tracker_data_add_rollback_statement_callback (TrackerCommitCallback    callback,
 
 void
 tracker_data_add_insert_statement_callback (TrackerStatementCallback callback,
-					    gpointer                 user_data)
+                                            gpointer                 user_data)
 {
 	TrackerStatementDelegate *delegate = g_new0 (TrackerStatementDelegate, 1);
 
@@ -169,7 +169,7 @@ tracker_data_add_insert_statement_callback (TrackerStatementCallback callback,
 
 void
 tracker_data_add_delete_statement_callback (TrackerStatementCallback callback,
-					    gpointer                 user_data)
+                                            gpointer                 user_data)
 {
 	TrackerStatementDelegate *delegate = g_new0 (TrackerStatementDelegate, 1);
 
@@ -194,7 +194,7 @@ tracker_data_update_get_new_service_id (TrackerDBInterface *iface)
 	TrackerDBInterface *temp_iface;
 	TrackerDBStatement *stmt;
 
-	static guint32	    max = 0;
+	static guint32      max = 0;
 
 	if (G_LIKELY (max != 0)) {
 		return ++max;
@@ -203,7 +203,7 @@ tracker_data_update_get_new_service_id (TrackerDBInterface *iface)
 	temp_iface = tracker_db_manager_get_db_interface ();
 
 	stmt = tracker_db_interface_create_statement (temp_iface,
-	                                             "SELECT MAX(ID) AS A FROM \"rdfs:Resource\"");
+	                                              "SELECT MAX(ID) AS A FROM \"rdfs:Resource\"");
 	cursor = tracker_db_statement_start_cursor (stmt, NULL);
 	g_object_unref (stmt);
 
@@ -222,7 +222,7 @@ tracker_data_update_get_next_modseq (void)
 	TrackerDBCursor    *cursor;
 	TrackerDBInterface *temp_iface;
 	TrackerDBStatement *stmt;
-	static guint32	    max = 0;
+	static guint32      max = 0;
 
 	if (G_LIKELY (max != 0)) {
 		return ++max;
@@ -275,7 +275,7 @@ cache_table_free (TrackerDataUpdateBufferTable *table)
 
 static TrackerDataUpdateBufferTable *
 cache_ensure_table (const gchar            *table_name,
-		    gboolean                multiple_values)
+                    gboolean                multiple_values)
 {
 	TrackerDataUpdateBufferTable *table;
 
@@ -301,10 +301,10 @@ cache_insert_row (TrackerClass *class)
 
 static void
 cache_insert_value (const gchar            *table_name,
-		    const gchar            *field_name,
-		    GValue                 *value,
-		    gboolean                multiple_values,
-		    gboolean                fts)
+                    const gchar            *field_name,
+                    GValue                 *value,
+                    gboolean                multiple_values,
+                    gboolean                fts)
 {
 	TrackerDataUpdateBufferTable    *table;
 	TrackerDataUpdateBufferProperty  property;
@@ -329,10 +329,10 @@ cache_delete_row (TrackerClass *class)
 
 static void
 cache_delete_value (const gchar            *table_name,
-		    const gchar            *field_name,
-		    GValue                 *value,
-		    gboolean                multiple_values,
-		    gboolean                fts)
+                    const gchar            *field_name,
+                    GValue                 *value,
+                    gboolean                multiple_values,
+                    gboolean                fts)
 {
 	TrackerDataUpdateBufferTable    *table;
 	TrackerDataUpdateBufferProperty  property;
@@ -396,8 +396,8 @@ ensure_resource_id (const gchar *uri)
 
 static void
 statement_bind_gvalue (TrackerDBStatement *stmt,
-		       gint                idx,
-		       const GValue       *value)
+                       gint                idx,
+                       const GValue       *value)
 {
 	switch (G_VALUE_TYPE (value)) {
 	case G_TYPE_STRING:
@@ -436,7 +436,7 @@ tracker_data_resource_buffer_flush (GError **error)
 	if (resource_buffer->new_subject != NULL) {
 		/* change uri of resource */
 		stmt = tracker_db_interface_create_statement (iface,
-			"UPDATE \"rdfs:Resource\" SET Uri = ? WHERE ID = ?");
+		                                              "UPDATE \"rdfs:Resource\" SET Uri = ? WHERE ID = ?");
 		tracker_db_statement_bind_text (stmt, 0, resource_buffer->new_subject);
 		tracker_db_statement_bind_int (stmt, 1, resource_buffer->id);
 		tracker_db_statement_execute (stmt, &actual_error);
@@ -460,14 +460,14 @@ tracker_data_resource_buffer_flush (GError **error)
 				if (table->delete_value) {
 					/* delete rows for multiple value properties */
 					stmt = tracker_db_interface_create_statement (iface,
-						"DELETE FROM \"%s\" WHERE ID = ? AND \"%s\" = ?",
-						table_name,
-						property->name);
+					                                              "DELETE FROM \"%s\" WHERE ID = ? AND \"%s\" = ?",
+					                                              table_name,
+					                                              property->name);
 				} else {
 					stmt = tracker_db_interface_create_statement (iface,
-						"INSERT OR IGNORE INTO \"%s\" (ID, \"%s\") VALUES (?, ?)",
-						table_name,
-						property->name);
+					                                              "INSERT OR IGNORE INTO \"%s\" (ID, \"%s\") VALUES (?, ?)",
+					                                              table_name,
+					                                              property->name);
 				}
 
 				tracker_db_statement_bind_int (stmt, 0, resource_buffer->id);
@@ -511,8 +511,8 @@ tracker_data_resource_buffer_flush (GError **error)
 			if (table->insert) {
 				/* ensure we have a row for the subject id */
 				stmt = tracker_db_interface_create_statement (iface,
-					"INSERT OR IGNORE INTO \"%s\" (ID) VALUES (?)",
-					table_name);
+				                                              "INSERT OR IGNORE INTO \"%s\" (ID) VALUES (?)",
+				                                              table_name);
 				tracker_db_statement_bind_int (stmt, 0, resource_buffer->id);
 				tracker_db_statement_execute (stmt, &actual_error);
 				g_object_unref (stmt);
@@ -662,7 +662,7 @@ tracker_data_blank_buffer_flush (GError **error)
 
 	/* generate name based uuid */
 	blank_uri = g_strdup_printf ("urn:uuid:%.8s-%.4s-%.4s-%.4s-%.12s",
-		sha1, sha1 + 8, sha1 + 12, sha1 + 16, sha1 + 20);
+	                             sha1, sha1 + 8, sha1 + 12, sha1 + 16, sha1 + 20);
 
 	id = tracker_data_query_resource_id (blank_uri);
 
@@ -846,8 +846,8 @@ get_property_values (TrackerProperty *property)
 
 	if (multiple_values) {
 		table_name = g_strdup_printf ("%s_%s",
-			tracker_class_get_name (tracker_property_get_domain (property)),
-			tracker_property_get_name (property));
+		                              tracker_class_get_name (tracker_property_get_domain (property)),
+		                              tracker_property_get_name (property));
 	} else {
 		table_name = g_strdup (tracker_class_get_name (tracker_property_get_domain (property)));
 	}
@@ -903,10 +903,10 @@ get_old_property_values (TrackerProperty  *property,
 	if (old_values == NULL) {
 		if (!check_property_domain (property)) {
 			g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_CONSTRAINT,
-				     "Subject `%s' is not in domain `%s' of property `%s'",
-				     resource_buffer->subject,
-				     tracker_class_get_name (tracker_property_get_domain (property)),
-				     tracker_property_get_name (property));
+			             "Subject `%s' is not in domain `%s' of property `%s'",
+			             resource_buffer->subject,
+			             tracker_class_get_name (tracker_property_get_domain (property)),
+			             tracker_property_get_name (property));
 			return NULL;
 		}
 
@@ -957,7 +957,7 @@ string_to_gvalue (const gchar         *value,
                   TrackerPropertyType  type,
                   GValue              *gvalue)
 {
-	guint32		    object_id;
+	guint32                     object_id;
 
 	switch (type) {
 	case TRACKER_PROPERTY_TYPE_STRING:
@@ -995,9 +995,9 @@ string_to_gvalue (const gchar         *value,
 }
 
 static void
-cache_set_metadata_decomposed (TrackerProperty	*property,
-			       const gchar	*value,
-			       GError          **error)
+cache_set_metadata_decomposed (TrackerProperty  *property,
+                               const gchar      *value,
+                               GError          **error)
 {
 	gboolean            multiple_values, fts;
 	gchar              *table_name;
@@ -1019,8 +1019,8 @@ cache_set_metadata_decomposed (TrackerProperty	*property,
 	multiple_values = tracker_property_get_multiple_values (property);
 	if (multiple_values) {
 		table_name = g_strdup_printf ("%s_%s",
-			tracker_class_get_name (tracker_property_get_domain (property)),
-			tracker_property_get_name (property));
+		                              tracker_class_get_name (tracker_property_get_domain (property)),
+		                              tracker_property_get_name (property));
 	} else {
 		table_name = g_strdup (tracker_class_get_name (tracker_property_get_domain (property)));
 	}
@@ -1058,8 +1058,8 @@ cache_set_metadata_decomposed (TrackerProperty	*property,
 
 static void
 delete_metadata_decomposed (TrackerProperty  *property,
-			    const gchar	     *value,
-			    GError          **error)
+                            const gchar              *value,
+                            GError          **error)
 {
 	gboolean            multiple_values, fts;
 	gchar              *table_name;
@@ -1072,8 +1072,8 @@ delete_metadata_decomposed (TrackerProperty  *property,
 	multiple_values = tracker_property_get_multiple_values (property);
 	if (multiple_values) {
 		table_name = g_strdup_printf ("%s_%s",
-			tracker_class_get_name (tracker_property_get_domain (property)),
-			tracker_property_get_name (property));
+		                              tracker_class_get_name (tracker_property_get_domain (property)),
+		                              tracker_property_get_name (property));
 	} else {
 		table_name = g_strdup (tracker_class_get_name (tracker_property_get_domain (property)));
 	}
@@ -1137,9 +1137,9 @@ cache_delete_resource_type (TrackerClass *class,
 	/* retrieve all subclasses we need to remove from the subject
 	 * before we can remove the class specified as object of the statement */
 	stmt = tracker_db_interface_create_statement (iface,
-		"SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:Class_rdfs:subClassOf\".ID) "
-		"FROM \"rdfs:Resource_rdf:type\" INNER JOIN \"rdfs:Class_rdfs:subClassOf\" ON (\"rdf:type\" = \"rdfs:Class_rdfs:subClassOf\".ID) "
-		"WHERE \"rdfs:Resource_rdf:type\".ID = ? AND \"rdfs:subClassOf\" = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
+	                                              "SELECT (SELECT Uri FROM \"rdfs:Resource\" WHERE ID = \"rdfs:Class_rdfs:subClassOf\".ID) "
+	                                              "FROM \"rdfs:Resource_rdf:type\" INNER JOIN \"rdfs:Class_rdfs:subClassOf\" ON (\"rdf:type\" = \"rdfs:Class_rdfs:subClassOf\".ID) "
+	                                              "WHERE \"rdfs:Resource_rdf:type\".ID = ? AND \"rdfs:subClassOf\" = (SELECT ID FROM \"rdfs:Resource\" WHERE Uri = ?)");
 	tracker_db_statement_bind_int (stmt, 0, resource_buffer->id);
 	tracker_db_statement_bind_text (stmt, 1, tracker_class_get_uri (class));
 	result_set = tracker_db_statement_execute (stmt, NULL);
@@ -1177,8 +1177,8 @@ cache_delete_resource_type (TrackerClass *class,
 		multiple_values = tracker_property_get_multiple_values (prop);
 		if (multiple_values) {
 			table_name = g_strdup_printf ("%s_%s",
-				tracker_class_get_name (class),
-				tracker_property_get_name (prop));
+			                              tracker_class_get_name (class),
+			                              tracker_property_get_name (prop));
 		} else {
 			table_name = g_strdup (tracker_class_get_name (class));
 		}
@@ -1214,8 +1214,8 @@ cache_delete_resource_type (TrackerClass *class,
 
 			delegate = g_ptr_array_index (delete_callbacks, n);
 			delegate->callback (graph, resource_buffer->subject,
-		                            RDF_PREFIX "type", tracker_class_get_uri (class),
-		                            resource_buffer->types, delegate->user_data);
+			                    RDF_PREFIX "type", tracker_class_get_uri (class),
+			                    resource_buffer->types, delegate->user_data);
 		}
 	}
 
@@ -1230,7 +1230,7 @@ tracker_data_delete_statement (const gchar  *graph,
 {
 	TrackerClass       *class;
 	TrackerProperty    *field;
-	gint		    subject_id;
+	gint                subject_id;
 
 	g_return_if_fail (subject != NULL);
 	g_return_if_fail (predicate != NULL);
@@ -1268,7 +1268,7 @@ tracker_data_delete_statement (const gchar  *graph,
 			cache_delete_resource_type (class, graph);
 		} else {
 			g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_UNKNOWN_CLASS,
-				     "Class '%s' not found in the ontology", object);
+			             "Class '%s' not found in the ontology", object);
 		}
 	} else {
 		field = tracker_ontology_get_property_by_uri (predicate);
@@ -1276,7 +1276,7 @@ tracker_data_delete_statement (const gchar  *graph,
 			delete_metadata_decomposed (field, object, error);
 		} else {
 			g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_UNKNOWN_PROPERTY,
-				     "Property '%s' not found in the ontology", predicate);
+			             "Property '%s' not found in the ontology", predicate);
 		}
 
 		if (delete_callbacks) {
@@ -1360,7 +1360,7 @@ tracker_data_insert_statement_common (const gchar            *graph,
 		}
 		resource_buffer->predicates = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, (GDestroyNotify) g_value_array_free);
 		resource_buffer->tables = g_hash_table_new_full (g_str_hash, g_str_equal,
-							      g_free, (GDestroyNotify) cache_table_free);
+		                                                 g_free, (GDestroyNotify) cache_table_free);
 
 		g_value_set_int (&gvalue, tracker_data_update_get_next_modseq ());
 		cache_insert_value ("rdfs:Resource", "tracker:modified", &gvalue, FALSE, FALSE);
@@ -1422,7 +1422,7 @@ tracker_data_insert_statement_with_uri (const gchar            *graph,
 			/* virtual tracker:uri property */
 		} else {
 			g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_UNKNOWN_PROPERTY,
-				     "Property '%s' not found in the ontology", predicate);
+			             "Property '%s' not found in the ontology", predicate);
 			return;
 		}
 	} else if (tracker_property_get_data_type (property) != TRACKER_PROPERTY_TYPE_RESOURCE) {
@@ -1484,7 +1484,7 @@ tracker_data_insert_statement_with_uri (const gchar            *graph,
 			cache_create_service_decomposed (class, graph);
 		} else {
 			g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_UNKNOWN_CLASS,
-				     "Class '%s' not found in the ontology", object);
+			             "Class '%s' not found in the ontology", object);
 		}
 	} else if (strcmp (predicate, TRACKER_PREFIX "uri") == 0) {
 		/* internal property tracker:uri, used to change uri of existing element */
@@ -1562,8 +1562,8 @@ tracker_data_insert_statement_with_string (const gchar            *graph,
 
 			delegate = g_ptr_array_index (insert_callbacks, n);
 			delegate->callback (graph, subject, predicate, object,
-					    resource_buffer->types,
-					    delegate->user_data);
+			                    resource_buffer->types,
+			                    delegate->user_data);
 		}
 	}
 }
@@ -1588,7 +1588,7 @@ void
 tracker_data_update_enable_volume (const gchar *udi,
                                    const gchar *mount_path)
 {
-	gchar		   *removable_device_urn;
+	gchar              *removable_device_urn;
 	gchar *delete_q;
 	gchar *set_q;
 	gchar *mount_path_uri;
@@ -1745,13 +1745,13 @@ tracker_data_update_disable_all_volumes (void)
 	iface = tracker_db_manager_get_db_interface ();
 
 	stmt = tracker_db_interface_create_statement (iface,
-		"UPDATE \"rdfs:Resource\" SET Available = 0 "
-		"WHERE ID IN ("
-			"SELECT ID FROM \"nie:DataObject\" "
-			"WHERE \"nie:dataSource\" IN ("
-				"SELECT ID FROM \"rdfs:Resource\" WHERE Uri != ?"
-			")"
-		")");
+	                                              "UPDATE \"rdfs:Resource\" SET Available = 0 "
+	                                              "WHERE ID IN ("
+	                                              "SELECT ID FROM \"nie:DataObject\" "
+	                                              "WHERE \"nie:dataSource\" IN ("
+	                                              "SELECT ID FROM \"rdfs:Resource\" WHERE Uri != ?"
+	                                              ")"
+	                                              ")");
 	tracker_db_statement_bind_text (stmt, 0, TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN);
 	tracker_db_statement_execute (stmt, NULL);
 	g_object_unref (stmt);
@@ -1871,10 +1871,10 @@ tracker_data_delete_resource_description (const gchar *graph,
 	TrackerDBInterface *iface;
 	TrackerDBStatement *stmt;
 	TrackerDBResultSet *result_set, *single_result, *multi_result;
-	TrackerClass	   *class;
-	GString		   *sql;
-	TrackerProperty	  **properties, *property;
-	int		    i;
+	TrackerClass       *class;
+	GString                    *sql;
+	TrackerProperty           **properties, *property;
+	int                 i;
 	gboolean            first, bail_out = FALSE;
 	gint                resource_id;
 	guint               p, n_props;
@@ -1990,9 +1990,9 @@ tracker_data_delete_resource_description (const gchar *graph,
 					format_sql_value_as_string (sql, property);
 
 					g_string_append_printf (sql,
-								" FROM \"%s_%s\" WHERE ID = ?",
-								tracker_class_get_name (tracker_property_get_domain (property)),
-								tracker_property_get_name (property));
+					                        " FROM \"%s_%s\" WHERE ID = ?",
+					                        tracker_class_get_name (tracker_property_get_domain (property)),
+					                        tracker_property_get_name (property));
 
 					stmt = tracker_db_interface_create_statement (iface, "%s", sql->str);
 					tracker_db_statement_bind_int (stmt, 0, resource_id);
@@ -2041,7 +2041,7 @@ tracker_data_delete_resource_description (const gchar *graph,
 
 void
 tracker_data_update_sparql (const gchar  *update,
-			    GError      **error)
+                            GError      **error)
 {
 	GError *actual_error = NULL;
 	TrackerDBInterface *iface;
@@ -2084,7 +2084,7 @@ tracker_data_update_sparql (const gchar  *update,
 
 GPtrArray *
 tracker_data_update_sparql_blank (const gchar  *update,
-			          GError      **error)
+                                  GError      **error)
 {
 	GError *actual_error = NULL;
 	TrackerDBInterface *iface;
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 4b2123a..73b8241 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -80,15 +80,15 @@ void     tracker_data_insert_statement_with_string  (const gchar               *
 void     tracker_data_begin_transaction             (void);
 void     tracker_data_commit_transaction            (void);
 void     tracker_data_update_sparql                 (const gchar               *update,
-						     GError                   **error);
+                                                     GError                   **error);
 GPtrArray *
-         tracker_data_update_sparql_blank           (const gchar               *update,
-						     GError                   **error);
+tracker_data_update_sparql_blank           (const gchar               *update,
+                                            GError                   **error);
 void     tracker_data_update_buffer_flush           (GError                   **error);
 
 /* Volume handling */
 void     tracker_data_update_enable_volume          (const gchar               *udi,
-						     const gchar               *mount_path);
+                                                     const gchar               *mount_path);
 void     tracker_data_update_disable_volume         (const gchar               *udi);
 void     tracker_data_update_disable_all_volumes    (void);
 void     tracker_data_update_reset_volume           (const gchar               *uri);
diff --git a/src/libtracker-db/tracker-db-backup.c b/src/libtracker-db/tracker-db-backup.c
index d5cec64..15e4c7d 100644
--- a/src/libtracker-db/tracker-db-backup.c
+++ b/src/libtracker-db/tracker-db-backup.c
@@ -35,7 +35,7 @@
 
 #include "tracker-db-backup.h"
 
-#define TRACKER_DB_BACKUP_META_FILENAME_T	"meta-backup.db.tmp"
+#define TRACKER_DB_BACKUP_META_FILENAME_T       "meta-backup.db.tmp"
 
 typedef struct {
 	TrackerDBBackupFinished callback;
@@ -120,11 +120,11 @@ backup_file_step (gpointer user_data)
 		info->result = sqlite3_backup_step(info->backup_db, 5);
 
 		switch (info->result) {
-			case SQLITE_OK:
+		case SQLITE_OK:
 			break;
 
-			case SQLITE_ERROR:
-			default:
+		case SQLITE_ERROR:
+		default:
 			cont = FALSE;
 			break;
 		}
@@ -168,9 +168,9 @@ on_backup_temp_finished (gpointer user_data)
 		to_file = g_file_get_child (info->parent, TRACKER_DB_BACKUP_META_FILENAME);
 
 		g_file_move (from_file, to_file,
-			     G_FILE_COPY_OVERWRITE,
-			     NULL, NULL, NULL,
-			     &info->error);
+		             G_FILE_COPY_OVERWRITE,
+		             NULL, NULL, NULL,
+		             &info->error);
 
 		g_object_unref (from_file);
 		g_object_unref (to_file);
diff --git a/src/libtracker-db/tracker-db-backup.h b/src/libtracker-db/tracker-db-backup.h
index ac0e6b5..bebf813 100644
--- a/src/libtracker-db/tracker-db-backup.h
+++ b/src/libtracker-db/tracker-db-backup.h
@@ -32,22 +32,22 @@ G_BEGIN_DECLS
 #error "only <libtracker-db/tracker-db.h> must be included directly."
 #endif
 
-#define TRACKER_DB_BACKUP_META_FILENAME	"meta-backup.db"
-#define TRACKER_DB_BACKUP_ERROR	        (tracker_db_backup_error_quark ())
+#define TRACKER_DB_BACKUP_META_FILENAME         "meta-backup.db"
+#define TRACKER_DB_BACKUP_ERROR                 (tracker_db_backup_error_quark ())
 
 typedef enum {
 	TRACKER_DB_BACKUP_ERROR_UNKNOWN,
 } TrackerDBBackupError;
 
 typedef void (*TrackerDBBackupFinished) (GError   *error,
-					 gpointer  user_data);
+                                         gpointer  user_data);
 
 GQuark tracker_db_backup_error_quark (void);
 void   tracker_db_backup_save        (TrackerDBBackupFinished   callback,
-				      gpointer                  user_data,
-				      GDestroyNotify            destroy);
+                                      gpointer                  user_data,
+                                      GDestroyNotify            destroy);
 GFile *tracker_db_backup_file        (GFile                   **parent_out,
-				      const gchar              *type);
+                                      const gchar              *type);
 void   tracker_db_backup_sync_fts    (void);
 
 G_END_DECLS
diff --git a/src/libtracker-db/tracker-db-dbus.c b/src/libtracker-db/tracker-db-dbus.c
index 3657fa6..70b2ef7 100644
--- a/src/libtracker-db/tracker-db-dbus.c
+++ b/src/libtracker-db/tracker-db-dbus.c
@@ -36,7 +36,7 @@ typedef struct {
 
 static inline void
 row_add (GPtrArray *row,
-	 gchar     *value)
+         gchar     *value)
 {
 	OneElem *elem;
 	GSList  *list = NULL;
@@ -51,8 +51,8 @@ row_add (GPtrArray *row,
 
 static inline gboolean
 row_insert (GPtrArray *row,
-	    gchar     *value,
-	    guint      lindex)
+            gchar     *value,
+            guint      lindex)
 {
 	OneElem *elem;
 	GSList  *list;
@@ -89,8 +89,8 @@ row_destroy (GPtrArray *row)
 		elem = g_ptr_array_index (row, i);
 		list = elem->value;
 		g_slist_foreach (list,
-				 (GFunc) g_free,
-				 NULL);
+		                 (GFunc) g_free,
+		                 NULL);
 		g_slist_free (list);
 		g_slice_free (OneElem, elem);
 	}
@@ -100,9 +100,9 @@ row_destroy (GPtrArray *row)
 
 static inline gpointer
 rows_lookup (GPtrArray *rows,
-	     gint       key)
+             gint       key)
 {
-	guint	 i;
+	guint    i;
 	gpointer value = NULL;
 
 	for (i = 0; i < rows->len; i++) {
@@ -137,8 +137,8 @@ rows_destroy (GPtrArray *rows)
 
 static inline void
 rows_add (GPtrArray *rows,
-	  gint       key,
-	  gpointer   value)
+          gint       key,
+          gpointer   value)
 {
 	OneRow *row;
 
@@ -152,7 +152,7 @@ rows_add (GPtrArray *rows,
 
 static inline void
 rows_migrate (GPtrArray *rows,
-	      GPtrArray *result)
+              GPtrArray *result)
 {
 	guint i, j;
 
@@ -194,19 +194,19 @@ rows_migrate (GPtrArray *rows,
 
 static gchar **
 dbus_query_result_to_strv (TrackerDBResultSet *result_set,
-			   gint		       column,
-			   gint		      *count,
-			   gboolean	       numeric)
+                           gint                        column,
+                           gint                       *count,
+                           gboolean            numeric)
 
 {
 	gchar **strv = NULL;
-	gint	rows = 0;
-	gint	i = 0;
+	gint    rows = 0;
+	gint    i = 0;
 
 	if (result_set) {
-		gchar	 *str;
+		gchar    *str;
 		gboolean  valid = TRUE;
-		gint	  value;
+		gint      value;
 
 		/* Make sure we rewind before iterating the result set */
 		tracker_db_result_set_rewind (result_set);
@@ -249,29 +249,29 @@ dbus_query_result_to_strv (TrackerDBResultSet *result_set,
 
 gchar **
 tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
-				   gint		       column,
-				   gint		      *count)
+                                   gint                        column,
+                                   gint                       *count)
 {
 	return dbus_query_result_to_strv (result_set, column, count, FALSE);
 }
 
 gchar **
 tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
-					   gint		       column,
-					   gint		      *count)
+                                           gint                        column,
+                                           gint                       *count)
 {
 	return dbus_query_result_to_strv (result_set, column, count, TRUE);
 }
 
 gchar **
 tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
-					   gint                offset_column,
-					   gint                until_column,
-					   gboolean            rewind)
+                                           gint                offset_column,
+                                           gint                until_column,
+                                           gboolean            rewind)
 {
 	gchar    **strv = NULL;
-	gint	   i = 0;
-	gint	   columns = 0;
+	gint       i = 0;
+	gint       columns = 0;
 	gint       row_counter = 0;
 	gboolean   valid = TRUE;
 
@@ -349,13 +349,13 @@ GHashTable *
 tracker_dbus_query_result_to_hash_table (TrackerDBResultSet *result_set)
 {
 	GHashTable *hash_table;
-	gint	    field_count;
+	gint        field_count;
 	gboolean    valid = FALSE;
 
 	hash_table = g_hash_table_new_full (g_str_hash,
-					    g_str_equal,
-					    (GDestroyNotify) g_free,
-					    (GDestroyNotify) tracker_dbus_gvalue_slice_free);
+	                                    g_str_equal,
+	                                    (GDestroyNotify) g_free,
+	                                    (GDestroyNotify) tracker_dbus_gvalue_slice_free);
 
 	if (result_set) {
 		valid = TRUE;
@@ -368,18 +368,18 @@ tracker_dbus_query_result_to_hash_table (TrackerDBResultSet *result_set)
 	}
 
 	while (valid) {
-		GValue	*values;
+		GValue  *values;
 		gchar  **p;
-		gint	 i = 0;
-		gchar	*key;
-		GSList	*list = NULL;
+		gint     i = 0;
+		gchar   *key;
+		GSList  *list = NULL;
 
 		tracker_db_result_set_get (result_set, 0, &key, -1);
 		values = tracker_dbus_gvalue_slice_new (G_TYPE_STRV);
 
 		for (i = 1; i < field_count; i++) {
 			GValue  transform = { 0, };
-			GValue	value = { 0, };
+			GValue  value = { 0, };
 			gchar  *str;
 
 			g_value_init (&transform, G_TYPE_STRING);
@@ -424,8 +424,8 @@ tracker_dbus_query_result_to_ptr_array (TrackerDBResultSet *result_set)
 {
 	GPtrArray *ptr_array;
 	gboolean   valid = FALSE;
-	gint	   columns;
-	gint	   i;
+	gint       columns;
+	gint       i;
 
 	ptr_array = g_ptr_array_new ();
 
@@ -445,8 +445,8 @@ tracker_dbus_query_result_to_ptr_array (TrackerDBResultSet *result_set)
 
 		/* Append fields to the array */
 		for (i = 0; i < columns; i++) {
-			GValue	transform = { 0, };
-			GValue	value = { 0, };
+			GValue  transform = { 0, };
+			GValue  value = { 0, };
 			gchar  *str = NULL;
 
 			g_value_init (&transform, G_TYPE_STRING);
@@ -489,7 +489,7 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
 	GPtrArray *result;
 	GPtrArray *rows;
 	gboolean   valid = FALSE;
-	gint	   columns;
+	gint       columns;
 
 	rows = g_ptr_array_new ();
 
@@ -505,8 +505,8 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
 
 	while (valid) {
 		GPtrArray *row;
-		GValue	   value_in = {0, };
-		gint	   key;
+		GValue     value_in = {0, };
+		gint       key;
 		gint       column;
 		gboolean   add = FALSE;
 
@@ -528,8 +528,8 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
 			g_value_init (&transform, G_TYPE_STRING);
 
 			_tracker_db_result_set_get_value (result_set,
-							  column,
-							  &value);
+			                                  column,
+			                                  &value);
 
 			if (g_value_transform (&value, &transform)) {
 				str = g_value_dup_string (&transform);
diff --git a/src/libtracker-db/tracker-db-dbus.h b/src/libtracker-db/tracker-db-dbus.h
index fd739c9..676ebd8 100644
--- a/src/libtracker-db/tracker-db-dbus.h
+++ b/src/libtracker-db/tracker-db-dbus.h
@@ -33,15 +33,15 @@ G_BEGIN_DECLS
 #endif
 
 gchar **    tracker_dbus_query_result_to_strv            (TrackerDBResultSet *result_set,
-							  gint                column,
-							  gint               *count);
+                                                          gint                column,
+                                                          gint               *count);
 gchar **    tracker_dbus_query_result_numeric_to_strv    (TrackerDBResultSet *result_set,
-							  gint                column,
-							  gint               *count);
+                                                          gint                column,
+                                                          gint               *count);
 gchar **    tracker_dbus_query_result_columns_to_strv    (TrackerDBResultSet *result_set,
-							  gint                offset_column,
-							  gint                until_column,
-							  gboolean            rewind);
+                                                          gint                offset_column,
+                                                          gint                until_column,
+                                                          gboolean            rewind);
 GHashTable *tracker_dbus_query_result_to_hash_table      (TrackerDBResultSet *result_set);
 GPtrArray * tracker_dbus_query_result_to_ptr_array       (TrackerDBResultSet *result_set);
 GPtrArray * tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set);
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index 5e8bb0b..842866b 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -37,10 +37,10 @@
 #define TRACKER_IS_DB_CURSOR_SQLITE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((o),    TRACKER_TYPE_DB_CURSOR_SQLITE))
 #define TRACKER_DB_CURSOR_SQLITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_DB_CURSOR_SQLITE, TrackerDBCursorSqliteClass))
 
-#define TRACKER_TYPE_DB_STATEMENT_SQLITE	 (tracker_db_statement_sqlite_get_type ())
-#define TRACKER_DB_STATEMENT_SQLITE(o)		 (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_STATEMENT_SQLITE, TrackerDBStatementSqlite))
-#define TRACKER_DB_STATEMENT_SQLITE_CLASS(c)	 (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_STATEMENT_SQLITE, TrackerDBStatementSqliteClass))
-#define TRACKER_IS_DB_STATEMENT_SQLITE(o)	 (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_STATEMENT_SQLITE))
+#define TRACKER_TYPE_DB_STATEMENT_SQLITE         (tracker_db_statement_sqlite_get_type ())
+#define TRACKER_DB_STATEMENT_SQLITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_STATEMENT_SQLITE, TrackerDBStatementSqlite))
+#define TRACKER_DB_STATEMENT_SQLITE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_STATEMENT_SQLITE, TrackerDBStatementSqliteClass))
+#define TRACKER_IS_DB_STATEMENT_SQLITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_STATEMENT_SQLITE))
 #define TRACKER_IS_DB_STATEMENT_SQLITE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((o),    TRACKER_TYPE_DB_STATEMENT_SQLITE))
 #define TRACKER_DB_STATEMENT_SQLITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_DB_STATEMENT_SQLITE, TrackerDBStatementSqliteClass))
 
@@ -129,10 +129,10 @@ static void tracker_db_cursor_sqlite_iface_init (TrackerDBCursorIface *iface);
 static void tracker_db_interface_sqlite_disconnect (TrackerDBInterface *db_interface);
 static void tracker_db_interface_sqlite_reconnect  (TrackerDBInterface *db_interface);
 
-static TrackerDBStatementSqlite * tracker_db_statement_sqlite_new (TrackerDBInterfaceSqlite	*db_interface,
-								   sqlite3_stmt			*sqlite_stmt);
-static TrackerDBCursor          * tracker_db_cursor_sqlite_new    (sqlite3_stmt			*sqlite_stmt,
-								   TrackerDBStatementSqlite     *ref_stmt);
+static TrackerDBStatementSqlite * tracker_db_statement_sqlite_new (TrackerDBInterfaceSqlite     *db_interface,
+                                                                   sqlite3_stmt                         *sqlite_stmt);
+static TrackerDBCursor          * tracker_db_cursor_sqlite_new    (sqlite3_stmt                         *sqlite_stmt,
+                                                                   TrackerDBStatementSqlite     *ref_stmt);
 static void tracker_db_statement_sqlite_reset (TrackerDBStatementSqlite *stmt);
 
 enum {
@@ -143,21 +143,21 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (TrackerDBInterfaceSqlite, tracker_db_interface_sqlite, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_INTERFACE,
-						tracker_db_interface_sqlite_iface_init))
+                         G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_INTERFACE,
+                                                tracker_db_interface_sqlite_iface_init))
 
 G_DEFINE_TYPE_WITH_CODE (TrackerDBStatementSqlite, tracker_db_statement_sqlite, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_STATEMENT,
-						tracker_db_statement_sqlite_iface_init))
+                         G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_STATEMENT,
+                                                tracker_db_statement_sqlite_iface_init))
 
 G_DEFINE_TYPE_WITH_CODE (TrackerDBCursorSqlite, tracker_db_cursor_sqlite, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_CURSOR,
-						tracker_db_cursor_sqlite_iface_init))
+                         G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_CURSOR,
+                                                tracker_db_cursor_sqlite_iface_init))
 
 void
 tracker_db_interface_sqlite_enable_shared_cache (void)
 {
-  sqlite3_enable_shared_cache (1);
+	sqlite3_enable_shared_cache (1);
 }
 
 static void
@@ -190,16 +190,16 @@ open_database (TrackerDBInterfaceSqlitePrivate *priv)
 }
 
 static GObject *
-tracker_db_interface_sqlite_constructor (GType			type,
-					 guint			n_construct_properties,
-					 GObjectConstructParam *construct_params)
+tracker_db_interface_sqlite_constructor (GType                  type,
+                                         guint                  n_construct_properties,
+                                         GObjectConstructParam *construct_params)
 {
 	GObject *object;
 	TrackerDBInterfaceSqlitePrivate *priv;
 
 	object = (* G_OBJECT_CLASS (tracker_db_interface_sqlite_parent_class)->constructor) (type,
-											     n_construct_properties,
-											     construct_params);
+		               n_construct_properties,
+		               construct_params);
 	priv = TRACKER_DB_INTERFACE_SQLITE_GET_PRIVATE (object);
 
 	open_database (priv);
@@ -208,10 +208,10 @@ tracker_db_interface_sqlite_constructor (GType			type,
 }
 
 static void
-tracker_db_interface_sqlite_set_property (GObject	*object,
-					  guint		 prop_id,
-					  const GValue	*value,
-					  GParamSpec	*pspec)
+tracker_db_interface_sqlite_set_property (GObject       *object,
+                                          guint                  prop_id,
+                                          const GValue  *value,
+                                          GParamSpec    *pspec)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 
@@ -234,9 +234,9 @@ tracker_db_interface_sqlite_set_property (GObject	*object,
 
 static void
 tracker_db_interface_sqlite_get_property (GObject    *object,
-					  guint       prop_id,
-					  GValue     *value,
-					  GParamSpec *pspec)
+                                          guint       prop_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 
@@ -304,38 +304,38 @@ tracker_db_interface_sqlite_class_init (TrackerDBInterfaceSqliteClass *class)
 	object_class->finalize = tracker_db_interface_sqlite_finalize;
 
 	g_object_class_install_property (object_class,
-					 PROP_FILENAME,
-					 g_param_spec_string ("filename",
-							      "DB filename",
-							      "DB filename",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+	                                 PROP_FILENAME,
+	                                 g_param_spec_string ("filename",
+	                                                      "DB filename",
+	                                                      "DB filename",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 	/* Override properties from interface */
 	g_object_class_override_property (object_class,
-					  PROP_IN_TRANSACTION,
-					  "in-transaction");
+	                                  PROP_IN_TRANSACTION,
+	                                  "in-transaction");
 
 	g_object_class_install_property (object_class,
-						 PROP_RO,
-						 g_param_spec_boolean ("read-only",
-								   "Read only",
-								   "Whether the connection is read only",
-								   FALSE,
-								   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+	                                 PROP_RO,
+	                                 g_param_spec_boolean ("read-only",
+	                                                       "Read only",
+	                                                       "Whether the connection is read only",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_type_class_add_private (object_class,
-				  sizeof (TrackerDBInterfaceSqlitePrivate));
+	                          sizeof (TrackerDBInterfaceSqlitePrivate));
 }
 
 static void
 prepare_database (TrackerDBInterfaceSqlitePrivate *priv)
 {
 	priv->dynamic_statements = g_hash_table_new_full (g_str_hash, g_str_equal,
-							  (GDestroyNotify) g_free,
-							  (GDestroyNotify) g_object_unref);
+	                                                  (GDestroyNotify) g_free,
+	                                                  (GDestroyNotify) g_object_unref);
 	priv->statements = g_hash_table_new_full (g_str_hash, g_str_equal,
-						  (GDestroyNotify) g_free,
-						  (GDestroyNotify) sqlite3_finalize);
+	                                          (GDestroyNotify) g_free,
+	                                          (GDestroyNotify) sqlite3_finalize);
 
 }
 
@@ -352,7 +352,7 @@ tracker_db_interface_sqlite_init (TrackerDBInterfaceSqlite *db_interface)
 
 static void
 add_row (TrackerDBResultSet *result_set,
-	 sqlite3_stmt	    *stmt)
+         sqlite3_stmt       *stmt)
 {
 	gint cols, i;
 
@@ -394,8 +394,8 @@ add_row (TrackerDBResultSet *result_set,
 
 static void
 internal_sqlite3_function (sqlite3_context *context,
-			   int		    argc,
-			   sqlite3_value   *argv[])
+                           int              argc,
+                           sqlite3_value   *argv[])
 {
 	SqliteFunctionData *data;
 	GValue *values, result;
@@ -437,7 +437,7 @@ internal_sqlite3_function (sqlite3_context *context,
 		}
 		default:
 			g_critical ("Unknown sqlite3 database value type:%d",
-				    sqlite3_value_type (argv[i]));
+			            sqlite3_value_type (argv[i]));
 		}
 	}
 
@@ -451,19 +451,19 @@ internal_sqlite3_function (sqlite3_context *context,
 		sqlite3_result_double (context, g_value_get_double (&result));
 	} else if (G_VALUE_HOLDS_STRING (&result)) {
 		sqlite3_result_text (context,
-				     g_value_dup_string (&result),
-				     -1, g_free);
+		                     g_value_dup_string (&result),
+		                     -1, g_free);
 	} else if (G_VALUE_HOLDS (&result, TRACKER_TYPE_DB_BLOB)) {
 		blob_array = g_value_get_boxed (&result);
 		sqlite3_result_blob (context,
-				     g_memdup (blob_array->data, blob_array->len),
-				     blob_array->len,
-				     g_free);
+		                     g_memdup (blob_array->data, blob_array->len),
+		                     blob_array->len,
+		                     g_free);
 	} else if (G_VALUE_HOLDS (&result, G_TYPE_INVALID)) {
 		sqlite3_result_null (context);
 	} else {
 		g_critical ("Sqlite3 returned type not managed:'%s'",
-			    G_VALUE_TYPE_NAME (&result));
+		            G_VALUE_TYPE_NAME (&result));
 		sqlite3_result_null (context);
 	}
 
@@ -481,7 +481,7 @@ internal_sqlite3_function (sqlite3_context *context,
 
 static TrackerDBStatement *
 tracker_db_interface_sqlite_create_statement (TrackerDBInterface *db_interface,
-					      const gchar	 *query)
+                                              const gchar        *query)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 	TrackerDBStatementSqlite *stmt;
@@ -493,7 +493,7 @@ tracker_db_interface_sqlite_create_statement (TrackerDBInterface *db_interface,
 	if (!stmt) {
 		sqlite3_stmt *sqlite_stmt;
 
-	        g_debug ("Preparing query: '%s'", query);
+		g_debug ("Preparing query: '%s'", query);
 
 		if (sqlite3_prepare_v2 (priv->db, query, -1, &sqlite_stmt, NULL) != SQLITE_OK) {
 			g_critical ("Unable to prepare query '%s': %s", query, sqlite3_errmsg (priv->db));
@@ -511,8 +511,8 @@ tracker_db_interface_sqlite_create_statement (TrackerDBInterface *db_interface,
 
 static void
 internal_sqlite3_aggregate_step (sqlite3_context *context,
-				 int		    argc,
-				 sqlite3_value   *argv[])
+                                 int                argc,
+                                 sqlite3_value   *argv[])
 {
 	SqliteAggregateData *data;
 	void *aggregate_context;
@@ -559,7 +559,7 @@ internal_sqlite3_aggregate_step (sqlite3_context *context,
 		}
 		default:
 			g_critical ("Unknown sqlite3 database value type:%d",
-				    sqlite3_value_type (argv[i]));
+			            sqlite3_value_type (argv[i]));
 		}
 	}
 
@@ -601,19 +601,19 @@ internal_sqlite3_aggregate_final (sqlite3_context *context)
 		sqlite3_result_double (context, g_value_get_double (&result));
 	} else if (G_VALUE_HOLDS_STRING (&result)) {
 		sqlite3_result_text (context,
-				     g_value_dup_string (&result),
-				     -1, g_free);
+		                     g_value_dup_string (&result),
+		                     -1, g_free);
 	} else if (G_VALUE_HOLDS (&result, TRACKER_TYPE_DB_BLOB)) {
 		blob_array = g_value_get_boxed (&result);
 		sqlite3_result_blob (context,
-				     g_memdup (blob_array->data, blob_array->len),
-				     blob_array->len,
-				     g_free);
+		                     g_memdup (blob_array->data, blob_array->len),
+		                     blob_array->len,
+		                     g_free);
 	} else if (G_VALUE_HOLDS (&result, G_TYPE_INVALID)) {
 		sqlite3_result_null (context);
 	} else {
 		g_critical ("Sqlite3 returned type not managed:'%s'",
-			    G_VALUE_TYPE_NAME (&result));
+		            G_VALUE_TYPE_NAME (&result));
 		sqlite3_result_null (context);
 	}
 
@@ -633,8 +633,8 @@ foreach_print_error (gpointer key, gpointer value, gpointer stmt)
 
 static TrackerDBResultSet *
 create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
-			     sqlite3_stmt	       *stmt,
-			     GError		      **error)
+                             sqlite3_stmt              *stmt,
+                             GError                   **error)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 	TrackerDBResultSet *result_set = NULL;
@@ -679,25 +679,25 @@ create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
 			g_unlink (priv->filename);
 
 			g_error ("SQLite experienced an error with file:'%s'. "
-				 "It is either NOT a SQLite database or it is "
-				 "corrupt or there was an IO error accessing the data. "
-				 "This file has now been removed and will be recreated on the next start. "
-				 "Shutting down now.",
-				 priv->filename);
+			         "It is either NOT a SQLite database or it is "
+			         "corrupt or there was an IO error accessing the data. "
+			         "This file has now been removed and will be recreated on the next start. "
+			         "Shutting down now.",
+			         priv->filename);
 
 			return NULL;
 		}
 
 		if (!error) {
 			g_warning ("Could not perform SQLite operation, error:%d->'%s'",
-				   sqlite3_errcode (priv->db),
-				   sqlite3_errmsg (priv->db));
+			           sqlite3_errcode (priv->db),
+			           sqlite3_errmsg (priv->db));
 		} else {
 			g_set_error (error,
-				     TRACKER_DB_INTERFACE_ERROR,
-				     TRACKER_DB_QUERY_ERROR,
-				     "%s",
-                                     sqlite3_errmsg (priv->db));
+			             TRACKER_DB_INTERFACE_ERROR,
+			             TRACKER_DB_QUERY_ERROR,
+			             "%s",
+			             sqlite3_errmsg (priv->db));
 		}
 
 		/* If there was an error, result set may be invalid or incomplete */
@@ -714,8 +714,8 @@ create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
 
 static TrackerDBResultSet *
 tracker_db_interface_sqlite_execute_query (TrackerDBInterface  *db_interface,
-					   GError	      **error,
-					   const gchar	       *query)
+                                           GError             **error,
+                                           const gchar         *query)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 	TrackerDBResultSet *result_set;
@@ -724,22 +724,22 @@ tracker_db_interface_sqlite_execute_query (TrackerDBInterface  *db_interface,
 
 	priv = TRACKER_DB_INTERFACE_SQLITE_GET_PRIVATE (db_interface);
 
-        /* g_debug ("Running query: '%s'", query); */
+	/* g_debug ("Running query: '%s'", query); */
 	retval = sqlite3_prepare_v2 (priv->db, query, -1, &stmt, NULL);
 
 	if (retval != SQLITE_OK) {
 		g_set_error (error,
-			     TRACKER_DB_INTERFACE_ERROR,
-			     TRACKER_DB_QUERY_ERROR,
-			     "%s",
-                             sqlite3_errmsg (priv->db));
+		             TRACKER_DB_INTERFACE_ERROR,
+		             TRACKER_DB_QUERY_ERROR,
+		             "%s",
+		             sqlite3_errmsg (priv->db));
 		return NULL;
 	} else if (stmt == NULL) {
 		g_set_error (error,
-			     TRACKER_DB_INTERFACE_ERROR,
-			     TRACKER_DB_QUERY_ERROR,
-			     "Could not prepare SQL statement:'%s'",
-			     query);
+		             TRACKER_DB_INTERFACE_ERROR,
+		             TRACKER_DB_QUERY_ERROR,
+		             "Could not prepare SQL statement:'%s'",
+		             query);
 
 		return NULL;
 	}
@@ -763,25 +763,25 @@ TrackerDBInterface *
 tracker_db_interface_sqlite_new (const gchar *filename)
 {
 	return g_object_new (TRACKER_TYPE_DB_INTERFACE_SQLITE,
-			     "filename", filename,
-			     NULL);
+	                     "filename", filename,
+	                     NULL);
 }
 
 TrackerDBInterface *
 tracker_db_interface_sqlite_new_ro (const gchar *filename)
 {
 	return g_object_new (TRACKER_TYPE_DB_INTERFACE_SQLITE,
-				 "filename", filename,
-				 "read-only", TRUE,
-			     NULL);
+	                     "filename", filename,
+	                     "read-only", TRUE,
+	                     NULL);
 }
 
 static gint
-collation_function (gpointer	  data,
-		    int		  len1,
-		    gconstpointer str1,
-		    int		  len2,
-		    gconstpointer str2)
+collation_function (gpointer      data,
+                    int                   len1,
+                    gconstpointer str1,
+                    int                   len2,
+                    gconstpointer str2)
 {
 	TrackerDBCollationFunc func;
 
@@ -792,9 +792,9 @@ collation_function (gpointer	  data,
 
 void
 tracker_db_interface_sqlite_create_function (TrackerDBInterface *interface,
-					     const gchar	*name,
-					     TrackerDBFunc	 func,
-					     gint		 n_args)
+                                             const gchar        *name,
+                                             TrackerDBFunc       func,
+                                             gint                n_args)
 {
 	SqliteFunctionData *data;
 	TrackerDBInterfaceSqlitePrivate *priv;
@@ -812,11 +812,11 @@ tracker_db_interface_sqlite_create_function (TrackerDBInterface *interface,
 
 void
 tracker_db_interface_sqlite_create_aggregate (TrackerDBInterface *interface,
-					      const gchar	 *name,
-					      TrackerDBFuncStep   step,
-					      gint		  n_args,
-					      TrackerDBFuncFinal  final,
-					      guint               context_size)
+                                              const gchar        *name,
+                                              TrackerDBFuncStep   step,
+                                              gint                n_args,
+                                              TrackerDBFuncFinal  final,
+                                              guint               context_size)
 {
 	SqliteAggregateData *data;
 	TrackerDBInterfaceSqlitePrivate *priv;
@@ -832,14 +832,14 @@ tracker_db_interface_sqlite_create_aggregate (TrackerDBInterface *interface,
 	priv->aggregate_data = g_slist_prepend (priv->aggregate_data, data);
 
 	sqlite3_create_function (priv->db, name, n_args, SQLITE_ANY, data, NULL,
-				 &internal_sqlite3_aggregate_step,
-				 &internal_sqlite3_aggregate_final);
+	                         &internal_sqlite3_aggregate_step,
+	                         &internal_sqlite3_aggregate_final);
 }
 
 gboolean
 tracker_db_interface_sqlite_set_collation_function (TrackerDBInterfaceSqlite *interface,
-						    const gchar		     *name,
-						    TrackerDBCollationFunc    func)
+                                                    const gchar                      *name,
+                                                    TrackerDBCollationFunc    func)
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 	gint result;
@@ -892,12 +892,12 @@ tracker_db_statement_sqlite_class_init (TrackerDBStatementSqliteClass *class)
 	object_class->finalize = tracker_db_statement_sqlite_finalize;
 
 	g_type_class_add_private (object_class,
-				  sizeof (TrackerDBStatementSqlitePrivate));
+	                          sizeof (TrackerDBStatementSqlitePrivate));
 }
 
 static TrackerDBStatementSqlite *
-tracker_db_statement_sqlite_new (TrackerDBInterfaceSqlite	*db_interface,
-				 sqlite3_stmt			*sqlite_stmt)
+tracker_db_statement_sqlite_new (TrackerDBInterfaceSqlite       *db_interface,
+                                 sqlite3_stmt                   *sqlite_stmt)
 {
 	TrackerDBStatementSqlite *stmt;
 	TrackerDBStatementSqlitePrivate *priv;
@@ -941,12 +941,12 @@ tracker_db_cursor_sqlite_class_init (TrackerDBCursorSqliteClass *class)
 	object_class->finalize = tracker_db_cursor_sqlite_finalize;
 
 	g_type_class_add_private (object_class,
-				  sizeof (TrackerDBCursorSqlitePrivate));
+	                          sizeof (TrackerDBCursorSqlitePrivate));
 }
 
 static TrackerDBCursor *
-tracker_db_cursor_sqlite_new (sqlite3_stmt		*sqlite_stmt,
-			      TrackerDBStatementSqlite  *ref_stmt)
+tracker_db_cursor_sqlite_new (sqlite3_stmt              *sqlite_stmt,
+                              TrackerDBStatementSqlite  *ref_stmt)
 {
 	TrackerDBCursor *cursor;
 	TrackerDBCursorSqlitePrivate *priv;
@@ -971,9 +971,9 @@ tracker_db_cursor_sqlite_new (sqlite3_stmt		*sqlite_stmt,
 }
 
 static void
-tracker_db_statement_sqlite_bind_double (TrackerDBStatement	 *stmt,
-					 int			  index,
-					 double			  value)
+tracker_db_statement_sqlite_bind_double (TrackerDBStatement      *stmt,
+                                         int                      index,
+                                         double                           value)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -985,9 +985,9 @@ tracker_db_statement_sqlite_bind_double (TrackerDBStatement	 *stmt,
 }
 
 static void
-tracker_db_statement_sqlite_bind_int (TrackerDBStatement	 *stmt,
-				      int			  index,
-				      int			  value)
+tracker_db_statement_sqlite_bind_int (TrackerDBStatement         *stmt,
+                                      int                         index,
+                                      int                         value)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -1001,9 +1001,9 @@ tracker_db_statement_sqlite_bind_int (TrackerDBStatement	 *stmt,
 
 
 static void
-tracker_db_statement_sqlite_bind_int64 (TrackerDBStatement	 *stmt,
-				         int			  index,
-				         gint64			  value)
+tracker_db_statement_sqlite_bind_int64 (TrackerDBStatement       *stmt,
+                                        int                      index,
+                                        gint64                           value)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -1015,8 +1015,8 @@ tracker_db_statement_sqlite_bind_int64 (TrackerDBStatement	 *stmt,
 }
 
 static void
-tracker_db_statement_sqlite_bind_null (TrackerDBStatement	 *stmt,
-				       int			  index)
+tracker_db_statement_sqlite_bind_null (TrackerDBStatement        *stmt,
+                                       int                        index)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -1028,9 +1028,9 @@ tracker_db_statement_sqlite_bind_null (TrackerDBStatement	 *stmt,
 }
 
 static void
-tracker_db_statement_sqlite_bind_text (TrackerDBStatement	 *stmt,
-				       int			  index,
-				       const gchar		 *value)
+tracker_db_statement_sqlite_bind_text (TrackerDBStatement        *stmt,
+                                       int                        index,
+                                       const gchar               *value)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -1158,8 +1158,8 @@ tracker_db_interface_sqlite_reconnect (TrackerDBInterface *db_interface)
 }
 
 static TrackerDBResultSet *
-tracker_db_statement_sqlite_execute (TrackerDBStatement		 *stmt,
-				     GError			**error)
+tracker_db_statement_sqlite_execute (TrackerDBStatement                  *stmt,
+                                     GError                     **error)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
@@ -1171,8 +1171,8 @@ tracker_db_statement_sqlite_execute (TrackerDBStatement		 *stmt,
 }
 
 static TrackerDBCursor *
-tracker_db_statement_sqlite_start_cursor (TrackerDBStatement		 *stmt,
-					  GError			**error)
+tracker_db_statement_sqlite_start_cursor (TrackerDBStatement             *stmt,
+                                          GError                        **error)
 {
 	TrackerDBStatementSqlitePrivate *priv;
 
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.h b/src/libtracker-db/tracker-db-interface-sqlite.h
index d8c5efc..b24876a 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.h
+++ b/src/libtracker-db/tracker-db-interface-sqlite.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #error "only <libtracker-db/tracker-db.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_DB_INTERFACE_SQLITE	 (tracker_db_interface_sqlite_get_type ())
-#define TRACKER_DB_INTERFACE_SQLITE(o)		 (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqlite))
-#define TRACKER_DB_INTERFACE_SQLITE_CLASS(c)	 (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
-#define TRACKER_IS_DB_INTERFACE_SQLITE(o)	 (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE))
+#define TRACKER_TYPE_DB_INTERFACE_SQLITE         (tracker_db_interface_sqlite_get_type ())
+#define TRACKER_DB_INTERFACE_SQLITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqlite))
+#define TRACKER_DB_INTERFACE_SQLITE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
+#define TRACKER_IS_DB_INTERFACE_SQLITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE))
 #define TRACKER_IS_DB_INTERFACE_SQLITE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((o),    TRACKER_TYPE_DB_INTERFACE_SQLITE))
 #define TRACKER_DB_INTERFACE_SQLITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
 
@@ -40,20 +40,20 @@ typedef struct TrackerDBInterfaceSqlite      TrackerDBInterfaceSqlite;
 typedef struct TrackerDBInterfaceSqliteClass TrackerDBInterfaceSqliteClass;
 
 typedef gint (* TrackerDBCollationFunc) (gchar *str1,
-					 gint	len1,
-					 gchar *str2,
-					 gint	len2);
+                                         gint   len1,
+                                         gchar *str2,
+                                         gint   len2);
 typedef GValue (* TrackerDBFunc) (TrackerDBInterface *interface,
-				  gint		      argc,
-				  GValue	      argv[]);
+                                  gint                argc,
+                                  GValue              argv[]);
 
 typedef void (* TrackerDBFuncStep) (TrackerDBInterface *interface,
-				    void               *aggregate_context,
-				    gint		  argc,
-				    GValue	          argv[]);
+                                    void               *aggregate_context,
+                                    gint                  argc,
+                                    GValue                argv[]);
 
 typedef GValue (* TrackerDBFuncFinal) (TrackerDBInterface *interface,
-				       void               *aggregate_context);
+                                       void               *aggregate_context);
 
 struct TrackerDBInterfaceSqlite {
 	GObject parent_instance;
diff --git a/src/libtracker-db/tracker-db-interface.c b/src/libtracker-db/tracker-db-interface.c
index 452de4d..55a2ff3 100644
--- a/src/libtracker-db/tracker-db-interface.c
+++ b/src/libtracker-db/tracker-db-interface.c
@@ -52,11 +52,11 @@ static void
 tracker_db_interface_class_init (gpointer iface)
 {
 	g_object_interface_install_property (iface,
-					     g_param_spec_boolean ("in-transaction",
-								   "In transaction",
-								   "Whether the connection has a transaction opened",
-								   FALSE,
-								   G_PARAM_READWRITE));
+	                                     g_param_spec_boolean ("in-transaction",
+	                                                           "In transaction",
+	                                                           "Whether the connection has a transaction opened",
+	                                                           FALSE,
+	                                                           G_PARAM_READWRITE));
 }
 
 GType
@@ -66,10 +66,10 @@ tracker_db_interface_get_type (void)
 
 	if (G_UNLIKELY (type == 0)) {
 		type = g_type_register_static_simple (G_TYPE_INTERFACE,
-						      "TrackerDBInterface",
-						      sizeof (TrackerDBInterfaceIface),
-						      (GClassInitFunc) tracker_db_interface_class_init,
-						      0, NULL, 0);
+		                                      "TrackerDBInterface",
+		                                      sizeof (TrackerDBInterfaceIface),
+		                                      (GClassInitFunc) tracker_db_interface_class_init,
+		                                      0, NULL, 0);
 
 		g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	}
@@ -84,10 +84,10 @@ tracker_db_statement_get_type (void)
 
 	if (G_UNLIKELY (type == 0)) {
 		type = g_type_register_static_simple (G_TYPE_INTERFACE,
-						      "TrackerDBStatement",
-						      sizeof (TrackerDBStatementIface),
-						      NULL,
-						      0, NULL, 0);
+		                                      "TrackerDBStatement",
+		                                      sizeof (TrackerDBStatementIface),
+		                                      NULL,
+		                                      0, NULL, 0);
 
 		g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	}
@@ -102,10 +102,10 @@ tracker_db_cursor_get_type (void)
 
 	if (G_UNLIKELY (type == 0)) {
 		type = g_type_register_static_simple (G_TYPE_INTERFACE,
-						      "TrackerDBCursor",
-						      sizeof (TrackerDBCursorIface),
-						      NULL,
-						      0, NULL, 0);
+		                                      "TrackerDBCursor",
+		                                      sizeof (TrackerDBCursorIface),
+		                                      NULL,
+		                                      0, NULL, 0);
 
 		g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	}
@@ -143,8 +143,8 @@ tracker_db_blob_get_type (void)
 
 	if (G_UNLIKELY (type == 0)) {
 		type = g_boxed_type_register_static ("TrackerDBBlob",
-						     blob_copy,
-						     blob_free);
+		                                     blob_copy,
+		                                     blob_free);
 	}
 
 	return type;
@@ -152,10 +152,10 @@ tracker_db_blob_get_type (void)
 
 /* TrackerDBResultSet */
 static void
-tracker_db_result_set_set_property (GObject	  *object,
-				    guint	   prop_id,
-				    const GValue  *value,
-				    GParamSpec	  *pspec)
+tracker_db_result_set_set_property (GObject       *object,
+                                    guint          prop_id,
+                                    const GValue  *value,
+                                    GParamSpec    *pspec)
 {
 	TrackerDBResultSetPrivate *priv;
 
@@ -173,9 +173,9 @@ tracker_db_result_set_set_property (GObject	  *object,
 
 static void
 tracker_db_result_set_get_property (GObject    *object,
-				    guint	prop_id,
-				    GValue     *value,
-				    GParamSpec *pspec)
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
 {
 	TrackerDBResultSetPrivate *priv;
 
@@ -192,7 +192,7 @@ tracker_db_result_set_get_property (GObject    *object,
 
 static void
 free_row (gpointer *row,
-	  gpointer  data)
+          gpointer  data)
 {
 	guint columns = GPOINTER_TO_UINT (data);
 	guint i;
@@ -216,7 +216,7 @@ tracker_db_result_set_finalize (GObject *object)
 
 	if (priv->array) {
 		g_ptr_array_foreach (priv->array, (GFunc) free_row,
-				     GUINT_TO_POINTER (priv->columns));
+		                     GUINT_TO_POINTER (priv->columns));
 		g_ptr_array_free (priv->array, TRUE);
 	}
 
@@ -235,17 +235,17 @@ tracker_db_result_set_class_init (TrackerDBResultSetClass *class)
 	object_class->finalize = tracker_db_result_set_finalize;
 
 	g_object_class_install_property (object_class,
-					 PROP_COLUMNS,
-					 g_param_spec_uint ("columns",
-							    "Columns",
-							    "Resultset columns",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READWRITE |
-							    G_PARAM_CONSTRUCT_ONLY));
+	                                 PROP_COLUMNS,
+	                                 g_param_spec_uint ("columns",
+	                                                    "Columns",
+	                                                    "Resultset columns",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READWRITE |
+	                                                    G_PARAM_CONSTRUCT_ONLY));
 
 
 	g_type_class_add_private (object_class,
-				  sizeof (TrackerDBResultSetPrivate));
+	                          sizeof (TrackerDBResultSetPrivate));
 }
 
 static void
@@ -272,8 +272,8 @@ ensure_result_set_state (TrackerDBResultSet *result_set)
 
 TrackerDBStatement *
 tracker_db_interface_create_statement (TrackerDBInterface  *interface,
-				       const gchar	   *query,
-				       ...)
+                                       const gchar         *query,
+                                       ...)
 {
 	TrackerDBStatement *stmt;
 	TrackerDBInterfaceIface *iface;
@@ -290,16 +290,16 @@ tracker_db_interface_create_statement (TrackerDBInterface  *interface,
 	iface = TRACKER_DB_INTERFACE_GET_IFACE (interface);
 	stmt = iface->create_statement (interface, str);
 	g_free (str);
-	
+        
 	return stmt;
 }
 
 
 TrackerDBResultSet *
 tracker_db_interface_execute_vquery (TrackerDBInterface  *interface,
-				     GError		**error,
-				     const gchar	 *query,
-				     va_list		  args)
+                                     GError             **error,
+                                     const gchar         *query,
+                                     va_list              args)
 {
 	TrackerDBResultSet *result_set = NULL;
 	gchar *str;
@@ -309,15 +309,15 @@ tracker_db_interface_execute_vquery (TrackerDBInterface  *interface,
 
 	if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query) {
 		g_critical ("Database abstraction %s doesn't implement "
-			    "the method execute_vquery()",
-			    G_OBJECT_TYPE_NAME (interface));
+		            "the method execute_vquery()",
+		            G_OBJECT_TYPE_NAME (interface));
 		return NULL;
 	}
 
 	str = g_strdup_vprintf (query, args);
 	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query (interface,
-										error,
-										str);
+		  error,
+		  str);
 	g_free (str);
 
 	return ensure_result_set_state (result_set);
@@ -326,19 +326,19 @@ tracker_db_interface_execute_vquery (TrackerDBInterface  *interface,
 
 
 TrackerDBResultSet *
-tracker_db_interface_execute_query (TrackerDBInterface	*interface,
-				    GError	       **error,
-				    const gchar		*query,
-				    ...)
+tracker_db_interface_execute_query (TrackerDBInterface  *interface,
+                                    GError             **error,
+                                    const gchar                 *query,
+                                    ...)
 {
 	TrackerDBResultSet *result_set;
 	va_list args;
 
 	va_start (args, query);
 	result_set = tracker_db_interface_execute_vquery (interface,
-							  error,
-							  query,
-							  args);
+	                                                  error,
+	                                                  query,
+	                                                  args);
 	va_end (args);
 
 	return result_set;
@@ -350,8 +350,8 @@ tracker_db_interface_start_transaction (TrackerDBInterface *interface)
 	GError *error = NULL;
 
 	tracker_db_interface_execute_query (interface,
-					    &error,
-					    "BEGIN TRANSACTION");
+	                                    &error,
+	                                    "BEGIN TRANSACTION");
 
 	if (error) {
 		g_warning ("%s", error->message);
@@ -408,9 +408,9 @@ tracker_db_interface_reconnect (TrackerDBInterface  *interface)
 }
 
 void
-tracker_db_statement_bind_double (TrackerDBStatement	*stmt,
-				  int			 idx,
-				  double		 value)
+tracker_db_statement_bind_double (TrackerDBStatement    *stmt,
+                                  int                    idx,
+                                  double                 value)
 {
 	g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
 
@@ -418,9 +418,9 @@ tracker_db_statement_bind_double (TrackerDBStatement	*stmt,
 }
 
 void
-tracker_db_statement_bind_int (TrackerDBStatement	*stmt,
-			       int			 idx,
-			       int			 value)
+tracker_db_statement_bind_int (TrackerDBStatement       *stmt,
+                               int                       idx,
+                               int                       value)
 {
 	g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
 
@@ -429,9 +429,9 @@ tracker_db_statement_bind_int (TrackerDBStatement	*stmt,
 
 
 void
-tracker_db_statement_bind_int64 (TrackerDBStatement	*stmt,
-			         int			 idx,
-			         gint64			 value)
+tracker_db_statement_bind_int64 (TrackerDBStatement     *stmt,
+                                 int                     idx,
+                                 gint64                          value)
 {
 	g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
 
@@ -439,8 +439,8 @@ tracker_db_statement_bind_int64 (TrackerDBStatement	*stmt,
 }
 
 void
-tracker_db_statement_bind_null (TrackerDBStatement	*stmt,
-				int			 idx)
+tracker_db_statement_bind_null (TrackerDBStatement      *stmt,
+                                int                      idx)
 {
 	g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
 
@@ -448,9 +448,9 @@ tracker_db_statement_bind_null (TrackerDBStatement	*stmt,
 }
 
 void
-tracker_db_statement_bind_text (TrackerDBStatement	*stmt,
-				int			 idx,
-				const gchar		*value)
+tracker_db_statement_bind_text (TrackerDBStatement      *stmt,
+                                int                      idx,
+                                const gchar             *value)
 {
 	g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
 
@@ -458,8 +458,8 @@ tracker_db_statement_bind_text (TrackerDBStatement	*stmt,
 }
 
 TrackerDBResultSet *
-tracker_db_statement_execute (TrackerDBStatement	 *stmt,
-			      GError			**error)
+tracker_db_statement_execute (TrackerDBStatement         *stmt,
+                              GError                    **error)
 {
 	TrackerDBResultSet *result_set;
 
@@ -471,8 +471,8 @@ tracker_db_statement_execute (TrackerDBStatement	 *stmt,
 }
 
 TrackerDBCursor *
-tracker_db_statement_start_cursor (TrackerDBStatement	 *stmt,
-				   GError		**error)
+tracker_db_statement_start_cursor (TrackerDBStatement    *stmt,
+                                   GError               **error)
 {
 	g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL);
 
@@ -544,8 +544,8 @@ TrackerDBResultSet *
 _tracker_db_result_set_new (guint columns)
 {
 	return g_object_new (TRACKER_TYPE_DB_RESULT_SET,
-			     "columns", columns,
-			     NULL);
+	                     "columns", columns,
+	                     NULL);
 }
 
 void
@@ -567,8 +567,8 @@ _tracker_db_result_set_append (TrackerDBResultSet *result_set)
 
 void
 _tracker_db_result_set_set_value (TrackerDBResultSet *result_set,
-				  guint		      column,
-				  const GValue	     *value)
+                                  guint                       column,
+                                  const GValue       *value)
 {
 	TrackerDBResultSetPrivate *priv;
 	gpointer *row = NULL;
@@ -621,8 +621,8 @@ _tracker_db_result_set_set_value (TrackerDBResultSet *result_set,
 }
 
 static void
-fill_in_value (GValue	*value,
-	       gpointer  data)
+fill_in_value (GValue   *value,
+               gpointer  data)
 {
 	switch (G_VALUE_TYPE (value)) {
 	case G_TYPE_INT:
@@ -642,8 +642,8 @@ fill_in_value (GValue	*value,
 
 void
 _tracker_db_result_set_get_value (TrackerDBResultSet *result_set,
-				  guint		      column,
-				  GValue	     *value)
+                                  guint                       column,
+                                  GValue             *value)
 {
 	TrackerDBResultSetPrivate *priv;
 	gpointer *row;
@@ -664,7 +664,7 @@ _tracker_db_result_set_get_value (TrackerDBResultSet *result_set,
 /* TrackerDBResultSet API */
 void
 tracker_db_result_set_get (TrackerDBResultSet *result_set,
-			   ...)
+                           ...)
 {
 	TrackerDBResultSetPrivate *priv;
 	va_list args;
@@ -684,8 +684,8 @@ tracker_db_result_set_get (TrackerDBResultSet *result_set,
 	while ((n_col = va_arg (args, gint)) >= 0) {
 		if ((guint) n_col >= priv->columns) {
 			g_critical ("Result set has %d columns, trying to access column %d, "
-				    "maybe -1 is missing at the end of the arguments?",
-				    priv->columns, n_col);
+			            "maybe -1 is missing at the end of the arguments?",
+			            priv->columns, n_col);
 			break;
 		}
 
diff --git a/src/libtracker-db/tracker-db-interface.h b/src/libtracker-db/tracker-db-interface.h
index 0fb5836..547c20d 100644
--- a/src/libtracker-db/tracker-db-interface.h
+++ b/src/libtracker-db/tracker-db-interface.h
@@ -29,31 +29,31 @@ G_BEGIN_DECLS
 #error "only <libtracker-db/tracker-db.h> must be included directly."
 #endif
 
-#define TRACKER_TYPE_DB_INTERFACE	    (tracker_db_interface_get_type ())
-#define TRACKER_DB_INTERFACE(obj)	    (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterface))
-#define TRACKER_IS_DB_INTERFACE(obj)	    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_INTERFACE))
+#define TRACKER_TYPE_DB_INTERFACE           (tracker_db_interface_get_type ())
+#define TRACKER_DB_INTERFACE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterface))
+#define TRACKER_IS_DB_INTERFACE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_INTERFACE))
 #define TRACKER_DB_INTERFACE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterfaceIface))
 
-#define TRACKER_TYPE_DB_STATEMENT	    (tracker_db_statement_get_type ())
-#define TRACKER_DB_STATEMENT(obj)	    (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_STATEMENT, TrackerDBStatement))
-#define TRACKER_IS_DB_STATEMENT(obj)	    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_STATEMENT))
+#define TRACKER_TYPE_DB_STATEMENT           (tracker_db_statement_get_type ())
+#define TRACKER_DB_STATEMENT(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_STATEMENT, TrackerDBStatement))
+#define TRACKER_IS_DB_STATEMENT(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_STATEMENT))
 #define TRACKER_DB_STATEMENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TRACKER_TYPE_DB_STATEMENT, TrackerDBStatementIface))
 
-#define TRACKER_TYPE_DB_CURSOR		    (tracker_db_cursor_get_type ())
-#define TRACKER_DB_CURSOR(obj)		    (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_CURSOR, TrackerDBCursor))
-#define TRACKER_IS_DB_CURSOR(obj)	    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_CURSOR))
+#define TRACKER_TYPE_DB_CURSOR              (tracker_db_cursor_get_type ())
+#define TRACKER_DB_CURSOR(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_CURSOR, TrackerDBCursor))
+#define TRACKER_IS_DB_CURSOR(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_CURSOR))
 #define TRACKER_DB_CURSOR_GET_IFACE(obj)    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TRACKER_TYPE_DB_CURSOR, TrackerDBCursorIface))
 
-#define TRACKER_TYPE_DB_RESULT_SET	    (tracker_db_result_set_get_type ())
-#define TRACKER_DB_RESULT_SET(o)	    (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSet))
-#define TRACKER_DB_RESULT_SET_CLASS(c)	    (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
-#define TRACKER_IS_DB_RESULT_SET(o)	    (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_RESULT_SET))
+#define TRACKER_TYPE_DB_RESULT_SET          (tracker_db_result_set_get_type ())
+#define TRACKER_DB_RESULT_SET(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSet))
+#define TRACKER_DB_RESULT_SET_CLASS(c)      (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
+#define TRACKER_IS_DB_RESULT_SET(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_RESULT_SET))
 #define TRACKER_IS_DB_RESULT_SET_CLASS(c)   (G_TYPE_CHECK_CLASS_TYPE ((o),    TRACKER_TYPE_DB_RESULT_SET))
 #define TRACKER_DB_RESULT_SET_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
 
-#define TRACKER_TYPE_DB_BLOB		    (tracker_db_blob_get_type ())
+#define TRACKER_TYPE_DB_BLOB                (tracker_db_blob_get_type ())
 
-#define TRACKER_DB_INTERFACE_ERROR	    (tracker_db_interface_error_quark ())
+#define TRACKER_DB_INTERFACE_ERROR          (tracker_db_interface_error_quark ())
 
 typedef enum {
 	TRACKER_DB_QUERY_ERROR,
@@ -73,35 +73,35 @@ struct TrackerDBInterfaceIface {
 	GTypeInterface iface;
 
 	TrackerDBStatement * (* create_statement) (TrackerDBInterface  *interface,
-						   const gchar	       *query);
-	TrackerDBResultSet * (* execute_query)	  (TrackerDBInterface  *interface,
-						   GError	      **error,
-						   const gchar	       *query);
-	void		     (* disconnect)	  (TrackerDBInterface  *interface);
-	void		     (* reconnect)	  (TrackerDBInterface  *interface);
+	                                           const gchar         *query);
+	TrackerDBResultSet * (* execute_query)    (TrackerDBInterface  *interface,
+	                                           GError             **error,
+	                                           const gchar         *query);
+	void                 (* disconnect)       (TrackerDBInterface  *interface);
+	void                 (* reconnect)        (TrackerDBInterface  *interface);
 };
 
 struct TrackerDBStatementIface {
 	GTypeInterface iface;
 
-	void		     (* bind_double)	(TrackerDBStatement  *stmt,
-						 int		      index,
-						 double		      value);
-	void		     (* bind_int)	(TrackerDBStatement  *stmt,
-						 int		      index,
-						 int		      value);
-	void		     (* bind_int64)	(TrackerDBStatement  *stmt,
-						 int		      index,
-						 gint64		      value);
-	void		     (* bind_null)	(TrackerDBStatement  *stmt,
-						 int		      index);
-	void		     (* bind_text)	(TrackerDBStatement  *stmt,
-						 int		      index,
-						 const gchar	     *value);
-	TrackerDBResultSet * (* execute)	(TrackerDBStatement  *stmt,
-						 GError		    **error);
-	TrackerDBCursor    * (* start_cursor)	(TrackerDBStatement  *stmt,
-						 GError		    **error);
+	void                 (* bind_double)    (TrackerDBStatement  *stmt,
+	                                         int                  index,
+	                                         double                       value);
+	void                 (* bind_int)       (TrackerDBStatement  *stmt,
+	                                         int                  index,
+	                                         int                  value);
+	void                 (* bind_int64)     (TrackerDBStatement  *stmt,
+	                                         int                  index,
+	                                         gint64                       value);
+	void                 (* bind_null)      (TrackerDBStatement  *stmt,
+	                                         int                  index);
+	void                 (* bind_text)      (TrackerDBStatement  *stmt,
+	                                         int                  index,
+	                                         const gchar         *value);
+	TrackerDBResultSet * (* execute)        (TrackerDBStatement  *stmt,
+	                                         GError                     **error);
+	TrackerDBCursor    * (* start_cursor)   (TrackerDBStatement  *stmt,
+	                                         GError                     **error);
 };
 
 struct TrackerDBResultSet {
@@ -119,14 +119,14 @@ struct TrackerDBCursorIface {
 	gboolean      (*iter_next)     (TrackerDBCursor *cursor);
 	guint         (*get_n_columns) (TrackerDBCursor *cursor);
 	void          (*get_value)     (TrackerDBCursor *cursor,
-				        guint            column,
-				        GValue          *value);
+	                                guint            column,
+	                                GValue          *value);
 	const gchar*  (*get_string)    (TrackerDBCursor *cursor,
-				        guint            column);
+	                                guint            column);
 	gint          (*get_int)       (TrackerDBCursor *cursor,
-				        guint            column);
+	                                guint            column);
 	gdouble       (*get_double)    (TrackerDBCursor *cursor,
-				        guint            column);
+	                                guint            column);
 };
 
 GQuark              tracker_db_interface_error_quark       (void);
@@ -139,53 +139,53 @@ GType               tracker_db_blob_get_type               (void);
 
 /* Functions to create queries/procedures */
 TrackerDBStatement *tracker_db_interface_create_statement  (TrackerDBInterface   *interface,
-							    const gchar	       *query,
-							    ...) G_GNUC_PRINTF (2, 3);
-TrackerDBResultSet *tracker_db_interface_execute_vquery	   (TrackerDBInterface   *interface,
-							    GError	     **error,
-							    const gchar	       *query,
-							    va_list		args);
-TrackerDBResultSet *tracker_db_interface_execute_query	   (TrackerDBInterface   *interface,
-							    GError	     **error,
-							    const gchar	       *query,
-							    ...) G_GNUC_PRINTF (3, 4);
+                                                            const gchar                *query,
+                                                            ...) G_GNUC_PRINTF (2, 3);
+TrackerDBResultSet *tracker_db_interface_execute_vquery            (TrackerDBInterface   *interface,
+                                                                    GError           **error,
+                                                                    const gchar                *query,
+                                                                    va_list             args);
+TrackerDBResultSet *tracker_db_interface_execute_query     (TrackerDBInterface   *interface,
+                                                            GError           **error,
+                                                            const gchar                *query,
+                                                            ...) G_GNUC_PRINTF (3, 4);
 
 gboolean            tracker_db_interface_start_transaction (TrackerDBInterface  *interface);
 gboolean            tracker_db_interface_end_transaction   (TrackerDBInterface  *interface);
 void                tracker_db_interface_disconnect        (TrackerDBInterface  *interface);
 void                tracker_db_interface_reconnect         (TrackerDBInterface  *interface);
 void                tracker_db_statement_bind_double       (TrackerDBStatement  *stmt,
-							    int                  index,
-							    double               value);
+                                                            int                  index,
+                                                            double               value);
 void                tracker_db_statement_bind_int          (TrackerDBStatement  *stmt,
-							    int                  index,
-							    int                  value);
+                                                            int                  index,
+                                                            int                  value);
 void                tracker_db_statement_bind_int64        (TrackerDBStatement  *stmt,
-							    int                  index,
-							    gint64               value);
+                                                            int                  index,
+                                                            gint64               value);
 void                tracker_db_statement_bind_null         (TrackerDBStatement  *stmt,
-							    int                  index);
+                                                            int                  index);
 void                tracker_db_statement_bind_text         (TrackerDBStatement  *stmt,
-							    int                  index,
-							    const gchar         *value);
+                                                            int                  index,
+                                                            const gchar         *value);
 TrackerDBResultSet *tracker_db_statement_execute           (TrackerDBStatement  *stmt,
-							    GError             **error);
+                                                            GError             **error);
 TrackerDBCursor *   tracker_db_statement_start_cursor      (TrackerDBStatement  *stmt,
-							    GError             **error);
+                                                            GError             **error);
 
 /* Semi private TrackerDBResultSet functions */
 TrackerDBResultSet *_tracker_db_result_set_new             (guint                cols);
 void                _tracker_db_result_set_append          (TrackerDBResultSet  *result_set);
 void                _tracker_db_result_set_set_value       (TrackerDBResultSet  *result_set,
-							    guint                column,
-							    const GValue        *value);
+                                                            guint                column,
+                                                            const GValue        *value);
 void                _tracker_db_result_set_get_value       (TrackerDBResultSet  *result_set,
-							    guint                column,
-							    GValue              *value);
+                                                            guint                column,
+                                                            GValue              *value);
 
 /* Functions to deal with the resultset */
 void                tracker_db_result_set_get              (TrackerDBResultSet  *result_set,
-							    ...);
+                                                            ...);
 void                tracker_db_result_set_rewind           (TrackerDBResultSet  *result_set);
 gboolean            tracker_db_result_set_iter_next        (TrackerDBResultSet  *result_set);
 guint               tracker_db_result_set_get_n_columns    (TrackerDBResultSet  *result_set);
@@ -196,14 +196,14 @@ void                tracker_db_cursor_rewind               (TrackerDBCursor
 gboolean            tracker_db_cursor_iter_next            (TrackerDBCursor     *cursor);
 guint               tracker_db_cursor_get_n_columns        (TrackerDBCursor     *cursor);
 void                tracker_db_cursor_get_value            (TrackerDBCursor     *cursor,
-							    guint                column,
-							    GValue              *value);
+                                                            guint                column,
+                                                            GValue              *value);
 const gchar*        tracker_db_cursor_get_string           (TrackerDBCursor     *cursor,
-							    guint                column);
+                                                            guint                column);
 gint                tracker_db_cursor_get_int              (TrackerDBCursor     *cursor,
-							    guint                column);
+                                                            guint                column);
 gdouble             tracker_db_cursor_get_double           (TrackerDBCursor     *cursor,
-							    guint                column);
+                                                            guint                column);
 
 G_END_DECLS
 
diff --git a/src/libtracker-db/tracker-db-journal.c b/src/libtracker-db/tracker-db-journal.c
index a7bb31c..8fb2f20 100644
--- a/src/libtracker-db/tracker-db-journal.c
+++ b/src/libtracker-db/tracker-db-journal.c
@@ -37,7 +37,7 @@ static FILE *journal = NULL;
 static GMappedFile *mapped = NULL;
 static gsize current_size = 0;
 
-#define TRACKER_DB_JOURNAL_LOG_FILENAME		"log.sparql.txt"
+#define TRACKER_DB_JOURNAL_LOG_FILENAME                 "log.sparql.txt"
 
 static void
 get_filename (void)
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index e998e8f..53b0c09 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -42,7 +42,7 @@
 #include "tracker-db-interface.h"
 
 /* ZLib buffer settings */
-#define ZLIB_BUF_SIZE		      8192
+#define ZLIB_BUF_SIZE                 8192
 
 /* Required minimum space needed to create databases (5Mb) */
 #define TRACKER_DB_MIN_REQUIRED_SPACE 5242880
@@ -71,17 +71,17 @@ typedef enum {
 } TrackerDBVersion;
 
 typedef struct {
-	TrackerDB	    db;
+	TrackerDB           db;
 	TrackerDBLocation   location;
 	TrackerDBInterface *iface;
-	const gchar	   *file;
-	const gchar	   *name;
-	gchar		   *abs_filename;
-	gint		    cache_size;
-	gint		    page_size;
-	gboolean	    add_functions;
-	gboolean	    attached;
-	gboolean	    is_index;
+	const gchar        *file;
+	const gchar        *name;
+	gchar              *abs_filename;
+	gint                cache_size;
+	gint                page_size;
+	gboolean            add_functions;
+	gboolean            attached;
+	gboolean            is_index;
 	guint64             mtime;
 } TrackerDBDefinition;
 
@@ -101,7 +101,7 @@ static TrackerDBDefinition dbs[] = {
 	  FALSE,
 	  FALSE,
 	  FALSE,
- 	  0 },
+	  0 },
 	{ TRACKER_DB_METADATA,
 	  TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
@@ -113,7 +113,7 @@ static TrackerDBDefinition dbs[] = {
 	  TRUE,
 	  FALSE,
 	  FALSE,
- 	  0 },
+	  0 },
 	{ TRACKER_DB_CONTENTS,
 	  TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
@@ -125,7 +125,7 @@ static TrackerDBDefinition dbs[] = {
 	  FALSE,
 	  FALSE,
 	  FALSE,
- 	  0 },
+	  0 },
 	{ TRACKER_DB_FULLTEXT,
 	  TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
@@ -137,22 +137,22 @@ static TrackerDBDefinition dbs[] = {
 	  TRUE,
 	  FALSE,
 	  TRUE,
- 	  0 },
+	  0 },
 };
 
-static gboolean		   db_exec_no_reply    (TrackerDBInterface *iface,
-						const gchar	   *query,
-						...);
-static TrackerDBInterface *db_interface_create (TrackerDB	    db);
+static gboolean                    db_exec_no_reply    (TrackerDBInterface *iface,
+                                                        const gchar        *query,
+                                                        ...);
+static TrackerDBInterface *db_interface_create (TrackerDB           db);
 static TrackerDBInterface *tracker_db_manager_get_db_interfaces     (gint num, ...);
 static TrackerDBInterface *tracker_db_manager_get_db_interfaces_ro  (gint num, ...);
 
-static gboolean		   initialized;
-static gchar		  *sql_dir;
-static gchar		  *data_dir;
-static gchar		  *user_data_dir;
-static gchar		  *sys_tmp_dir;
-static gpointer		   db_type_enum_class_pointer;
+static gboolean                    initialized;
+static gchar              *sql_dir;
+static gchar              *data_dir;
+static gchar              *user_data_dir;
+static gchar              *sys_tmp_dir;
+static gpointer                    db_type_enum_class_pointer;
 static TrackerDBInterface *resources_iface;
 
 static const gchar *
@@ -172,8 +172,8 @@ location_to_directory (TrackerDBLocation location)
 
 static void
 load_sql_file (TrackerDBInterface *iface,
-	       const gchar	  *file,
-	       const gchar	  *delimiter)
+               const gchar        *file,
+               const gchar        *delimiter)
 {
 	gchar *path, *content, **queries;
 	gint   count;
@@ -187,7 +187,7 @@ load_sql_file (TrackerDBInterface *iface,
 
 	if (!g_file_get_contents (path, &content, NULL, NULL)) {
 		g_critical ("Cannot read SQL file:'%s', please reinstall tracker"
-			    " or check read permissions on the file if it exists", path);
+		            " or check read permissions on the file if it exists", path);
 		g_assert_not_reached ();
 	}
 
@@ -224,11 +224,11 @@ load_sql_file (TrackerDBInterface *iface,
 
 static gboolean
 db_exec_no_reply (TrackerDBInterface *iface,
-		  const gchar	     *query,
-		  ...)
+                  const gchar        *query,
+                  ...)
 {
 	TrackerDBResultSet *result_set;
-	va_list		    args;
+	va_list                     args;
 
 	va_start (args, query);
 	result_set = tracker_db_interface_execute_vquery (iface, NULL, query, args);
@@ -244,10 +244,10 @@ db_exec_no_reply (TrackerDBInterface *iface,
 /* Converts date/time in UTC format to ISO 8160 standardised format for display */
 static GValue
 function_date_to_str (TrackerDBInterface *interface,
-		      gint		  argc,
-		      GValue		  values[])
+                      gint                argc,
+                      GValue              values[])
 {
-	GValue	result = { 0, };
+	GValue  result = { 0, };
 	gchar  *str;
 
 	str = tracker_date_to_string (g_value_get_double (&values[0]));
@@ -259,12 +259,12 @@ function_date_to_str (TrackerDBInterface *interface,
 
 static GValue
 function_regexp (TrackerDBInterface *interface,
-		 gint		     argc,
-		 GValue		     values[])
+                 gint                argc,
+                 GValue                      values[])
 {
-	GValue	result = { 0, };
-	regex_t	regex;
-	int	ret;
+	GValue  result = { 0, };
+	regex_t         regex;
+	int     ret;
 
 	if (argc != 2) {
 		g_critical ("Invalid argument count");
@@ -272,8 +272,8 @@ function_regexp (TrackerDBInterface *interface,
 	}
 
 	ret = regcomp (&regex,
-		       g_value_get_string (&values[0]),
-		       REG_EXTENDED | REG_NOSUB);
+	               g_value_get_string (&values[0]),
+	               REG_EXTENDED | REG_NOSUB);
 
 	if (ret != 0) {
 		g_critical ("Error compiling regular expression");
@@ -281,8 +281,8 @@ function_regexp (TrackerDBInterface *interface,
 	}
 
 	ret = regexec (&regex,
-		       g_value_get_string (&values[1]),
-		       0, NULL, 0);
+	               g_value_get_string (&values[1]),
+	               0, NULL, 0);
 
 	g_value_init (&result, G_TYPE_INT);
 	g_value_set_int (&result, (ret == REG_NOMATCH) ? 0 : 1);
@@ -293,9 +293,9 @@ function_regexp (TrackerDBInterface *interface,
 
 static void
 function_group_concat_step (TrackerDBInterface *interface,
-			    void               *aggregate_context,
-			    gint		argc,
-			    GValue		values[])
+                            void               *aggregate_context,
+                            gint                argc,
+                            GValue              values[])
 {
 	AggregateData *p;
 
@@ -316,7 +316,7 @@ function_group_concat_step (TrackerDBInterface *interface,
 
 static GValue
 function_group_concat_final (TrackerDBInterface *interface,
-			     void               *aggregate_context)
+                             void               *aggregate_context)
 {
 	GValue result = { 0, };
 	AggregateData *p;
@@ -333,11 +333,11 @@ function_group_concat_final (TrackerDBInterface *interface,
 
 static GValue
 function_sparql_regex (TrackerDBInterface *interface,
-		       gint		     argc,
-		       GValue		     values[])
+                       gint                  argc,
+                       GValue                values[])
 {
-	GValue	result = { 0, };
-	gboolean	ret;
+	GValue  result = { 0, };
+	gboolean        ret;
 	const gchar *text, *pattern, *flags;
 	GRegexCompileFlags regex_flags;
 
@@ -382,13 +382,13 @@ function_sparql_regex (TrackerDBInterface *interface,
 
 static gchar *
 function_uncompress_string (const gchar *ptr,
-			    gint	 size,
-			    gint	*uncompressed_size)
+                            gint         size,
+                            gint        *uncompressed_size)
 {
 	z_stream       zs;
-	gchar	      *buf, *swap;
+	gchar         *buf, *swap;
 	unsigned char  obuf[ZLIB_BUF_SIZE];
-	gint	       rv, asiz, bsiz, osiz;
+	gint           rv, asiz, bsiz, osiz;
 
 	zs.zalloc = Z_NULL;
 	zs.zfree = Z_NULL;
@@ -557,13 +557,13 @@ function_compress_string (const gchar *text)
 
 static GValue
 function_uncompress (TrackerDBInterface *interface,
-		     gint		 argc,
-		     GValue		 values[])
+                     gint                argc,
+                     GValue              values[])
 {
 	GByteArray *array;
-	GValue	    result = { 0, };
-	gchar	   *output;
-	gint	    len;
+	GValue      result = { 0, };
+	gchar      *output;
+	gint        len;
 
 	array = g_value_get_boxed (&values[0]);
 
@@ -572,8 +572,8 @@ function_uncompress (TrackerDBInterface *interface,
 	}
 
 	output = function_uncompress_string ((const gchar *) array->data,
-					     array->len,
-					     &len);
+	                                     array->len,
+	                                     &len);
 
 	if (!output) {
 		g_warning ("Uncompress failed");
@@ -588,8 +588,8 @@ function_uncompress (TrackerDBInterface *interface,
 
 static GValue
 function_compress (TrackerDBInterface *interface,
-		   gint		       argc,
-		   GValue	       values[])
+                   gint                        argc,
+                   GValue              values[])
 {
 	GByteArray *array;
 	GValue result = { 0, };
@@ -612,15 +612,15 @@ function_compress (TrackerDBInterface *interface,
 
 static GValue
 function_replace (TrackerDBInterface *interface,
-		  gint		      argc,
-		  GValue	      values[])
+                  gint                argc,
+                  GValue              values[])
 {
 	GValue result = { 0, };
 	gchar *str;
 
 	str = tracker_string_replace (g_value_get_string (&values[0]),
-				      g_value_get_string (&values[1]),
-				      g_value_get_string (&values[2]));
+	                              g_value_get_string (&values[1]),
+	                              g_value_get_string (&values[2]));
 
 	g_value_init (&result, G_TYPE_STRING);
 	g_value_take_string (&result, str);
@@ -630,8 +630,8 @@ function_replace (TrackerDBInterface *interface,
 
 static GValue
 function_collate_key (TrackerDBInterface *interface,
-		      gint                argc,
-		      GValue              values[])
+                      gint                argc,
+                      GValue              values[])
 {
 	GValue result = { 0 };
 	gchar *collate_key;
@@ -646,9 +646,9 @@ function_collate_key (TrackerDBInterface *interface,
 
 static void
 db_set_params (TrackerDBInterface *iface,
-	       gint		   cache_size,
-	       gint		   page_size,
-	       gboolean		   add_functions)
+               gint                cache_size,
+               gint                page_size,
+               gboolean                    add_functions)
 {
 	tracker_db_interface_execute_query (iface, NULL, "PRAGMA synchronous = OFF;");
 	tracker_db_interface_execute_query (iface, NULL, "PRAGMA count_changes = 0;");
@@ -669,42 +669,42 @@ db_set_params (TrackerDBInterface *iface,
 
 		/* Create user defined functions that can be used in sql */
 		tracker_db_interface_sqlite_create_function (iface,
-							     "FormatDate",
-							     function_date_to_str,
-							     1);
+		                                             "FormatDate",
+		                                             function_date_to_str,
+		                                             1);
 		tracker_db_interface_sqlite_create_function (iface,
-							     "REGEXP",
-							     function_regexp,
-							     2);
+		                                             "REGEXP",
+		                                             function_regexp,
+		                                             2);
 		tracker_db_interface_sqlite_create_function (iface,
-							     "SparqlRegex",
-							     function_sparql_regex,
-							     3);
+		                                             "SparqlRegex",
+		                                             function_sparql_regex,
+		                                             3);
 
 		tracker_db_interface_sqlite_create_function (iface,
-							     "uncompress",
-							     function_uncompress,
-							     1);
+		                                             "uncompress",
+		                                             function_uncompress,
+		                                             1);
 		tracker_db_interface_sqlite_create_function (iface,
-							     "compress",
-							     function_compress,
-							     1);
+		                                             "compress",
+		                                             function_compress,
+		                                             1);
 		tracker_db_interface_sqlite_create_function (iface,
-							     "replace",
-							     function_replace,
-							     3);
+		                                             "replace",
+		                                             function_replace,
+		                                             3);
 
 		tracker_db_interface_sqlite_create_aggregate (iface,
-							      "group_concat",
-							      function_group_concat_step,
-							      1,
-							      function_group_concat_final,
-							      sizeof(AggregateData));
+		                                              "group_concat",
+		                                              function_group_concat_step,
+		                                              1,
+		                                              function_group_concat_final,
+		                                              sizeof(AggregateData));
 
 		tracker_db_interface_sqlite_create_function (iface,
-							     "CollateKey",
-							     function_collate_key,
-							     1);
+		                                             "CollateKey",
+		                                             function_collate_key,
+		                                             1);
 	}
 }
 
@@ -712,7 +712,7 @@ db_set_params (TrackerDBInterface *iface,
 static const gchar *
 db_type_to_string (TrackerDB db)
 {
-	GType	    type;
+	GType       type;
 	GEnumClass *enum_class;
 	GEnumValue *enum_value;
 
@@ -729,10 +729,10 @@ db_type_to_string (TrackerDB db)
 
 static TrackerDBInterface *
 db_interface_get (TrackerDB  type,
-		  gboolean  *create)
+                  gboolean  *create)
 {
 	TrackerDBInterface *iface;
-	const gchar	   *path;
+	const gchar        *path;
 
 	path = dbs[type].abs_filename;
 
@@ -743,16 +743,16 @@ db_interface_get (TrackerDB  type,
 	}
 
 	g_message ("%s database... '%s' (%s)",
-		   *create ? "Creating" : "Loading",
-		   path,
-		   db_type_to_string (type));
+	           *create ? "Creating" : "Loading",
+	           path,
+	           db_type_to_string (type));
 
 	iface = tracker_db_interface_sqlite_new (path);
 
 	db_set_params (iface,
-		       dbs[type].cache_size,
-		       dbs[type].page_size,
-		       dbs[type].add_functions);
+	               dbs[type].cache_size,
+	               dbs[type].page_size,
+	               dbs[type].add_functions);
 
 	return iface;
 }
@@ -761,7 +761,7 @@ static TrackerDBInterface *
 db_interface_get_fulltext (void)
 {
 	TrackerDBInterface *iface;
-	gboolean	    create;
+	gboolean            create;
 
 	iface = db_interface_get (TRACKER_DB_FULLTEXT, &create);
 
@@ -772,7 +772,7 @@ static TrackerDBInterface *
 db_interface_get_contents (void)
 {
 	TrackerDBInterface *iface;
-	gboolean	    create;
+	gboolean            create;
 
 	iface = db_interface_get (TRACKER_DB_CONTENTS, &create);
 
@@ -783,13 +783,13 @@ db_interface_get_contents (void)
 	}
 
 	tracker_db_interface_sqlite_create_function (iface,
-						     "uncompress",
-						     function_uncompress,
-						     1);
+	                                             "uncompress",
+	                                             function_uncompress,
+	                                             1);
 	tracker_db_interface_sqlite_create_function (iface,
-						     "compress",
-						     function_compress,
-						     1);
+	                                             "compress",
+	                                             function_compress,
+	                                             1);
 
 	return iface;
 }
@@ -800,7 +800,7 @@ static TrackerDBInterface *
 db_interface_get_metadata (void)
 {
 	TrackerDBInterface *iface;
-	gboolean	    create;
+	gboolean            create;
 
 	iface = db_interface_get (TRACKER_DB_METADATA, &create);
 
@@ -834,8 +834,8 @@ db_interface_create (TrackerDB db)
 
 	default:
 		g_critical ("This TrackerDB type:%d->'%s' has no interface set up yet!!",
-			    db,
-			    db_type_to_string (db));
+		            db,
+		            db_type_to_string (db));
 		return NULL;
 	}
 }
@@ -857,7 +857,7 @@ db_manager_remove_all (gboolean rm_backup_and_log, gboolean not_meta)
 		}
 
 		g_message ("  Removing database:'%s'",
-			   dbs[i].abs_filename);
+		           dbs[i].abs_filename);
 		g_unlink (dbs[i].abs_filename);
 	}
 
@@ -869,13 +869,13 @@ db_manager_remove_all (gboolean rm_backup_and_log, gboolean not_meta)
 		file = tracker_db_backup_file (NULL, TRACKER_DB_BACKUP_META_FILENAME);
 		path = g_file_get_path (file);
 		g_message ("  Removing database:'%s'",
-			   path);
+		           path);
 		g_free (path);
 		g_file_delete (file, NULL, NULL);
 		g_object_unref (file);
 		cpath = tracker_db_journal_filename ();
 		g_message ("  Removing database:'%s'",
-			   cpath);
+		           cpath);
 		file = g_file_new_for_path (cpath);
 		g_file_delete (file, NULL, NULL);
 		g_object_unref (file);
@@ -935,7 +935,7 @@ db_set_version (void)
 
 	if (!g_file_set_contents (filename, str, -1, &error)) {
 		g_message ("  Could not set file contents, %s",
-			   error ? error->message : "no error given");
+		           error ? error->message : "no error given");
 		g_clear_error (&error);
 	}
 
@@ -1079,18 +1079,18 @@ check_meta_backup (gboolean *did_copy)
 }
 
 gboolean
-tracker_db_manager_init (TrackerDBManagerFlags	flags,
-			 gboolean	       *first_time,
-			 gboolean	        shared_cache,
-			 gboolean	       *need_journal)
+tracker_db_manager_init (TrackerDBManagerFlags  flags,
+                         gboolean              *first_time,
+                         gboolean               shared_cache,
+                         gboolean              *need_journal)
 {
-	GType		    etype;
+	GType               etype;
 	TrackerDBVersion    version;
-	gchar		   *filename;
-	const gchar	   *dir;
+	gchar              *filename;
+	const gchar        *dir;
 	const gchar        *env_path;
-	gboolean	    need_reindex, did_copy = FALSE;
-	guint		    i;
+	gboolean            need_reindex, did_copy = FALSE;
+	guint               i;
 
 	/* First set defaults for return values */
 	if (first_time) {
@@ -1130,20 +1130,20 @@ tracker_db_manager_init (TrackerDBManagerFlags	flags,
 
 	if (G_UNLIKELY (!env_path)) {
 		sql_dir = g_build_filename (SHAREDIR,
-					    "tracker",
-					    NULL);
+		                            "tracker",
+		                            NULL);
 	} else {
 		sql_dir = g_strdup (env_path);
 	}
 
 	user_data_dir = g_build_filename (g_get_user_data_dir (),
-					  "tracker",
-					  "data",
-					  NULL);
+	                                  "tracker",
+	                                  "data",
+	                                  NULL);
 
 	data_dir = g_build_filename (g_get_user_cache_dir (),
-				     "tracker",
-				     NULL);
+	                             "tracker",
+	                             NULL);
 
 	/* Make sure the directories exist */
 	g_message ("Checking database directories exist");
@@ -1241,7 +1241,7 @@ tracker_db_manager_init (TrackerDBManagerFlags	flags,
 
 		/* In cases where we re-init this module, make sure
 		 * we have cleaned up the ontology before we load all
-		* new databases.
+		 * new databases.
 		 */
 		tracker_ontology_shutdown ();
 
@@ -1282,14 +1282,14 @@ tracker_db_manager_init (TrackerDBManagerFlags	flags,
 
 	if (flags & TRACKER_DB_MANAGER_READONLY) {
 		resources_iface = tracker_db_manager_get_db_interfaces_ro (3,
-								    TRACKER_DB_METADATA,
-								    TRACKER_DB_FULLTEXT,
-								    TRACKER_DB_CONTENTS);
+		                                                           TRACKER_DB_METADATA,
+		                                                           TRACKER_DB_FULLTEXT,
+		                                                           TRACKER_DB_CONTENTS);
 	} else {
 		resources_iface = tracker_db_manager_get_db_interfaces (3,
-								    TRACKER_DB_METADATA,
-								    TRACKER_DB_FULLTEXT,
-								    TRACKER_DB_CONTENTS);
+		                                                        TRACKER_DB_METADATA,
+		                                                        TRACKER_DB_FULLTEXT,
+		                                                        TRACKER_DB_CONTENTS);
 	}
 
 	if (did_copy) {
@@ -1305,14 +1305,14 @@ tracker_db_manager_disconnect (void)
 	if (resources_iface) {
 		guint i;
 		TrackerDB attachments[2] = { TRACKER_DB_FULLTEXT,
-					     TRACKER_DB_CONTENTS };
+		                             TRACKER_DB_CONTENTS };
 
 		for (i = 0; i < 2; i++) {
 			TrackerDB db = attachments [i];
 
 			db_exec_no_reply (resources_iface,
-					  "DETACH '%s'",
-					  dbs[db].name);
+			                  "DETACH '%s'",
+			                  dbs[db].name);
 		}
 
 		tracker_db_interface_disconnect (resources_iface);
@@ -1325,22 +1325,22 @@ tracker_db_manager_reconnect (void)
 	if (resources_iface) {
 		guint i;
 		TrackerDB attachments[2] = { TRACKER_DB_FULLTEXT,
-					     TRACKER_DB_CONTENTS };
+		                             TRACKER_DB_CONTENTS };
 
 		tracker_db_interface_reconnect (resources_iface);
 
 		db_set_params (resources_iface,
-			       dbs[TRACKER_DB_METADATA].cache_size,
-			       dbs[TRACKER_DB_METADATA].page_size,
-			       TRUE);
+		               dbs[TRACKER_DB_METADATA].cache_size,
+		               dbs[TRACKER_DB_METADATA].page_size,
+		               TRUE);
 
 		for (i = 0; i < 2; i++) {
 			TrackerDB db = attachments [i];
 
 			db_exec_no_reply (resources_iface,
-					  "ATTACH '%s' as '%s'",
-					  dbs[db].abs_filename,
-					  dbs[db].name);
+			                  "ATTACH '%s' as '%s'",
+			                  dbs[db].abs_filename,
+			                  dbs[db].name);
 		}
 	}
 }
@@ -1419,8 +1419,8 @@ tracker_db_manager_optimize (void)
 	for (i = 1; i < G_N_ELEMENTS (dbs); i++) {
 		if (G_OBJECT (dbs[i].iface)->ref_count > 1) {
 			g_message ("  DB:'%s' is still open with %d references!",
-				   dbs[i].name,
-				   G_OBJECT (dbs[i].iface)->ref_count);
+			           dbs[i].name,
+			           G_OBJECT (dbs[i].iface)->ref_count);
 
 			dbs_are_open = TRUE;
 		}
@@ -1458,8 +1458,8 @@ tracker_db_manager_get_file (TrackerDB db)
 static TrackerDBInterface *
 tracker_db_manager_get_db_interfaces (gint num, ...)
 {
-	gint		    n_args;
-	va_list		    args;
+	gint                n_args;
+	va_list                     args;
 	TrackerDBInterface *connection = NULL;
 
 	g_return_val_if_fail (initialized != FALSE, NULL);
@@ -1472,15 +1472,15 @@ tracker_db_manager_get_db_interfaces (gint num, ...)
 			connection = tracker_db_interface_sqlite_new (dbs[db].abs_filename);
 
 			db_set_params (connection,
-				       dbs[db].cache_size,
-				       dbs[db].page_size,
-				       TRUE);
+			               dbs[db].cache_size,
+			               dbs[db].page_size,
+			               TRUE);
 
 		} else {
 			db_exec_no_reply (connection,
-					  "ATTACH '%s' as '%s'",
-					  dbs[db].abs_filename,
-					  dbs[db].name);
+			                  "ATTACH '%s' as '%s'",
+			                  dbs[db].abs_filename,
+			                  dbs[db].name);
 		}
 
 	}
@@ -1492,8 +1492,8 @@ tracker_db_manager_get_db_interfaces (gint num, ...)
 static TrackerDBInterface *
 tracker_db_manager_get_db_interfaces_ro (gint num, ...)
 {
-	gint		    n_args;
-	va_list		    args;
+	gint                n_args;
+	va_list                     args;
 	TrackerDBInterface *connection = NULL;
 
 	g_return_val_if_fail (initialized != FALSE, NULL);
@@ -1505,14 +1505,14 @@ tracker_db_manager_get_db_interfaces_ro (gint num, ...)
 		if (!connection) {
 			connection = tracker_db_interface_sqlite_new_ro (dbs[db].abs_filename);
 			db_set_params (connection,
-				       dbs[db].cache_size,
-				       dbs[db].page_size,
-				       TRUE);
+			               dbs[db].cache_size,
+			               dbs[db].page_size,
+			               TRUE);
 		} else {
 			db_exec_no_reply (connection,
-					  "ATTACH '%s' as '%s'",
-					  dbs[db].abs_filename,
-					  dbs[db].name);
+			                  "ATTACH '%s' as '%s'",
+			                  dbs[db].abs_filename,
+			                  dbs[db].name);
 		}
 
 	}
diff --git a/src/libtracker-db/tracker-db-manager.h b/src/libtracker-db/tracker-db-manager.h
index 60e92d8..14052c9 100644
--- a/src/libtracker-db/tracker-db-manager.h
+++ b/src/libtracker-db/tracker-db-manager.h
@@ -48,11 +48,11 @@ typedef enum {
 	TRACKER_DB_MANAGER_READONLY         = 1 << 5
 } TrackerDBManagerFlags;
 
-GType	            tracker_db_get_type			(void) G_GNUC_CONST;
+GType               tracker_db_get_type                         (void) G_GNUC_CONST;
 gboolean            tracker_db_manager_init             (TrackerDBManagerFlags  flags,
-							 gboolean              *first_time,
-							 gboolean               shared_cache,
-							 gboolean              *need_journal);
+                                                         gboolean              *first_time,
+                                                         gboolean               shared_cache,
+                                                         gboolean              *need_journal);
 void                tracker_db_manager_shutdown         (void);
 void                tracker_db_manager_remove_all       (gboolean               rm_backup_and_log);
 void                tracker_db_manager_optimize         (void);
diff --git a/src/libtracker-fts/tracker-fts-config.c b/src/libtracker-fts/tracker-fts-config.c
index 9849f59..4612980 100644
--- a/src/libtracker-fts/tracker-fts-config.c
+++ b/src/libtracker-fts/tracker-fts-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -33,11 +33,11 @@
 #define TRACKER_FTS_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_INDEXING		   "Indexing"
+#define GROUP_INDEXING             "Indexing"
 
 /* Default values */
-#define DEFAULT_MIN_WORD_LENGTH	   3	  /* 0->30 */
-#define DEFAULT_MAX_WORD_LENGTH	   30	  /* 0->200 */
+#define DEFAULT_MIN_WORD_LENGTH            3      /* 0->30 */
+#define DEFAULT_MAX_WORD_LENGTH            30     /* 0->200 */
 #define DEFAULT_MAX_WORDS_TO_INDEX 10000
 
 typedef struct {
@@ -55,18 +55,18 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void config_set_property         (GObject       *object,
-					 guint          param_id,
-					 const GValue  *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         const GValue  *value,
+                                         GParamSpec    *pspec);
 static void config_get_property         (GObject       *object,
-					 guint          param_id,
-					 GValue        *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         GValue        *value,
+                                         GParamSpec    *pspec);
 static void config_finalize             (GObject       *object);
 static void config_constructed          (GObject       *object);
 static void config_create_with_defaults (TrackerFTSConfig *config,
-					 GKeyFile      *key_file,
-					 gboolean       overwrite);
+                                         GKeyFile      *key_file,
+                                         gboolean       overwrite);
 static void config_load                 (TrackerFTSConfig *config);
 
 enum {
@@ -95,37 +95,37 @@ tracker_fts_config_class_init (TrackerFTSConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	/* Indexing */
 	g_object_class_install_property (object_class,
-					 PROP_MIN_WORD_LENGTH,
-					 g_param_spec_int ("min-word-length",
-							   "Minimum word length",
-							   " Set the minimum length of words to index (0->30, default=3)",
-							   0,
-							   30,
-							   DEFAULT_MIN_WORD_LENGTH,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MIN_WORD_LENGTH,
+	                                 g_param_spec_int ("min-word-length",
+	                                                   "Minimum word length",
+	                                                   " Set the minimum length of words to index (0->30, default=3)",
+	                                                   0,
+	                                                   30,
+	                                                   DEFAULT_MIN_WORD_LENGTH,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_MAX_WORD_LENGTH,
-					 g_param_spec_int ("max-word-length",
-							   "Maximum word length",
-							   " Set the maximum length of words to index (0->200, default=30)",
-							   0,
-							   200, /* Is this a reasonable limit? */
-							   DEFAULT_MAX_WORD_LENGTH,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MAX_WORD_LENGTH,
+	                                 g_param_spec_int ("max-word-length",
+	                                                   "Maximum word length",
+	                                                   " Set the maximum length of words to index (0->200, default=30)",
+	                                                   0,
+	                                                   200, /* Is this a reasonable limit? */
+	                                                   DEFAULT_MAX_WORD_LENGTH,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_MAX_WORDS_TO_INDEX,
-					 g_param_spec_int ("max-words-to-index",
-							   "Maximum words to index",
-							   " Maximum unique words to index from a file's content (default=10000)",
-							   0,
-							   G_MAXINT,
-							   DEFAULT_MAX_WORDS_TO_INDEX,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MAX_WORDS_TO_INDEX,
+	                                 g_param_spec_int ("max-words-to-index",
+	                                                   "Maximum words to index",
+	                                                   " Maximum unique words to index from a file's content (default=10000)",
+	                                                   0,
+	                                                   G_MAXINT,
+	                                                   DEFAULT_MAX_WORDS_TO_INDEX,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerFTSConfigPrivate));
 }
@@ -136,24 +136,24 @@ tracker_fts_config_init (TrackerFTSConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* Indexing */
 	case PROP_MIN_WORD_LENGTH:
 		tracker_fts_config_set_min_word_length (TRACKER_FTS_CONFIG (object),
-							g_value_get_int (value));
+		                                        g_value_get_int (value));
 		break;
 	case PROP_MAX_WORD_LENGTH:
 		tracker_fts_config_set_max_word_length (TRACKER_FTS_CONFIG (object),
-							g_value_get_int (value));
+		                                        g_value_get_int (value));
 		break;
 	case PROP_MAX_WORDS_TO_INDEX:
 		tracker_fts_config_set_max_words_to_index (TRACKER_FTS_CONFIG (object),
-							   g_value_get_int (value));
+		                                           g_value_get_int (value));
 		break;
 
 	default:
@@ -163,10 +163,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -210,8 +210,8 @@ config_constructed (GObject *object)
 
 static void
 config_create_with_defaults (TrackerFTSConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gint i;
 
@@ -221,9 +221,9 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -231,10 +231,10 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		default:
@@ -243,11 +243,11 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-								      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -268,17 +268,17 @@ config_load (TrackerFTSConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -308,10 +308,10 @@ config_save (TrackerFTSConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -327,8 +327,8 @@ TrackerFTSConfig *
 tracker_fts_config_new (void)
 {
 	return g_object_new (TRACKER_TYPE_FTS_CONFIG,
-			     "domain", "tracker-fts",
-			     NULL);
+	                     "domain", "tracker-fts",
+	                     NULL);
 }
 
 gboolean
@@ -377,7 +377,7 @@ tracker_fts_config_get_max_words_to_index (TrackerFTSConfig *config)
 
 void
 tracker_fts_config_set_min_word_length (TrackerFTSConfig *config,
-					gint	          value)
+                                        gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -395,7 +395,7 @@ tracker_fts_config_set_min_word_length (TrackerFTSConfig *config,
 
 void
 tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
-					gint	          value)
+                                        gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -413,7 +413,7 @@ tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
 
 void
 tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
-					   gint  	     value)
+                                           gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
diff --git a/src/libtracker-fts/tracker-fts-config.h b/src/libtracker-fts/tracker-fts-config.h
index 1919472..87d684f 100644
--- a/src/libtracker-fts/tracker-fts-config.h
+++ b/src/libtracker-fts/tracker-fts-config.h
@@ -27,14 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_FTS_CONFIG	        (tracker_fts_config_get_type ())
-#define TRACKER_FTS_CONFIG(o)	        (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfig))
+#define TRACKER_TYPE_FTS_CONFIG                 (tracker_fts_config_get_type ())
+#define TRACKER_FTS_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfig))
 #define TRACKER_FTS_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigClass))
 #define TRACKER_IS_FTS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FTS_CONFIG))
 #define TRACKER_IS_FTS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FTS_CONFIG))
 #define TRACKER_FTS_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigClass))
 
-typedef struct TrackerFTSConfig	     TrackerFTSConfig;
+typedef struct TrackerFTSConfig              TrackerFTSConfig;
 typedef struct TrackerFTSConfigClass TrackerFTSConfigClass;
 
 struct TrackerFTSConfig {
@@ -53,11 +53,11 @@ gint              tracker_fts_config_get_min_word_length    (TrackerFTSConfig *c
 gint              tracker_fts_config_get_max_word_length    (TrackerFTSConfig *config);
 gint              tracker_fts_config_get_max_words_to_index (TrackerFTSConfig *config);
 void              tracker_fts_config_set_min_word_length    (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 void              tracker_fts_config_set_max_word_length    (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 void              tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 
 G_END_DECLS
 
diff --git a/src/libtracker-fts/tracker-parser.c b/src/libtracker-fts/tracker-parser.c
index cd1db1d..1fbdbc3 100644
--- a/src/libtracker-fts/tracker-parser.c
+++ b/src/libtracker-fts/tracker-parser.c
@@ -35,21 +35,21 @@
 /* Need pango for CJK ranges which are : 0x3400 - 0x4DB5, 0x4E00 -
  * 0x9FA5, 0x20000 - <= 0x2A6D6
  */
-#define NEED_PANGO(c)		 (((c) >= 0x3400 && (c) <= 0x4DB5)  ||	\
-				  ((c) >= 0x4E00 && (c) <= 0x9FA5)  ||	\
-				  ((c) >= 0x20000 && (c) <= 0x2A6D6))
-#define IS_LATIN(c)		 (((c) <= 0x02AF) ||			\
-				  ((c) >= 0x1E00 && (c) <= 0x1EFF))
-#define IS_ASCII(c)		 ((c) <= 0x007F)
+#define NEED_PANGO(c)            (((c) >= 0x3400 && (c) <= 0x4DB5)  ||  \
+                                  ((c) >= 0x4E00 && (c) <= 0x9FA5)  ||  \
+                                  ((c) >= 0x20000 && (c) <= 0x2A6D6))
+#define IS_LATIN(c)              (((c) <= 0x02AF) ||	\
+                                  ((c) >= 0x1E00 && (c) <= 0x1EFF))
+#define IS_ASCII(c)              ((c) <= 0x007F)
 #define IS_ASCII_ALPHA_LOWER(c)  ((c) >= 0x0061 && (c) <= 0x007A)
 #define IS_ASCII_ALPHA_HIGHER(c) ((c) >= 0x0041 && (c) <= 0x005A)
-#define IS_ASCII_NUMERIC(c)	 ((c) >= 0x0030 && (c) <= 0x0039)
-#define IS_ASCII_IGNORE(c)	 ((c) <= 0x002C)
-#define IS_HYPHEN(c)		 ((c) == 0x002D)
-#define IS_UNDERSCORE(c)	 ((c) == 0x005F)
-#define IS_NEWLINE(c)		 ((c) == 0x000D)
-#define IS_O(c)			 ((c) == 0x006F)
-#define IS_R(c)			 ((c) == 0x0072)
+#define IS_ASCII_NUMERIC(c)      ((c) >= 0x0030 && (c) <= 0x0039)
+#define IS_ASCII_IGNORE(c)       ((c) <= 0x002C)
+#define IS_HYPHEN(c)             ((c) == 0x002D)
+#define IS_UNDERSCORE(c)         ((c) == 0x005F)
+#define IS_NEWLINE(c)            ((c) == 0x000D)
+#define IS_O(c)                          ((c) == 0x006F)
+#define IS_R(c)                          ((c) == 0x0072)
 
 typedef enum {
 	TRACKER_PARSER_WORD_ASCII_HIGHER,
@@ -72,29 +72,29 @@ typedef enum {
 } TrackerParserEncoding;
 
 struct TrackerParser {
-	const gchar	      *txt;
-	gint		       txt_size;
+	const gchar           *txt;
+	gint                   txt_size;
 
 	TrackerLanguage       *language;
-	gboolean	       enable_stemmer;
-	gboolean	       enable_stop_words;
-	guint		       max_words_to_index;
-	guint		       max_word_length;
-	guint		       min_word_length;
-	gboolean	       delimit_words;
-	gboolean	       parse_reserved_words;
+	gboolean               enable_stemmer;
+	gboolean               enable_stop_words;
+	guint                  max_words_to_index;
+	guint                  max_word_length;
+	guint                  min_word_length;
+	gboolean               delimit_words;
+	gboolean               parse_reserved_words;
 
 	/* Private members */
-	gchar			*word;
-	gint			word_length;
-	guint			word_position;
-	TrackerParserEncoding	encoding;
-	const gchar		*cursor;
+	gchar                   *word;
+	gint                    word_length;
+	guint                   word_position;
+	TrackerParserEncoding   encoding;
+	const gchar             *cursor;
 
 	/* Pango members for CJK text parsing */
-	PangoLogAttr	      *attrs;
-	guint		       attr_length;
-	guint		       attr_pos;
+	PangoLogAttr          *attrs;
+	guint                  attr_length;
+	guint                  attr_pos;
 };
 
 static inline TrackerParserWordType
@@ -142,8 +142,8 @@ get_word_type (gunichar c)
 
 static inline gchar *
 strip_word (const gchar *str,
-	    gint	 length,
-	    guint32	*len)
+            gint         length,
+            guint32     *len)
 {
 #ifdef HAVE_UNAC
 	gchar *s = NULL;
@@ -164,7 +164,7 @@ get_encoding (const gchar *txt)
 {
 	const gchar *p;
 	gunichar     c;
-	gint	     i = 0;
+	gint         i = 0;
 
 	/* Grab first 255 non-whitespace chars and test */
 	for (p = txt; *p && i < 255; p = g_utf8_next_char (p)) {
@@ -189,7 +189,7 @@ get_encoding (const gchar *txt)
 
 static gboolean
 is_stop_word (TrackerLanguage *language,
-	      const gchar     *word)
+              const gchar     *word)
 {
 	GHashTable *stop_words;
 
@@ -204,14 +204,14 @@ is_stop_word (TrackerLanguage *language,
 
 static gboolean
 pango_next (TrackerParser *parser,
-	    gint	  *byte_offset_start,
-	    gint	  *byte_offset_end)
+            gint          *byte_offset_start,
+            gint          *byte_offset_end)
 
 {
 	/* CJK text does not need stemming or other treatment */
-	gint	word_start = -1;
-	gint	old_word_start = -1;
-	guint	i;
+	gint    word_start = -1;
+	gint    old_word_start = -1;
+	guint   i;
 
 	for (i = parser->attr_pos; i < parser->attr_length; i++) {
 		if (parser->attrs[i].is_word_start) {
@@ -268,19 +268,19 @@ pango_next (TrackerParser *parser,
 
 static gboolean
 parser_next (TrackerParser *parser,
-	     gint	   *byte_offset_start,
-	     gint	   *byte_offset_end)
+             gint          *byte_offset_start,
+             gint          *byte_offset_end)
 {
 	TrackerParserWordType word_type;
-	gunichar	      word[64];
-	gboolean	      is_valid;
-	guint		      length;
-	gint		      char_count = 0;
-	glong		      bytes;
-	const gchar	     *p;
-	const gchar	     *start;
-	const gchar	     *end;
-	gboolean	      do_strip = FALSE;
+	gunichar              word[64];
+	gboolean              is_valid;
+	guint                 length;
+	gint                  char_count = 0;
+	glong                 bytes;
+	const gchar          *p;
+	const gchar          *start;
+	const gchar          *end;
+	gboolean              do_strip = FALSE;
 
 	*byte_offset_start = 0;
 	*byte_offset_end = 0;
@@ -301,7 +301,7 @@ parser_next (TrackerParser *parser,
 
 	for (p = parser->cursor; *p && *p != '\0'; p = g_utf8_next_char (p)) {
 		TrackerParserWordType type;
-		gunichar	      c;
+		gunichar              c;
 
 		char_count++;
 		c = g_utf8_get_char (p);
@@ -428,8 +428,8 @@ parser_next (TrackerParser *parser,
 	}
 
 	if (word_type == TRACKER_PARSER_WORD_ALPHA_NUM || word_type == TRACKER_PARSER_WORD_ALPHA) {
-		gchar	    *utf8;
-		gchar	    *processed_word;
+		gchar       *utf8;
+		gchar       *processed_word;
 
 
 
@@ -461,8 +461,8 @@ parser_next (TrackerParser *parser,
 
 TrackerParser *
 tracker_parser_new (TrackerLanguage *language,
-		    gint	     max_word_length,
-		    gint	     min_word_length)
+                    gint             max_word_length,
+                    gint             min_word_length)
 {
 	TrackerParser *parser;
 
@@ -500,12 +500,12 @@ tracker_parser_free (TrackerParser *parser)
 
 void
 tracker_parser_reset (TrackerParser *parser,
-		      const gchar   *txt,
-		      gint	     txt_size,
-		      gboolean	     delimit_words,
-		      gboolean	     enable_stemmer,
-		      gboolean	     enable_stop_words,
-		      gboolean	     parse_reserved_words)
+                      const gchar   *txt,
+                      gint           txt_size,
+                      gboolean       delimit_words,
+                      gboolean       enable_stemmer,
+                      gboolean       enable_stop_words,
+                      gboolean       parse_reserved_words)
 {
 	g_return_if_fail (parser != NULL);
 	g_return_if_fail (txt != NULL);
@@ -540,11 +540,11 @@ tracker_parser_reset (TrackerParser *parser,
 		attrs = g_new0 (PangoLogAttr, parser->attr_length);
 
 		pango_get_log_attrs (parser->txt,
-				     txt_size,
-				     0,
-				     pango_language_from_string ("C"),
-				     attrs,
-				     parser->attr_length);
+		                     txt_size,
+		                     0,
+		                     pango_language_from_string ("C"),
+		                     attrs,
+		                     parser->attr_length);
 
 		parser->attrs = attrs;
 		parser->attr_pos = 0;
@@ -553,9 +553,9 @@ tracker_parser_reset (TrackerParser *parser,
 
 gchar *
 tracker_parser_process_word (TrackerParser *parser,
-			     const char    *word,
-			     gint	    length,
-			     gboolean	    do_strip)
+                             const char    *word,
+                             gint           length,
+                             gboolean       do_strip)
 {
 	gchar *stem_word;
 	gchar *str;
@@ -583,12 +583,12 @@ tracker_parser_process_word (TrackerParser *parser,
 
 		if (!stripped_word) {
 			str = g_utf8_normalize (word,
-						bytes,
-						G_NORMALIZE_NFC);
+			                        bytes,
+			                        G_NORMALIZE_NFC);
 		} else {
 			str = g_utf8_normalize (stripped_word,
-						len,
-						G_NORMALIZE_NFC);
+			                        len,
+			                        G_NORMALIZE_NFC);
 			g_free (stripped_word);
 		}
 
@@ -612,14 +612,14 @@ tracker_parser_process_word (TrackerParser *parser,
 
 const gchar *
 tracker_parser_next (TrackerParser *parser,
-		     gint	   *position,
-		     gint	   *byte_offset_start,
-		     gint	   *byte_offset_end,
-		     gboolean	   *stop_word,
-		     gint	   *word_length)
+                     gint          *position,
+                     gint          *byte_offset_start,
+                     gint          *byte_offset_end,
+                     gboolean      *stop_word,
+                     gint          *word_length)
 {
 	const gchar  *str;
-	gint	 byte_start = 0, byte_end = 0;
+	gint     byte_start = 0, byte_end = 0;
 
 	str = NULL;
 
diff --git a/src/libtracker-fts/tracker-parser.h b/src/libtracker-fts/tracker-parser.h
index 6b8f8d6..6bd4a10 100644
--- a/src/libtracker-fts/tracker-parser.h
+++ b/src/libtracker-fts/tracker-parser.h
@@ -30,27 +30,27 @@ G_BEGIN_DECLS
 
 typedef struct TrackerParser TrackerParser;
 
-TrackerParser *tracker_parser_new	      (TrackerLanguage *language,
-					       gint		max_word_length,
-					       gint		min_word_length);
-void	       tracker_parser_reset	      (TrackerParser   *parser,
-					       const gchar     *txt,
-					       gint		txt_size,
-					       gboolean		delimit_words,
-					       gboolean		enable_stemmer,
-					       gboolean		enable_stop_words,
-					       gboolean		parse_reserved_words);
-const gchar *  tracker_parser_next	      (TrackerParser   *parser,
-					       gint	       *position,
-					       gint	       *byte_offset_start,
-					       gint	       *byte_offset_end,
-					       gboolean        *stop_word,
-					       gint	       *word_length);
+TrackerParser *tracker_parser_new             (TrackerLanguage *language,
+                                               gint             max_word_length,
+                                               gint             min_word_length);
+void           tracker_parser_reset           (TrackerParser   *parser,
+                                               const gchar     *txt,
+                                               gint             txt_size,
+                                               gboolean                 delimit_words,
+                                               gboolean                 enable_stemmer,
+                                               gboolean                 enable_stop_words,
+                                               gboolean                 parse_reserved_words);
+const gchar *  tracker_parser_next            (TrackerParser   *parser,
+                                               gint            *position,
+                                               gint            *byte_offset_start,
+                                               gint            *byte_offset_end,
+                                               gboolean        *stop_word,
+                                               gint            *word_length);
 gchar *        tracker_parser_process_word    (TrackerParser   *parser,
-					       const char      *word,
-					       gint		length,
-					       gboolean		do_strip);
-void	       tracker_parser_free	      (TrackerParser   *parser);
+                                               const char      *word,
+                                               gint             length,
+                                               gboolean                 do_strip);
+void           tracker_parser_free            (TrackerParser   *parser);
 
 G_END_DECLS
 
diff --git a/src/libtracker-gtk/tracker-keyword-store.c b/src/libtracker-gtk/tracker-keyword-store.c
index bafd072..35b352b 100644
--- a/src/libtracker-gtk/tracker-keyword-store.c
+++ b/src/libtracker-gtk/tracker-keyword-store.c
@@ -41,8 +41,8 @@ static void tracker_keyword_store_populate_cb (GPtrArray *result, GError *error,
 #endif
 
 G_DEFINE_TYPE_WITH_CODE (TrackerKeywordStore, tracker_keyword_store, GTK_TYPE_LIST_STORE,
-			G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
-			tracker_keyword_store_tree_drag_source_init))
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
+                                                tracker_keyword_store_tree_drag_source_init))
 
 #define parent_class tracker_keyword_store_parent_class
 
@@ -58,11 +58,11 @@ tracker_keyword_store_init (TrackerKeywordStore *store)
 {
 	/* setup the basic class list store properties */
 	GType types[TRACKER_KEYWORD_STORE_NUM_COLUMNS];
-	types[TRACKER_KEYWORD_STORE_KEYWORD]	= G_TYPE_STRING;
-	types[TRACKER_KEYWORD_STORE_IMAGE_URI]	= G_TYPE_STRING;
+	types[TRACKER_KEYWORD_STORE_KEYWORD]    = G_TYPE_STRING;
+	types[TRACKER_KEYWORD_STORE_IMAGE_URI]  = G_TYPE_STRING;
 
 	gtk_list_store_set_column_types (GTK_LIST_STORE (store),
-					TRACKER_KEYWORD_STORE_NUM_COLUMNS, types);
+	                                 TRACKER_KEYWORD_STORE_NUM_COLUMNS, types);
 
 	//setup private members
 	store->keywords = g_hash_table_new (g_str_hash, g_str_equal);
@@ -72,24 +72,24 @@ tracker_keyword_store_init (TrackerKeywordStore *store)
 #if 0
 	//populate the liststore asyncronously
 	tracker_keywords_get_list_async (store->tracker_client,
-					SERVICE_FILES,
-					tracker_keyword_store_populate_cb,
-					store);
+	                                 SERVICE_FILES,
+	                                 tracker_keyword_store_populate_cb,
+	                                 store);
 #endif
 }
 
 static gboolean
-tracker_keyword_store_row_draggable (GtkTreeDragSource		*drag_source,
-					GtkTreePath		*path)
+tracker_keyword_store_row_draggable (GtkTreeDragSource          *drag_source,
+                                     GtkTreePath             *path)
 {
 	printf ("ROW DRAGGABLE\n");
 	return TRUE;
 }
 
 static gboolean
-tracker_keyword_store_drag_data_get (GtkTreeDragSource		*drag_source,
-				     GtkTreePath		*path,
-				     GtkSelectionData		*data)
+tracker_keyword_store_drag_data_get (GtkTreeDragSource          *drag_source,
+                                     GtkTreePath                *path,
+                                     GtkSelectionData           *data)
 {
 	gchar *keyword;
 	GtkTreeIter iter;
@@ -109,8 +109,8 @@ tracker_keyword_store_drag_data_get (GtkTreeDragSource		*drag_source,
 }
 
 static gboolean
-tracker_keyword_store_drag_data_delete (GtkTreeDragSource	*drag_source,
-					GtkTreePath		*path)
+tracker_keyword_store_drag_data_delete (GtkTreeDragSource       *drag_source,
+                                        GtkTreePath             *path)
 {
 	printf ("DRAG DATA DELETE\n");
 	return FALSE;
@@ -139,8 +139,8 @@ tracker_keyword_store_populate_cb (GPtrArray *result, GError *error, gpointer us
 			if (strlen (name) > 2) {
 				//FIXME: Modify this function when tracker stores emblem images
 				gtk_list_store_insert_with_values (list_store, &iter, 0,
-								TRACKER_KEYWORD_STORE_KEYWORD, name,
-								-1);
+				                                   TRACKER_KEYWORD_STORE_KEYWORD, name,
+				                                   -1);
 
 			}
 		}
@@ -188,10 +188,10 @@ tracker_keyword_store_new (void)
  * returns true if successful
  **/
 gboolean
-tracker_keyword_store_insert (	GtkListStore			*store,
-				const char			*keyword,
-				const char			*stock_id
-)
+tracker_keyword_store_insert (  GtkListStore                    *store,
+                                const char                      *keyword,
+                                const char                      *stock_id
+                                )
 {
 	GtkTreeIter *iter;
 	TrackerKeywordStore *self;
@@ -202,17 +202,17 @@ tracker_keyword_store_insert (	GtkListStore			*store,
 	self = TRACKER_KEYWORD_STORE (store);
 
 	if (g_hash_table_lookup (self->keywords, keyword) == NULL)
-	{
-		iter = (GtkTreeIter *)g_new0 (GtkTreeIter, 1);
-		gtk_list_store_insert_with_values (store,
-						iter, 0,
-						TRACKER_KEYWORD_STORE_KEYWORD, keyword,
-						TRACKER_KEYWORD_STORE_IMAGE_URI, stock_id,
-						-1);
-		g_hash_table_insert (self->keywords, g_strdup (keyword), iter);
-		return TRUE;
+		{
+			iter = (GtkTreeIter *)g_new0 (GtkTreeIter, 1);
+			gtk_list_store_insert_with_values (store,
+			                                   iter, 0,
+			                                   TRACKER_KEYWORD_STORE_KEYWORD, keyword,
+			                                   TRACKER_KEYWORD_STORE_IMAGE_URI, stock_id,
+			                                   -1);
+			g_hash_table_insert (self->keywords, g_strdup (keyword), iter);
+			return TRUE;
 
-	}
+		}
 	return FALSE;
 }
 
@@ -222,8 +222,8 @@ tracker_keyword_store_insert (	GtkListStore			*store,
  * NULL of it cant be found
  **/
 GtkTreeIter *
-tracker_keyword_store_lookup (	GtkListStore			*store,
-				const char			*keyword)
+tracker_keyword_store_lookup (  GtkListStore                    *store,
+                                const char                      *keyword)
 {
 	TrackerKeywordStore *self;
 
@@ -238,8 +238,8 @@ tracker_keyword_store_lookup (	GtkListStore			*store,
  * O(1) removal of items by keyword
  **/
 gboolean
-tracker_keyword_store_remove (	GtkListStore			*store,
-				const char			*keyword)
+tracker_keyword_store_remove (  GtkListStore                    *store,
+                                const char                      *keyword)
 {
 	GtkTreeIter *iter;
 	TrackerKeywordStore *self;
diff --git a/src/libtracker-gtk/tracker-keyword-store.h b/src/libtracker-gtk/tracker-keyword-store.h
index 1238200..05319ef 100644
--- a/src/libtracker-gtk/tracker-keyword-store.h
+++ b/src/libtracker-gtk/tracker-keyword-store.h
@@ -39,10 +39,10 @@ typedef enum
 } TrackerKeywordStoreColumns;
 
 
-#define TRACKER_TYPE_KEYWORD_STORE	      (tracker_keyword_store_get_type ())
-#define TRACKER_KEYWORD_STORE(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStore))
+#define TRACKER_TYPE_KEYWORD_STORE            (tracker_keyword_store_get_type ())
+#define TRACKER_KEYWORD_STORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStore))
 #define TRACKER_KEYWORD_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStoreClass))
-#define TRACKER_IS_KEYWORD_STORE(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_KEYWORD_STORE))
+#define TRACKER_IS_KEYWORD_STORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_KEYWORD_STORE))
 #define TRACKER_IS_KEYWORD_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_KEYWORD_STORE))
 #define TRACKER_KEYWORD_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStoreClass))
 
@@ -64,23 +64,23 @@ struct _TrackerKeywordStoreClass
 };
 
 
-GType		tracker_keyword_store_get_type		(void) G_GNUC_CONST;
+GType           tracker_keyword_store_get_type          (void) G_GNUC_CONST;
 
-GtkListStore *	tracker_keyword_store_new		(void);
+GtkListStore *  tracker_keyword_store_new               (void);
 
 gboolean
-tracker_keyword_store_insert (GtkListStore		*store,
-			      const char		*keyword,
-			      const char		*stock_id );
+tracker_keyword_store_insert (GtkListStore              *store,
+                              const char                *keyword,
+                              const char                *stock_id );
 
 GtkTreeIter *
-tracker_keyword_store_lookup (GtkListStore		*store,
-			      const char		*keyword);
+tracker_keyword_store_lookup (GtkListStore              *store,
+                              const char                *keyword);
 
 gboolean
-tracker_keyword_store_remove (GtkListStore		*store,
-			      const char		*keyword);
+tracker_keyword_store_remove (GtkListStore              *store,
+                              const char                *keyword);
 
 G_END_DECLS
 
-#endif	/* TRACKER_KEYWORD_STORE_H */
+#endif  /* TRACKER_KEYWORD_STORE_H */
diff --git a/src/libtracker-gtk/tracker-metadata-tile.c b/src/libtracker-gtk/tracker-metadata-tile.c
index 696afb9..054e8fa 100644
--- a/src/libtracker-gtk/tracker-metadata-tile.c
+++ b/src/libtracker-gtk/tracker-metadata-tile.c
@@ -75,8 +75,8 @@ static GObjectClass *parent_class = NULL;
 #define GIGABYTE_FACTOR (1024.0 * 1024.0 * 1024.0)
 
 /* forward declerations */
-static void  tracker_metadata_tile_class_init	    (TrackerMetadataTileClass *class);
-static void  tracker_metadata_tile_init		    (TrackerMetadataTile      *tile);
+static void  tracker_metadata_tile_class_init       (TrackerMetadataTileClass *class);
+static void  tracker_metadata_tile_init                     (TrackerMetadataTile      *tile);
 static gboolean tracker_metadata_tile_expose_event(GtkWidget *widget, GdkEventExpose *event);
 #if 0
 static void tracker_metadata_tile_show (TrackerMetadataTile *tile);
@@ -97,15 +97,15 @@ static inline gboolean is_empty_string (const char *s);
 #if 0
 
 static const char *default_keys[] =
-{
-	"File:Name",
-	"File:Path",
-	"File:Modified",
-	"File:Size",
-	"File:Accessed",
-	"File:Mime",
-	NULL
-};
+	{
+		"File:Name",
+		"File:Path",
+		"File:Modified",
+		"File:Size",
+		"File:Accessed",
+		"File:Mime",
+		NULL
+	};
 
 #endif
 
@@ -122,16 +122,16 @@ enum {
 #if 0
 
 static const char *doc_keys[] =
-{
-	"File:Name",
-	"Doc:Subject",
-	"Doc:Author",
-	"Doc:Comments",
-	"Doc:PageCount",
-	"Doc:WordCount",
-	"Doc:Created",
-	NULL
-};
+	{
+		"File:Name",
+		"Doc:Subject",
+		"Doc:Author",
+		"Doc:Comments",
+		"Doc:PageCount",
+		"Doc:WordCount",
+		"Doc:Created",
+		NULL
+	};
 
 #endif
 
@@ -149,15 +149,15 @@ enum {
 #if 0
 
 static const char *email_keys[] =
-{
-	"Email:Sender",
-	"Email:Subject",
-	"Email:Date",
-	"Email:SentTo",
-	"Email:CC",
-	"Email:Attachments",
-	NULL
-};
+	{
+		"Email:Sender",
+		"Email:Subject",
+		"Email:Date",
+		"Email:SentTo",
+		"Email:CC",
+		"Email:Attachments",
+		NULL
+	};
 
 #endif
 
@@ -174,14 +174,14 @@ enum {
 #if 0
 
 static const char *webhistory_keys[] =
-{
-	"Doc:URL",
-	"Doc:Title",
-	"File:Size",
-	"File:Mime",
-	"Doc:Keywords",
-	NULL
-};
+	{
+		"Doc:URL",
+		"Doc:Title",
+		"File:Size",
+		"File:Mime",
+		"Doc:Keywords",
+		NULL
+	};
 
 #endif
 
@@ -197,13 +197,13 @@ enum {
 #if 0
 
 static const char *app_keys[] =
-{
-	"App:DisplayName",
-	"App:GenericName",
-	"App:Comment",
-	"App:Categories",
-	NULL
-};
+	{
+		"App:DisplayName",
+		"App:GenericName",
+		"App:Comment",
+		"App:Categories",
+		NULL
+	};
 
 #endif
 
@@ -218,18 +218,18 @@ enum {
 #if 0
 
 static const char *audio_keys[] =
-{
-	"Audio:Title",
-	"Audio:Artist",
-	"Audio:Album",
-	"Audio:Duration",
-	"Audio:Genre",
-	"Audio:Bitrate",
-	"Audio:ReleaseDate",
-	"Audio:Codec",
-	"File:Size",
-	NULL
-};
+	{
+		"Audio:Title",
+		"Audio:Artist",
+		"Audio:Album",
+		"Audio:Duration",
+		"Audio:Genre",
+		"Audio:Bitrate",
+		"Audio:ReleaseDate",
+		"Audio:Codec",
+		"File:Size",
+		NULL
+	};
 
 #endif
 
@@ -249,19 +249,19 @@ enum {
 #if 0
 
 static const char *image_keys[] =
-{
-	"File:Name",
-	"Image:Height",
-	"Image:Width",
-	"Image:Date",
-	"Image:CameraMake",
-	"Image:CameraModel",
-	"Image:Orientation",
-	"Image:Flash",
-	"Image:FocalLength",
-	"Image:ExposureTime",
-	NULL
-};
+	{
+		"File:Name",
+		"Image:Height",
+		"Image:Width",
+		"Image:Date",
+		"Image:CameraMake",
+		"Image:CameraModel",
+		"Image:Orientation",
+		"Image:Flash",
+		"Image:FocalLength",
+		"Image:ExposureTime",
+		NULL
+	};
 
 #endif
 
@@ -282,17 +282,17 @@ enum {
 #if 0
 
 static const char *video_keys[] =
-{
-	"File:Name",
-	"Video:Height",
-	"Video:Width",
-	"Video:Author",
-	"Video:FrameRate",
-	"Video:Codec",
-	"Video:Bitrate",
-	"Video:Duration",
-	NULL
-};
+	{
+		"File:Name",
+		"Video:Height",
+		"Video:Width",
+		"Video:Author",
+		"Video:FrameRate",
+		"Video:Codec",
+		"Video:Bitrate",
+		"Video:Duration",
+		NULL
+	};
 
 #endif
 
@@ -355,7 +355,7 @@ _tile_tracker_populate_default (char **array, GError *error, TrackerMetadataTile
 
 	TrackerMetadataTilePrivate *priv;
 
-	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);	/* create title */
+	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);        /* create title */
 
 	_property_to_label ( priv->title, array[DEFAULT_NAME] , "<span size='large'><b>%s</b></span>");
 
@@ -486,7 +486,7 @@ _tile_tracker_populate_audio (char **array, GError *error, TrackerMetadataTile *
 
 	TrackerMetadataTilePrivate *priv;
 
-	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);	/* create title */
+	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);        /* create title */
 
 	char *prop = NULL;
 	/* make nice looking description */
@@ -568,7 +568,7 @@ _tile_tracker_populate_image (char **array, GError *error, TrackerMetadataTile *
 
 	TrackerMetadataTilePrivate *priv;
 
-	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);	/* create title */
+	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);        /* create title */
 
 	/* create title */
 	_property_to_label ( priv->title, array[IMAGE_TITLE] , "<span size='large'><b>%s</b></span>");
@@ -592,14 +592,14 @@ _tile_tracker_populate_image (char **array, GError *error, TrackerMetadataTile *
 	}
 	if (camera && model) {
 		prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
-						  g_markup_escape_text (array[IMAGE_CAMERA], -1),
-						  g_markup_escape_text (array[IMAGE_MODEL], -1));
+		                        g_markup_escape_text (array[IMAGE_CAMERA], -1),
+		                        g_markup_escape_text (array[IMAGE_MODEL], -1));
 	} else if (camera) {
 		prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
-						  g_markup_escape_text (array[IMAGE_CAMERA], -1));
+		                        g_markup_escape_text (array[IMAGE_CAMERA], -1));
 	} else if (model) {
 		prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
-						  g_markup_escape_text (array[IMAGE_MODEL], -1));
+		                        g_markup_escape_text (array[IMAGE_MODEL], -1));
 	} else {
 		prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1));
 	}
@@ -632,7 +632,7 @@ _tile_tracker_populate_video (char **array, GError *error, TrackerMetadataTile *
 
 	TrackerMetadataTilePrivate *priv;
 
-	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);	/* create title */
+	priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);        /* create title */
 
 	_property_to_label ( priv->title, array[VIDEO_TITLE] , "<span size='large'><b>%s</b></span>");
 
@@ -788,15 +788,15 @@ format_file_size_for_display (gulong size)
 		if (size < MEGABYTE_FACTOR) {
 			displayed_size = (gdouble) size / KILOBYTE_FACTOR;
 			return g_strdup_printf (_("%.1f KB"),
-						displayed_size);
+			                        displayed_size);
 		} else if (size < GIGABYTE_FACTOR) {
 			displayed_size = (gdouble) size / MEGABYTE_FACTOR;
 			return g_strdup_printf (_("%.1f MB"),
-						displayed_size);
+			                        displayed_size);
 		} else {
 			displayed_size = (gdouble) size / GIGABYTE_FACTOR;
 			return g_strdup_printf (_("%.1f GB"),
-						displayed_size);
+			                        displayed_size);
 		}
 	}
 }
@@ -945,9 +945,9 @@ _property_to_label (GtkWidget *label, const char *prop, const char *string)
 #if 0
 void
 tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
-							  ServiceType service_type,
-							  const gchar *type,
-							  GdkPixbuf *icon)
+                               ServiceType service_type,
+                               const gchar *type,
+                               GdkPixbuf *icon)
 {
 	TrackerMetadataTilePrivate *priv;
 
@@ -969,61 +969,61 @@ tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
 	case SERVICE_MUSIC:
 
 		tracker_metadata_get_async (priv->client, SERVICE_MUSIC,
-					    uri, audio_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_audio,
-					    (gpointer)tile);
+		                            uri, audio_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_audio,
+		                            (gpointer)tile);
 
 		break;
 
 	case SERVICE_EMAILS:
 
 		tracker_metadata_get_async (priv->client, SERVICE_EMAILS,
-					    uri, email_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_email,
-					    (gpointer)tile);
+		                            uri, email_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_email,
+		                            (gpointer)tile);
 		break;
 
 
 	case SERVICE_DOCUMENTS:
 
 		tracker_metadata_get_async (priv->client, SERVICE_DOCUMENTS,
-					    uri, doc_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_documents,
-					    (gpointer)tile);
+		                            uri, doc_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_documents,
+		                            (gpointer)tile);
 		break;
 
 	case SERVICE_WEBHISTORY:
 
 		tracker_metadata_get_async (priv->client, SERVICE_WEBHISTORY,
-					    uri, webhistory_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_webhistory,
-					    (gpointer)tile);
+		                            uri, webhistory_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_webhistory,
+		                            (gpointer)tile);
 		break;
 
 
 	case SERVICE_IMAGES:
 
 		tracker_metadata_get_async (priv->client, SERVICE_IMAGES,
-					    uri, image_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_image,
-					    (gpointer)tile);
+		                            uri, image_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_image,
+		                            (gpointer)tile);
 
 		break;
 
 	case SERVICE_VIDEOS:
 		tracker_metadata_get_async (priv->client, SERVICE_VIDEOS,
-					    uri, video_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_video,
-					    (gpointer)tile);
+		                            uri, video_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_video,
+		                            (gpointer)tile);
 
 		break;
 
 	case SERVICE_APPLICATIONS:
 
 		tracker_metadata_get_async (priv->client, SERVICE_APPLICATIONS,
-					    uri, app_keys,
-					    (TrackerArrayReply)_tile_tracker_populate_applications,
-					    (gpointer)tile);
+		                            uri, app_keys,
+		                            (TrackerArrayReply)_tile_tracker_populate_applications,
+		                            (gpointer)tile);
 
 		break;
 
@@ -1035,9 +1035,9 @@ tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
 		} else {
 
 			tracker_metadata_get_async (priv->client, SERVICE_FILES,
-						    uri, default_keys,
-						    (TrackerArrayReply)_tile_tracker_populate_default,
-						    (gpointer)tile);
+			                            uri, default_keys,
+			                            (TrackerArrayReply)_tile_tracker_populate_default,
+			                            (gpointer)tile);
 		}
 
 		break;
@@ -1085,13 +1085,13 @@ tracker_metadata_tile_toggle_view (GtkWidget *button, TrackerMetadataTile *tile)
 		gtk_widget_hide (priv->image);
 		gtk_widget_hide (priv->table);
 		gtk_arrow_set (GTK_ARROW (priv->arrow),
-			       GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+		               GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
 		gtk_alignment_set_padding (GTK_ALIGNMENT (priv->align), 1, 1, 4, 4);
 	} else {
 		gtk_widget_show (priv->image);
 		gtk_widget_show (priv->table);
 		gtk_arrow_set (GTK_ARROW (priv->arrow),
-			       GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+		               GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 		gtk_alignment_set_padding (GTK_ALIGNMENT (priv->align), 6, 6, 4, 4);
 	}
 	priv->expanded = !priv->expanded;
@@ -1136,13 +1136,13 @@ draw (GtkWidget *widget, cairo_t *cr)
 	/* main gradient */
 	pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, height);
 	cairo_pattern_add_color_stop_rgba (pat, 0.0, step2.red/65535.0,
-						     step2.green/65535.0,
-						     step2.blue/65535.0,
-						     0.05);
+	                                   step2.green/65535.0,
+	                                   step2.blue/65535.0,
+	                                   0.05);
 	cairo_pattern_add_color_stop_rgba ( pat, 1.0, step2.red/65535.0,
-						      step2.green/65535.0,
-						      step2.blue/65535.0,
-						      0.5);
+	                                    step2.green/65535.0,
+	                                    step2.blue/65535.0,
+	                                    0.5);
 
 	cairo_rectangle (cr, 0, 0, width, height);
 	cairo_set_source(cr, pat);
@@ -1151,9 +1151,9 @@ draw (GtkWidget *widget, cairo_t *cr)
 
 	/* border line */
 	cairo_set_source_rgba (cr, step2.red/65535.0,
-				   step2.green/65535.0,
-				   step2.blue/65535.0,
-				   0.7);
+	                       step2.green/65535.0,
+	                       step2.blue/65535.0,
+	                       0.7);
 	cairo_move_to (cr, 0, 0);
 	cairo_line_to (cr, width, 0);
 	cairo_stroke (cr);
@@ -1274,7 +1274,7 @@ tracker_metadata_tile_init (TrackerMetadataTile *tile)
 	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	gtk_widget_show (button);
 	g_signal_connect (G_OBJECT (button), "clicked",
-			  G_CALLBACK (tracker_metadata_tile_toggle_view), (gpointer)tile);
+	                  G_CALLBACK (tracker_metadata_tile_toggle_view), (gpointer)tile);
 
 	hbox = gtk_hbox_new (FALSE, 4);
 	gtk_container_add (GTK_CONTAINER(button), hbox);
diff --git a/src/libtracker-gtk/tracker-metadata-tile.h b/src/libtracker-gtk/tracker-metadata-tile.h
index d7cb3aa..9c7240c 100644
--- a/src/libtracker-gtk/tracker-metadata-tile.h
+++ b/src/libtracker-gtk/tracker-metadata-tile.h
@@ -27,12 +27,12 @@
 #include <libtracker-client/tracker.h>
 
 
-#define TRACKER_TYPE_METADATA_TILE		(tracker_metadata_tile_get_type ())
-#define TRACKER_METADATA_TILE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTile))
-#define TRACKER_METADATA_TILE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
-#define TRACKER_IS_METADATA_TILE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_METADATA_TILE))
-#define TRACKER_IS_METADATA_TILE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_METADATA_TILE))
-#define TRACKER_METADATA_TILE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
+#define TRACKER_TYPE_METADATA_TILE              (tracker_metadata_tile_get_type ())
+#define TRACKER_METADATA_TILE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTile))
+#define TRACKER_METADATA_TILE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
+#define TRACKER_IS_METADATA_TILE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_METADATA_TILE))
+#define TRACKER_IS_METADATA_TILE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_METADATA_TILE))
+#define TRACKER_METADATA_TILE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
 
 typedef struct TrackerMetadataTilePrivate TrackerMetadataTilePrivate;
 
@@ -46,16 +46,16 @@ typedef struct {
 
 } TrackerMetadataTileClass;
 
-GType	   tracker_metadata_tile_get_type  (void);
+GType      tracker_metadata_tile_get_type  (void);
 
-GtkWidget* tracker_metadata_tile_new	   (void);
+GtkWidget* tracker_metadata_tile_new       (void);
 
 #if 0
-void	   tracker_metadata_tile_set_uri (TrackerMetadataTile		*tile,
-					  const gchar			*uri,
-					  ServiceType			service_type,
-					  const gchar			*type,
-					  GdkPixbuf			*icon);
+void       tracker_metadata_tile_set_uri (TrackerMetadataTile           *tile,
+                                          const gchar                   *uri,
+                                          ServiceType                   service_type,
+                                          const gchar                   *type,
+                                          GdkPixbuf                     *icon);
 #endif
 
 #endif /* TRACKER_METADATA_TILE_H */
diff --git a/src/libtracker-gtk/tracker-tag-bar.c b/src/libtracker-gtk/tracker-tag-bar.c
index 26c6b0b..f04961d 100644
--- a/src/libtracker-gtk/tracker-tag-bar.c
+++ b/src/libtracker-gtk/tracker-tag-bar.c
@@ -108,9 +108,9 @@ _keywords_reply (char **array, GError *error, TrackerTagBar *bar)
 }
 
 static gboolean
-_on_tag_button_press_event (GtkWidget			*button,
-			    GdkEventButton		*event,
-			    TrackerTagBar		*bar)
+_on_tag_button_press_event (GtkWidget                   *button,
+                            GdkEventButton              *event,
+                            TrackerTagBar               *bar)
 {
 	TrackerTagBarPrivate *priv;
 	GtkWidget *label;
@@ -122,17 +122,17 @@ _on_tag_button_press_event (GtkWidget			*button,
 	tag = gtk_label_get_text (GTK_LABEL (label));
 
 	switch (event->button) {
-		case 1:
-			_tag_launch_search (tag);
-			break;
-		case 3:
-			priv->active_tag = tag;
-			gtk_menu_popup (GTK_MENU (priv->menu),
-					NULL, NULL, NULL, bar, 3, event->time);
-
-			break;
-		default:
-			break;
+	case 1:
+		_tag_launch_search (tag);
+		break;
+	case 3:
+		priv->active_tag = tag;
+		gtk_menu_popup (GTK_MENU (priv->menu),
+		                NULL, NULL, NULL, bar, 3, event->time);
+
+		break;
+	default:
+		break;
 
 	}
 	return FALSE;
@@ -185,7 +185,7 @@ remove_tag_activate_cb(GtkMenuItem *menu_item, TrackerTagBar *bar)
 	/* TODO: Port to SPARQL */
 #if 0
 	tracker_keywords_remove(priv->client, priv->type, priv->uri,
-				 args, &error);
+	                        args, &error);
 	if (error) {
 		g_print ("Tag Removal Error : %s", error->message);
 		return;
@@ -231,7 +231,7 @@ _on_apply_add_tag (GtkButton *but, TrackerTagBar *bar)
 		tags = g_strsplit (text, ",", 0);
 
 		tracker_keywords_add(priv->client, priv->type, priv->uri,
-				 tags, &error);
+		                     tags, &error);
 		if (error) {
 			g_print ("Tag Addition Error : %s", error->message);
 			return;
@@ -272,7 +272,7 @@ _on_add_tag_clicked (GtkButton *but, TrackerTagBar *bar)
 	gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
 	g_signal_connect (G_OBJECT (entry), "activate",
-			  G_CALLBACK (_on_entry_activate), bar);
+	                  G_CALLBACK (_on_entry_activate), bar);
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
 
@@ -282,7 +282,7 @@ _on_add_tag_clicked (GtkButton *but, TrackerTagBar *bar)
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
 	g_signal_connect (G_OBJECT (button), "clicked",
-			  G_CALLBACK (_on_close_add_tag), bar);
+	                  G_CALLBACK (_on_close_add_tag), bar);
 
 	image = gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU);
 
@@ -293,7 +293,7 @@ _on_add_tag_clicked (GtkButton *but, TrackerTagBar *bar)
 
 
 	g_signal_connect (G_OBJECT (button), "clicked",
-			  G_CALLBACK (_on_apply_add_tag), bar);
+	                  G_CALLBACK (_on_apply_add_tag), bar);
 
 	gtk_box_pack_start (GTK_BOX (bar), hbox, TRUE, TRUE, 0);
 	gtk_widget_show_all (hbox);
@@ -325,18 +325,18 @@ _tag_bar_add_tag (TrackerTagBar *bar, GtkWidget *box, const char *tag)
 	gtk_box_pack_start (GTK_BOX(box), button, FALSE, FALSE, 0);
 
 	tracker_set_atk_relationship(button, ATK_RELATION_LABELLED_BY,
-				     label);
+	                             label);
 	tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
-				     button);
+	                             button);
 
 	g_signal_connect (G_OBJECT (button), "button-press-event",
-			  G_CALLBACK (_on_tag_button_press_event), bar);
+	                  G_CALLBACK (_on_tag_button_press_event), bar);
 
 	g_free (temp);
 }
 
 /* HEADER FUNCTIONS */
-	/* TODO: Port to SPARQL */
+/* TODO: Port to SPARQL */
 void
 tracker_tag_bar_set_uri (TrackerTagBar *bar, ServiceType type, const gchar *uri)
 {
@@ -350,8 +350,8 @@ tracker_tag_bar_set_uri (TrackerTagBar *bar, ServiceType type, const gchar *uri)
 	priv->type = type;
 
 	tracker_keywords_get_async (priv->client, priv->type, uri,
-				    (TrackerArrayReply)_keywords_reply,
-				    bar);
+	                            (TrackerArrayReply)_keywords_reply,
+	                            bar);
 }
 
 #endif
@@ -403,12 +403,12 @@ tracker_tag_bar_init (TrackerTagBar *tag_bar)
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
 	tracker_set_atk_relationship(button, ATK_RELATION_LABELLED_BY,
-				     label);
+	                             label);
 	tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
-				     button);
+	                             button);
 
 	g_signal_connect (G_OBJECT (button), "clicked",
-			  G_CALLBACK (_on_add_tag_clicked), tag_bar);
+	                  G_CALLBACK (_on_add_tag_clicked), tag_bar);
 
 	menu = gtk_menu_new();
 	priv->menu = menu;
@@ -419,7 +419,7 @@ tracker_tag_bar_init (TrackerTagBar *tag_bar)
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	g_signal_connect(G_OBJECT(item), "activate",
-					 G_CALLBACK(search_tag_activate_cb), tag_bar);
+	                 G_CALLBACK(search_tag_activate_cb), tag_bar);
 
 	image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
@@ -431,7 +431,7 @@ tracker_tag_bar_init (TrackerTagBar *tag_bar)
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	g_signal_connect(G_OBJECT(item), "activate",
-					 G_CALLBACK(remove_tag_activate_cb), tag_bar);
+	                 G_CALLBACK(remove_tag_activate_cb), tag_bar);
 
 	image = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
@@ -446,9 +446,9 @@ tracker_tag_bar_new (void)
 	TrackerTagBarPrivate *priv;
 
 	tag_bar = g_object_new (TRACKER_TYPE_TAG_BAR,
-				"homogeneous", FALSE,
-				"spacing", 0 ,
-				NULL);
+	                        "homogeneous", FALSE,
+	                        "spacing", 0 ,
+	                        NULL);
 	priv = TRACKER_TAG_BAR_GET_PRIVATE (tag_bar);
 
 	client = tracker_connect (TRUE, -1);
diff --git a/src/libtracker-gtk/tracker-tag-bar.h b/src/libtracker-gtk/tracker-tag-bar.h
index 987e900..afefe78 100644
--- a/src/libtracker-gtk/tracker-tag-bar.h
+++ b/src/libtracker-gtk/tracker-tag-bar.h
@@ -28,15 +28,15 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_TAG_BAR		(tracker_tag_bar_get_type ())
-#define TRACKER_TAG_BAR(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_TAG_BAR, TrackerTagBar))
-#define TRACKER_TAG_BAR_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), TRACKER_TAG_BAR, TrackerTagBarClass))
-#define TRACKER_IS_TAG_BAR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_TAG_BAR))
-#define TRACKER_IS_TAG_BAR_CLASS(obj)	(G_TYPE_CHECK_CLASS_TYPE ((obj), TRACKER_TYPE_TAG_BAR))
-#define TRACKER_TAG_BAR_GET_CLASS	(G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_TAG_BAR, TrackerTagBarClass))
+#define TRACKER_TYPE_TAG_BAR            (tracker_tag_bar_get_type ())
+#define TRACKER_TAG_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_TAG_BAR, TrackerTagBar))
+#define TRACKER_TAG_BAR_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), TRACKER_TAG_BAR, TrackerTagBarClass))
+#define TRACKER_IS_TAG_BAR(obj)                 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_TAG_BAR))
+#define TRACKER_IS_TAG_BAR_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE ((obj), TRACKER_TYPE_TAG_BAR))
+#define TRACKER_TAG_BAR_GET_CLASS       (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_TAG_BAR, TrackerTagBarClass))
 
-typedef struct _TrackerTagBar		TrackerTagBar;
-typedef struct _TrackerTagBarClass	TrackerTagBarClass;
+typedef struct _TrackerTagBar           TrackerTagBar;
+typedef struct _TrackerTagBarClass      TrackerTagBarClass;
 
 struct _TrackerTagBar
 {
@@ -51,14 +51,14 @@ struct _TrackerTagBarClass
 GtkWidget *tracker_tag_bar_new (void);
 
 /*
-uri has to be a local uri i.e.
-'/home/john/doe.mp3' not 'file:///home/john/doe.mp3'
+  uri has to be a local uri i.e.
+  '/home/john/doe.mp3' not 'file:///home/john/doe.mp3'
 */
 #if 0
-void	   tracker_tag_bar_set_uri (TrackerTagBar		*bar,
-				    ServiceType			type,
-				    const gchar			*uri
-				   );
+void       tracker_tag_bar_set_uri (TrackerTagBar               *bar,
+                                    ServiceType                         type,
+                                    const gchar                         *uri
+                                    );
 #endif
 
 GType tracker_tag_bar_get_type (void);
diff --git a/src/libtracker-gtk/tracker-ui.c b/src/libtracker-gtk/tracker-ui.c
index b041601..29e63cd 100644
--- a/src/libtracker-gtk/tracker-ui.c
+++ b/src/libtracker-gtk/tracker-ui.c
@@ -35,11 +35,11 @@
  *
  **/
 void
-tracker_render_emblem_pixbuf_cb (GtkCellLayout			*cell_layout,
-				 GtkCellRenderer		*cell,
-				 GtkTreeModel			*tree_model,
-				 GtkTreeIter			*iter,
-				 gpointer			icon_theme)
+tracker_render_emblem_pixbuf_cb (GtkCellLayout                  *cell_layout,
+                                 GtkCellRenderer                *cell,
+                                 GtkTreeModel                   *tree_model,
+                                 GtkTreeIter                    *iter,
+                                 gpointer                       icon_theme)
 {
 	char *stock_id;
 	GdkPixbuf *pixbuf;
diff --git a/src/libtracker-gtk/tracker-ui.h b/src/libtracker-gtk/tracker-ui.h
index d68eaf0..065bedf 100644
--- a/src/libtracker-gtk/tracker-ui.h
+++ b/src/libtracker-gtk/tracker-ui.h
@@ -36,10 +36,10 @@ const GtkTargetEntry KEYWORD_DRAG_TYPES[] = {
 };
 
 void
-tracker_render_emblem_pixbuf_cb (GtkCellLayout	 *cell_layout,
-				 GtkCellRenderer *cell,
-				 GtkTreeModel	 *tree_model,
-				 GtkTreeIter	 *iter,
-				 gpointer	 user_data);
+tracker_render_emblem_pixbuf_cb (GtkCellLayout   *cell_layout,
+                                 GtkCellRenderer *cell,
+                                 GtkTreeModel    *tree_model,
+                                 GtkTreeIter     *iter,
+                                 gpointer        user_data);
 
 #endif /* TRACKER_UI_H */
diff --git a/src/libtracker-gtk/tracker-utils.c b/src/libtracker-gtk/tracker-utils.c
index f874c55..41ed219 100644
--- a/src/libtracker-gtk/tracker-utils.c
+++ b/src/libtracker-gtk/tracker-utils.c
@@ -79,32 +79,32 @@ tracker_get_all_keywords (TrackerClient *tracker_client)
 }
 
 /* Creates a tree model containing the keywords in List
-this simple treemodel has a single column containing the keyword name*/
+   this simple treemodel has a single column containing the keyword name*/
 GtkTreeModel *
 tracker_create_simple_keyword_liststore (const GList *list)
 {
-    GtkListStore *store;
-    const GList *tmp;
+	GtkListStore *store;
+	const GList *tmp;
 
-    store = gtk_list_store_new (1, G_TYPE_STRING);
+	store = gtk_list_store_new (1, G_TYPE_STRING);
 
-    for (tmp = list; tmp; tmp = tmp->next) {
-	    gchar *keyword = keyword = tmp->data;
+	for (tmp = list; tmp; tmp = tmp->next) {
+		gchar *keyword = keyword = tmp->data;
 
-	    gtk_list_store_insert_with_values (store,
-					       NULL,
-					       0,
-					       0,
-					       keyword,
-					       -1);
-    }
+		gtk_list_store_insert_with_values (store,
+		                                   NULL,
+		                                   0,
+		                                   0,
+		                                   keyword,
+		                                   -1);
+	}
 
-    return GTK_TREE_MODEL (store);
+	return GTK_TREE_MODEL (store);
 }
 
 void
 tracker_set_atk_relationship(GtkWidget *obj1, int relation_type,
-			     GtkWidget *obj2)
+                             GtkWidget *obj2)
 {
 	AtkObject *atk_obj1, *atk_obj2, *targets[1];
 	AtkRelationSet *atk_rel_set;
diff --git a/src/libtracker-gtk/tracker-utils.h b/src/libtracker-gtk/tracker-utils.h
index 7cfbf9d..275aff8 100644
--- a/src/libtracker-gtk/tracker-utils.h
+++ b/src/libtracker-gtk/tracker-utils.h
@@ -29,9 +29,9 @@
 
 #include <libtracker-client/tracker.h>
 
-GList *		tracker_keyword_array_to_glist (gchar **array);
-GList *		tracker_get_all_keywords (TrackerClient *tracker_client);
-GtkTreeModel *	tracker_create_simple_keyword_liststore (const GList *list);
-void		tracker_set_atk_relationship(GtkWidget *obj1, int relation_type,
-					     GtkWidget *obj2);
+GList *                 tracker_keyword_array_to_glist (gchar **array);
+GList *                 tracker_get_all_keywords (TrackerClient *tracker_client);
+GtkTreeModel *  tracker_create_simple_keyword_liststore (const GList *list);
+void            tracker_set_atk_relationship(GtkWidget *obj1, int relation_type,
+                                             GtkWidget *obj2);
 #endif /* TRACKER_UTILS_H */
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index 439bbce..f6ec327 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -26,8 +26,8 @@
 
 #define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
 
-#define FILE_ATTRIBUTES				\
-	G_FILE_ATTRIBUTE_STANDARD_NAME ","	\
+#define FILE_ATTRIBUTES	  \
+	G_FILE_ATTRIBUTE_STANDARD_NAME "," \
 	G_FILE_ATTRIBUTE_STANDARD_TYPE
 
 #define FILES_QUEUE_PROCESS_INTERVAL 2000
@@ -36,35 +36,35 @@
 /* This is the number of files to be called back with from GIO at a
  * time so we don't get called back for every file.
  */
-#define FILES_GROUP_SIZE	     100
+#define FILES_GROUP_SIZE             100
 
 struct TrackerCrawlerPrivate {
 	/* Found data */
-	GQueue	       *found;
+	GQueue         *found;
 
 	/* Usable data */
-	GQueue	       *directories;
-	GQueue	       *files;
+	GQueue         *directories;
+	GQueue         *files;
 
 	GCancellable   *cancellable;
 
 	/* Idle handler for processing found data */
-	guint		idle_id;
+	guint           idle_id;
 
 	gdouble         throttle;
 
 	gboolean        recurse;
 
 	/* Statistics */
-	GTimer	       *timer;
-	guint		directories_found;
-	guint		directories_ignored;
-	guint		files_found;
-	guint		files_ignored;
+	GTimer         *timer;
+	guint           directories_found;
+	guint           directories_ignored;
+	guint           files_found;
+	guint           files_ignored;
 
 	/* Status */
-	gboolean	is_running;
-	gboolean	is_finished;
+	gboolean        is_running;
+	gboolean        is_finished;
 	gboolean        is_paused;
 	gboolean        was_started;
 };
@@ -84,20 +84,20 @@ typedef struct {
 
 typedef struct {
 	TrackerCrawler *crawler;
-	GFile	       *parent;
+	GFile          *parent;
 	GHashTable     *children;
 } EnumeratorData;
 
 static void     crawler_finalize        (GObject         *object);
 static gboolean check_defaults          (TrackerCrawler  *crawler,
-					 GFile           *file);
+                                         GFile           *file);
 static gboolean check_contents_defaults (TrackerCrawler  *crawler,
-					 GFile           *file,
-					 GList           *contents);
+                                         GFile           *file,
+                                         GList           *contents);
 static void     file_enumerate_next     (GFileEnumerator *enumerator,
-					 EnumeratorData  *ed);
+                                         EnumeratorData  *ed);
 static void     file_enumerate_children (TrackerCrawler  *crawler,
-					 GFile           *file);
+                                         GFile           *file);
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
@@ -107,7 +107,7 @@ static void
 tracker_crawler_class_init (TrackerCrawlerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-        TrackerCrawlerClass *crawler_class = TRACKER_CRAWLER_CLASS (klass);
+	TrackerCrawlerClass *crawler_class = TRACKER_CRAWLER_CLASS (klass);
 
 	object_class->finalize = crawler_finalize;
 
@@ -117,51 +117,51 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
 
 	signals[CHECK_DIRECTORY] =
 		g_signal_new ("check-directory",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT,
-			      G_TYPE_BOOLEAN,
-			      1,
-			      G_TYPE_FILE);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT,
+		              G_TYPE_BOOLEAN,
+		              1,
+		              G_TYPE_FILE);
 	signals[CHECK_FILE] =
 		g_signal_new ("check-file",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerCrawlerClass, check_file),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT,
-			      G_TYPE_BOOLEAN,
-			      1,
-			      G_TYPE_FILE);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerCrawlerClass, check_file),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT,
+		              G_TYPE_BOOLEAN,
+		              1,
+		              G_TYPE_FILE);
 	signals[CHECK_DIRECTORY_CONTENTS] =
 		g_signal_new ("check-directory-contents",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory_contents),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT_POINTER,
-			      G_TYPE_BOOLEAN,
-			      2, G_TYPE_FILE, G_TYPE_POINTER);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerCrawlerClass, check_directory_contents),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT_POINTER,
+		              G_TYPE_BOOLEAN,
+		              2, G_TYPE_FILE, G_TYPE_POINTER);
 	signals[FINISHED] =
 		g_signal_new ("finished",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerCrawlerClass, finished),
-			      NULL, NULL,
-			      tracker_marshal_VOID__POINTER_BOOLEAN_UINT_UINT_UINT_UINT,
-			      G_TYPE_NONE,
-			      6,
-			      G_TYPE_POINTER,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerCrawlerClass, finished),
+		              NULL, NULL,
+		              tracker_marshal_VOID__POINTER_BOOLEAN_UINT_UINT_UINT_UINT,
+		              G_TYPE_NONE,
+		              6,
+		              G_TYPE_POINTER,
+		              G_TYPE_BOOLEAN,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT);
 
 	g_type_class_add_private (object_class, sizeof (TrackerCrawlerPrivate));
 }
@@ -214,15 +214,15 @@ crawler_finalize (GObject *object)
 
 static gboolean
 check_defaults (TrackerCrawler *crawler,
-		GFile          *file)
+                GFile          *file)
 {
 	return TRUE;
 }
 
 static gboolean
 check_contents_defaults (TrackerCrawler  *crawler,
-			 GFile           *file,
-			 GList           *contents)
+                         GFile           *file,
+                         GList           *contents)
 {
 	return TRUE;
 }
@@ -239,7 +239,7 @@ tracker_crawler_new (void)
 
 static void
 add_file (TrackerCrawler *crawler,
-	  GFile		 *file)
+          GFile                  *file)
 {
 	g_return_if_fail (G_IS_FILE (file));
 
@@ -248,8 +248,8 @@ add_file (TrackerCrawler *crawler,
 
 static void
 add_directory (TrackerCrawler *crawler,
-	       GFile	      *file,
-	       gboolean        override)
+               GFile          *file,
+               gboolean        override)
 {
 	g_return_if_fail (G_IS_FILE (file));
 
@@ -260,7 +260,7 @@ add_directory (TrackerCrawler *crawler,
 
 static gboolean
 check_file (TrackerCrawler *crawler,
-	    GFile          *file)
+            GFile          *file)
 {
 	gboolean use = FALSE;
 
@@ -277,7 +277,7 @@ check_file (TrackerCrawler *crawler,
 
 static gboolean
 check_directory (TrackerCrawler *crawler,
-		 GFile          *file)
+                 GFile          *file)
 {
 	gboolean use = FALSE;
 
@@ -297,9 +297,9 @@ check_directory (TrackerCrawler *crawler,
 static gboolean
 process_func (gpointer data)
 {
-	TrackerCrawler	      *crawler;
+	TrackerCrawler        *crawler;
 	TrackerCrawlerPrivate *priv;
-	GFile		      *file;
+	GFile                 *file;
 
 	crawler = TRACKER_CRAWLER (data);
 	priv = crawler->private;
@@ -380,7 +380,7 @@ process_func_stop (TrackerCrawler *crawler)
 
 static EnumeratorChildData *
 enumerator_child_data_new (GFile    *child,
-			   gboolean  is_dir)
+                           gboolean  is_dir)
 {
 	EnumeratorChildData *cd;
 
@@ -401,7 +401,7 @@ enumerator_child_data_free (EnumeratorChildData *cd)
 
 static EnumeratorData *
 enumerator_data_new (TrackerCrawler *crawler,
-		     GFile	    *parent)
+                     GFile          *parent)
 {
 	EnumeratorData *ed;
 
@@ -410,21 +410,21 @@ enumerator_data_new (TrackerCrawler *crawler,
 	ed->crawler = g_object_ref (crawler);
 	ed->parent = g_object_ref (parent);
 	ed->children = g_hash_table_new_full (g_str_hash,
-					      g_str_equal,
-					      (GDestroyNotify) g_free,
-					      (GDestroyNotify) enumerator_child_data_free);
+	                                      g_str_equal,
+	                                      (GDestroyNotify) g_free,
+	                                      (GDestroyNotify) enumerator_child_data_free);
 	return ed;
 }
 
 static void
 enumerator_data_add_child (EnumeratorData *ed,
-			   const gchar    *name,
-			   GFile          *file,
-			   gboolean        is_dir)
+                           const gchar    *name,
+                           GFile          *file,
+                           gboolean        is_dir)
 {
 	g_hash_table_insert (ed->children,
-			     g_strdup (name),
-			     enumerator_child_data_new (file, is_dir));
+	                     g_strdup (name),
+	                     enumerator_child_data_new (file, is_dir));
 }
 
 static void
@@ -478,8 +478,8 @@ enumerator_data_free (EnumeratorData *ed)
 
 static void
 file_enumerator_close_cb (GObject      *enumerator,
-			  GAsyncResult *result,
-			  gpointer	user_data)
+                          GAsyncResult *result,
+                          gpointer      user_data)
 {
 	TrackerCrawler *crawler;
 	GError *error = NULL;
@@ -487,10 +487,10 @@ file_enumerator_close_cb (GObject      *enumerator,
 	crawler = TRACKER_CRAWLER (user_data);
 
 	if (!g_file_enumerator_close_finish (G_FILE_ENUMERATOR (enumerator),
-					     result,
-					     &error)) {
+	                                     result,
+	                                     &error)) {
 		g_warning ("Couldn't close GFileEnumerator (%p): %s", enumerator,
-			   (error) ? error->message : "No reason");
+		           (error) ? error->message : "No reason");
 
 		g_clear_error (&error);
 	}
@@ -503,8 +503,8 @@ file_enumerator_close_cb (GObject      *enumerator,
 
 static void
 file_enumerate_next_cb (GObject      *object,
-			GAsyncResult *result,
-			gpointer      user_data)
+                        GAsyncResult *result,
+                        gpointer      user_data)
 {
 	TrackerCrawler *crawler;
 	EnumeratorData *ed;
@@ -523,8 +523,8 @@ file_enumerate_next_cb (GObject      *object,
 	cancelled = g_cancellable_is_cancelled (crawler->private->cancellable);
 
 	files = g_file_enumerator_next_files_finish (enumerator,
-						     result,
-						     &error);
+	                                             result,
+	                                             &error);
 
 	if (error || !files || !crawler->private->is_running) {
 		if (error && !cancelled) {
@@ -546,10 +546,10 @@ file_enumerate_next_cb (GObject      *object,
 
 		enumerator_data_free (ed);
 		g_file_enumerator_close_async (enumerator,
-					       G_PRIORITY_DEFAULT,
-					       NULL,
-					       file_enumerator_close_cb,
-					       crawler);
+		                               G_PRIORITY_DEFAULT,
+		                               NULL,
+		                               file_enumerator_close_cb,
+		                               crawler);
 		g_object_unref (enumerator);
 
 		return;
@@ -579,20 +579,20 @@ file_enumerate_next_cb (GObject      *object,
 
 static void
 file_enumerate_next (GFileEnumerator *enumerator,
-		     EnumeratorData  *ed)
+                     EnumeratorData  *ed)
 {
 	g_file_enumerator_next_files_async (enumerator,
-					    FILES_GROUP_SIZE,
-					    G_PRIORITY_DEFAULT,
-					    ed->crawler->private->cancellable,
-					    file_enumerate_next_cb,
-					    ed);
+	                                    FILES_GROUP_SIZE,
+	                                    G_PRIORITY_DEFAULT,
+	                                    ed->crawler->private->cancellable,
+	                                    file_enumerate_next_cb,
+	                                    ed);
 }
 
 static void
-file_enumerate_children_cb (GObject	 *file,
-			    GAsyncResult *result,
-			    gpointer	  user_data)
+file_enumerate_children_cb (GObject      *file,
+                            GAsyncResult *result,
+                            gpointer      user_data)
 {
 	TrackerCrawler *crawler;
 	EnumeratorData *ed;
@@ -614,7 +614,7 @@ file_enumerate_children_cb (GObject	 *file,
 			path = g_file_get_path (parent);
 
 			g_warning ("Could not open directory '%s': %s",
-				   path, error->message);
+			           path, error->message);
 
 			g_error_free (error);
 			g_free (path);
@@ -631,25 +631,25 @@ file_enumerate_children_cb (GObject	 *file,
 
 static void
 file_enumerate_children (TrackerCrawler *crawler,
-			 GFile		*file)
+                         GFile          *file)
 {
 	EnumeratorData *ed;
 
 	ed = enumerator_data_new (crawler, file);
 
 	g_file_enumerate_children_async (file,
-					 FILE_ATTRIBUTES,
-					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-					 G_PRIORITY_LOW,
-					 crawler->private->cancellable,
-					 file_enumerate_children_cb,
-					 ed);
+	                                 FILE_ATTRIBUTES,
+	                                 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                                 G_PRIORITY_LOW,
+	                                 crawler->private->cancellable,
+	                                 file_enumerate_children_cb,
+	                                 ed);
 }
 
 gboolean
 tracker_crawler_start (TrackerCrawler *crawler,
-		       GFile          *file,
-		       gboolean        recurse)
+                       GFile          *file,
+                       gboolean        recurse)
 {
 	TrackerCrawlerPrivate *priv;
 
@@ -713,12 +713,12 @@ tracker_crawler_stop (TrackerCrawler *crawler)
 	}
 
 	g_signal_emit (crawler, signals[FINISHED], 0,
-		       priv->found,
-		       !priv->is_finished,
-		       priv->directories_found,
-		       priv->directories_ignored,
-		       priv->files_found,
-		       priv->files_ignored);
+	               priv->found,
+	               !priv->is_finished,
+	               priv->directories_found,
+	               priv->directories_ignored,
+	               priv->files_found,
+	               priv->files_ignored);
 
 	/* Clean up queue */
 	g_queue_foreach (priv->found, (GFunc) g_object_unref, NULL);
@@ -742,7 +742,7 @@ tracker_crawler_pause (TrackerCrawler *crawler)
 	}
 
 	g_message ("Crawler is paused, %s",
-		   crawler->private->is_running ? "currently running" : "not running");
+	           crawler->private->is_running ? "currently running" : "not running");
 }
 
 void
@@ -758,12 +758,12 @@ tracker_crawler_resume (TrackerCrawler *crawler)
 	}
 
 	g_message ("Crawler is resuming, %s",
-		   crawler->private->is_running ? "currently running" : "not running");
+	           crawler->private->is_running ? "currently running" : "not running");
 }
 
 void
 tracker_crawler_set_throttle (TrackerCrawler *crawler,
-			      gdouble         throttle)
+                              gdouble         throttle)
 {
 	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
 
diff --git a/src/libtracker-miner/tracker-crawler.h b/src/libtracker-miner/tracker-crawler.h
index d9333e3..ad0e501 100644
--- a/src/libtracker-miner/tracker-crawler.h
+++ b/src/libtracker-miner/tracker-crawler.h
@@ -26,17 +26,17 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_CRAWLER		(tracker_crawler_get_type ())
-#define TRACKER_CRAWLER(object)		(G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_CRAWLER, TrackerCrawler))
-#define TRACKER_CRAWLER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
-#define TRACKER_IS_CRAWLER(object)	(G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_CRAWLER))
+#define TRACKER_TYPE_CRAWLER            (tracker_crawler_get_type ())
+#define TRACKER_CRAWLER(object)                 (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_CRAWLER, TrackerCrawler))
+#define TRACKER_CRAWLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
+#define TRACKER_IS_CRAWLER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_CRAWLER))
 #define TRACKER_IS_CRAWLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_CRAWLER))
-#define TRACKER_CRAWLER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
+#define TRACKER_CRAWLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
 
 /* Max timeouts time (in msec) */
 #define MAX_TIMEOUT_INTERVAL 1000
 
-typedef struct TrackerCrawler	      TrackerCrawler;
+typedef struct TrackerCrawler         TrackerCrawler;
 typedef struct TrackerCrawlerClass    TrackerCrawlerClass;
 typedef struct TrackerCrawlerPrivate  TrackerCrawlerPrivate;
 
@@ -49,32 +49,32 @@ struct TrackerCrawlerClass {
 	GObjectClass parent;
 
 	gboolean (* check_directory)     (TrackerCrawler *crawler,
-					  GFile          *file);
+	                                  GFile          *file);
 	gboolean (* check_file)          (TrackerCrawler *crawler,
-					  GFile          *file);
+	                                  GFile          *file);
 	gboolean (* check_directory_contents) (TrackerCrawler *crawler,
-					       GFile          *file,
-					       GList          *contents);
+	                                       GFile          *file,
+	                                       GList          *contents);
 	void     (* finished)            (TrackerCrawler *crawler,
-					  GQueue         *found_files,
-					  gboolean        interrupted,
-					  guint           directories_found,
-					  guint           directories_ignored,
-					  guint           files_found,
-					  guint           files_ignored);
+	                                  GQueue         *found_files,
+	                                  gboolean        interrupted,
+	                                  guint           directories_found,
+	                                  guint           directories_ignored,
+	                                  guint           files_found,
+	                                  guint           files_ignored);
 };
 
 GType           tracker_crawler_get_type (void);
 TrackerCrawler *tracker_crawler_new      (void);
 gboolean        tracker_crawler_start    (TrackerCrawler *crawler,
-					  GFile          *file,
-					  gboolean        recurse);
+                                          GFile          *file,
+                                          gboolean        recurse);
 void            tracker_crawler_stop     (TrackerCrawler *crawler);
 void            tracker_crawler_pause    (TrackerCrawler *crawler);
 void            tracker_crawler_resume   (TrackerCrawler *crawler);
 
 void            tracker_crawler_set_throttle (TrackerCrawler *crawler,
-					      gdouble         throttle);
+                                              gdouble         throttle);
 
 G_END_DECLS
 
diff --git a/src/libtracker-miner/tracker-miner-dbus.h b/src/libtracker-miner/tracker-miner-dbus.h
index be62f6d..0ab3b23 100644
--- a/src/libtracker-miner/tracker-miner-dbus.h
+++ b/src/libtracker-miner/tracker-miner-dbus.h
@@ -32,33 +32,33 @@ G_BEGIN_DECLS
 #define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
 
 void tracker_miner_dbus_get_name          (TrackerMiner           *miner,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_get_description   (TrackerMiner           *miner,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_get_status        (TrackerMiner           *miner,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_get_progress      (TrackerMiner           *miner,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_get_pause_details (TrackerMiner           *miner,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_pause             (TrackerMiner           *miner,
-					   const gchar            *application,
-					   const gchar            *name,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           const gchar            *application,
+                                           const gchar            *name,
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_resume            (TrackerMiner           *miner,
-					   gint                    cookie,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           gint                    cookie,
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 void tracker_miner_dbus_writeback         (TrackerMiner           *miner,
-					   const GStrv             subjects,
-					   DBusGMethodInvocation  *context,
-					   GError                **error);
+                                           const GStrv             subjects,
+                                           DBusGMethodInvocation  *context,
+                                           GError                **error);
 
 G_END_DECLS
 
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 41de13a..fabe1bb 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -87,10 +87,10 @@ struct TrackerMinerFSPrivate {
 	GList          *directories;
 	DirectoryData  *current_directory;
 
-	GTimer	       *timer;
+	GTimer         *timer;
 
 	guint           crawl_directories_id;
-	guint		item_queues_handler_id;
+	guint           item_queues_handler_id;
 
 	gdouble         throttle;
 
@@ -105,15 +105,15 @@ struct TrackerMinerFSPrivate {
 	guint           is_crawling : 1;
 
 	/* Statistics */
-	guint		total_directories_found;
-	guint		total_directories_ignored;
-	guint		total_files_found;
-	guint		total_files_ignored;
-
-	guint		directories_found;
-	guint		directories_ignored;
-	guint		files_found;
-	guint		files_ignored;
+	guint           total_directories_found;
+	guint           total_directories_ignored;
+	guint           total_files_found;
+	guint           total_files_ignored;
+
+	guint           directories_found;
+	guint           directories_ignored;
+	guint           files_found;
+	guint           files_ignored;
 };
 
 enum {
@@ -144,19 +144,19 @@ enum {
 
 static void           fs_finalize                  (GObject        *object);
 static void           fs_set_property              (GObject        *object,
-						    guint           prop_id,
-						    const GValue   *value,
-						    GParamSpec     *pspec);
+                                                    guint           prop_id,
+                                                    const GValue   *value,
+                                                    GParamSpec     *pspec);
 static void           fs_get_property              (GObject        *object,
-						    guint           prop_id,
-						    GValue         *value,
-						    GParamSpec     *pspec);
+                                                    guint           prop_id,
+                                                    GValue         *value,
+                                                    GParamSpec     *pspec);
 
 static gboolean       fs_defaults                  (TrackerMinerFS *fs,
-						    GFile          *file);
+                                                    GFile          *file);
 static gboolean       fs_contents_defaults         (TrackerMinerFS *fs,
-						    GFile          *parent,
-						    GList          *children);
+                                                    GFile          *parent,
+                                                    GList          *children);
 static void           miner_started                (TrackerMiner   *miner);
 static void           miner_stopped                (TrackerMiner   *miner);
 static void           miner_paused                 (TrackerMiner   *miner);
@@ -165,56 +165,56 @@ static void           miner_writeback              (TrackerMiner   *miner,
                                                     const GStrv     subjects);
 
 static DirectoryData *directory_data_new           (GFile          *file,
-						    gboolean        recurse);
+                                                    gboolean        recurse);
 static void           directory_data_free          (DirectoryData  *dd);
 static ItemMovedData *item_moved_data_new          (GFile          *file,
-						    GFile          *source_file);
+                                                    GFile          *source_file);
 static void           item_moved_data_free         (ItemMovedData  *data);
 static void           monitor_item_created_cb      (TrackerMonitor *monitor,
-						    GFile          *file,
-						    gboolean        is_directory,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    gboolean        is_directory,
+                                                    gpointer        user_data);
 static void           monitor_item_updated_cb      (TrackerMonitor *monitor,
-						    GFile          *file,
-						    gboolean        is_directory,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    gboolean        is_directory,
+                                                    gpointer        user_data);
 static void           monitor_item_deleted_cb      (TrackerMonitor *monitor,
-						    GFile          *file,
-						    gboolean        is_directory,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    gboolean        is_directory,
+                                                    gpointer        user_data);
 static void           monitor_item_moved_cb        (TrackerMonitor *monitor,
-						    GFile          *file,
-						    GFile          *other_file,
-						    gboolean        is_directory,
-						    gboolean        is_source_monitored,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    GFile          *other_file,
+                                                    gboolean        is_directory,
+                                                    gboolean        is_source_monitored,
+                                                    gpointer        user_data);
 static gboolean       crawler_check_file_cb        (TrackerCrawler *crawler,
-						    GFile          *file,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    gpointer        user_data);
 static gboolean       crawler_check_directory_cb   (TrackerCrawler *crawler,
-						    GFile          *file,
-						    gpointer        user_data);
+                                                    GFile          *file,
+                                                    gpointer        user_data);
 static gboolean       crawler_check_directory_contents_cb (TrackerCrawler *crawler,
-							   GFile          *parent,
-							   GList          *children,
-							   gpointer        user_data);
+                                                           GFile          *parent,
+                                                           GList          *children,
+                                                           gpointer        user_data);
 static void           crawler_finished_cb          (TrackerCrawler *crawler,
-						    GQueue         *found,
-						    gboolean        was_interrupted,
-						    guint           directories_found,
-						    guint           directories_ignored,
-						    guint           files_found,
-						    guint           files_ignored,
-						    gpointer        user_data);
+                                                    GQueue         *found,
+                                                    gboolean        was_interrupted,
+                                                    guint           directories_found,
+                                                    guint           directories_ignored,
+                                                    guint           files_found,
+                                                    guint           files_ignored,
+                                                    gpointer        user_data);
 static void           crawl_directories_start      (TrackerMinerFS *fs);
 static void           crawl_directories_stop       (TrackerMinerFS *fs);
 
 static void           item_queue_handlers_set_up   (TrackerMinerFS *fs);
 
 static void           item_update_uri_recursively (TrackerMinerFS    *fs,
-						   RecursiveMoveData *data,
-						   const gchar       *source_uri,
-						   const gchar       *uri);
+                                                   RecursiveMoveData *data,
+                                                   const gchar       *source_uri,
+                                                   const gchar       *uri);
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
@@ -224,15 +224,15 @@ static void
 tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-        TrackerMinerFSClass *fs_class = TRACKER_MINER_FS_CLASS (klass);
-        TrackerMinerClass *miner_class = TRACKER_MINER_CLASS (klass);
+	TrackerMinerFSClass *fs_class = TRACKER_MINER_FS_CLASS (klass);
+	TrackerMinerClass *miner_class = TRACKER_MINER_CLASS (klass);
 
 	object_class->finalize = fs_finalize;
 	object_class->set_property = fs_set_property;
 	object_class->get_property = fs_get_property;
 
-        miner_class->started = miner_started;
-        miner_class->stopped = miner_stopped;
+	miner_class->started = miner_started;
+	miner_class->stopped = miner_stopped;
 	miner_class->paused  = miner_paused;
 	miner_class->resumed = miner_resumed;
 	miner_class->writeback = miner_writeback;
@@ -243,19 +243,19 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	fs_class->check_directory_contents = fs_contents_defaults;
 
 	g_object_class_install_property (object_class,
-					 PROP_THROTTLE,
-					 g_param_spec_double ("throttle",
-							      "Throttle",
-							      "Modifier for the indexing speed, 0 is max speed",
-							      0, 1, 0,
-							      G_PARAM_READWRITE));
+	                                 PROP_THROTTLE,
+	                                 g_param_spec_double ("throttle",
+	                                                      "Throttle",
+	                                                      "Modifier for the indexing speed, 0 is max speed",
+	                                                      0, 1, 0,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_POOL_LIMIT,
-					 g_param_spec_uint ("process-pool-limit",
-							    "Processing pool limit",
-							    "Number of files that can be concurrently processed",
-							    1, G_MAXUINT, 1,
-							    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_POOL_LIMIT,
+	                                 g_param_spec_uint ("process-pool-limit",
+	                                                    "Processing pool limit",
+	                                                    "Number of files that can be concurrently processed",
+	                                                    1, G_MAXUINT, 1,
+	                                                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	/**
 	 * TrackerMinerFS::check-file:
 	 * @miner_fs: the #TrackerMinerFS
@@ -269,13 +269,13 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	 **/
 	signals[CHECK_FILE] =
 		g_signal_new ("check-file",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, check_file),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT,
-			      G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, check_file),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT,
+		              G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
 	/**
 	 * TrackerMinerFS::check-directory:
 	 * @miner_fs: the #TrackerMinerFS
@@ -289,13 +289,13 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	 **/
 	signals[CHECK_DIRECTORY] =
 		g_signal_new ("check-directory",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, check_directory),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT,
-			      G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, check_directory),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT,
+		              G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
 	/**
 	 * TrackerMinerFS::check-directory-contents:
 	 * @miner_fs: the #TrackerMinerFS
@@ -312,13 +312,13 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	 **/
 	signals[CHECK_DIRECTORY_CONTENTS] =
 		g_signal_new ("check-directory-contents",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, check_directory_contents),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT_POINTER,
-			      G_TYPE_BOOLEAN, 2, G_TYPE_FILE, G_TYPE_POINTER);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, check_directory_contents),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT_POINTER,
+		              G_TYPE_BOOLEAN, 2, G_TYPE_FILE, G_TYPE_POINTER);
 	/**
 	 * TrackerMinerFS::monitor-directory:
 	 * @miner_fs: the #TrackerMinerFS
@@ -332,13 +332,13 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	 **/
 	signals[MONITOR_DIRECTORY] =
 		g_signal_new ("monitor-directory",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, monitor_directory),
-			      tracker_accumulator_check_file,
-			      NULL,
-			      tracker_marshal_BOOLEAN__OBJECT,
-			      G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, monitor_directory),
+		              tracker_accumulator_check_file,
+		              NULL,
+		              tracker_marshal_BOOLEAN__OBJECT,
+		              G_TYPE_BOOLEAN, 1, G_TYPE_FILE);
 	/**
 	 * TrackerMinerFS::process-file:
 	 * @miner_fs: the #TrackerMinerFS
@@ -364,66 +364,66 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	 **/
 	signals[PROCESS_FILE] =
 		g_signal_new ("process-file",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, process_file),
-			      NULL, NULL,
-			      tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
-			      G_TYPE_BOOLEAN,
-			      3, G_TYPE_FILE, TRACKER_TYPE_SPARQL_BUILDER, G_TYPE_CANCELLABLE),
-
-	/**
-	 * TrackerMinerFS::writeback-file:
-	 * @miner_fs: the #TrackerMinerFS
-	 * @file: a #GFile
-	 * @builder: a #TrackerSparqlBuilder
-	 * @cancellable: a #GCancellable
-	 *
-	 * The ::writeback-file signal is emitted whenever a file should
-	 * be marked as writeback, and it's metadata prepared for that.
-	 *
-	 * @builder is the #TrackerSparqlBuilder where all sparql updates
-	 * to be performed for @file will be appended.
-	 *
-	 * Returns: %TRUE on success
-	 *          %FALSE on failure
-	 **/
-	signals[WRITEBACK_FILE] =
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, process_file),
+		              NULL, NULL,
+		              tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
+		              G_TYPE_BOOLEAN,
+		              3, G_TYPE_FILE, TRACKER_TYPE_SPARQL_BUILDER, G_TYPE_CANCELLABLE),
+
+		/**
+		 * TrackerMinerFS::writeback-file:
+		 * @miner_fs: the #TrackerMinerFS
+		 * @file: a #GFile
+		 * @builder: a #TrackerSparqlBuilder
+		 * @cancellable: a #GCancellable
+		 *
+		 * The ::writeback-file signal is emitted whenever a file should
+		 * be marked as writeback, and it's metadata prepared for that.
+		 *
+		 * @builder is the #TrackerSparqlBuilder where all sparql updates
+		 * to be performed for @file will be appended.
+		 *
+		 * Returns: %TRUE on success
+		 *          %FALSE on failure
+		 **/
+		signals[WRITEBACK_FILE] =
 		g_signal_new ("writeback-file",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, writeback_file),
-			      NULL, NULL,
-			      tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
-			      G_TYPE_BOOLEAN,
-			      3, G_TYPE_FILE, TRACKER_TYPE_SPARQL_BUILDER, G_TYPE_CANCELLABLE),
-
-	/**
-	 * TrackerMinerFS::finished:
-	 * @miner_fs: the #TrackerMinerFS
-	 * @elapsed: elapsed time since mining was started
-	 * @directories_found: number of directories found
-	 * @directories_ignored: number of ignored directories
-	 * @files_found: number of files found
-	 * @files_ignored: number of ignored files
-	 *
-	 * The ::finished signal is emitted when @miner_fs has finished
-	 * all pending processing.
-	 **/
-	signals[FINISHED] =
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, writeback_file),
+		              NULL, NULL,
+		              tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
+		              G_TYPE_BOOLEAN,
+		              3, G_TYPE_FILE, TRACKER_TYPE_SPARQL_BUILDER, G_TYPE_CANCELLABLE),
+
+		/**
+		 * TrackerMinerFS::finished:
+		 * @miner_fs: the #TrackerMinerFS
+		 * @elapsed: elapsed time since mining was started
+		 * @directories_found: number of directories found
+		 * @directories_ignored: number of ignored directories
+		 * @files_found: number of files found
+		 * @files_ignored: number of ignored files
+		 *
+		 * The ::finished signal is emitted when @miner_fs has finished
+		 * all pending processing.
+		 **/
+		signals[FINISHED] =
 		g_signal_new ("finished",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerFSClass, finished),
-			      NULL, NULL,
-			      tracker_marshal_VOID__DOUBLE_UINT_UINT_UINT_UINT,
-			      G_TYPE_NONE,
-			      5,
-			      G_TYPE_DOUBLE,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT);
+		              G_TYPE_FROM_CLASS (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, finished),
+		              NULL, NULL,
+		              tracker_marshal_VOID__DOUBLE_UINT_UINT_UINT_UINT,
+		              G_TYPE_NONE,
+		              5,
+		              G_TYPE_DOUBLE,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT,
+		              G_TYPE_UINT);
 
 	g_type_class_add_private (object_class, sizeof (TrackerMinerFSPrivate));
 }
@@ -452,41 +452,41 @@ tracker_miner_fs_init (TrackerMinerFS *object)
 	priv->crawler = tracker_crawler_new ();
 
 	g_signal_connect (priv->crawler, "check-file",
-			  G_CALLBACK (crawler_check_file_cb),
-			  object);
+	                  G_CALLBACK (crawler_check_file_cb),
+	                  object);
 	g_signal_connect (priv->crawler, "check-directory",
-			  G_CALLBACK (crawler_check_directory_cb),
-			  object);
+	                  G_CALLBACK (crawler_check_directory_cb),
+	                  object);
 	g_signal_connect (priv->crawler, "check-directory-contents",
-			  G_CALLBACK (crawler_check_directory_contents_cb),
-			  object);
+	                  G_CALLBACK (crawler_check_directory_contents_cb),
+	                  object);
 	g_signal_connect (priv->crawler, "finished",
-			  G_CALLBACK (crawler_finished_cb),
-			  object);
+	                  G_CALLBACK (crawler_finished_cb),
+	                  object);
 
 	/* Set up the monitor */
 	priv->monitor = tracker_monitor_new ();
 
 	g_signal_connect (priv->monitor, "item-created",
-			  G_CALLBACK (monitor_item_created_cb),
-			  object);
+	                  G_CALLBACK (monitor_item_created_cb),
+	                  object);
 	g_signal_connect (priv->monitor, "item-updated",
-			  G_CALLBACK (monitor_item_updated_cb),
-			  object);
+	                  G_CALLBACK (monitor_item_updated_cb),
+	                  object);
 	g_signal_connect (priv->monitor, "item-deleted",
-			  G_CALLBACK (monitor_item_deleted_cb),
-			  object);
+	                  G_CALLBACK (monitor_item_deleted_cb),
+	                  object);
 	g_signal_connect (priv->monitor, "item-moved",
-			  G_CALLBACK (monitor_item_moved_cb),
-			  object);
+	                  G_CALLBACK (monitor_item_moved_cb),
+	                  object);
 
 	priv->quark_ignore_file = g_quark_from_static_string ("tracker-ignore-file");
 }
 
 static ProcessData *
 process_data_new (GFile                *file,
-		  GCancellable         *cancellable,
-		  TrackerSparqlBuilder *builder)
+                  GCancellable         *cancellable,
+                  TrackerSparqlBuilder *builder)
 {
 	ProcessData *data;
 
@@ -522,7 +522,7 @@ process_data_free (ProcessData *data)
 
 static ProcessData *
 process_data_find (TrackerMinerFS *fs,
-		   GFile          *file)
+                   GFile          *file)
 {
 	GList *l;
 
@@ -585,16 +585,16 @@ fs_finalize (GObject *object)
 
 static void
 fs_set_property (GObject      *object,
-		 guint         prop_id,
-		 const GValue *value,
-		 GParamSpec   *pspec)
+                 guint         prop_id,
+                 const GValue *value,
+                 GParamSpec   *pspec)
 {
 	TrackerMinerFS *fs = TRACKER_MINER_FS (object);
 
 	switch (prop_id) {
 	case PROP_THROTTLE:
 		tracker_miner_fs_set_throttle (TRACKER_MINER_FS (object),
-					       g_value_get_double (value));
+		                               g_value_get_double (value));
 		break;
 	case PROP_POOL_LIMIT:
 		fs->private->pool_limit = g_value_get_uint (value);
@@ -608,9 +608,9 @@ fs_set_property (GObject      *object,
 
 static void
 fs_get_property (GObject    *object,
-		 guint       prop_id,
-		 GValue     *value,
-		 GParamSpec *pspec)
+                 guint       prop_id,
+                 GValue     *value,
+                 GParamSpec *pspec)
 {
 	TrackerMinerFS *fs;
 
@@ -631,15 +631,15 @@ fs_get_property (GObject    *object,
 
 static gboolean
 fs_defaults (TrackerMinerFS *fs,
-	     GFile          *file)
+             GFile          *file)
 {
 	return TRUE;
 }
 
 static gboolean
 fs_contents_defaults (TrackerMinerFS *fs,
-		      GFile          *parent,
-		      GList          *children)
+                      GFile          *parent,
+                      GList          *children)
 {
 	return TRUE;
 }
@@ -654,9 +654,9 @@ miner_started (TrackerMiner *miner)
 	fs->private->been_started = TRUE;
 
 	g_object_set (miner,
-		      "progress", 0.0,
-		      "status", _("Initializing"),
-		      NULL);
+	              "progress", 0.0,
+	              "status", _("Initializing"),
+	              NULL);
 
 	crawl_directories_start (fs);
 }
@@ -665,9 +665,9 @@ static void
 miner_stopped (TrackerMiner *miner)
 {
 	g_object_set (miner,
-		      "progress", 1.0,
-		      "status", _("Idle"),
-		      NULL);
+	              "progress", 1.0,
+	              "status", _("Idle"),
+	              NULL);
 }
 
 static void
@@ -730,7 +730,7 @@ miner_writeback (TrackerMiner *miner, const GStrv subjects)
 
 static DirectoryData *
 directory_data_new (GFile    *file,
-		    gboolean  recurse)
+                    gboolean  recurse)
 {
 	DirectoryData *dd;
 
@@ -765,13 +765,13 @@ process_print_stats (TrackerMinerFS *fs)
 
 		g_message ("--------------------------------------------------");
 		g_message ("Total directories : %d (%d ignored)",
-			   fs->private->total_directories_found,
-			   fs->private->total_directories_ignored);
+		           fs->private->total_directories_found,
+		           fs->private->total_directories_ignored);
 		g_message ("Total files       : %d (%d ignored)",
-			   fs->private->total_files_found,
-			   fs->private->total_files_ignored);
+		           fs->private->total_files_found,
+		           fs->private->total_files_ignored);
 		g_message ("Total monitors    : %d",
-			   tracker_monitor_get_count (fs->private->monitor));
+		           tracker_monitor_get_count (fs->private->monitor));
 		g_message ("--------------------------------------------------\n");
 	}
 }
@@ -803,16 +803,16 @@ process_stop (TrackerMinerFS *fs)
 	g_message ("Idle");
 
 	g_object_set (fs,
-		      "progress", 1.0,
-		      "status", _("Idle"),
-		      NULL);
+	              "progress", 1.0,
+	              "status", _("Idle"),
+	              NULL);
 
 	g_signal_emit (fs, signals[FINISHED], 0,
-		       g_timer_elapsed (fs->private->timer, NULL),
-		       fs->private->total_directories_found,
-		       fs->private->total_directories_ignored,
-		       fs->private->total_files_found,
-		       fs->private->total_files_ignored);
+	               g_timer_elapsed (fs->private->timer, NULL),
+	               fs->private->total_directories_found,
+	               fs->private->total_directories_ignored,
+	               fs->private->total_files_found,
+	               fs->private->total_files_ignored);
 
 	if (fs->private->timer) {
 		g_timer_destroy (fs->private->timer);
@@ -829,7 +829,7 @@ process_stop (TrackerMinerFS *fs)
 
 static ItemMovedData *
 item_moved_data_new (GFile *file,
-		     GFile *source_file)
+                     GFile *source_file)
 {
 	ItemMovedData *data;
 
@@ -907,8 +907,8 @@ sparql_query_cb (GObject      *object,
 
 static void
 item_add_or_update_cb (TrackerMinerFS *fs,
-		       ProcessData    *data,
-		       const GError   *error)
+                       ProcessData    *data,
+                       const GError   *error)
 {
 	gchar *uri;
 
@@ -932,13 +932,13 @@ item_add_or_update_cb (TrackerMinerFS *fs,
 		g_debug ("Adding item '%s'", uri);
 
 		full_sparql = g_strdup_printf ("DROP GRAPH <%s> %s",
-					       uri, tracker_sparql_builder_get_result (data->builder));
+		                               uri, tracker_sparql_builder_get_result (data->builder));
 
 		tracker_miner_execute_batch_update (TRACKER_MINER (fs),
-						    full_sparql,
-						    NULL,
-						    sparql_update_cb,
-						    data);
+		                                    full_sparql,
+		                                    NULL,
+		                                    sparql_update_cb,
+		                                    data);
 		g_free (full_sparql);
 	}
 
@@ -947,7 +947,7 @@ item_add_or_update_cb (TrackerMinerFS *fs,
 
 static gboolean
 item_add_or_update (TrackerMinerFS *fs,
-		    GFile          *file)
+                    GFile          *file)
 {
 	TrackerMinerFSPrivate *priv;
 	TrackerSparqlBuilder *sparql;
@@ -966,8 +966,8 @@ item_add_or_update (TrackerMinerFS *fs,
 	priv->processing_pool = g_list_prepend (priv->processing_pool, data);
 
 	g_signal_emit (fs, signals[PROCESS_FILE], 0,
-		       file, sparql, cancellable,
-		       &processing);
+	               file, sparql, cancellable,
+	               &processing);
 
 	if (!processing) {
 		/* Re-fetch data, since it might have been
@@ -980,9 +980,9 @@ item_add_or_update (TrackerMinerFS *fs,
 
 			uri = g_file_get_uri (file);
 			g_critical ("%s has returned FALSE in ::process-file for '%s', "
-				    "but it seems that this file has been processed through "
-				    "tracker_miner_fs_notify_file(), this is an "
-				    "implementation error", G_OBJECT_TYPE_NAME (fs), uri);
+			            "but it seems that this file has been processed through "
+			            "tracker_miner_fs_notify_file(), this is an "
+			            "implementation error", G_OBJECT_TYPE_NAME (fs), uri);
 			g_free (uri);
 		} else {
 			priv->processing_pool = g_list_remove (priv->processing_pool, data);
@@ -1007,7 +1007,7 @@ item_add_or_update (TrackerMinerFS *fs,
 
 static gboolean
 item_query_exists (TrackerMinerFS *miner,
-		   GFile          *file)
+                   GFile          *file)
 {
 	gboolean   result;
 	gchar     *sparql, *uri;
@@ -1021,10 +1021,10 @@ item_query_exists (TrackerMinerFS *miner,
 	data.value = FALSE;
 
 	tracker_miner_execute_sparql (TRACKER_MINER (miner),
-				      sparql,
-				      NULL,
-				      sparql_query_cb,
-				      &data);
+	                              sparql,
+	                              NULL,
+	                              sparql_query_cb,
+	                              &data);
 
 	g_main_loop_run (data.main_loop);
 	result = data.value;
@@ -1039,7 +1039,7 @@ item_query_exists (TrackerMinerFS *miner,
 
 static gboolean
 item_remove (TrackerMinerFS *fs,
-	     GFile          *file)
+             GFile          *file)
 {
 	GString *sparql;
 	gchar *uri, *slash_uri;
@@ -1048,7 +1048,7 @@ item_remove (TrackerMinerFS *fs,
 	uri = g_file_get_uri (file);
 
 	g_debug ("Removing item: '%s' (Deleted from filesystem)",
-		 uri);
+	         uri);
 
 	if (!item_query_exists (fs, file)) {
 		g_debug ("  File does not exist anyway (uri:'%s')", uri);
@@ -1066,23 +1066,23 @@ item_remove (TrackerMinerFS *fs,
 
 	/* Delete all children */
 	g_string_append_printf (sparql,
-				"DELETE FROM <%s> { ?u a rdfs:Resource } "
-				"WHERE { ?u nfo:belongsToContainer ?p . FILTER (fn:starts-with (?p, \"%s\")) } ",
-				uri, slash_uri);
+	                        "DELETE FROM <%s> { ?u a rdfs:Resource } "
+	                        "WHERE { ?u nfo:belongsToContainer ?p . FILTER (fn:starts-with (?p, \"%s\")) } ",
+	                        uri, slash_uri);
 
 	/* Delete resource itself */
 	g_string_append_printf (sparql,
-				"DELETE FROM <%s> { <%s> a rdfs:Resource }",
-				uri, uri);
+	                        "DELETE FROM <%s> { <%s> a rdfs:Resource }",
+	                        uri, uri);
 
 	data = process_data_new (file, NULL, NULL);
 	fs->private->processing_pool = g_list_prepend (fs->private->processing_pool, data);
 
 	tracker_miner_execute_batch_update (TRACKER_MINER (fs),
-					    sparql->str,
-					    NULL,
-					    sparql_update_cb,
-					    data);
+	                                    sparql->str,
+	                                    NULL,
+	                                    sparql_update_cb,
+	                                    data);
 
 	g_string_free (sparql, TRUE);
 	g_free (slash_uri);
@@ -1154,15 +1154,15 @@ item_writeback (TrackerMinerFS *fs,
 		 * Or we add support for DELETE to TrackerSparqlBuilder ofcrs */
 
 		query = g_strdup_printf ("DELETE FROM <%s> { <%s> "
-		                           "nfo:fileSize ?unknown1 ;\n\t"
-		                           "nfo:fileLastModified ?unknown2 ;\n\t"
-		                           "nfo:fileLastAccessed ?unknown3 ;\n\t"
-		                           "nie:mimeType ?unknown4 \n"
+		                         "nfo:fileSize ?unknown1 ;\n\t"
+		                         "nfo:fileLastModified ?unknown2 ;\n\t"
+		                         "nfo:fileLastAccessed ?unknown3 ;\n\t"
+		                         "nie:mimeType ?unknown4 \n"
 		                         "} WHERE { <%s> "
-		                           "nfo:fileSize ?unknown1 ;\n\t"
-		                           "nfo:fileLastModified ?unknown2 ;\n\t"
-		                           "nfo:fileLastAccessed ?unknown3 ;\n\t"
-		                           "nie:mimeType ?unknown4 \n"
+		                         "nfo:fileSize ?unknown1 ;\n\t"
+		                         "nfo:fileLastModified ?unknown2 ;\n\t"
+		                         "nfo:fileLastAccessed ?unknown3 ;\n\t"
+		                         "nie:mimeType ?unknown4 \n"
 		                         "} \n %s",
 		                         uri, uri, uri,
 		                         tracker_sparql_builder_get_result (sparql));
@@ -1210,8 +1210,8 @@ item_update_uri_recursively_cb (GObject      *object,
 
 				if (!g_str_has_prefix (*child_source_uri, data->source_uri)) {
 					g_warning ("Child URI '%s' does not start with parent URI '%s'",
-						   *child_source_uri,
-						   data->source_uri);
+					           *child_source_uri,
+					           data->source_uri);
 					continue;
 				}
 
@@ -1235,9 +1235,9 @@ item_update_uri_recursively_cb (GObject      *object,
 
 static void
 item_update_uri_recursively (TrackerMinerFS    *fs,
-			     RecursiveMoveData *move_data,
-			     const gchar       *source_uri,
-			     const gchar       *uri)
+                             RecursiveMoveData *move_data,
+                             const gchar       *source_uri,
+                             const gchar       *uri)
 {
 	gchar *sparql;
 
@@ -1247,17 +1247,17 @@ item_update_uri_recursively (TrackerMinerFS    *fs,
 
 	sparql = g_strdup_printf ("SELECT ?child WHERE { ?child nfo:belongsToContainer <%s> }", source_uri);
 	tracker_miner_execute_sparql (TRACKER_MINER (fs),
-				      sparql,
-				      NULL,
-				      item_update_uri_recursively_cb,
-				      move_data);
+	                              sparql,
+	                              NULL,
+	                              item_update_uri_recursively_cb,
+	                              move_data);
 	g_free (sparql);
 }
 
 static gboolean
 item_move (TrackerMinerFS *fs,
-	   GFile          *file,
-	   GFile          *source_file)
+           GFile          *file,
+           GFile          *source_file)
 {
 	gchar     *uri, *source_uri, *escaped_filename;
 	GFileInfo *file_info;
@@ -1283,9 +1283,9 @@ item_move (TrackerMinerFS *fs,
 	}
 
 	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-				       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-				       NULL, NULL);
+	                               G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL, NULL);
 
 	if (!file_info) {
 		gboolean retval;
@@ -1300,14 +1300,14 @@ item_move (TrackerMinerFS *fs,
 	}
 
 	g_debug ("Moving item from '%s' to '%s'",
-		 source_uri,
-		 uri);
+	         source_uri,
+	         uri);
 
 	sparql = g_string_new ("");
 
 	g_string_append_printf (sparql,
-				"DELETE FROM <%s> { <%s> nfo:fileName ?o } WHERE { <%s> nfo:fileName ?o }",
-				source_uri, source_uri, source_uri);
+	                        "DELETE FROM <%s> { <%s> nfo:fileName ?o } WHERE { <%s> nfo:fileName ?o }",
+	                        source_uri, source_uri, source_uri);
 
 	g_string_append_printf (sparql, " INSERT INTO <%s> {", uri);
 
@@ -1333,10 +1333,10 @@ item_move (TrackerMinerFS *fs,
 	fs->private->processing_pool = g_list_prepend (fs->private->processing_pool, data);
 
 	tracker_miner_execute_batch_update (TRACKER_MINER (fs),
-					    sparql->str,
-					    NULL,
-					    sparql_update_cb,
-					    data);
+	                                    sparql->str,
+	                                    NULL,
+	                                    sparql_update_cb,
+	                                    data);
 
 	g_free (uri);
 	g_free (source_uri);
@@ -1360,8 +1360,8 @@ check_writeback (TrackerMinerFS *fs, GFile *queue_file)
 
 static gint
 item_queue_get_next_file (TrackerMinerFS  *fs,
-			  GFile          **file,
-			  GFile          **source_file)
+                          GFile          **file,
+                          GFile          **source_file)
 {
 	ItemMovedData *data;
 	GFile *queue_file;
@@ -1534,8 +1534,8 @@ item_queue_handlers_cb (gpointer user_data)
 
 static guint
 _tracker_idle_add (TrackerMinerFS *fs,
-		   GSourceFunc     func,
-		   gpointer        user_data)
+                   GSourceFunc     func,
+                   gpointer        user_data)
 {
 	guint interval;
 
@@ -1578,13 +1578,13 @@ item_queue_handlers_set_up (TrackerMinerFS *fs)
 
 	fs->private->item_queues_handler_id =
 		_tracker_idle_add (fs,
-				   item_queue_handlers_cb,
-				   fs);
+		                   item_queue_handlers_cb,
+		                   fs);
 }
 
 static gboolean
 should_change_index_for_file (TrackerMinerFS *fs,
-			      GFile          *file)
+                              GFile          *file)
 {
 	gboolean            uptodate;
 	GFileInfo          *file_info;
@@ -1595,10 +1595,10 @@ should_change_index_for_file (TrackerMinerFS *fs,
 	SparqlQueryData     data;
 
 	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_TIME_MODIFIED,
-				       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-				       NULL,
-				       NULL);
+	                               G_FILE_ATTRIBUTE_TIME_MODIFIED,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL,
+	                               NULL);
 	if (!file_info) {
 		/* NOTE: We return TRUE here because we want to update the DB
 		 * about this file, not because we want to index it.
@@ -1616,21 +1616,21 @@ should_change_index_for_file (TrackerMinerFS *fs,
 
 	query = g_strdup_printf ("SELECT ?file { ?file nfo:fileLastModified \"%04d-%02d-%02dT%02d:%02d:%02dZ\" . FILTER (?file = <%s>) }",
 	                         t.tm_year + 1900,
-				 t.tm_mon + 1,
-				 t.tm_mday,
-				 t.tm_hour,
-				 t.tm_min,
-				 t.tm_sec,
-				 uri);
+	                         t.tm_mon + 1,
+	                         t.tm_mday,
+	                         t.tm_hour,
+	                         t.tm_min,
+	                         t.tm_sec,
+	                         uri);
 
 	data.main_loop = g_main_loop_new (NULL, FALSE);
 	data.value = FALSE;
 
 	tracker_miner_execute_sparql (TRACKER_MINER (fs),
-						      query,
-						      NULL,
-						      sparql_query_cb,
-						      &data);
+	                              query,
+	                              NULL,
+	                              sparql_query_cb,
+	                              &data);
 
 	g_main_loop_run (data.main_loop);
 	uptodate = data.value;
@@ -1652,8 +1652,8 @@ should_change_index_for_file (TrackerMinerFS *fs,
 
 static gboolean
 should_check_file (TrackerMinerFS *fs,
-		   GFile          *file,
-		   gboolean        is_dir)
+                   GFile          *file,
+                   gboolean        is_dir)
 {
 	gboolean should_check;
 
@@ -1668,8 +1668,8 @@ should_check_file (TrackerMinerFS *fs,
 
 static gboolean
 should_process_file (TrackerMinerFS *fs,
-		     GFile          *file,
-		     gboolean        is_dir)
+                     GFile          *file,
+                     gboolean        is_dir)
 {
 	if (!should_check_file (fs, file, is_dir)) {
 		return FALSE;
@@ -1681,9 +1681,9 @@ should_process_file (TrackerMinerFS *fs,
 
 static void
 monitor_item_created_cb (TrackerMonitor *monitor,
-			 GFile		*file,
-			 gboolean	 is_directory,
-			 gpointer	 user_data)
+                         GFile          *file,
+                         gboolean        is_directory,
+                         gpointer        user_data)
 {
 	TrackerMinerFS *fs;
 	gboolean should_process = TRUE;
@@ -1695,16 +1695,16 @@ monitor_item_created_cb (TrackerMonitor *monitor,
 	path = g_file_get_path (file);
 
 	g_debug ("%s:'%s' (%s) (create monitor event or user request)",
-		 should_process ? "Found " : "Ignored",
-		 path,
-		 is_directory ? "DIR" : "FILE");
+	         should_process ? "Found " : "Ignored",
+	         path,
+	         is_directory ? "DIR" : "FILE");
 
 	if (should_process) {
 		if (is_directory) {
 			tracker_miner_fs_add_directory (fs, file, TRUE);
 		} else {
 			g_queue_push_tail (fs->private->items_created,
-					   g_object_ref (file));
+			                   g_object_ref (file));
 
 			item_queue_handlers_set_up (fs);
 		}
@@ -1715,9 +1715,9 @@ monitor_item_created_cb (TrackerMonitor *monitor,
 
 static void
 monitor_item_updated_cb (TrackerMonitor *monitor,
-			 GFile		*file,
-			 gboolean	 is_directory,
-			 gpointer	 user_data)
+                         GFile          *file,
+                         gboolean        is_directory,
+                         gpointer        user_data)
 {
 	TrackerMinerFS *fs;
 	gboolean should_process;
@@ -1728,14 +1728,14 @@ monitor_item_updated_cb (TrackerMonitor *monitor,
 
 	path = g_file_get_path (file);
 
- 	g_debug ("%s:'%s' (%s) (update monitor event or user request)",
-		 should_process ? "Found " : "Ignored",
-		 path,
-		 is_directory ? "DIR" : "FILE");
+	g_debug ("%s:'%s' (%s) (update monitor event or user request)",
+	         should_process ? "Found " : "Ignored",
+	         path,
+	         is_directory ? "DIR" : "FILE");
 
 	if (should_process) {
 		g_queue_push_tail (fs->private->items_updated,
-				   g_object_ref (file));
+		                   g_object_ref (file));
 
 		item_queue_handlers_set_up (fs);
 	}
@@ -1745,9 +1745,9 @@ monitor_item_updated_cb (TrackerMonitor *monitor,
 
 static void
 monitor_item_deleted_cb (TrackerMonitor *monitor,
-			 GFile		*file,
-			 gboolean	 is_directory,
-			 gpointer	 user_data)
+                         GFile          *file,
+                         gboolean        is_directory,
+                         gpointer        user_data)
 {
 	TrackerMinerFS *fs;
 	gboolean should_process;
@@ -1758,13 +1758,13 @@ monitor_item_deleted_cb (TrackerMonitor *monitor,
 	path = g_file_get_path (file);
 
 	g_debug ("%s:'%s' (%s) (delete monitor event or user request)",
-		 should_process ? "Found " : "Ignored",
-		 path,
-		 is_directory ? "DIR" : "FILE");
+	         should_process ? "Found " : "Ignored",
+	         path,
+	         is_directory ? "DIR" : "FILE");
 
 	if (should_process) {
 		g_queue_push_tail (fs->private->items_deleted,
-				   g_object_ref (file));
+		                   g_object_ref (file));
 
 		item_queue_handlers_set_up (fs);
 	}
@@ -1776,8 +1776,8 @@ monitor_item_deleted_cb (TrackerMonitor *monitor,
 	 * iterate if it is in there.
 	 */
 	l = g_list_find_custom (fs->private->directories,
-				path,
-				(GCompareFunc) g_strcmp0);
+	                        path,
+	                        (GCompareFunc) g_strcmp0);
 
 	/* Make sure we don't remove the current device we are
 	 * processing, this is because we do this same clean up later
@@ -1795,11 +1795,11 @@ monitor_item_deleted_cb (TrackerMonitor *monitor,
 
 static void
 monitor_item_moved_cb (TrackerMonitor *monitor,
-		       GFile	      *file,
-		       GFile	      *other_file,
-		       gboolean        is_directory,
-		       gboolean        is_source_monitored,
-		       gpointer        user_data)
+                       GFile          *file,
+                       GFile          *other_file,
+                       gboolean        is_directory,
+                       gboolean        is_source_monitored,
+                       gpointer        user_data)
 {
 	TrackerMinerFS *fs;
 
@@ -1812,7 +1812,7 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
 			path = g_file_get_path (other_file);
 
 			g_debug ("Not in store:'?'->'%s' (DIR) (move monitor event, source unknown)",
-				 path);
+			         path);
 
 			/* If the source is not monitored, we need to crawl it. */
 			tracker_miner_fs_add_directory (fs, other_file, TRUE);
@@ -1831,11 +1831,11 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
 		should_process_other = should_check_file (fs, other_file, is_directory);
 
 		g_debug ("%s:'%s'->'%s':%s (%s) (move monitor event or user request)",
-			 source_stored ? "In store" : "Not in store",
-			 path,
-			 other_path,
-			 should_process_other ? "Found " : "Ignored",
-			 is_directory ? "DIR" : "FILE");
+		         source_stored ? "In store" : "Not in store",
+		         path,
+		         other_path,
+		         should_process_other ? "Found " : "Ignored",
+		         is_directory ? "DIR" : "FILE");
 
 		/* FIXME: Guessing this soon the queue the event should pertain
 		 *        to could introduce race conditions if events from other
@@ -1849,12 +1849,12 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
 			/* Source file was not stored, check dest file as new */
 			if (!is_directory) {
 				g_queue_push_tail (fs->private->items_created,
-						   g_object_ref (other_file));
+				                   g_object_ref (other_file));
 
 				item_queue_handlers_set_up (fs);
 			} else {
 				g_debug ("Not in store:'?'->'%s' (DIR) (move monitor event, source monitored)",
-					 path);
+				         path);
 
 				tracker_miner_fs_add_directory (fs, other_file, TRUE);
 			}
@@ -1866,7 +1866,7 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
 		} else {
 			/* Move old file to new file */
 			g_queue_push_tail (fs->private->items_moved,
-					   item_moved_data_new (other_file, file));
+			                   item_moved_data_new (other_file, file));
 
 			item_queue_handlers_set_up (fs);
 		}
@@ -1878,8 +1878,8 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
 
 static gboolean
 crawler_check_file_cb (TrackerCrawler *crawler,
-		       GFile	      *file,
-		       gpointer        user_data)
+                       GFile          *file,
+                       gpointer        user_data)
 {
 	TrackerMinerFS *fs = user_data;
 
@@ -1888,8 +1888,8 @@ crawler_check_file_cb (TrackerCrawler *crawler,
 
 static gboolean
 crawler_check_directory_cb (TrackerCrawler *crawler,
-			    GFile	   *file,
-			    gpointer	    user_data)
+                            GFile          *file,
+                            gpointer        user_data)
 {
 	TrackerMinerFS *fs = user_data;
 	gboolean should_check, should_change_index;
@@ -1904,8 +1904,8 @@ crawler_check_directory_cb (TrackerCrawler *crawler,
 		 * actually changed, hence this flag.
 		 */
 		g_object_set_qdata (G_OBJECT (file),
-				    fs->private->quark_ignore_file,
-				    GINT_TO_POINTER (TRUE));
+		                    fs->private->quark_ignore_file,
+		                    GINT_TO_POINTER (TRUE));
 	}
 
 	g_signal_emit (fs, signals[MONITOR_DIRECTORY], 0, file, &add_monitor);
@@ -1930,9 +1930,9 @@ crawler_check_directory_cb (TrackerCrawler *crawler,
 
 static gboolean
 crawler_check_directory_contents_cb (TrackerCrawler *crawler,
-				     GFile          *parent,
-				     GList          *children,
-				     gpointer        user_data)
+                                     GFile          *parent,
+                                     GList          *children,
+                                     gpointer        user_data)
 {
 	TrackerMinerFS *fs = user_data;
 	gboolean process;
@@ -1944,13 +1944,13 @@ crawler_check_directory_contents_cb (TrackerCrawler *crawler,
 
 static void
 crawler_finished_cb (TrackerCrawler *crawler,
-		     GQueue         *found,
-		     gboolean        was_interrupted,
-		     guint	     directories_found,
-		     guint	     directories_ignored,
-		     guint	     files_found,
-		     guint	     files_ignored,
-		     gpointer	     user_data)
+                     GQueue         *found,
+                     gboolean        was_interrupted,
+                     guint           directories_found,
+                     guint           directories_ignored,
+                     guint           files_found,
+                     guint           files_ignored,
+                     gpointer        user_data)
 {
 	TrackerMinerFS *fs = user_data;
 	GList *l;
@@ -1978,14 +1978,14 @@ crawler_finished_cb (TrackerCrawler *crawler,
 	fs->private->total_files_ignored += files_ignored;
 
 	g_message ("%s crawling files after %2.2f seconds",
-		   was_interrupted ? "Stopped" : "Finished",
-		   g_timer_elapsed (fs->private->timer, NULL));
+	           was_interrupted ? "Stopped" : "Finished",
+	           g_timer_elapsed (fs->private->timer, NULL));
 	g_message ("  Found %d directories, ignored %d directories",
-		   directories_found,
-		   directories_ignored);
+	           directories_found,
+	           directories_ignored);
 	g_message ("  Found %d files, ignored %d files",
-		   files_found,
-		   files_ignored);
+	           files_found,
+	           files_ignored);
 
 	directory_data_free (fs->private->current_directory);
 	fs->private->current_directory = NULL;
@@ -2018,7 +2018,7 @@ crawl_directories_cb (gpointer user_data)
 
 	fs->private->current_directory = fs->private->directories->data;
 	fs->private->directories = g_list_remove (fs->private->directories,
-						  fs->private->current_directory);
+	                                          fs->private->current_directory);
 
 	path = g_file_get_path (fs->private->current_directory->file);
 
@@ -2035,8 +2035,8 @@ crawl_directories_cb (gpointer user_data)
 	g_free (path);
 
 	if (tracker_crawler_start (fs->private->crawler,
-				   fs->private->current_directory->file,
-				   fs->private->current_directory->recurse)) {
+	                           fs->private->current_directory->file,
+	                           fs->private->current_directory->recurse)) {
 		/* Crawler when restart the idle function when done */
 		fs->private->is_crawling = TRUE;
 		fs->private->crawl_directories_id = 0;
@@ -2107,22 +2107,22 @@ crawl_directories_stop (TrackerMinerFS *fs)
  **/
 void
 tracker_miner_fs_add_directory (TrackerMinerFS *fs,
-				GFile          *file,
-				gboolean        recurse)
+                                GFile          *file,
+                                gboolean        recurse)
 {
 	g_return_if_fail (TRACKER_IS_MINER_FS (fs));
 	g_return_if_fail (G_IS_FILE (file));
 
 	fs->private->directories =
 		g_list_append (fs->private->directories,
-			       directory_data_new (file, recurse));
+		               directory_data_new (file, recurse));
 
 	crawl_directories_start (fs);
 }
 
 static void
 check_files_removal (GQueue *queue,
-		     GFile  *parent)
+                     GFile  *parent)
 {
 	GList *l;
 
@@ -2153,7 +2153,7 @@ check_files_removal (GQueue *queue,
  **/
 gboolean
 tracker_miner_fs_remove_directory (TrackerMinerFS *fs,
-				   GFile          *file)
+                                   GFile          *file)
 {
 	TrackerMinerFSPrivate *priv;
 	gboolean return_val = FALSE;
@@ -2227,7 +2227,7 @@ tracker_miner_fs_remove_directory (TrackerMinerFS *fs,
  **/
 void
 tracker_miner_fs_set_throttle (TrackerMinerFS *fs,
-			       gdouble         throttle)
+                               gdouble         throttle)
 {
 	g_return_if_fail (TRACKER_IS_MINER_FS (fs));
 
@@ -2245,8 +2245,8 @@ tracker_miner_fs_set_throttle (TrackerMinerFS *fs,
 
 		fs->private->item_queues_handler_id =
 			_tracker_idle_add (fs,
-					   item_queue_handlers_cb,
-					   fs);
+			                   item_queue_handlers_cb,
+			                   fs);
 	}
 
 	if (fs->private->crawl_directories_id) {
@@ -2285,8 +2285,8 @@ tracker_miner_fs_get_throttle (TrackerMinerFS *fs)
  **/
 void
 tracker_miner_fs_notify_file (TrackerMinerFS *fs,
-			      GFile          *file,
-			      const GError   *error)
+                              GFile          *file,
+                              const GError   *error)
 {
 	ProcessData *data;
 
@@ -2300,11 +2300,11 @@ tracker_miner_fs_notify_file (TrackerMinerFS *fs,
 
 		uri = g_file_get_uri (file);
 		g_critical ("%s has notified that file '%s' has been processed, "
-			    "but that file was not in the processing queue. "
-			    "This is an implementation error, please ensure that "
-			    "tracker_miner_fs_notify_file() is called on the right "
-			    "file and that the ::process-file signal didn't return "
-			    "FALSE for it", G_OBJECT_TYPE_NAME (fs), uri);
+		            "but that file was not in the processing queue. "
+		            "This is an implementation error, please ensure that "
+		            "tracker_miner_fs_notify_file() is called on the right "
+		            "file and that the ::process-file signal didn't return "
+		            "FALSE for it", G_OBJECT_TYPE_NAME (fs), uri);
 		g_free (uri);
 
 		return;
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index a856f41..0aa47c8 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -70,41 +70,41 @@ typedef struct {
 	TrackerMinerClass parent;
 
 	gboolean (* check_file)            (TrackerMinerFS       *fs,
-					    GFile                *file);
+	                                    GFile                *file);
 	gboolean (* check_directory)       (TrackerMinerFS       *fs,
-					    GFile                *file);
+	                                    GFile                *file);
 	gboolean (* check_directory_contents) (TrackerMinerFS    *fs,
-					       GFile             *parent,
-					       GList             *children);
+	                                       GFile             *parent,
+	                                       GList             *children);
 	gboolean (* process_file)          (TrackerMinerFS       *fs,
-					    GFile                *file,
-					    TrackerSparqlBuilder *builder,
-					    GCancellable         *cancellable);
+	                                    GFile                *file,
+	                                    TrackerSparqlBuilder *builder,
+	                                    GCancellable         *cancellable);
 	gboolean (* writeback_file)        (TrackerMinerFS       *fs,
-					    GFile                *file,
-					    TrackerSparqlBuilder *builder,
-					    GCancellable         *cancellable);
+	                                    GFile                *file,
+	                                    TrackerSparqlBuilder *builder,
+	                                    GCancellable         *cancellable);
 
 	gboolean (* monitor_directory)     (TrackerMinerFS       *fs,
-					    GFile                *file);
+	                                    GFile                *file);
 	void     (* finished)              (TrackerMinerFS       *fs);
 } TrackerMinerFSClass;
 
 GType    tracker_miner_fs_get_type         (void) G_GNUC_CONST;
 
 void     tracker_miner_fs_add_directory    (TrackerMinerFS *fs,
-					    GFile          *file,
-					    gboolean        recurse);
+                                            GFile          *file,
+                                            gboolean        recurse);
 gboolean tracker_miner_fs_remove_directory (TrackerMinerFS *fs,
-					    GFile          *file);
+                                            GFile          *file);
 
 void     tracker_miner_fs_set_throttle     (TrackerMinerFS *fs,
-					    gdouble         throttle);
+                                            gdouble         throttle);
 gdouble  tracker_miner_fs_get_throttle     (TrackerMinerFS *fs);
 
 void     tracker_miner_fs_notify_file      (TrackerMinerFS *fs,
-					    GFile          *file,
-					    const GError   *error);
+                                            GFile          *file,
+                                            const GError   *error);
 
 G_END_DECLS
 
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 0ca4e76..61887b7 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -102,15 +102,15 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
 	 **/
 	signals [MINER_PROGRESS] =
 		g_signal_new ("miner-progress",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_progress),
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_STRING_DOUBLE,
-			      G_TYPE_NONE, 3,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING,
-			      G_TYPE_DOUBLE);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_progress),
+		              NULL, NULL,
+		              tracker_marshal_VOID__STRING_STRING_DOUBLE,
+		              G_TYPE_NONE, 3,
+		              G_TYPE_STRING,
+		              G_TYPE_STRING,
+		              G_TYPE_DOUBLE);
 	/**
 	 * TrackerMinerManager::miner-paused
 	 * @manager: the #TrackerMinerManager
@@ -121,13 +121,13 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
 	 **/
 	signals [MINER_PAUSED] =
 		g_signal_new ("miner-paused",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_paused),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_STRING);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_paused),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_STRING);
 	/**
 	 * TrackerMinerManager::miner-resumed
 	 * @manager: the #TrackerMinerManager
@@ -138,13 +138,13 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
 	 **/
 	signals [MINER_RESUMED] =
 		g_signal_new ("miner-resumed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_resumed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_STRING);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_resumed),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_STRING);
 	/**
 	 * TrackerMinerManager::miner-activated
 	 * @manager: the #TrackerMinerManager
@@ -156,13 +156,13 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
 	 **/
 	signals [MINER_ACTIVATED] =
 		g_signal_new ("miner-activated",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_activated),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_STRING);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_activated),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_STRING);
 	/**
 	 * TrackerMinerManager::miner-deactivated
 	 * @manager: the #TrackerMinerManager
@@ -174,20 +174,20 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
 	 **/
 	signals [MINER_DEACTIVATED] =
 		g_signal_new ("miner-deactivated",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_deactivated),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_STRING);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerManagerClass, miner_deactivated),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_STRING);
 
 	g_type_class_add_private (object_class, sizeof (TrackerMinerManagerPrivate));
 }
 
 static DBusGProxy *
 find_miner_proxy (TrackerMinerManager *manager,
-		  const gchar         *name)
+                  const gchar         *name)
 {
 	TrackerMinerManagerPrivate *priv;
 	GHashTableIter iter;
@@ -207,10 +207,10 @@ find_miner_proxy (TrackerMinerManager *manager,
 
 static void
 name_owner_changed_cb (DBusGProxy  *proxy,
-		       const gchar *name,
-		       const gchar *old_owner,
-		       const gchar *new_owner,
-		       gpointer     user_data)
+                       const gchar *name,
+                       const gchar *old_owner,
+                       const gchar *new_owner,
+                       gpointer     user_data)
 {
 	TrackerMinerManager *manager = user_data;
 	TrackerMinerManagerPrivate *priv;
@@ -228,9 +228,9 @@ name_owner_changed_cb (DBusGProxy  *proxy,
 
 static void
 miner_progress_changed (DBusGProxy  *proxy,
-			const gchar *status,
-			gdouble      progress,
-			gpointer     user_data)
+                        const gchar *status,
+                        gdouble      progress,
+                        gpointer     user_data)
 {
 	TrackerMinerManager *manager = user_data;
 	TrackerMinerManagerPrivate *priv;
@@ -245,7 +245,7 @@ miner_progress_changed (DBusGProxy  *proxy,
 
 static void
 miner_paused (DBusGProxy *proxy,
-	      gpointer    user_data)
+              gpointer    user_data)
 {
 	TrackerMinerManager *manager = user_data;
 	TrackerMinerManagerPrivate *priv;
@@ -260,7 +260,7 @@ miner_paused (DBusGProxy *proxy,
 
 static void
 miner_resumed (DBusGProxy *proxy,
-	       gpointer    user_data)
+               gpointer    user_data)
 {
 	TrackerMinerManager *manager = user_data;
 	TrackerMinerManagerPrivate *priv;
@@ -286,40 +286,40 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 
 	if (!priv->connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 	}
 
 	priv->proxy = dbus_g_proxy_new_for_name (priv->connection,
-						 DBUS_SERVICE_DBUS,
-						 DBUS_PATH_DBUS,
-						 DBUS_INTERFACE_DBUS);
+	                                         DBUS_SERVICE_DBUS,
+	                                         DBUS_PATH_DBUS,
+	                                         DBUS_INTERFACE_DBUS);
 
 	if (!priv->proxy) {
 		g_critical ("Could not get proxy for D-Bus service");
 	}
 
 	priv->miner_proxies = g_hash_table_new_full (NULL, NULL,
-						     (GDestroyNotify) g_object_unref,
-						     (GDestroyNotify) g_free);
+	                                             (GDestroyNotify) g_object_unref,
+	                                             (GDestroyNotify) g_free);
 
 	dbus_g_object_register_marshaller (tracker_marshal_VOID__STRING_DOUBLE,
-					   G_TYPE_NONE,
-					   G_TYPE_STRING,
-					   G_TYPE_DOUBLE,
-					   G_TYPE_INVALID);
+	                                   G_TYPE_NONE,
+	                                   G_TYPE_STRING,
+	                                   G_TYPE_DOUBLE,
+	                                   G_TYPE_INVALID);
 
 	dbus_g_proxy_add_signal (priv->proxy,
-				 "NameOwnerChanged",
-				 G_TYPE_STRING,
-				 G_TYPE_STRING,
-				 G_TYPE_STRING,
-				 G_TYPE_INVALID);
+	                         "NameOwnerChanged",
+	                         G_TYPE_STRING,
+	                         G_TYPE_STRING,
+	                         G_TYPE_STRING,
+	                         G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (priv->proxy,
-				     "NameOwnerChanged",
-				     G_CALLBACK (name_owner_changed_cb),
-				     manager, NULL);
+	                             "NameOwnerChanged",
+	                             G_CALLBACK (name_owner_changed_cb),
+	                             manager, NULL);
 
 	initialize_miners_data (manager);
 
@@ -330,30 +330,30 @@ tracker_miner_manager_init (TrackerMinerManager *manager)
 		data = m->data;
 
 		proxy = dbus_g_proxy_new_for_name (priv->connection,
-						   data->dbus_name,
-						   data->dbus_path,
-						   TRACKER_MINER_DBUS_INTERFACE);
+		                                   data->dbus_name,
+		                                   data->dbus_path,
+		                                   TRACKER_MINER_DBUS_INTERFACE);
 
 		dbus_g_proxy_add_signal (proxy,
-					 "Progress",
-					 G_TYPE_STRING,
-					 G_TYPE_DOUBLE,
-					 G_TYPE_INVALID);
+		                         "Progress",
+		                         G_TYPE_STRING,
+		                         G_TYPE_DOUBLE,
+		                         G_TYPE_INVALID);
 		dbus_g_proxy_add_signal (proxy, "Paused", G_TYPE_INVALID);
 		dbus_g_proxy_add_signal (proxy, "Resumed", G_TYPE_INVALID);
 
 		dbus_g_proxy_connect_signal (proxy,
-					     "Progress",
-					     G_CALLBACK (miner_progress_changed),
-					     manager, NULL);
+		                             "Progress",
+		                             G_CALLBACK (miner_progress_changed),
+		                             manager, NULL);
 		dbus_g_proxy_connect_signal (proxy,
-					     "Paused",
-					     G_CALLBACK (miner_paused),
-					     manager, NULL);
+		                             "Paused",
+		                             G_CALLBACK (miner_paused),
+		                             manager, NULL);
 		dbus_g_proxy_connect_signal (proxy,
-					     "Resumed",
-					     G_CALLBACK (miner_resumed),
-					     manager, NULL);
+		                             "Resumed",
+		                             G_CALLBACK (miner_resumed),
+		                             manager, NULL);
 
 		g_hash_table_insert (priv->miner_proxies, proxy, g_strdup (data->dbus_name));
 	}
@@ -427,11 +427,11 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
 	}
 
 	if (!dbus_g_proxy_call (priv->proxy, "ListNames", &error,
-				G_TYPE_INVALID,
-				G_TYPE_STRV, &result,
-				G_TYPE_INVALID)) {
+	                        G_TYPE_INVALID,
+	                        G_TYPE_STRV, &result,
+	                        G_TYPE_INVALID)) {
 		g_critical ("Could not get a list of names registered on the session bus, %s",
-			    error ? error->message : "no error given");
+		            error ? error->message : "no error given");
 		g_clear_error (&error);
 		return NULL;
 	}
@@ -453,8 +453,8 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
 
 static gboolean
 crawler_check_file_cb (TrackerCrawler *crawler,
-		       GFile          *file,
-		       gpointer        user_data)
+                       GFile          *file,
+                       gpointer        user_data)
 {
 	TrackerMinerManager *manager;
 	TrackerMinerManagerPrivate *priv;
@@ -468,7 +468,7 @@ crawler_check_file_cb (TrackerCrawler *crawler,
 	priv = TRACKER_MINER_MANAGER_GET_PRIVATE (manager);
 
 	if (!g_str_has_suffix (path, ".desktop")) {
-	    return FALSE;
+		return FALSE;
 	}
 
 	key_file = g_key_file_new ();
@@ -513,13 +513,13 @@ crawler_check_file_cb (TrackerCrawler *crawler,
 
 static void
 crawler_finished_cb (TrackerCrawler *crawler,
-		     GQueue         *found,
-		     gboolean        was_interrupted,
-		     guint           directories_found,
-		     guint           directories_ignored,
-		     guint           files_found,
-		     guint           files_ignored,
-		     gpointer        user_data)
+                     GQueue         *found,
+                     gboolean        was_interrupted,
+                     guint           directories_found,
+                     guint           directories_ignored,
+                     guint           files_found,
+                     guint           files_ignored,
+                     gpointer        user_data)
 {
 	g_main_loop_quit (user_data);
 }
@@ -535,11 +535,11 @@ initialize_miners_data (TrackerMinerManager *manager)
 	main_loop = g_main_loop_new (NULL, FALSE);
 
 	g_signal_connect (crawler, "check-file",
-			  G_CALLBACK (crawler_check_file_cb),
-			  manager);
+	                  G_CALLBACK (crawler_check_file_cb),
+	                  manager);
 	g_signal_connect (crawler, "finished",
-			  G_CALLBACK (crawler_finished_cb),
-			  main_loop);
+	                  G_CALLBACK (crawler_finished_cb),
+	                  main_loop);
 
 	/* Go through service files */
 	file = g_file_new_for_path (TRACKER_MINERS_DIR);
@@ -593,9 +593,9 @@ tracker_miner_manager_get_available (TrackerMinerManager *manager)
  **/
 gboolean
 tracker_miner_manager_pause (TrackerMinerManager *manager,
-			     const gchar         *miner,
-			     const gchar         *reason,
-			     guint32             *cookie)
+                             const gchar         *miner,
+                             const gchar         *reason,
+                             guint32             *cookie)
 {
 	DBusGProxy *proxy;
 	const gchar *app_name;
@@ -647,8 +647,8 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
  **/
 gboolean
 tracker_miner_manager_resume (TrackerMinerManager *manager,
-			      const gchar         *miner,
-			      guint32              cookie)
+                              const gchar         *miner,
+                              guint32              cookie)
 {
 	DBusGProxy *proxy;
 	GError *error = NULL;
@@ -684,7 +684,7 @@ tracker_miner_manager_resume (TrackerMinerManager *manager,
  **/
 gboolean
 tracker_miner_manager_is_active (TrackerMinerManager *manager,
-				 const gchar         *miner)
+                                 const gchar         *miner)
 {
 	TrackerMinerManagerPrivate *priv;
 	GError *error = NULL;
@@ -696,12 +696,12 @@ tracker_miner_manager_is_active (TrackerMinerManager *manager,
 	priv = TRACKER_MINER_MANAGER_GET_PRIVATE (manager);
 
 	if (!dbus_g_proxy_call (priv->proxy, "NameHasOwner", &error,
-				G_TYPE_STRING, miner,
-				G_TYPE_INVALID,
-				G_TYPE_BOOLEAN, &active,
-				G_TYPE_INVALID)) {
+	                        G_TYPE_STRING, miner,
+	                        G_TYPE_INVALID,
+	                        G_TYPE_BOOLEAN, &active,
+	                        G_TYPE_INVALID)) {
 		g_critical ("Could not check whether miner '%s' is currently active: %s",
-			    miner, error ? error->message : "no error given");
+		            miner, error ? error->message : "no error given");
 		g_error_free (error);
 		return FALSE;
 	}
@@ -722,9 +722,9 @@ tracker_miner_manager_is_active (TrackerMinerManager *manager,
  **/
 gboolean
 tracker_miner_manager_get_status (TrackerMinerManager  *manager,
-				  const gchar          *miner,
-				  gchar               **status,
-				  gdouble              *progress)
+                                  const gchar          *miner,
+                                  gchar               **status,
+                                  gdouble              *progress)
 {
 	DBusGProxy *proxy;
 	GError *error = NULL;
@@ -749,7 +749,7 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
 		 */
 		if (error->code != DBUS_GERROR_SERVICE_UNKNOWN) {
 			g_critical ("Could not get miner progress for '%s': %s", miner,
-				    error->message);
+			            error->message);
 		}
 
 		g_error_free (error);
@@ -761,7 +761,7 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
 
 	if (error) {
 		g_critical ("Could not get miner status for '%s': %s", miner,
-			    error->message);
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -797,9 +797,9 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
  **/
 gboolean
 tracker_miner_manager_is_paused (TrackerMinerManager *manager,
-				 const gchar         *miner,
-				 GStrv               *applications,
-				 GStrv               *reasons)
+                                 const gchar         *miner,
+                                 GStrv               *applications,
+                                 GStrv               *reasons)
 {
 	DBusGProxy *proxy;
 	GStrv apps, r;
@@ -828,7 +828,7 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
 
 	if (error) {
 		g_critical ("Could not get pause details for miner '%s': %s", miner,
-			    error->message);
+		            error->message);
 		g_error_free (error);
 
 		return TRUE;
@@ -862,7 +862,7 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
  **/
 const gchar *
 tracker_miner_manager_get_display_name (TrackerMinerManager *manager,
-					const gchar         *miner)
+                                        const gchar         *miner)
 {
 	TrackerMinerManagerPrivate *priv;
 	GList *m;
@@ -894,7 +894,7 @@ tracker_miner_manager_get_display_name (TrackerMinerManager *manager,
  **/
 const gchar *
 tracker_miner_manager_get_description (TrackerMinerManager *manager,
-				       const gchar         *miner)
+                                       const gchar         *miner)
 {
 	TrackerMinerManagerPrivate *priv;
 	GList *m;
diff --git a/src/libtracker-miner/tracker-miner-manager.h b/src/libtracker-miner/tracker-miner-manager.h
index ce3148a..3f7b2a2 100644
--- a/src/libtracker-miner/tracker-miner-manager.h
+++ b/src/libtracker-miner/tracker-miner-manager.h
@@ -53,17 +53,17 @@ struct TrackerMinerManagerClass {
 	GObjectClass parent_class;
 
 	void (* miner_progress) (TrackerMinerManager *manager,
-				 const gchar         *miner_name,
-				 const gchar         *status,
-				 gdouble              progress);
+	                         const gchar         *miner_name,
+	                         const gchar         *status,
+	                         gdouble              progress);
 	void (* miner_paused)   (TrackerMinerManager *manager,
-				 const gchar         *miner_name);
+	                         const gchar         *miner_name);
 	void (* miner_resumed)  (TrackerMinerManager *manager,
-				 const gchar         *miner_name);
+	                         const gchar         *miner_name);
 	void (* miner_activated)   (TrackerMinerManager *manager,
-				    const gchar         *miner_name);
+	                            const gchar         *miner_name);
 	void (* miner_deactivated) (TrackerMinerManager *manager,
-				    const gchar         *miner_name);
+	                            const gchar         *miner_name);
 };
 
 GType   tracker_miner_manager_get_type (void) G_GNUC_CONST;
@@ -74,33 +74,33 @@ GSList *tracker_miner_manager_get_running   (TrackerMinerManager *manager);
 GSList *tracker_miner_manager_get_available (TrackerMinerManager *manager);
 
 gboolean tracker_miner_manager_pause  (TrackerMinerManager *manager,
-				       const gchar         *miner,
-				       const gchar         *reason,
-				       guint32             *cookie);
+                                       const gchar         *miner,
+                                       const gchar         *reason,
+                                       guint32             *cookie);
 gboolean tracker_miner_manager_resume (TrackerMinerManager *manager,
-				       const gchar         *miner,
-				       guint32              cookie);
+                                       const gchar         *miner,
+                                       guint32              cookie);
 
 gboolean tracker_miner_manager_is_active (TrackerMinerManager *manager,
-					  const gchar         *miner);
+                                          const gchar         *miner);
 
 gboolean tracker_miner_manager_is_paused (TrackerMinerManager *manager,
-					  const gchar         *miner,
-					  GStrv               *applications,
-					  GStrv               *reasons);
+                                          const gchar         *miner,
+                                          GStrv               *applications,
+                                          GStrv               *reasons);
 
 gboolean tracker_miner_manager_get_status (TrackerMinerManager  *manager,
-					   const gchar          *miner,
-					   gchar               **status,
-					   gdouble              *progress);
+                                           const gchar          *miner,
+                                           gchar               **status,
+                                           gdouble              *progress);
 gboolean tracker_miner_manager_writeback  (TrackerMinerManager *manager,
-					   const gchar         *miner,
-					   const gchar        **subjects);
+                                           const gchar         *miner,
+                                           const gchar        **subjects);
 
 const gchar * tracker_miner_manager_get_display_name (TrackerMinerManager *manager,
-						      const gchar         *miner);
+                                                      const gchar         *miner);
 const gchar * tracker_miner_manager_get_description  (TrackerMinerManager *manager,
-						      const gchar         *miner);
+                                                      const gchar         *miner);
 
 
 G_END_DECLS
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index cac845d..b9e2e21 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -108,28 +108,28 @@ static GQuark dbus_data = 0;
 static guint signals[LAST_SIGNAL] = { 0 };
 
 static void       miner_set_property           (GObject       *object,
-						guint          param_id,
-						const GValue  *value,
-						GParamSpec    *pspec);
+                                                guint          param_id,
+                                                const GValue  *value,
+                                                GParamSpec    *pspec);
 static void       miner_get_property           (GObject       *object,
-						guint          param_id,
-						GValue        *value,
-						GParamSpec    *pspec);
+                                                guint          param_id,
+                                                GValue        *value,
+                                                GParamSpec    *pspec);
 static void       miner_finalize               (GObject       *object);
 static void       miner_constructed            (GObject       *object);
 static void       dbus_data_destroy            (gpointer       data);
 static DBusData * dbus_data_new                (TrackerMiner  *miner,
-						const gchar   *name);
+                                                const gchar   *name);
 static void       pause_data_destroy           (gpointer       data);
 static PauseData *pause_data_new               (const gchar   *application,
-						const gchar   *reason);
+                                                const gchar   *reason);
 static void       async_call_data_notify_error (AsyncCallData *data,
-						gint           code,
-						const gchar   *message);
+                                                gint           code,
+                                                const gchar   *message);
 static void       async_call_data_destroy      (AsyncCallData *data,
-						gboolean       remove);
+                                                gboolean       remove);
 static void       sparql_cancelled_cb          (GCancellable  *cancellable,
-						AsyncCallData *data);
+                                                AsyncCallData *data);
 
 G_DEFINE_ABSTRACT_TYPE (TrackerMiner, tracker_miner, G_TYPE_OBJECT)
 
@@ -153,12 +153,12 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[STARTED] =
 		g_signal_new ("started",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, started),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, started),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
 	/**
 	 * TrackerMiner::stopped:
 	 * @miner: the #TrackerMiner
@@ -169,12 +169,12 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[STOPPED] =
 		g_signal_new ("stopped",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, stopped),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, stopped),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
 	/**
 	 * TrackerMiner::paused:
 	 * @miner: the #TrackerMiner
@@ -186,12 +186,12 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[PAUSED] =
 		g_signal_new ("paused",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, paused),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, paused),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
 	/**
 	 * TrackerMiner::resumed:
 	 * @miner: the #TrackerMiner
@@ -202,12 +202,12 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[RESUMED] =
 		g_signal_new ("resumed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, resumed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, resumed),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
 	/**
 	 * TrackerMiner::progress:
 	 * @miner: the #TrackerMiner
@@ -221,14 +221,14 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[PROGRESS] =
 		g_signal_new ("progress",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, progress),
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_DOUBLE,
-			      G_TYPE_NONE, 2,
-			      G_TYPE_STRING,
-			      G_TYPE_DOUBLE);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, progress),
+		              NULL, NULL,
+		              tracker_marshal_VOID__STRING_DOUBLE,
+		              G_TYPE_NONE, 2,
+		              G_TYPE_STRING,
+		              G_TYPE_DOUBLE);
 	/**
 	 * TrackerMiner::error:
 	 * @miner: the #TrackerMiner
@@ -239,13 +239,13 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[ERROR] =
 		g_signal_new ("error",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, error),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, error),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__POINTER,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_POINTER);
 
 	/**
 	 * TrackerMiner::writeback:
@@ -258,37 +258,37 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 	 **/
 	signals[WRITEBACK] =
 		g_signal_new ("writeback",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerMinerClass, writeback),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_STRV);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerMinerClass, writeback),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__BOXED,
+		              G_TYPE_NONE, 1,
+		              G_TYPE_STRV);
 
 	g_object_class_install_property (object_class,
-					 PROP_NAME,
-					 g_param_spec_string ("name",
-							      "Miner name",
-							      "Miner name",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+	                                 PROP_NAME,
+	                                 g_param_spec_string ("name",
+	                                                      "Miner name",
+	                                                      "Miner name",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 	g_object_class_install_property (object_class,
-					 PROP_STATUS,
-					 g_param_spec_string ("status",
-							      "Status",
-							      "Translatable string with status description",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_STATUS,
+	                                 g_param_spec_string ("status",
+	                                                      "Status",
+	                                                      "Translatable string with status description",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 	g_object_class_install_property (object_class,
-					 PROP_PROGRESS,
-					 g_param_spec_double ("progress",
-							      "Progress",
-							      "Miner progress",
-							      0.0,
-							      1.0,
-							      0.0,
-							      G_PARAM_READWRITE));
+	                                 PROP_PROGRESS,
+	                                 g_param_spec_double ("progress",
+	                                                      "Progress",
+	                                                      "Miner progress",
+	                                                      0.0,
+	                                                      1.0,
+	                                                      0.0,
+	                                                      G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerMinerPrivate));
 
@@ -306,9 +306,9 @@ tracker_miner_init (TrackerMiner *miner)
 	priv->client = tracker_connect (TRUE, 0);
 
 	priv->pauses = g_hash_table_new_full (g_direct_hash,
-					      g_direct_equal,
-					      NULL,
-					      pause_data_destroy);
+	                                      g_direct_equal,
+	                                      NULL,
+	                                      pause_data_destroy);
 	priv->async_calls = g_ptr_array_new ();
 }
 
@@ -316,15 +316,15 @@ static void
 miner_update_progress (TrackerMiner *miner)
 {
 	g_signal_emit (miner, signals[PROGRESS], 0,
-		       miner->private->status,
-		       miner->private->progress);
+	               miner->private->status,
+	               miner->private->progress);
 }
 
 static void
 miner_set_property (GObject      *object,
-		    guint         prop_id,
-		    const GValue *value,
-		    GParamSpec   *pspec)
+                    guint         prop_id,
+                    const GValue *value,
+                    GParamSpec   *pspec)
 {
 	TrackerMiner *miner = TRACKER_MINER (object);
 
@@ -371,9 +371,9 @@ miner_set_property (GObject      *object,
 
 static void
 miner_get_property (GObject    *object,
-		    guint       prop_id,
-		    GValue     *value,
-		    GParamSpec *pspec)
+                    guint       prop_id,
+                    GValue     *value,
+                    GParamSpec *pspec)
 {
 	TrackerMiner *miner = TRACKER_MINER (object);
 
@@ -395,7 +395,7 @@ miner_get_property (GObject    *object,
 
 static void
 async_call_finalize_foreach (AsyncCallData *data,
-			     gpointer       user_data)
+                             gpointer       user_data)
 {
 	async_call_data_notify_error (data, 0, "Miner is being finalized");
 	async_call_data_destroy (data, FALSE);
@@ -420,8 +420,8 @@ miner_finalize (GObject *object)
 	g_hash_table_unref (miner->private->pauses);
 
 	g_ptr_array_foreach (miner->private->async_calls,
-			     (GFunc) async_call_finalize_foreach,
-			     object);
+	                     (GFunc) async_call_finalize_foreach,
+	                     object);
 	g_ptr_array_free (miner->private->async_calls, TRUE);
 
 	G_OBJECT_CLASS (tracker_miner_parent_class)->finalize (object);
@@ -457,29 +457,29 @@ miner_constructed (GObject *object)
 	}
 
 	g_object_set_qdata_full (G_OBJECT (miner),
-				 dbus_data,
-				 data,
-				 dbus_data_destroy);
+	                         dbus_data,
+	                         data,
+	                         dbus_data_destroy);
 }
 
 static gboolean
 dbus_register_service (DBusGProxy  *proxy,
-		       const gchar *name)
+                       const gchar *name)
 {
 	GError *error = NULL;
-	guint	result;
+	guint   result;
 
 	g_message ("Registering D-Bus service...\n"
-		   "  Name:'%s'",
-		   name);
+	           "  Name:'%s'",
+	           name);
 
 	if (!org_freedesktop_DBus_request_name (proxy,
-						name,
-						DBUS_NAME_FLAG_DO_NOT_QUEUE,
-						&result, &error)) {
+	                                        name,
+	                                        DBUS_NAME_FLAG_DO_NOT_QUEUE,
+	                                        &result, &error)) {
 		g_critical ("Could not acquire name:'%s', %s",
-			    name,
-			    error ? error->message : "no error given");
+		            name,
+		            error ? error->message : "no error given");
 		g_error_free (error);
 
 		return FALSE;
@@ -487,8 +487,8 @@ dbus_register_service (DBusGProxy  *proxy,
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_critical ("D-Bus service name:'%s' is already taken, "
-			    "perhaps the application is already running?",
-			    name);
+		            "perhaps the application is already running?",
+		            name);
 		return FALSE;
 	}
 
@@ -496,11 +496,11 @@ dbus_register_service (DBusGProxy  *proxy,
 }
 
 static gboolean
-dbus_register_object (GObject		    *object,
-		      DBusGConnection	    *connection,
-		      DBusGProxy	    *proxy,
-		      const DBusGObjectInfo *info,
-		      const gchar	    *path)
+dbus_register_object (GObject               *object,
+                      DBusGConnection       *connection,
+                      DBusGProxy            *proxy,
+                      const DBusGObjectInfo *info,
+                      const gchar           *path)
 {
 	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
@@ -514,10 +514,10 @@ dbus_register_object (GObject		    *object,
 
 static void
 name_owner_changed_cb (DBusGProxy *proxy,
-		       gchar	  *name,
-		       gchar	  *old_owner,
-		       gchar	  *new_owner,
-		       gpointer    user_data)
+                       gchar      *name,
+                       gchar      *old_owner,
+                       gchar      *new_owner,
+                       gpointer    user_data)
 {
 	TrackerMiner *miner;
 	gboolean available;
@@ -535,8 +535,8 @@ name_owner_changed_cb (DBusGProxy *proxy,
 
 	if (available && miner->private->availability_cookie != 0) {
 		tracker_miner_resume (miner,
-				      miner->private->availability_cookie,
-				      &error);
+		                      miner->private->availability_cookie,
+		                      &error);
 
 		if (error) {
 			g_warning ("Error happened resuming miner: %s\n", error->message);
@@ -548,8 +548,8 @@ name_owner_changed_cb (DBusGProxy *proxy,
 		gint cookie_id;
 
 		cookie_id = tracker_miner_pause (miner,
-						 _("Data store is not available"),
-						 &error);
+		                                 _("Data store is not available"),
+		                                 &error);
 
 		if (error) {
 			g_warning ("Could not pause: %s", error->message);
@@ -562,15 +562,15 @@ name_owner_changed_cb (DBusGProxy *proxy,
 
 static void
 dbus_set_name_monitor (TrackerMiner *miner,
-		       DBusGProxy   *proxy)
+                       DBusGProxy   *proxy)
 {
 	dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
-				 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-				 G_TYPE_INVALID);
+	                         G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+	                         G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
-				     G_CALLBACK (name_owner_changed_cb),
-				     miner, NULL);
+	                             G_CALLBACK (name_owner_changed_cb),
+	                             miner, NULL);
 }
 
 static void
@@ -597,7 +597,7 @@ dbus_data_destroy (gpointer data)
 
 static DBusData *
 dbus_data_new (TrackerMiner *miner,
-	       const gchar  *name)
+               const gchar  *name)
 {
 	DBusData *data;
 	DBusGConnection *connection;
@@ -609,15 +609,15 @@ dbus_data_new (TrackerMiner *miner,
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_error_free (error);
 		return NULL;
 	}
 
 	gproxy = dbus_g_proxy_new_for_name (connection,
-					    DBUS_SERVICE_DBUS,
-					    DBUS_PATH_DBUS,
-					    DBUS_INTERFACE_DBUS);
+	                                    DBUS_SERVICE_DBUS,
+	                                    DBUS_PATH_DBUS,
+	                                    DBUS_INTERFACE_DBUS);
 
 	/* Register the service name for the miner */
 	full_name = g_strconcat (TRACKER_MINER_DBUS_NAME_PREFIX, name, NULL);
@@ -633,9 +633,9 @@ dbus_data_new (TrackerMiner *miner,
 	full_path = g_strconcat (TRACKER_MINER_DBUS_PATH_PREFIX, name, NULL);
 
 	if (!dbus_register_object (G_OBJECT (miner),
-				   connection, gproxy,
-				   &dbus_glib_tracker_miner_object_info,
-				   full_path)) {
+	                           connection, gproxy,
+	                           &dbus_glib_tracker_miner_object_info,
+	                           full_path)) {
 		g_object_unref (gproxy);
 		g_free (full_path);
 		return NULL;
@@ -655,7 +655,7 @@ dbus_data_new (TrackerMiner *miner,
 
 static PauseData *
 pause_data_new (const gchar *application,
-		const gchar *reason)
+                const gchar *reason)
 {
 	PauseData *data;
 	static gint cookie = 1;
@@ -684,7 +684,7 @@ pause_data_destroy (gpointer data)
 
 static void
 async_call_data_destroy (AsyncCallData *data,
-			 gboolean       remove)
+                         gboolean       remove)
 {
 	TrackerMiner *miner = data->miner;
 
@@ -710,10 +710,10 @@ async_call_data_destroy (AsyncCallData *data,
 
 static AsyncCallData *
 async_call_data_new (TrackerMiner *miner,
-		     GCancellable *cancellable,
-		     gpointer      callback,
-		     gpointer      user_data,
-		     gpointer      source_function)
+                     GCancellable *cancellable,
+                     gpointer      callback,
+                     gpointer      user_data,
+                     gpointer      source_function)
 {
 	AsyncCallData *data;
 
@@ -727,7 +727,7 @@ async_call_data_new (TrackerMiner *miner,
 		data->cancellable = g_object_ref (cancellable);
 
 		data->signal_id = g_signal_connect (cancellable, "cancelled",
-						    G_CALLBACK (sparql_cancelled_cb), data);
+		                                    G_CALLBACK (sparql_cancelled_cb), data);
 	}
 
 	g_ptr_array_add (miner->private->async_calls, data);
@@ -737,7 +737,7 @@ async_call_data_new (TrackerMiner *miner,
 
 static void
 async_call_data_update_callback (AsyncCallData *data,
-				 GError        *error)
+                                 GError        *error)
 {
 	GAsyncReadyCallback callback;
 	GSimpleAsyncResult *result;
@@ -751,9 +751,9 @@ async_call_data_update_callback (AsyncCallData *data,
 		                                               (GError *) error);
 	} else {
 		result = g_simple_async_result_new (G_OBJECT (data->miner),
-						    callback,
-						    data->user_data,
-						    data->source_function);
+		                                    callback,
+		                                    data->user_data,
+		                                    data->source_function);
 	}
 
 	g_simple_async_result_complete (result);
@@ -762,8 +762,8 @@ async_call_data_update_callback (AsyncCallData *data,
 
 static void
 async_call_data_query_callback (AsyncCallData   *data,
-				const GPtrArray *query_results,
-				GError          *error)
+                                const GPtrArray *query_results,
+                                GError          *error)
 {
 	GAsyncReadyCallback callback;
 	GSimpleAsyncResult *result;
@@ -789,8 +789,8 @@ async_call_data_query_callback (AsyncCallData   *data,
 
 static void
 async_call_data_notify_error (AsyncCallData *data,
-			      gint           code,
-			      const gchar   *message)
+                              gint           code,
+                              const gchar   *message)
 {
 	TrackerMiner *miner;
 	GError *error;
@@ -819,7 +819,7 @@ async_call_data_notify_error (AsyncCallData *data,
 
 static void
 sparql_update_cb (GError   *error,
-		  gpointer  user_data)
+                  gpointer  user_data)
 {
 	AsyncCallData *data = user_data;
 
@@ -833,8 +833,8 @@ sparql_update_cb (GError   *error,
 
 static void
 sparql_query_cb (GPtrArray *result,
-		 GError    *error,
-		 gpointer   user_data)
+                 GError    *error,
+                 gpointer   user_data)
 {
 	AsyncCallData *data = user_data;
 
@@ -853,7 +853,7 @@ sparql_query_cb (GPtrArray *result,
 
 static void
 sparql_cancelled_cb (GCancellable  *cancellable,
-		     AsyncCallData *data)
+                     AsyncCallData *data)
 {
 	TrackerMinerPrivate *priv;
 
@@ -920,7 +920,7 @@ tracker_miner_stop (TrackerMiner *miner)
  **/
 void
 tracker_miner_writeback (TrackerMiner *miner,
-			 const GStrv   subjects)
+                         const GStrv   subjects)
 {
 	g_return_if_fail (TRACKER_IS_MINER (miner));
 
@@ -1046,8 +1046,8 @@ tracker_miner_execute_sparql (TrackerMiner        *miner,
 	data = async_call_data_new (miner, cancellable, callback, user_data, tracker_miner_execute_sparql);
 
 	data->id = tracker_resources_sparql_query_async (miner->private->client,
-							 sparql, sparql_query_cb,
-							 data);
+	                                                 sparql, sparql_query_cb,
+	                                                 data);
 }
 
 /**
@@ -1111,8 +1111,8 @@ tracker_miner_execute_batch_update (TrackerMiner        *miner,
 	data = async_call_data_new (miner, cancellable, callback, user_data, tracker_miner_execute_batch_update);
 
 	data->id = tracker_resources_batch_sparql_update_async (miner->private->client,
-								sparql, sparql_update_cb,
-								data);
+	                                                        sparql, sparql_update_cb,
+	                                                        data);
 }
 
 /**
@@ -1169,8 +1169,8 @@ tracker_miner_commit (TrackerMiner        *miner,
 	data = async_call_data_new (miner, cancellable, callback, user_data, tracker_miner_commit);
 
 	data->id = tracker_resources_batch_commit_async (miner->private->client,
-							 sparql_update_cb,
-							 data);
+	                                                 sparql_update_cb,
+	                                                 data);
 }
 
 /**
@@ -1195,9 +1195,9 @@ tracker_miner_commit_finish (TrackerMiner  *miner,
 
 static gint
 tracker_miner_pause_internal (TrackerMiner  *miner,
-			      const gchar   *application,
-			      const gchar   *reason,
-			      GError       **error)
+                              const gchar   *application,
+                              const gchar   *reason,
+                              GError       **error)
 {
 	PauseData *pd;
 	GHashTableIter iter;
@@ -1212,7 +1212,7 @@ tracker_miner_pause_internal (TrackerMiner  *miner,
 		    g_strcmp0 (reason, pd->reason) == 0) {
 			/* Can't use duplicate pauses */
 			g_set_error_literal (error, TRACKER_MINER_ERROR, 0,
-					     _("Pause application and reason match an already existing pause request"));
+			                     _("Pause application and reason match an already existing pause request"));
 			return -1;
 		}
 	}
@@ -1220,8 +1220,8 @@ tracker_miner_pause_internal (TrackerMiner  *miner,
 	pd = pause_data_new (application, reason);
 
 	g_hash_table_insert (miner->private->pauses,
-			     GINT_TO_POINTER (pd->cookie),
-			     pd);
+	                     GINT_TO_POINTER (pd->cookie),
+	                     pd);
 
 	if (g_hash_table_size (miner->private->pauses) == 1) {
 		/* Pause */
@@ -1246,8 +1246,8 @@ tracker_miner_pause_internal (TrackerMiner  *miner,
  **/
 gint
 tracker_miner_pause (TrackerMiner  *miner,
-		     const gchar   *reason,
-		     GError       **error)
+                     const gchar   *reason,
+                     GError       **error)
 {
 	const gchar *application;
 
@@ -1277,14 +1277,14 @@ tracker_miner_pause (TrackerMiner  *miner,
  **/
 gboolean
 tracker_miner_resume (TrackerMiner  *miner,
-		      gint           cookie,
-		      GError       **error)
+                      gint           cookie,
+                      GError       **error)
 {
 	g_return_val_if_fail (TRACKER_IS_MINER (miner), FALSE);
 
 	if (!g_hash_table_remove (miner->private->pauses, GINT_TO_POINTER (cookie))) {
 		g_set_error_literal (error, TRACKER_MINER_ERROR, 0,
-				     _("Cookie not recognized to resume paused miner"));
+		                     _("Cookie not recognized to resume paused miner"));
 		return FALSE;
 	}
 
@@ -1300,8 +1300,8 @@ tracker_miner_resume (TrackerMiner  *miner,
 /* DBus methods */
 void
 tracker_miner_dbus_get_status (TrackerMiner           *miner,
-			       DBusGMethodInvocation  *context,
-			       GError                **error)
+                               DBusGMethodInvocation  *context,
+                               GError                **error)
 {
 	guint request_id;
 
@@ -1318,8 +1318,8 @@ tracker_miner_dbus_get_status (TrackerMiner           *miner,
 
 void
 tracker_miner_dbus_get_progress (TrackerMiner           *miner,
-				 DBusGMethodInvocation  *context,
-				 GError                **error)
+                                 DBusGMethodInvocation  *context,
+                                 GError                **error)
 {
 	guint request_id;
 
@@ -1336,8 +1336,8 @@ tracker_miner_dbus_get_progress (TrackerMiner           *miner,
 
 void
 tracker_miner_dbus_get_pause_details (TrackerMiner           *miner,
-				      DBusGMethodInvocation  *context,
-				      GError                **error)
+                                      DBusGMethodInvocation  *context,
+                                      GError                **error)
 {
 	GSList *applications, *reasons;
 	GStrv applications_strv, reasons_strv;
@@ -1381,10 +1381,10 @@ tracker_miner_dbus_get_pause_details (TrackerMiner           *miner,
 
 void
 tracker_miner_dbus_pause (TrackerMiner           *miner,
-			  const gchar            *application,
-			  const gchar            *reason,
-			  DBusGMethodInvocation  *context,
-			  GError                **error)
+                          const gchar            *application,
+                          const gchar            *reason,
+                          DBusGMethodInvocation  *context,
+                          GError                **error)
 {
 	GError *local_error = NULL;
 	guint request_id;
@@ -1397,9 +1397,9 @@ tracker_miner_dbus_pause (TrackerMiner           *miner,
 	tracker_dbus_async_return_if_fail (reason != NULL, context);
 
 	tracker_dbus_request_new (request_id, "%s(application:'%s', reason:'%s')",
-				  __PRETTY_FUNCTION__,
-				  application,
-				  reason);
+	                          __PRETTY_FUNCTION__,
+	                          application,
+	                          reason);
 
 	cookie = tracker_miner_pause_internal (miner, application, reason, &local_error);
 	if (cookie == -1) {
@@ -1422,9 +1422,9 @@ tracker_miner_dbus_pause (TrackerMiner           *miner,
 
 void
 tracker_miner_dbus_resume (TrackerMiner           *miner,
-			   gint                    cookie,
-			   DBusGMethodInvocation  *context,
-			   GError                **error)
+                           gint                    cookie,
+                           DBusGMethodInvocation  *context,
+                           GError                **error)
 {
 	GError *local_error = NULL;
 	guint request_id;
@@ -1434,8 +1434,8 @@ tracker_miner_dbus_resume (TrackerMiner           *miner,
 	tracker_dbus_async_return_if_fail (miner != NULL, context);
 
 	tracker_dbus_request_new (request_id, "%s(cookie:%d)",
-				  __PRETTY_FUNCTION__,
-				  cookie);
+	                          __PRETTY_FUNCTION__,
+	                          cookie);
 
 	if (!tracker_miner_resume (miner, cookie, &local_error)) {
 		GError *actual_error = NULL;
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index cd15b17..86e40d6 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -27,15 +27,15 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_MINER	   (tracker_miner_get_type())
-#define TRACKER_MINER(o)	   (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
+#define TRACKER_TYPE_MINER         (tracker_miner_get_type())
+#define TRACKER_MINER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
 #define TRACKER_MINER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_MINER, TrackerMinerClass))
-#define TRACKER_IS_MINER(o)	   (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_MINER))
+#define TRACKER_IS_MINER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_MINER))
 #define TRACKER_IS_MINER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c),    TRACKER_TYPE_MINER))
 #define TRACKER_MINER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_MINER, TrackerMinerClass))
 
 #define TRACKER_MINER_ERROR_DOMAIN     "TrackerMiner"
-#define TRACKER_MINER_ERROR	       tracker_miner_error_quark()
+#define TRACKER_MINER_ERROR            tracker_miner_error_quark()
 
 typedef struct TrackerMiner TrackerMiner;
 typedef struct TrackerMinerPrivate TrackerMinerPrivate;
@@ -46,8 +46,8 @@ typedef struct TrackerMinerPrivate TrackerMinerPrivate;
  * Abstract miner object.
  **/
 struct TrackerMiner {
-        GObject parent_instance;
-        TrackerMinerPrivate *private;
+	GObject parent_instance;
+	TrackerMinerPrivate *private;
 };
 
 /**
@@ -65,23 +65,23 @@ struct TrackerMiner {
  * Virtual methods left to implement.
  **/
 typedef struct {
-        GObjectClass parent_class;
+	GObjectClass parent_class;
 
-        /* signals */
-        void (* started)    (TrackerMiner *miner);
-        void (* stopped)    (TrackerMiner *miner);
+	/* signals */
+	void (* started)    (TrackerMiner *miner);
+	void (* stopped)    (TrackerMiner *miner);
 
-        void (* paused)     (TrackerMiner *miner);
-        void (* resumed)    (TrackerMiner *miner);
+	void (* paused)     (TrackerMiner *miner);
+	void (* resumed)    (TrackerMiner *miner);
 
 	void (* progress)   (TrackerMiner *miner,
-			     const gchar  *status,
-			     gdouble       progress);
+	                     const gchar  *status,
+	                     gdouble       progress);
 
 	void (* error)      (TrackerMiner *miner,
-			     GError       *error);
+	                     GError       *error);
 	void (* writeback)  (TrackerMiner *miner,
-			     const GStrv   subjects);
+	                     const GStrv   subjects);
 } TrackerMinerClass;
 
 GType            tracker_miner_get_type                    (void) G_GNUC_CONST;
@@ -90,45 +90,45 @@ GQuark           tracker_miner_error_quark                 (void);
 void             tracker_miner_start                       (TrackerMiner         *miner);
 void             tracker_miner_stop                        (TrackerMiner         *miner);
 void             tracker_miner_writeback                   (TrackerMiner         *miner,
-							    const GStrv           subjects);
+                                                            const GStrv           subjects);
 gboolean         tracker_miner_is_started                  (TrackerMiner         *miner);
 gint             tracker_miner_pause                       (TrackerMiner         *miner,
-							    const gchar          *reason,
-							    GError              **error);
+                                                            const gchar          *reason,
+                                                            GError              **error);
 gboolean         tracker_miner_resume                      (TrackerMiner         *miner,
-							    gint                  cookie,
-							    GError              **error);
+                                                            gint                  cookie,
+                                                            GError              **error);
 void             tracker_miner_execute_update              (TrackerMiner         *miner,
-							    const gchar          *sparql,
-							    GCancellable         *cancellable,
-							    GAsyncReadyCallback   callback,
-							    gpointer              user_data);
+                                                            const gchar          *sparql,
+                                                            GCancellable         *cancellable,
+                                                            GAsyncReadyCallback   callback,
+                                                            gpointer              user_data);
 void             tracker_miner_execute_update_finish       (TrackerMiner         *miner,
-							    GAsyncResult         *result,
-							    GError              **error);
+                                                            GAsyncResult         *result,
+                                                            GError              **error);
 void             tracker_miner_execute_sparql              (TrackerMiner         *miner,
-							    const gchar          *sparql,
-							    GCancellable         *cancellable,
-							    GAsyncReadyCallback   callback,
-							    gpointer              user_data);
+                                                            const gchar          *sparql,
+                                                            GCancellable         *cancellable,
+                                                            GAsyncReadyCallback   callback,
+                                                            gpointer              user_data);
 const GPtrArray* tracker_miner_execute_sparql_finish       (TrackerMiner         *miner,
-							    GAsyncResult         *result,
-							    GError              **error);
+                                                            GAsyncResult         *result,
+                                                            GError              **error);
 void             tracker_miner_execute_batch_update        (TrackerMiner         *miner,
-							    const gchar          *sparql,
-							    GCancellable         *cancellable,
-							    GAsyncReadyCallback   callback,
-							    gpointer              user_data);
+                                                            const gchar          *sparql,
+                                                            GCancellable         *cancellable,
+                                                            GAsyncReadyCallback   callback,
+                                                            gpointer              user_data);
 void             tracker_miner_execute_batch_update_finish (TrackerMiner         *miner,
-							    GAsyncResult         *result,
-							    GError              **error);
+                                                            GAsyncResult         *result,
+                                                            GError              **error);
 void             tracker_miner_commit                      (TrackerMiner         *miner,
-							    GCancellable         *cancellable,
-							    GAsyncReadyCallback   callback,
-							    gpointer              user_data);
+                                                            GCancellable         *cancellable,
+                                                            GAsyncReadyCallback   callback,
+                                                            gpointer              user_data);
 void             tracker_miner_commit_finish               (TrackerMiner         *miner,
-							    GAsyncResult         *result,
-							    GError              **error);
+                                                            GAsyncResult         *result,
+                                                            GError              **error);
 
 G_END_DECLS
 
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 0b2ce7e..a5184b1 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -55,11 +55,11 @@ struct TrackerMonitorPrivate {
 	gint           scan_timeout;
 	gint           cache_timeout;
 
-	GType	       monitor_backend;
+	GType          monitor_backend;
 
-	guint	       monitor_limit;
+	guint          monitor_limit;
 	gboolean       monitor_limit_warned;
-	guint	       monitors_ignored;
+	guint          monitors_ignored;
 
 	/* For FAM, the _CHANGES_DONE event is not signalled, so we
 	 * have to just use the _CHANGED event instead.
@@ -68,14 +68,14 @@ struct TrackerMonitorPrivate {
 
 #ifdef PAUSE_ON_IO
 	/* Timeout id for pausing when we get IO */
-	guint	       unpause_timeout_id;
+	guint          unpause_timeout_id;
 #endif /* PAUSE_ON_IO */
 
 	GHashTable    *event_pairs;
-	guint	       event_pairs_timeout_id;
+	guint          event_pairs_timeout_id;
 
 	GHashTable    *cached_events;
-	guint	       cached_events_timeout_id;
+	guint          cached_events_timeout_id;
 };
 
 typedef struct {
@@ -102,25 +102,25 @@ enum {
 
 static void           tracker_monitor_finalize     (GObject        *object);
 static void           tracker_monitor_set_property (GObject        *object,
-						    guint           prop_id,
-						    const GValue   *value,
-						    GParamSpec     *pspec);
+                                                    guint           prop_id,
+                                                    const GValue   *value,
+                                                    GParamSpec     *pspec);
 static void           tracker_monitor_get_property (GObject        *object,
-						    guint           prop_id,
-						    GValue         *value,
-						    GParamSpec     *pspec);
+                                                    guint           prop_id,
+                                                    GValue         *value,
+                                                    GParamSpec     *pspec);
 static EventData *    event_data_new               (GFile          *file,
-						    guint32         event_type);
+                                                    guint32         event_type);
 static void           event_data_free              (gpointer        data);
 static guint          get_inotify_limit            (void);
 
 static INotifyHandle *libinotify_monitor_directory (TrackerMonitor *monitor,
-						    GFile          *file);
+                                                    GFile          *file);
 static void           libinotify_monitor_cancel    (gpointer        data);
 
 static gboolean       monitor_move                 (TrackerMonitor *monitor,
-						    GFile          *old_file,
-						    GFile          *new_file);
+                                                    GFile          *old_file,
+                                                    GFile          *new_file);
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
@@ -139,76 +139,76 @@ tracker_monitor_class_init (TrackerMonitorClass *klass)
 
 	signals[ITEM_CREATED] =
 		g_signal_new ("item-created",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__OBJECT_BOOLEAN,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_OBJECT,
-			      G_TYPE_BOOLEAN);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__OBJECT_BOOLEAN,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_OBJECT,
+		              G_TYPE_BOOLEAN);
 	signals[ITEM_UPDATED] =
 		g_signal_new ("item-updated",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__OBJECT_BOOLEAN,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_OBJECT,
-			      G_TYPE_BOOLEAN);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__OBJECT_BOOLEAN,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_OBJECT,
+		              G_TYPE_BOOLEAN);
 	signals[ITEM_DELETED] =
 		g_signal_new ("item-deleted",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__OBJECT_BOOLEAN,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_OBJECT,
-			      G_TYPE_BOOLEAN);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__OBJECT_BOOLEAN,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_OBJECT,
+		              G_TYPE_BOOLEAN);
 	signals[ITEM_MOVED] =
 		g_signal_new ("item-moved",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__OBJECT_OBJECT_BOOLEAN_BOOLEAN,
-			      G_TYPE_NONE,
-			      4,
-			      G_TYPE_OBJECT,
-			      G_TYPE_OBJECT,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__OBJECT_OBJECT_BOOLEAN_BOOLEAN,
+		              G_TYPE_NONE,
+		              4,
+		              G_TYPE_OBJECT,
+		              G_TYPE_OBJECT,
+		              G_TYPE_BOOLEAN,
+		              G_TYPE_BOOLEAN);
 
 	g_object_class_install_property (object_class,
-					 PROP_ENABLED,
-					 g_param_spec_boolean ("enabled",
-							       "Enabled",
-							       "Enabled",
-							       TRUE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_ENABLED,
+	                                 g_param_spec_boolean ("enabled",
+	                                                       "Enabled",
+	                                                       "Enabled",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_SCAN_TIMEOUT,
-					 g_param_spec_int ("scan-timeout",
-							   "Scan Timeout",
-							   "Time in seconds between same events to prevent flooding (0->1000)",
-							   0,
-							   1000,
-							   0,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_SCAN_TIMEOUT,
+	                                 g_param_spec_int ("scan-timeout",
+	                                                   "Scan Timeout",
+	                                                   "Time in seconds between same events to prevent flooding (0->1000)",
+	                                                   0,
+	                                                   1000,
+	                                                   0,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_CACHE_TIMEOUT,
-					 g_param_spec_int ("cache-timeout",
-							   "Scan Timeout",
-							   "Time in seconds for events to be cached (0->1000)",
-							   0,
-							   1000,
-							   60,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_CACHE_TIMEOUT,
+	                                 g_param_spec_int ("cache-timeout",
+	                                                   "Scan Timeout",
+	                                                   "Time in seconds for events to be cached (0->1000)",
+	                                                   0,
+	                                                   1000,
+	                                                   60,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerMonitorPrivate));
 }
@@ -217,9 +217,9 @@ static void
 tracker_monitor_init (TrackerMonitor *object)
 {
 	TrackerMonitorPrivate *priv;
-	GFile		      *file;
-	GFileMonitor	      *monitor;
-	const gchar	      *name;
+	GFile                 *file;
+	GFileMonitor          *monitor;
+	const gchar           *name;
 
 	object->private = TRACKER_MONITOR_GET_PRIVATE (object);
 
@@ -233,9 +233,9 @@ tracker_monitor_init (TrackerMonitor *object)
 	 */
 	priv->event_pairs =
 		g_hash_table_new_full (g_direct_hash,
-				       g_direct_equal,
-				       NULL,
-				       event_data_free);
+		                       g_direct_equal,
+		                       NULL,
+		                       event_data_free);
 
 	/* We have a hash table for events so we don't flood the
 	 * indexer with the same events too frequently, we also
@@ -243,25 +243,25 @@ tracker_monitor_init (TrackerMonitor *object)
 	 */
 	priv->cached_events =
 		g_hash_table_new_full (g_file_hash,
-				       (GEqualFunc) g_file_equal,
-				       g_object_unref,
-				       event_data_free);
+		                       (GEqualFunc) g_file_equal,
+		                       g_object_unref,
+		                       event_data_free);
 
 	/* Create monitors table for this module */
 	priv->monitors =
 		g_hash_table_new_full (g_file_hash,
-				       (GEqualFunc) g_file_equal,
-				       (GDestroyNotify) g_object_unref,
-				       (GDestroyNotify) libinotify_monitor_cancel);
+		                       (GEqualFunc) g_file_equal,
+		                       (GDestroyNotify) g_object_unref,
+		                       (GDestroyNotify) libinotify_monitor_cancel);
 
 	/* For the first monitor we get the type and find out if we
 	 * are using inotify, FAM, polling, etc.
 	 */
 	file = g_file_new_for_path (g_get_home_dir ());
 	monitor = g_file_monitor_directory (file,
-					    G_FILE_MONITOR_WATCH_MOUNTS,
-					    NULL,
-					    NULL);
+	                                    G_FILE_MONITOR_WATCH_MOUNTS,
+	                                    NULL,
+	                                    NULL);
 
 	priv->monitor_backend = G_OBJECT_TYPE (monitor);
 
@@ -321,8 +321,8 @@ tracker_monitor_init (TrackerMonitor *object)
 		else {
 			/* Unknown */
 			g_warning ("Monitor backend:'%s' is unknown, we have no limits "
-				   "in place because we don't know what we are dealing with!",
-				   name);
+			           "in place because we don't know what we are dealing with!",
+			           name);
 
 			/* Guessing limit... */
 			priv->monitor_limit = 100;
@@ -365,23 +365,23 @@ tracker_monitor_finalize (GObject *object)
 }
 
 static void
-tracker_monitor_set_property (GObject	   *object,
-			      guint	    prop_id,
-			      const GValue *value,
-			      GParamSpec   *pspec)
+tracker_monitor_set_property (GObject      *object,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
 {
 	switch (prop_id) {
 	case PROP_ENABLED:
 		tracker_monitor_set_enabled (TRACKER_MONITOR (object),
-					     g_value_get_boolean (value));
+		                             g_value_get_boolean (value));
 		break;
 	case PROP_SCAN_TIMEOUT:
 		tracker_monitor_set_scan_timeout (TRACKER_MONITOR (object),
-						  g_value_get_int (value));
+		                                  g_value_get_int (value));
 		break;
 	case PROP_CACHE_TIMEOUT:
 		tracker_monitor_set_cache_timeout (TRACKER_MONITOR (object),
-						   g_value_get_int (value));
+		                                   g_value_get_int (value));
 		break;
 
 	default:
@@ -390,10 +390,10 @@ tracker_monitor_set_property (GObject	   *object,
 }
 
 static void
-tracker_monitor_get_property (GObject	   *object,
-			      guint	    prop_id,
-			      GValue	   *value,
-			      GParamSpec   *pspec)
+tracker_monitor_get_property (GObject      *object,
+                              guint         prop_id,
+                              GValue       *value,
+                              GParamSpec   *pspec)
 {
 	TrackerMonitorPrivate *priv;
 
@@ -417,7 +417,7 @@ tracker_monitor_get_property (GObject	   *object,
 
 static EventData *
 event_data_new (GFile   *file,
-		guint32  event_type)
+                guint32  event_type)
 {
 	EventData *event;
 	GTimeVal now;
@@ -457,20 +457,20 @@ event_data_free (gpointer data)
 static guint
 get_inotify_limit (void)
 {
-	GError	    *error = NULL;
+	GError      *error = NULL;
 	const gchar *filename;
-	gchar	    *contents = NULL;
-	guint	     limit;
+	gchar       *contents = NULL;
+	guint        limit;
 
 	filename = "/proc/sys/fs/inotify/max_user_watches";
 
 	if (!g_file_get_contents (filename,
-				  &contents,
-				  NULL,
-				  &error)) {
+	                          &contents,
+	                          NULL,
+	                          &error)) {
 		g_warning ("Couldn't get INotify monitor limit from:'%s', %s",
-			   filename,
-			   error ? error->message : "no error given");
+		           filename,
+		           error ? error->message : "no error given");
 		g_clear_error (&error);
 
 		/* Setting limit to an arbitary limit */
@@ -493,8 +493,8 @@ unpause_cb (gpointer data)
 	monitor = data;
 
 	g_message ("Resuming indexing now we have stopped "
-		   "receiving monitor events for %d seconds",
-		   PAUSE_ON_IO_SECONDS);
+	           "receiving monitor events for %d seconds",
+	           PAUSE_ON_IO_SECONDS);
 
 	monitor->private->unpause_timeout_id = 0;
 	tracker_status_set_is_paused_for_io (FALSE);
@@ -586,9 +586,9 @@ static gboolean
 libinotify_event_pairs_timeout_cb (gpointer data)
 {
 	TrackerMonitor *monitor;
-	GTimeVal	now;
-	GHashTableIter	iter;
-	gpointer	key, value;
+	GTimeVal        now;
+	GHashTableIter  iter;
+	gpointer        key, value;
 
 	monitor = data;
 
@@ -599,8 +599,8 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 	g_hash_table_iter_init (&iter, monitor->private->event_pairs);
 	while (g_hash_table_iter_next (&iter, &key, &value)) {
 		EventData   *event;
-		glong	     seconds;
-		glong	     seconds_then;
+		glong        seconds;
+		glong        seconds_then;
 		gboolean     is_directory;
 
 		event = value;
@@ -611,9 +611,9 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 		seconds -= seconds_then;
 
 		g_debug ("Comparing now:%ld to then:%ld, diff:%ld",
-			 now.tv_sec,
-			 seconds_then,
-			 seconds);
+		         now.tv_sec,
+		         seconds_then,
+		         seconds);
 
 		if (seconds < 2) {
 			continue;
@@ -624,9 +624,9 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 		 * DELETE event for the file we know about.
 		 */
 		g_debug ("Event:%d with cookie:%d has timed out (%ld seconds have elapsed)",
-			 event->event_type,
-			 GPOINTER_TO_UINT (key),
-			 seconds);
+		         event->event_type,
+		         GPOINTER_TO_UINT (key),
+		         seconds);
 
 		is_directory =
 			g_file_query_file_type (event->file, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
@@ -639,14 +639,14 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 			 * target location for the event.
 			 */
 			if (is_directory) {
- 				tracker_monitor_remove (monitor,
-							event->file);
+				tracker_monitor_remove (monitor,
+				                        event->file);
 			}
 
 			g_signal_emit (monitor,
-				       signals[ITEM_DELETED], 0,
-				       event->file,
-				       is_directory);
+			               signals[ITEM_DELETED], 0,
+			               event->file,
+			               is_directory);
 			break;
 
 		case IN_CREATE:
@@ -655,9 +655,9 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 			 * source location for the event.
 			 */
 			g_signal_emit (monitor,
-				       signals[ITEM_CREATED], 0,
-				       event->file,
-				       is_directory);
+			               signals[ITEM_CREATED], 0,
+			               event->file,
+			               is_directory);
 			break;
 		default:
 			break;
@@ -677,17 +677,17 @@ libinotify_event_pairs_timeout_cb (gpointer data)
 
 static void
 libinotify_cached_event_handle (TrackerMonitor *monitor,
-				EventData      *data,
-				gboolean        is_directory)
+                                EventData      *data,
+                                gboolean        is_directory)
 {
 	switch (data->event_type) {
 	case IN_MODIFY:
 	case IN_CLOSE_WRITE:
 	case IN_ATTRIB:
 		g_signal_emit (monitor,
-			       signals[ITEM_UPDATED], 0,
-			       data->file,
-			       is_directory);
+		               signals[ITEM_UPDATED], 0,
+		               data->file,
+		               is_directory);
 		break;
 
 	case IN_MOVED_FROM:
@@ -699,13 +699,13 @@ libinotify_cached_event_handle (TrackerMonitor *monitor,
 	case IN_DELETE_SELF:
 		if (is_directory) {
 			tracker_monitor_remove (monitor,
-						data->file);
+			                        data->file);
 		}
 
 		g_signal_emit (monitor,
-			       signals[ITEM_DELETED], 0,
-			       data->file,
-			       is_directory);
+		               signals[ITEM_DELETED], 0,
+		               data->file,
+		               is_directory);
 
 		break;
 
@@ -716,9 +716,9 @@ libinotify_cached_event_handle (TrackerMonitor *monitor,
 
 	case IN_CREATE:
 		g_signal_emit (monitor,
-			       signals[ITEM_CREATED], 0,
-			       data->file,
-			       is_directory);
+		               signals[ITEM_CREATED], 0,
+		               data->file,
+		               is_directory);
 
 		break;
 	default:
@@ -730,9 +730,9 @@ static gboolean
 libinotify_cached_events_timeout_cb (gpointer data)
 {
 	TrackerMonitor *monitor;
-	GTimeVal	now;
-	GHashTableIter	iter;
-	gpointer	key, value;
+	GTimeVal        now;
+	GHashTableIter  iter;
+	gpointer        key, value;
 
 	monitor = data;
 
@@ -743,7 +743,7 @@ libinotify_cached_events_timeout_cb (gpointer data)
 	g_hash_table_iter_init (&iter, monitor->private->cached_events);
 	while (g_hash_table_iter_next (&iter, &key, &value)) {
 		EventData   *event;
-		glong	     last_event_seconds;
+		glong        last_event_seconds;
 		glong        start_event_seconds;
 		gboolean     is_directory;
 		gboolean     force_emit = FALSE;
@@ -758,11 +758,11 @@ libinotify_cached_events_timeout_cb (gpointer data)
 			g_file_query_file_type (event->file, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
 
 		g_debug ("Comparing now:%ld to then:%ld (start:%ld), diff:%ld (with start:%ld)",
-			 now.tv_sec,
-			 event->last_time.tv_sec,
-			 event->start_time.tv_sec,
-			 last_event_seconds,
-			 start_event_seconds);
+		         now.tv_sec,
+		         event->last_time.tv_sec,
+		         event->start_time.tv_sec,
+		         last_event_seconds,
+		         start_event_seconds);
 
 		/* If the item has been in the cache for too long
 		 * according to the module config options, then we
@@ -775,7 +775,7 @@ libinotify_cached_events_timeout_cb (gpointer data)
 		}
 
 		timed_out = last_event_seconds >= MAX (CACHE_LIFETIME_SECONDS,
-						       monitor->private->scan_timeout);
+		                                       monitor->private->scan_timeout);
 
 		/* Make sure the item is in the cache for at least 2
 		 * seconds OR the time as stated by the module config
@@ -792,19 +792,19 @@ libinotify_cached_events_timeout_cb (gpointer data)
 			 * DELETE event for the file we know about.
 			 */
 			g_debug ("Cached event:%d has timed out (%ld seconds have elapsed)",
-				 event->event_type,
-				 last_event_seconds);
+			         event->event_type,
+			         last_event_seconds);
 		} else {
 			event->start_time = now;
 			g_debug ("Cached event:%d has been forced to signal (%ld seconds have elapsed since the beginning)",
-				 event->event_type,
-				 start_event_seconds);
+			         event->event_type,
+			         start_event_seconds);
 		}
 
 		/* Signal event */
 		libinotify_cached_event_handle (monitor,
-						event,
-						is_directory);
+		                                event,
+		                                is_directory);
 
 
 		if (timed_out) {
@@ -832,23 +832,23 @@ libinotify_cached_events_timeout_cb (gpointer data)
 
 static gboolean
 libinotify_cached_event_delete_children_func (gpointer key,
-					      gpointer value,
-					      gpointer user_data)
+                                              gpointer value,
+                                              gpointer user_data)
 {
 	EventData *data;
 
 	data = user_data;
 
 	return (data->event_type == IN_DELETE ||
-		data->event_type == IN_DELETE_SELF) &&
+	        data->event_type == IN_DELETE_SELF) &&
 		g_file_has_prefix (key, data->file);
 }
 
 static void
 libinotify_monitor_force_emission (TrackerMonitor *monitor,
-				   GFile          *file,
-				   guint32         event_type,
-				   gboolean        is_directory)
+                                   GFile          *file,
+                                   guint32         event_type,
+                                   gboolean        is_directory)
 {
 	EventData *data;
 
@@ -860,13 +860,13 @@ libinotify_monitor_force_emission (TrackerMonitor *monitor,
 		event_type_str = libinotify_monitor_event_to_string (event_type);
 
 		g_debug ("Cached event:%d being handled before %s",
-			 data->event_type,
-			 event_type_str);
+		         data->event_type,
+		         event_type_str);
 
 		/* Signal event */
 		libinotify_cached_event_handle (monitor,
-						data,
-						is_directory);
+		                                data,
+		                                is_directory);
 
 		/* Clean up */
 		g_hash_table_remove (monitor->private->cached_events, data->file);
@@ -877,19 +877,19 @@ libinotify_monitor_force_emission (TrackerMonitor *monitor,
 
 static void
 libinotify_monitor_event_cb (INotifyHandle *handle,
-			     const char    *monitor_name,
-			     const char    *filename,
-			     guint32	    event_type,
-			     guint32	    cookie,
-			     gpointer	    user_data)
+                             const char    *monitor_name,
+                             const char    *filename,
+                             guint32        event_type,
+                             guint32        cookie,
+                             gpointer       user_data)
 {
 	TrackerMonitor *monitor;
-	GFile	       *file;
-	GFile	       *other_file;
-	gchar	       *str1;
-	gchar	       *str2;
-	gboolean	is_directory;
-	gchar	       *event_type_str;
+	GFile          *file;
+	GFile          *other_file;
+	gchar          *str1;
+	gchar          *str2;
+	gboolean        is_directory;
+	gchar          *event_type_str;
 	EventData      *data = NULL;
 	gboolean        set_up_cache_timeout = FALSE;
 
@@ -934,10 +934,10 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 
 	event_type_str = libinotify_monitor_event_to_string (event_type);
 	g_message ("Received monitor event:%d->'%s' for file:'%s' (cookie:%d)",
-		   event_type,
-		   event_type_str,
-		   str1 ? str1 : "",
-		   cookie);
+	           event_type,
+	           event_type_str,
+	           str1 ? str1 : "",
+	           cookie);
 	g_free (event_type_str);
 
 #ifdef PAUSE_ON_IO
@@ -945,15 +945,15 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		g_source_remove (monitor->private->unpause_timeout_id);
 	} else {
 		g_message ("Pausing indexing because we are "
-			   "receiving monitor events");
+		           "receiving monitor events");
 
 		tracker_status_set_is_paused_for_io (TRUE);
 	}
 
 	monitor->private->unpause_timeout_id =
 		g_timeout_add_seconds (PAUSE_ON_IO_SECONDS,
-				       unpause_cb,
-				       monitor);
+		                       unpause_cb,
+		                       monitor);
 #endif /* PAUSE_ON_IO */
 
 	if (cookie > 0) {
@@ -961,14 +961,14 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		 * the event pairs hash table.
 		 */
 		data = g_hash_table_lookup (monitor->private->event_pairs,
-					    GUINT_TO_POINTER (cookie));
+		                            GUINT_TO_POINTER (cookie));
 
 		if (!data) {
 			data = event_data_new (file, event_type);
 
 			g_hash_table_insert (monitor->private->event_pairs,
-					     GUINT_TO_POINTER (cookie),
-					     data);
+			                     GUINT_TO_POINTER (cookie),
+			                     data);
 		} else {
 			other_file = data->file;
 		}
@@ -981,8 +981,8 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 
 			monitor->private->event_pairs_timeout_id =
 				g_timeout_add_seconds (CACHE_LIFETIME_SECONDS,
-						       libinotify_event_pairs_timeout_cb,
-						       monitor);
+				                       libinotify_event_pairs_timeout_cb,
+				                       monitor);
 		}
 	}
 
@@ -1012,8 +1012,8 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		data = event_data_new (file, event_type);
 
 		g_hash_table_insert (monitor->private->cached_events,
-				     g_object_ref (data->file),
-				     data);
+		                     g_object_ref (data->file),
+		                     data);
 		break;
 
 	case IN_MOVED_FROM:
@@ -1022,9 +1022,9 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		 * disparity when the cache expires.
 		 */
 		libinotify_monitor_force_emission (monitor,
-						   file,
-						   event_type,
-						   is_directory);
+		                                   file,
+		                                   event_type,
+		                                   is_directory);
 
 		/* Fall through */
 	case IN_DELETE:
@@ -1056,17 +1056,17 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 
 				tracker_monitor_remove (monitor, file);
 
-				count =	g_hash_table_foreach_remove (monitor->private->cached_events,
-								     libinotify_cached_event_delete_children_func,
-								     data);
+				count =         g_hash_table_foreach_remove (monitor->private->cached_events,
+				                                             libinotify_cached_event_delete_children_func,
+				                                             data);
 
 				g_debug ("Removed %d child items in recently deleted cache", count);
 			}
 
 			/* Stage 2: */
 			g_hash_table_insert (monitor->private->cached_events,
-					     g_object_ref (data->file),
-					     data);
+			                     g_object_ref (data->file),
+			                     data);
 
 			/* Stage 3: */
 			set_up_cache_timeout = TRUE;
@@ -1080,18 +1080,18 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 			 */
 		} else if (other_file) {
 			g_signal_emit (monitor,
-				       signals[ITEM_MOVED], 0,
-				       file,
-				       other_file,
-				       is_directory,
-				       TRUE);
+			               signals[ITEM_MOVED], 0,
+			               file,
+			               other_file,
+			               is_directory,
+			               TRUE);
 
 			if (is_directory) {
 				monitor_move (monitor, file, other_file);
 			}
 
 			g_hash_table_remove (monitor->private->event_pairs,
-					     GUINT_TO_POINTER (cookie));
+			                     GUINT_TO_POINTER (cookie));
 		}
 
 		break;
@@ -1107,8 +1107,8 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		data = event_data_new (file, event_type);
 
 		g_hash_table_insert (monitor->private->cached_events,
-				     g_object_ref (data->file),
-				     data);
+		                     g_object_ref (data->file),
+		                     data);
 		break;
 
 	case IN_MOVED_TO:
@@ -1121,9 +1121,9 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 		/* Handle event */
 		if (cookie == 0) {
 			g_signal_emit (monitor,
-				       signals[ITEM_CREATED], 0,
-				       file,
-				       is_directory);
+			               signals[ITEM_CREATED], 0,
+			               file,
+			               is_directory);
 		} else if (other_file) {
 			gboolean is_source_indexed;
 
@@ -1138,25 +1138,25 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 			 */
 
 			if (g_hash_table_lookup (monitor->private->event_pairs,
-						 GUINT_TO_POINTER (cookie))) {
+			                         GUINT_TO_POINTER (cookie))) {
 				is_source_indexed = TRUE;
 			} else {
 				is_source_indexed = FALSE;
 			}
 
 			g_signal_emit (monitor,
-				       signals[ITEM_MOVED], 0,
-				       other_file,
-				       file,
-				       is_directory,
-				       is_source_indexed);
+			               signals[ITEM_MOVED], 0,
+			               other_file,
+			               file,
+			               is_directory,
+			               is_source_indexed);
 
 			if (is_directory) {
 				monitor_move (monitor, other_file, file);
 			}
 
 			g_hash_table_remove (monitor->private->event_pairs,
-					     GUINT_TO_POINTER (cookie));
+			                     GUINT_TO_POINTER (cookie));
 		}
 
 		break;
@@ -1177,8 +1177,8 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 
 		monitor->private->cached_events_timeout_id =
 			g_timeout_add_seconds (CACHE_LIFETIME_SECONDS,
-					       libinotify_cached_events_timeout_cb,
-					       monitor);
+			                       libinotify_cached_events_timeout_cb,
+			                       monitor);
 	}
 
 	g_free (str1);
@@ -1188,11 +1188,11 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 
 static INotifyHandle *
 libinotify_monitor_directory (TrackerMonitor *monitor,
-			      GFile	     *file)
+                              GFile          *file)
 {
 	INotifyHandle *handle;
-	gchar	      *path;
-	guint32	       mask;
+	gchar         *path;
+	guint32                mask;
 	unsigned long  flags;
 
 	flags  = 0;
@@ -1209,21 +1209,21 @@ libinotify_monitor_directory (TrackerMonitor *monitor,
 	 *   IN_OPEN
 	 */
 	mask   = (IN_MOVED_FROM | IN_MOVED_TO | IN_MOVE_SELF |
-		  IN_DELETE | IN_DELETE_SELF |
-		  IN_CREATE |
-		  IN_CLOSE_WRITE |
-		  IN_ATTRIB |
-		  IN_UNMOUNT);
+	          IN_DELETE | IN_DELETE_SELF |
+	          IN_CREATE |
+	          IN_CLOSE_WRITE |
+	          IN_ATTRIB |
+	          IN_UNMOUNT);
 
 	/* For files */
 	/* flags |= IN_FLAG_FILE_BASED; */
 
 	path = g_file_get_path (file);
 	handle = inotify_monitor_add (path,
-				      mask,
-				      flags,
-				      libinotify_monitor_event_cb,
-				      monitor);
+	                              mask,
+	                              flags,
+	                              libinotify_monitor_event_cb,
+	                              monitor);
 	g_free (path);
 
 	if (!handle) {
@@ -1243,8 +1243,8 @@ libinotify_monitor_cancel (gpointer data)
 
 static gboolean
 monitor_move (TrackerMonitor *monitor,
-	      GFile          *old_file,
-	      GFile          *new_file)
+              GFile          *old_file,
+              GFile          *new_file)
 {
 	GHashTableIter iter;
 	GHashTable *new_monitors;
@@ -1257,9 +1257,9 @@ monitor_move (TrackerMonitor *monitor,
 	 * monitors recursively for the NEW directory.
 	 */
 	new_monitors = g_hash_table_new_full (g_file_hash,
-					      (GEqualFunc) g_file_equal,
-					      (GDestroyNotify) g_object_unref,
-					      NULL);
+	                                      (GEqualFunc) g_file_equal,
+	                                      (GDestroyNotify) g_object_unref,
+	                                      NULL);
 	old_prefix = g_file_get_path (old_file);
 
 	/* Remove the monitor for the top level directory */
@@ -1311,8 +1311,8 @@ monitor_move (TrackerMonitor *monitor,
 		g_hash_table_iter_remove (&iter);
 
 		g_debug ("Removed monitor for path:'%s', total monitors:%d",
-			 old_path,
-			 g_hash_table_size (monitor->private->monitors));
+		         old_path,
+		         g_hash_table_size (monitor->private->monitors));
 
 		g_free (old_path);
 
@@ -1377,7 +1377,7 @@ tracker_monitor_get_cache_timeout (TrackerMonitor *monitor)
 
 void
 tracker_monitor_set_enabled (TrackerMonitor *monitor,
-			     gboolean	     enabled)
+                             gboolean        enabled)
 {
 	GList *keys, *k;
 
@@ -1407,11 +1407,11 @@ tracker_monitor_set_enabled (TrackerMonitor *monitor,
 			/* Create monitor for dir */
 			handle = libinotify_monitor_directory (monitor, file);
 			g_hash_table_replace (monitor->private->monitors,
-					      g_object_ref (file), handle);
+			                      g_object_ref (file), handle);
 		} else {
 			/* Remove monitor */
 			g_hash_table_replace (monitor->private->monitors,
-					      g_object_ref (file), NULL);
+			                      g_object_ref (file), NULL);
 		}
 	}
 
@@ -1420,7 +1420,7 @@ tracker_monitor_set_enabled (TrackerMonitor *monitor,
 
 void
 tracker_monitor_set_scan_timeout (TrackerMonitor *monitor,
-				  gint            value)
+                                  gint            value)
 {
 	TrackerMonitorPrivate *priv;
 
@@ -1438,7 +1438,7 @@ tracker_monitor_set_scan_timeout (TrackerMonitor *monitor,
 
 void
 tracker_monitor_set_cache_timeout (TrackerMonitor *monitor,
-				   gint            value)
+                                   gint            value)
 {
 	TrackerMonitorPrivate *priv;
 
@@ -1456,7 +1456,7 @@ tracker_monitor_set_cache_timeout (TrackerMonitor *monitor,
 
 gboolean
 tracker_monitor_add (TrackerMonitor *monitor,
-		     GFile	    *file)
+                     GFile          *file)
 {
 	INotifyHandle *file_monitor = NULL;
 	gchar *path;
@@ -1474,8 +1474,8 @@ tracker_monitor_add (TrackerMonitor *monitor,
 
 		if (!monitor->private->monitor_limit_warned) {
 			g_warning ("The maximum number of monitors to set (%d) "
-				   "has been reached, not adding any new ones",
-				   monitor->private->monitor_limit);
+			           "has been reached, not adding any new ones",
+			           monitor->private->monitor_limit);
 			monitor->private->monitor_limit_warned = TRUE;
 		}
 
@@ -1494,7 +1494,7 @@ tracker_monitor_add (TrackerMonitor *monitor,
 
 		if (!file_monitor) {
 			g_warning ("Could not add monitor for path:'%s'",
-				   path);
+			           path);
 			g_free (path);
 			return FALSE;
 		}
@@ -1505,12 +1505,12 @@ tracker_monitor_add (TrackerMonitor *monitor,
 	 * add or remove monitors.
 	 */
 	g_hash_table_insert (monitor->private->monitors,
-			     g_object_ref (file),
-			     file_monitor);
+	                     g_object_ref (file),
+	                     file_monitor);
 
 	g_debug ("Added monitor for path:'%s', total monitors:%d",
-		 path,
-		 g_hash_table_size (monitor->private->monitors));
+	         path,
+	         g_hash_table_size (monitor->private->monitors));
 
 	g_free (path);
 
@@ -1519,7 +1519,7 @@ tracker_monitor_add (TrackerMonitor *monitor,
 
 gboolean
 tracker_monitor_remove (TrackerMonitor *monitor,
-			GFile          *file)
+                        GFile          *file)
 {
 	gchar *path;
 	gboolean removed;
@@ -1531,8 +1531,8 @@ tracker_monitor_remove (TrackerMonitor *monitor,
 	path = g_file_get_path (file);
 
 	g_debug ("Removed monitor for path:'%s', total monitors:%d",
-		 path,
-		 g_hash_table_size (monitor->private->monitors));
+	         path,
+	         g_hash_table_size (monitor->private->monitors));
 
 	g_free (path);
 
@@ -1541,7 +1541,7 @@ tracker_monitor_remove (TrackerMonitor *monitor,
 
 gboolean
 tracker_monitor_remove_recursively (TrackerMonitor *monitor,
-				    GFile          *file)
+                                    GFile          *file)
 {
 	GHashTableIter iter;
 	gpointer iter_file, iter_file_monitor;
@@ -1564,8 +1564,8 @@ tracker_monitor_remove_recursively (TrackerMonitor *monitor,
 		g_hash_table_iter_remove (&iter);
 
 		g_debug ("Removed monitor for path:'%s', total monitors:%d",
-			 path,
-			 g_hash_table_size (monitor->private->monitors));
+		         path,
+		         g_hash_table_size (monitor->private->monitors));
 
 		g_free (path);
 
@@ -1579,7 +1579,7 @@ tracker_monitor_remove_recursively (TrackerMonitor *monitor,
 
 gboolean
 tracker_monitor_is_watched (TrackerMonitor *monitor,
-			    GFile	   *file)
+                            GFile          *file)
 {
 	g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1589,9 +1589,9 @@ tracker_monitor_is_watched (TrackerMonitor *monitor,
 
 gboolean
 tracker_monitor_is_watched_by_string (TrackerMonitor *monitor,
-				      const gchar    *path)
+                                      const gchar    *path)
 {
-	GFile	   *file;
+	GFile      *file;
 	gboolean    watched;
 
 	g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
diff --git a/src/libtracker-miner/tracker-monitor.h b/src/libtracker-miner/tracker-monitor.h
index c73365c..4198025 100644
--- a/src/libtracker-miner/tracker-monitor.h
+++ b/src/libtracker-miner/tracker-monitor.h
@@ -26,19 +26,19 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_MONITOR		(tracker_monitor_get_type ())
-#define TRACKER_MONITOR(object)		(G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_MONITOR, TrackerMonitor))
-#define TRACKER_MONITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
-#define TRACKER_IS_MONITOR(object)	(G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_MONITOR))
+#define TRACKER_TYPE_MONITOR            (tracker_monitor_get_type ())
+#define TRACKER_MONITOR(object)                 (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_MONITOR, TrackerMonitor))
+#define TRACKER_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
+#define TRACKER_IS_MONITOR(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_MONITOR))
 #define TRACKER_IS_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_MONITOR))
-#define TRACKER_MONITOR_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
+#define TRACKER_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
 
-typedef struct TrackerMonitor	      TrackerMonitor;
+typedef struct TrackerMonitor         TrackerMonitor;
 typedef struct TrackerMonitorClass    TrackerMonitorClass;
 typedef struct TrackerMonitorPrivate  TrackerMonitorPrivate;
 
 struct TrackerMonitor {
-	GObject	parent;
+	GObject         parent;
 	TrackerMonitorPrivate *private;
 };
 
@@ -54,21 +54,21 @@ gint            tracker_monitor_get_scan_timeout     (TrackerMonitor *monitor);
 gint            tracker_monitor_get_cache_timeout    (TrackerMonitor *monitor);
 
 void            tracker_monitor_set_enabled          (TrackerMonitor *monitor,
-						      gboolean        enabled);
+                                                      gboolean        enabled);
 void            tracker_monitor_set_scan_timeout     (TrackerMonitor *monitor,
-						      gint            value);
+                                                      gint            value);
 void            tracker_monitor_set_cache_timeout    (TrackerMonitor *monitor,
-						      gint            value);
+                                                      gint            value);
 gboolean        tracker_monitor_add                  (TrackerMonitor *monitor,
-						      GFile          *file);
+                                                      GFile          *file);
 gboolean        tracker_monitor_remove               (TrackerMonitor *monitor,
-						      GFile          *file);
+                                                      GFile          *file);
 gboolean        tracker_monitor_remove_recursively   (TrackerMonitor *monitor,
-						      GFile          *file);
+                                                      GFile          *file);
 gboolean        tracker_monitor_is_watched           (TrackerMonitor *monitor,
-						      GFile          *file);
+                                                      GFile          *file);
 gboolean        tracker_monitor_is_watched_by_string (TrackerMonitor *monitor,
-						      const gchar    *path);
+                                                      const gchar    *path);
 guint           tracker_monitor_get_count            (TrackerMonitor *monitor);
 guint           tracker_monitor_get_ignored          (TrackerMonitor *monitor);
 
diff --git a/src/libtracker-miner/tracker-utils.c b/src/libtracker-miner/tracker-utils.c
index 6afe92d..525f914 100644
--- a/src/libtracker-miner/tracker-utils.c
+++ b/src/libtracker-miner/tracker-utils.c
@@ -22,14 +22,14 @@
 
 gboolean
 tracker_accumulator_check_file (GSignalInvocationHint *hint,
-				GValue                *return_accumulator,
-				const GValue          *handler_return,
-				gpointer               accumulator_data)
+                                GValue                *return_accumulator,
+                                const GValue          *handler_return,
+                                gpointer               accumulator_data)
 {
-        gboolean use;
+	gboolean use;
 
-        use = g_value_get_boolean (handler_return);
-        g_value_set_boolean (return_accumulator, use);
+	use = g_value_get_boolean (handler_return);
+	g_value_set_boolean (return_accumulator, use);
 
-        return (use == TRUE);
+	return (use == TRUE);
 }
diff --git a/src/libtracker-miner/tracker-utils.h b/src/libtracker-miner/tracker-utils.h
index 3b1aa8b..2b22731 100644
--- a/src/libtracker-miner/tracker-utils.h
+++ b/src/libtracker-miner/tracker-utils.h
@@ -26,9 +26,9 @@
 G_BEGIN_DECLS
 
 gboolean tracker_accumulator_check_file (GSignalInvocationHint *hint,
-					 GValue                *return_accumulator,
-					 const GValue          *handler_return,
-					 gpointer               accumulator_data);
+                                         GValue                *return_accumulator,
+                                         const GValue          *handler_return,
+                                         gpointer               accumulator_data);
 
 G_END_DECLS
 
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 85ee730..5a912f1 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -88,17 +88,17 @@
  * reads, never writes). We hope that's sufficient for not having to get our
  * code involved in Camel's cruel inneryard of having to lock the db_r ptr. */
 
-#define MAX_BEFORE_SEND			50
-#define QUEUED_SETS_PER_MAINLOOP 	100
+#define MAX_BEFORE_SEND                         50
+#define QUEUED_SETS_PER_MAINLOOP        100
 
-#define TRACKER_SERVICE			"org.freedesktop.Tracker1"
+#define TRACKER_SERVICE                         "org.freedesktop.Tracker1"
 
-#define NIE_DATASOURCE			TRACKER_NIE_PREFIX "DataSource"
-#define RDF_PREFIX			TRACKER_RDF_PREFIX
-#define NMO_PREFIX			TRACKER_NMO_PREFIX
-#define NCO_PREFIX			TRACKER_NCO_PREFIX
-#define NAO_PREFIX			TRACKER_NAO_PREFIX
-#define DATASOURCE_URN			"urn:nepomuk:datasource:1cb1eb90-1241-11de-8c30-0800200c9a66"
+#define NIE_DATASOURCE                  TRACKER_NIE_PREFIX "DataSource"
+#define RDF_PREFIX                      TRACKER_RDF_PREFIX
+#define NMO_PREFIX                      TRACKER_NMO_PREFIX
+#define NCO_PREFIX                      TRACKER_NCO_PREFIX
+#define NAO_PREFIX                      TRACKER_NAO_PREFIX
+#define DATASOURCE_URN                  "urn:nepomuk:datasource:1cb1eb90-1241-11de-8c30-0800200c9a66"
 
 G_DEFINE_TYPE (TrackerEvolutionPlugin, tracker_evolution_plugin, TRACKER_TYPE_MINER)
 
@@ -214,26 +214,26 @@ camel_stream_format_text (CamelDataWrapper *dw, CamelStream *stream)
 	ssize_t bytes = -1;
 
 	if (dw->mime_type && (charset = camel_content_type_param
-			(dw->mime_type, "charset")) &&
-		g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0)
-	{
-		CamelStream *null;
-
-		/* Since a few Windows mailers like to claim they sent
-		* out iso-8859-# encoded text when they really sent
-		* out windows-cp125#, do some simple sanity checking
-		* before we move on... */
-
-		null = camel_stream_null_new();
-		filter_stream = camel_stream_filter_new_with_stream(null);
-		camel_object_unref(null);
-		windows = (CamelMimeFilterWindows *)camel_mime_filter_windows_new(charset);
-		camel_stream_filter_add (filter_stream, (CamelMimeFilter *)windows);
-		camel_data_wrapper_decode_to_stream (dw, (CamelStream *)filter_stream);
-		camel_stream_flush ((CamelStream *)filter_stream);
-		camel_object_unref (filter_stream);
-		charset = camel_mime_filter_windows_real_charset (windows);
-	}
+	                      (dw->mime_type, "charset")) &&
+	    g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0)
+		{
+			CamelStream *null;
+
+			/* Since a few Windows mailers like to claim they sent
+			 * out iso-8859-# encoded text when they really sent
+			 * out windows-cp125#, do some simple sanity checking
+			 * before we move on... */
+
+			null = camel_stream_null_new();
+			filter_stream = camel_stream_filter_new_with_stream(null);
+			camel_object_unref(null);
+			windows = (CamelMimeFilterWindows *)camel_mime_filter_windows_new(charset);
+			camel_stream_filter_add (filter_stream, (CamelMimeFilter *)windows);
+			camel_data_wrapper_decode_to_stream (dw, (CamelStream *)filter_stream);
+			camel_stream_flush ((CamelStream *)filter_stream);
+			camel_object_unref (filter_stream);
+			charset = camel_mime_filter_windows_real_charset (windows);
+		}
 
 	filter_stream = camel_stream_filter_new_with_stream (stream);
 
@@ -292,8 +292,8 @@ folder_registry_free (FolderRegistry *registry)
 
 static FolderRegistry*
 folder_registry_new (const gchar *account_uri,
-		     CamelFolder *folder,
-		     TrackerEvolutionPlugin *self)
+                     CamelFolder *folder,
+                     TrackerEvolutionPlugin *self)
 {
 	FolderRegistry *registry = g_slice_new (FolderRegistry);
 
@@ -309,7 +309,7 @@ folder_registry_new (const gchar *account_uri,
 
 static void
 on_replied (GError   *error,
-	    gpointer  user_data)
+            gpointer  user_data)
 {
 	if (error) {
 		g_warning ("Error updating data: %s\n", error->message);
@@ -326,9 +326,9 @@ send_sparql_update (TrackerEvolutionPlugin *self, const gchar *sparql)
 
 	if (priv->client) {
 		dbus_g_proxy_call_no_reply (priv->client->proxy_resources,
-					    "SparqlUpdate",
-					    G_TYPE_STRING, sparql,
-					    G_TYPE_INVALID);
+		                            "SparqlUpdate",
+		                            G_TYPE_STRING, sparql,
+		                            G_TYPE_INVALID);
 	}
 }
 
@@ -455,14 +455,14 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
 	tracker_sparql_builder_object_boolean (sparql, (flags & CAMEL_MESSAGE_SEEN));
 
 	/*
-	g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_UID));
-	g_ptr_array_add (values_temp, g_strdup (uid));
+	  g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_UID));
+	  g_ptr_array_add (values_temp, g_strdup (uid));
 
-	g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_JUNK));
-	g_ptr_array_add (values_temp, g_strdup ((flags & CAMEL_MESSAGE_JUNK) ? "True" : "False"));
+	  g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_JUNK));
+	  g_ptr_array_add (values_temp, g_strdup ((flags & CAMEL_MESSAGE_JUNK) ? "True" : "False"));
 
-	g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_FORWARDED));
-	g_ptr_array_add (values_temp, g_strdup ((flags & CAMEL_MESSAGE_FORWARDED) ? "True" : "False"));
+	  g_ptr_array_add (predicates_temp, g_strdup (TRACKER_EVOLUTION_PREDICATE_FORWARDED));
+	  g_ptr_array_add (values_temp, g_strdup ((flags & CAMEL_MESSAGE_FORWARDED) ? "True" : "False"));
 	*/
 
 	if (to && (arr = g_strsplit (to, ",", -1)) != NULL) {
@@ -562,8 +562,8 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
 
 static void
 on_folder_summary_changed (CamelFolder *folder,
-			   CamelFolderChangeInfo *changes,
-			   gpointer user_data)
+                           CamelFolderChangeInfo *changes,
+                           gpointer user_data)
 {
 	OnSummaryChangedInfo *info = user_data;
 	CamelFolderSummary *summary;
@@ -851,10 +851,10 @@ many_idle_destroy (gpointer user_data)
 static void
 start_many_handler (TrackerEvolutionPlugin *self)
 {
-	 g_idle_add_full (G_PRIORITY_LOW,
-	                  many_idle_handler,
-	                  g_object_ref (self),
-	                  many_idle_destroy);
+	g_idle_add_full (G_PRIORITY_LOW,
+	                 many_idle_handler,
+	                 g_object_ref (self),
+	                 many_idle_destroy);
 }
 
 /* Initial upload of more recent than last_checkout items, called in the mainloop */
@@ -894,15 +894,15 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 		 * exist (not guaranteed). In IMAP BODYSTRUCTURE format. */
 
 		query = sqlite3_mprintf ("SELECT uid, flags, read, deleted, "            /* 0  - 3  */
-					        "replied, important, junk, attachment, " /* 4  - 7  */
-					        "size, dsent, dreceived, subject, "      /* 8  - 11 */
-					        "mail_from, mail_to, mail_cc, mlist, "   /* 12 - 15 */
-					        "labels, usertags "                      /* 16 - 17 */
-					 "FROM %Q "
-					 "WHERE modified > %"G_GUINT64_FORMAT,
+		                         "replied, important, junk, attachment, " /* 4  - 7  */
+		                         "size, dsent, dreceived, subject, "      /* 8  - 11 */
+		                         "mail_from, mail_to, mail_cc, mlist, "   /* 12 - 15 */
+		                         "labels, usertags "                      /* 16 - 17 */
+		                         "FROM %Q "
+		                         "WHERE modified > %"G_GUINT64_FORMAT,
 
-					 iter->full_name,
-					 info->last_checkout);
+		                         iter->full_name,
+		                         info->last_checkout);
 
 
 		ret = sqlite3_prepare_v2 (cdb_r->db, query, -1, &stmt, NULL);
@@ -999,36 +999,36 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 					/* Extract User tags */
 					p = part = g_strdup ((const gchar *) sqlite3_column_text (stmt, 17));
 					EXTRACT_FIRST_DIGIT (max)
-					for (j = 0; j < max; j++) {
-						int len;
-						char *name, *value;
-						EXTRACT_STRING (name)
-						EXTRACT_STRING (value)
-						if (name && g_utf8_validate (name, -1, NULL) &&
-						    value && g_utf8_validate (value, -1, NULL)) {
-
-							if (!opened) {
-								tracker_sparql_builder_subject_iri (sparql, uri);
-								opened = TRUE;
-							}
+						for (j = 0; j < max; j++) {
+							int len;
+							char *name, *value;
+							EXTRACT_STRING (name)
+								EXTRACT_STRING (value)
+								if (name && g_utf8_validate (name, -1, NULL) &&
+								    value && g_utf8_validate (value, -1, NULL)) {
+
+									if (!opened) {
+										tracker_sparql_builder_subject_iri (sparql, uri);
+										opened = TRUE;
+									}
 
-							tracker_sparql_builder_predicate (sparql, "nao:hasProperty");
-							tracker_sparql_builder_object_blank_open (sparql);
+									tracker_sparql_builder_predicate (sparql, "nao:hasProperty");
+									tracker_sparql_builder_object_blank_open (sparql);
 
-							tracker_sparql_builder_predicate (sparql, "rdf:type");
-							tracker_sparql_builder_object (sparql, "nao:Property");
+									tracker_sparql_builder_predicate (sparql, "rdf:type");
+									tracker_sparql_builder_object (sparql, "nao:Property");
 
-							tracker_sparql_builder_predicate (sparql, "nao:propertyName");
-							tracker_sparql_builder_object_string (sparql, name);
+									tracker_sparql_builder_predicate (sparql, "nao:propertyName");
+									tracker_sparql_builder_object_string (sparql, name);
 
-							tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
-							tracker_sparql_builder_object_string (sparql, value);
+									tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
+									tracker_sparql_builder_object_string (sparql, value);
 
-							tracker_sparql_builder_object_blank_close (sparql);
+									tracker_sparql_builder_object_blank_close (sparql);
+								}
+							g_free(name);
+							g_free(value);
 						}
-						g_free(name);
-						g_free(value);
-					}
 
 					g_free (uri);
 					g_free (p);
@@ -1122,9 +1122,9 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 
 static void
 introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
-				   CamelStore *store,
-				   char *account_uri,
-				   gpointer user_data)
+                                   CamelStore *store,
+                                   char *account_uri,
+                                   gpointer user_data)
 {
 	ClientRegistry *info = user_data;
 	gboolean more = TRUE;
@@ -1175,7 +1175,7 @@ introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
 			 * directory separator here */
 
 			g_ptr_array_add (subjects_a, g_strdup_printf ("%s%s/%s", em_uri,
-								      mailbox, uid));
+			                                              mailbox, uid));
 
 			if (count > MAX_BEFORE_SEND) {
 
@@ -1337,11 +1337,11 @@ register_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
 	                      g_strdup (iter->full_name),
 	                      folder);
 
-	not_ready:
+ not_ready:
 
 	g_static_rec_mutex_unlock (priv->mutex);
 
-	fail_register:
+ fail_register:
 
 	camel_folder_info_free (info->iter);
 	g_free (info->account_uri);
@@ -1353,9 +1353,9 @@ register_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
 
 static void
 register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
-				 CamelFolderInfo *iter,
-				 CamelStore *store,
-				 gchar *account_uri)
+                                 CamelFolderInfo *iter,
+                                 CamelStore *store,
+                                 gchar *account_uri)
 {
 	TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self);
 
@@ -1432,11 +1432,11 @@ unregister_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
 		}
 	}
 
-	no_folders:
+ no_folders:
 
 	g_static_rec_mutex_unlock (priv->mutex);
 
-	fail_unregister:
+ fail_unregister:
 
 	camel_folder_info_free (info->iter);
 	g_free (info->account_uri);
@@ -1666,7 +1666,7 @@ register_client_second_half (ClientRegistry *info)
 	if (info->last_checkout < too_old) {
 
 		send_sparql_update (info->self, "DELETE FROM <"DATASOURCE_URN"> { ?s a rdfs:Resource } "
-		                                "WHERE { ?s nie:dataSource <" DATASOURCE_URN "> }");
+		                    "WHERE { ?s nie:dataSource <" DATASOURCE_URN "> }");
 		send_sparql_commit (info->self, FALSE);
 
 		info->last_checkout = 0;
@@ -1741,7 +1741,7 @@ register_client (TrackerEvolutionPlugin *self)
 	priv->of_total = 0;
 
 	query = "SELECT ?c "
-	        "WHERE { <" DATASOURCE_URN "> nie:contentLastModified ?c }";
+		"WHERE { <" DATASOURCE_URN "> nie:contentLastModified ?c }";
 
 	tracker_resources_sparql_query_async (priv->client, query,
 	                                      on_register_client_qry,
@@ -2048,10 +2048,10 @@ list_names_reply_cb (DBusGProxy     *proxy,
 
 static void
 name_owner_changed_cb (DBusGProxy *proxy,
-		       gchar *name,
-		       gchar *old_owner,
-		       gchar *new_owner,
-		       gpointer user_data)
+                       gchar *name,
+                       gchar *old_owner,
+                       gchar *new_owner,
+                       gpointer user_data)
 {
 	TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (user_data);
 
@@ -2210,7 +2210,7 @@ tracker_evolution_plugin_init (TrackerEvolutionPlugin *plugin)
 	                  G_CALLBACK (on_account_removed), plugin);
 	g_signal_connect (priv->accounts, "account-changed",
 	                  G_CALLBACK (on_account_changed), plugin);
-	error_handler:
+ error_handler:
 
 	if (error) {
 		g_warning ("Could not setup DBus for Tracker plugin, %s\n", error->message);
diff --git a/src/plugins/kmail/tracker-kmail-common.h b/src/plugins/kmail/tracker-kmail-common.h
index e67efec..1d4f27c 100644
--- a/src/plugins/kmail/tracker-kmail-common.h
+++ b/src/plugins/kmail/tracker-kmail-common.h
@@ -26,53 +26,53 @@
 
 /* Latest spec location: http://live.kde.org/Evolution/Metadata */
 
-#define TRACKER_KMAIL_INDEXER_PATH		"/org/freedesktop/Tracker1/Indexer/KMail/Registrar"
+#define TRACKER_KMAIL_INDEXER_PATH              "/org/freedesktop/Tracker1/Indexer/KMail/Registrar"
 
-#define TRACKER_KMAIL_REGISTRAR_SERVICE		"org.freedesktop.Tracker1"
-#define TRACKER_KMAIL_REGISTRAR_PATH		"/org/freedesktop/Tracker1/KMail/Registrar"
-#define TRACKER_KMAIL_REGISTRAR_INTERFACE	"org.freedesktop.email.metadata.Registrar"
+#define TRACKER_KMAIL_REGISTRAR_SERVICE                 "org.freedesktop.Tracker1"
+#define TRACKER_KMAIL_REGISTRAR_PATH            "/org/freedesktop/Tracker1/KMail/Registrar"
+#define TRACKER_KMAIL_REGISTRAR_INTERFACE       "org.freedesktop.email.metadata.Registrar"
 
-#define TRACKER_KMAIL_MANAGER_SERVICE		"org.kde.kmail"
-#define TRACKER_KMAIL_MANAGER_PATH		"/org/freedesktop/email/metadata/Manager"
-#define TRACKER_KMAIL_MANAGER_INTERFACE		"org.freedesktop.email.metadata.Manager"
+#define TRACKER_KMAIL_MANAGER_SERVICE           "org.kde.kmail"
+#define TRACKER_KMAIL_MANAGER_PATH              "/org/freedesktop/email/metadata/Manager"
+#define TRACKER_KMAIL_MANAGER_INTERFACE                 "org.freedesktop.email.metadata.Manager"
 
-#define DBUS_ERROR_DOMAIN			"TrackerKMail"
-#define DBUS_ERROR				g_quark_from_static_string (DBUS_ERROR_DOMAIN)
+#define DBUS_ERROR_DOMAIN                       "TrackerKMail"
+#define DBUS_ERROR                              g_quark_from_static_string (DBUS_ERROR_DOMAIN)
 
-#define TRACKER_KMAIL_PREDICATE_SUBJECT		"EMailMeta:MessageSubject"
-#define TRACKER_KMAIL_PREDICATE_SENT		"EMailMeta:MessageSent"
-#define TRACKER_KMAIL_PREDICATE_FROM		"EMailMeta:MessageFrom"
-#define TRACKER_KMAIL_PREDICATE_TO		"EMailMeta:MessageTo"
-#define TRACKER_KMAIL_PREDICATE_CC		"EMailMeta:MessageCc"
-#define TRACKER_KMAIL_PREDICATE_SEEN		"EMailMeta:MessageSeen"
-#define TRACKER_KMAIL_PREDICATE_ANSWERED	"EMailMeta:MessageAnswered"
-#define TRACKER_KMAIL_PREDICATE_FORWARDED	"EMailMeta:MessageForwarded"
-#define TRACKER_KMAIL_PREDICATE_DELETED		"EMailMeta:MessageDeleted"
-#define TRACKER_KMAIL_PREDICATE_SIZE		"EMailMeta:MessageSize"
+#define TRACKER_KMAIL_PREDICATE_SUBJECT                 "EMailMeta:MessageSubject"
+#define TRACKER_KMAIL_PREDICATE_SENT            "EMailMeta:MessageSent"
+#define TRACKER_KMAIL_PREDICATE_FROM            "EMailMeta:MessageFrom"
+#define TRACKER_KMAIL_PREDICATE_TO              "EMailMeta:MessageTo"
+#define TRACKER_KMAIL_PREDICATE_CC              "EMailMeta:MessageCc"
+#define TRACKER_KMAIL_PREDICATE_SEEN            "EMailMeta:MessageSeen"
+#define TRACKER_KMAIL_PREDICATE_ANSWERED        "EMailMeta:MessageAnswered"
+#define TRACKER_KMAIL_PREDICATE_FORWARDED       "EMailMeta:MessageForwarded"
+#define TRACKER_KMAIL_PREDICATE_DELETED                 "EMailMeta:MessageDeleted"
+#define TRACKER_KMAIL_PREDICATE_SIZE            "EMailMeta:MessageSize"
 
-#define TRACKER_KMAIL_PREDICATE_IDMD5		"KMail:MessageIdMD5"
-#define TRACKER_KMAIL_PREDICATE_UID 		"KMail:MessageUID"
-#define TRACKER_KMAIL_PREDICATE_TAG		"KMail:MessageTag"
-#define TRACKER_KMAIL_PREDICATE_SERNUM		"KMail:MessageSerNum"
-#define TRACKER_KMAIL_PREDICATE_SPAM		"KMail:MessageSpam"
-#define TRACKER_KMAIL_PREDICATE_HAM		"KMail:MessageHam"
+#define TRACKER_KMAIL_PREDICATE_IDMD5           "KMail:MessageIdMD5"
+#define TRACKER_KMAIL_PREDICATE_UID             "KMail:MessageUID"
+#define TRACKER_KMAIL_PREDICATE_TAG             "KMail:MessageTag"
+#define TRACKER_KMAIL_PREDICATE_SERNUM          "KMail:MessageSerNum"
+#define TRACKER_KMAIL_PREDICATE_SPAM            "KMail:MessageSpam"
+#define TRACKER_KMAIL_PREDICATE_HAM             "KMail:MessageHam"
 
-#define dbus_async_return_if_fail(expr,context)				\
-	G_STMT_START {							\
-		if G_LIKELY(expr) { } else {				\
-			GError *error = NULL;				\
-									\
-			g_set_error (&error,				\
-				     DBUS_ERROR,			\
-				     0,					\
-				     "Assertion `%s' failed",		\
-				     #expr);				\
-									\
-			dbus_g_method_return_error (context, error);	\
-			g_error_free (error);				\
-									\
-			return;						\
-		};							\
+#define dbus_async_return_if_fail(expr,context)	  \
+	G_STMT_START { \
+		if G_LIKELY(expr) { } else { \
+			GError *error = NULL; \
+                                                                        \
+			g_set_error (&error, \
+			             DBUS_ERROR, \
+			             0, \
+			             "Assertion `%s' failed", \
+			             #expr); \
+                                                                        \
+			dbus_g_method_return_error (context, error); \
+			g_error_free (error); \
+                                                                        \
+			return; \
+		}; \
 	} G_STMT_END
 
 #endif /* __TRACKER_KMAIL_COMMON_H__ */
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index 68cb845..892a63e 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -45,15 +45,15 @@
 #define TRACKER_TYPE_KMAIL_PUSH_REGISTRAR    (tracker_kmail_push_registrar_get_type ())
 #define TRACKER_KMAIL_PUSH_REGISTRAR(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), TRACKER_TYPE_KMAIL_PUSH_REGISTRAR, TrackerKMailPushRegistrar))
 
-#define RDF_PREFIX	TRACKER_RDF_PREFIX
-#define NMO_PREFIX	TRACKER_NMO_PREFIX
-#define NCO_PREFIX	TRACKER_NCO_PREFIX
-#define NAO_PREFIX	TRACKER_NAO_PREFIX
+#define RDF_PREFIX      TRACKER_RDF_PREFIX
+#define NMO_PREFIX      TRACKER_NMO_PREFIX
+#define NCO_PREFIX      TRACKER_NCO_PREFIX
+#define NAO_PREFIX      TRACKER_NAO_PREFIX
 
-#define NIE_DATASOURCE 			       TRACKER_NIE_PREFIX "DataSource"
-#define NIE_DATASOURCE_P 		       TRACKER_NIE_PREFIX "dataSource"
+#define NIE_DATASOURCE                                 TRACKER_NIE_PREFIX "DataSource"
+#define NIE_DATASOURCE_P                       TRACKER_NIE_PREFIX "dataSource"
 
-#define DATASOURCE_URN			       "urn:nepomuk:datasource:4a157cf0-1241-11de-8c30-0800200c9a66"
+#define DATASOURCE_URN                         "urn:nepomuk:datasource:4a157cf0-1241-11de-8c30-0800200c9a66"
 
 typedef struct TrackerKMailPushRegistrar TrackerKMailPushRegistrar;
 typedef struct TrackerKMailPushRegistrarClass TrackerKMailPushRegistrarClass;
@@ -88,9 +88,9 @@ tracker_kmail_registrar_finalize (GObject *object)
 
 static void
 tracker_kmail_registrar_set_property (GObject      *object,
-				      guint         prop_id,
-				      const GValue *value,
-				      GParamSpec   *pspec)
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
 {
 	switch (prop_id) {
 	default:
@@ -100,9 +100,9 @@ tracker_kmail_registrar_set_property (GObject      *object,
 
 static void
 tracker_kmail_registrar_get_property (GObject    *object,
-					  guint       prop_id,
-					  GValue     *value,
-					  GParamSpec *pspec)
+                                      guint       prop_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
 {
 	switch (prop_id) {
 	default:
@@ -156,9 +156,9 @@ get_email_and_fullname (const gchar *line, gchar **email, gchar **fullname)
 
 static void
 perform_set (TrackerKMailRegistrar *object,
-	     const gchar *subject,
-	     const GStrv predicates,
-	     const GStrv values)
+             const gchar *subject,
+             const GStrv predicates,
+             const GStrv values)
 {
 	guint i = 0;
 	TrackerSparqlBuilder *sparql;
@@ -357,7 +357,7 @@ perform_set (TrackerKMailRegistrar *object,
 
 static void
 perform_unset (TrackerKMailRegistrar *object,
-	       const gchar *subject)
+               const gchar *subject)
 {
 	gchar *sparql = g_strdup_printf ("DELETE FROM <%s> { <%s> a rdfs:Resource }",
 	                                 subject, subject);
@@ -389,26 +389,26 @@ on_commit (gpointer user_data)
 
 void
 tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
-				 const gchar *subject,
-				 const GStrv predicates,
-				 const GStrv values,
-				 const guint modseq,
-				 DBusGMethodInvocation *context,
-				 GError *derror)
+                             const gchar *subject,
+                             const GStrv predicates,
+                             const GStrv values,
+                             const guint modseq,
+                             DBusGMethodInvocation *context,
+                             GError *derror)
 {
 	guint request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to set one: 'KMail' ");
+	                          "D-Bus request to set one: 'KMail' ");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
 	if (predicates && values) {
 
 		dbus_async_return_if_fail (g_strv_length (predicates) ==
-					   g_strv_length (values), context);
+		                           g_strv_length (values), context);
 
 		perform_set (object, subject, predicates, values);
 	}
@@ -424,12 +424,12 @@ tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
 
 void
 tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
-				  const GStrv subjects,
-				  const GPtrArray *predicates,
-				  const GPtrArray *values,
-				  const guint modseq,
-				  DBusGMethodInvocation *context,
-				  GError *derror)
+                                  const GStrv subjects,
+                                  const GPtrArray *predicates,
+                                  const GPtrArray *values,
+                                  const guint modseq,
+                                  DBusGMethodInvocation *context,
+                                  GError *derror)
 {
 	guint request_id;
 	guint len, i = 0;
@@ -446,8 +446,8 @@ tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
 	dbus_async_return_if_fail (len == values->len, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to set many: 'KMail' "
-				  "'%d'", len);
+	                          "D-Bus request to set many: 'KMail' "
+	                          "'%d'", len);
 
 	while (subjects[i] != NULL) {
 		perform_set (object,
@@ -469,10 +469,10 @@ tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
 
 void
 tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
-				    const GStrv subjects,
-				    const guint modseq,
-				    DBusGMethodInvocation *context,
-				    GError *derror)
+                                    const GStrv subjects,
+                                    const guint modseq,
+                                    DBusGMethodInvocation *context,
+                                    GError *derror)
 {
 	guint i = 0;
 	guint request_id;
@@ -480,8 +480,8 @@ tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to unset many: 'KMail' "
-				  "'%d'", g_strv_length (subjects));
+	                          "D-Bus request to unset many: 'KMail' "
+	                          "'%d'", g_strv_length (subjects));
 
 	dbus_async_return_if_fail (subjects != NULL, context);
 
@@ -499,17 +499,17 @@ tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
 
 void
 tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
-			       const gchar *subject,
-			       const guint modseq,
-			       DBusGMethodInvocation *context,
-			       GError *derror)
+                               const gchar *subject,
+                               const guint modseq,
+                               DBusGMethodInvocation *context,
+                               GError *derror)
 {
 	guint request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to unset one: 'KMail'");
+	                          "D-Bus request to unset one: 'KMail'");
 
 	dbus_async_return_if_fail (subject != NULL, context);
 
@@ -524,16 +524,16 @@ tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
 
 void
 tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
-				 const guint modseq,
-				 DBusGMethodInvocation *context,
-				 GError *derror)
+                                 const guint modseq,
+                                 DBusGMethodInvocation *context,
+                                 GError *derror)
 {
 	guint request_id;
 
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to cleanup: 'KMail'");
+	                          "D-Bus request to cleanup: 'KMail'");
 
 	perform_cleanup (object);
 
@@ -555,9 +555,9 @@ on_manager_destroy (DBusGProxy *proxy, gpointer user_data)
 
 static void
 tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
-				     DBusGConnection      *connection,
-				     DBusGProxy           *dbus_proxy,
-				     GError              **error)
+                                     DBusGConnection      *connection,
+                                     DBusGProxy           *dbus_proxy,
+                                     GError              **error)
 {
 	GError *nerror = NULL;
 	guint result;
@@ -568,18 +568,18 @@ tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
 	tracker_push_registrar_set_manager (registrar, NULL);
 
 	manager_proxy = dbus_g_proxy_new_for_name (connection,
-						   TRACKER_KMAIL_MANAGER_SERVICE,
-						   TRACKER_KMAIL_MANAGER_PATH,
-						   TRACKER_KMAIL_MANAGER_INTERFACE);
+	                                           TRACKER_KMAIL_MANAGER_SERVICE,
+	                                           TRACKER_KMAIL_MANAGER_PATH,
+	                                           TRACKER_KMAIL_MANAGER_INTERFACE);
 
 	/* Creation of the registrar */
 	if (!org_freedesktop_DBus_request_name (dbus_proxy,
-						TRACKER_KMAIL_REGISTRAR_SERVICE,
-						DBUS_NAME_FLAG_DO_NOT_QUEUE,
-						&result, &nerror)) {
+	                                        TRACKER_KMAIL_REGISTRAR_SERVICE,
+	                                        DBUS_NAME_FLAG_DO_NOT_QUEUE,
+	                                        &result, &nerror)) {
 
 		g_critical ("Could not setup D-Bus, %s in use\n",
-			    TRACKER_KMAIL_REGISTRAR_SERVICE);
+		            TRACKER_KMAIL_REGISTRAR_SERVICE);
 
 		if (nerror) {
 			g_propagate_error (error, nerror);
@@ -593,27 +593,27 @@ tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
 	}
 
 	object = g_object_new (TRACKER_TYPE_KMAIL_REGISTRAR,
-			       "connection", connection, NULL);
+	                       "connection", connection, NULL);
 
 	dbus_g_object_type_install_info (G_OBJECT_TYPE (object),
-					 &dbus_glib_tracker_kmail_registrar_object_info);
+	                                 &dbus_glib_tracker_kmail_registrar_object_info);
 
 	dbus_g_connection_register_g_object (connection,
-					     TRACKER_KMAIL_REGISTRAR_PATH,
-					     object);
+	                                     TRACKER_KMAIL_REGISTRAR_PATH,
+	                                     object);
 
 	/* Registration of the registrar to the manager - the cast is fine and checked */
 	dbus_g_proxy_call_no_reply (manager_proxy, "Register",
-				    G_TYPE_OBJECT, object,
-				    G_TYPE_UINT, (guint) tracker_data_manager_get_db_option_int64 ("KMailLastModseq"),
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
+	                            G_TYPE_OBJECT, object,
+	                            G_TYPE_UINT, (guint) tracker_data_manager_get_db_option_int64 ("KMailLastModseq"),
+	                            G_TYPE_INVALID,
+	                            G_TYPE_INVALID);
 
 	/* If while we had a proxy for the manager the manager shut itself down,
 	 * then we'll get rid of our registrar too, in on_manager_destroy */
 
 	g_signal_connect (manager_proxy, "destroy",
-			  G_CALLBACK (on_manager_destroy), registrar);
+	                  G_CALLBACK (on_manager_destroy), registrar);
 
 	tracker_push_registrar_set_object (registrar, object);
 	tracker_push_registrar_set_manager (registrar, manager_proxy);
@@ -656,7 +656,7 @@ tracker_push_module_init (void)
 	object = g_object_new (TRACKER_TYPE_KMAIL_PUSH_REGISTRAR, NULL);
 
 	tracker_push_registrar_set_service (TRACKER_PUSH_REGISTRAR (object),
-					    TRACKER_KMAIL_MANAGER_SERVICE);
+	                                    TRACKER_KMAIL_MANAGER_SERVICE);
 
 	return TRACKER_PUSH_REGISTRAR (object);
 }
diff --git a/src/plugins/kmail/tracker-kmail-registrar.h b/src/plugins/kmail/tracker-kmail-registrar.h
index 4e99c6e..546b156 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.h
+++ b/src/plugins/kmail/tracker-kmail-registrar.h
@@ -60,33 +60,33 @@ struct TrackerKMailRegistrarClass {
 GType  tracker_kmail_registrar_get_type   (void);
 
 void  tracker_kmail_registrar_set         (TrackerKMailRegistrar *object,
-					   const gchar *subject,
-					   const GStrv predicates,
-					   const GStrv values,
-					   const guint modseq,
-					   DBusGMethodInvocation *context,
-					   GError *derror);
+                                           const gchar *subject,
+                                           const GStrv predicates,
+                                           const GStrv values,
+                                           const guint modseq,
+                                           DBusGMethodInvocation *context,
+                                           GError *derror);
 void  tracker_kmail_registrar_set_many    (TrackerKMailRegistrar *object,
-					   const GStrv subjects,
-					   const GPtrArray *predicates,
-					   const GPtrArray *values,
-					   const guint modseq,
-					   DBusGMethodInvocation *context,
-					   GError *derror);
+                                           const GStrv subjects,
+                                           const GPtrArray *predicates,
+                                           const GPtrArray *values,
+                                           const guint modseq,
+                                           DBusGMethodInvocation *context,
+                                           GError *derror);
 void  tracker_kmail_registrar_unset_many  (TrackerKMailRegistrar *object,
-					   const GStrv subjects,
-					   const guint modseq,
-					   DBusGMethodInvocation *context,
-					   GError *derror);
+                                           const GStrv subjects,
+                                           const guint modseq,
+                                           DBusGMethodInvocation *context,
+                                           GError *derror);
 void  tracker_kmail_registrar_unset       (TrackerKMailRegistrar *object,
-					   const gchar *subject,
-					   const guint modseq,
-					   DBusGMethodInvocation *context,
-					   GError *derror);
+                                           const gchar *subject,
+                                           const guint modseq,
+                                           DBusGMethodInvocation *context,
+                                           GError *derror);
 void  tracker_kmail_registrar_cleanup     (TrackerKMailRegistrar *object,
-					   const guint modseq,
-					   DBusGMethodInvocation *context,
-					   GError *derror);
+                                           const guint modseq,
+                                           DBusGMethodInvocation *context,
+                                           GError *derror);
 
 
 G_END_DECLS
diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c
index cc0861a..2125da0 100644
--- a/src/tracker-control/tracker-control.c
+++ b/src/tracker-control/tracker-control.c
@@ -38,15 +38,15 @@
 #include <libtracker-miner/tracker-miner-manager.h>
 #include <libtracker-miner/tracker-crawler.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static gboolean     should_kill;
 static gboolean     should_terminate;
@@ -97,8 +97,8 @@ get_pids (void)
 	dir = g_dir_open ("/proc", 0, &error);
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not open /proc"),
-			    error ? error->message : _("no error given"));
+		            _("Could not open /proc"),
+		            error ? error->message : _("no error given"));
 		g_clear_error (&error);
 		return NULL;
 	}
@@ -125,9 +125,9 @@ get_pids (void)
 
 static void
 log_handler (const gchar    *domain,
-	     GLogLevelFlags  log_level,
-	     const gchar    *message,
-	     gpointer	     user_data)
+             GLogLevelFlags  log_level,
+             const gchar    *message,
+             gpointer        user_data)
 {
 	switch (log_level) {
 	case G_LOG_LEVEL_WARNING:
@@ -151,8 +151,8 @@ log_handler (const gchar    *domain,
 
 static gboolean
 crawler_check_file_cb (TrackerCrawler *crawler,
-		       GFile          *file,
-		       gpointer        user_data)
+                       GFile          *file,
+                       gpointer        user_data)
 {
 	const gchar **suffix;
 	gchar *path;
@@ -184,13 +184,13 @@ crawler_check_file_cb (TrackerCrawler *crawler,
 
 static void
 crawler_finished_cb (TrackerCrawler *crawler,
-		     GQueue         *found,
-		     gboolean        was_interrupted,
-		     guint           directories_found,
-		     guint           directories_ignored,
-		     guint           files_found,
-		     guint           files_ignored,
-		     gpointer        user_data)
+                     GQueue         *found,
+                     gboolean        was_interrupted,
+                     guint           directories_found,
+                     guint           directories_ignored,
+                     guint           files_found,
+                     guint           files_ignored,
+                     gpointer        user_data)
 {
 	g_main_loop_quit (user_data);
 }
@@ -216,29 +216,29 @@ main (int argc, char **argv)
 		g_thread_init (NULL);
 	}
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new (_(" - Manage Tracker processes and data"));
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		return EXIT_SUCCESS;
 	}
 
 	if (should_kill && should_terminate) {
 		g_printerr ("%s\n",
-			    _("You can not use the --kill and --terminate arguments together"));
+		            _("You can not use the --kill and --terminate arguments together"));
 		return EXIT_FAILURE;
 	} else if ((hard_reset || soft_reset) && should_terminate) {
 		g_printerr ("%s\n",
-			    _("You can not use the --terminate with --hard-reset or --soft-reset, --kill is implied"));
+		            _("You can not use the --terminate with --hard-reset or --soft-reset, --kill is implied"));
 		return EXIT_FAILURE;
 	} else if (hard_reset && soft_reset) {
 		g_printerr ("%s\n",
-			    _("You can not use the --hard-reset and --soft-reset arguments together"));
+		            _("You can not use the --hard-reset and --soft-reset arguments together"));
 		return EXIT_FAILURE;
 	}
 
@@ -254,10 +254,10 @@ main (int argc, char **argv)
 	    (!start && !remove_config && !remove_thumbnails)) {
 		pids = get_pids ();
 		str = g_strdup_printf (tracker_dngettext (NULL,
-							  "Found %d PIDâ?¦",
-							  "Found %d PIDsâ?¦",
-							  g_slist_length (pids)),
-				       g_slist_length (pids));
+		                                          "Found %d PIDâ?¦",
+		                                          "Found %d PIDsâ?¦",
+		                                          g_slist_length (pids)),
+		                       g_slist_length (pids));
 		g_print ("%s\n", str);
 		g_free (str);
 
@@ -270,8 +270,8 @@ main (int argc, char **argv)
 			if (!g_file_get_contents (filename, &contents, NULL, &error)) {
 				str = g_strdup_printf (_("Could not open '%s'"), filename);
 				g_printerr ("%s, %s\n",
-					    str,
-					    error ? error->message : _("no error given"));
+				            str,
+				            error ? error->message : _("no error given"));
 				g_free (str);
 				g_clear_error (&error);
 				g_free (contents);
@@ -300,8 +300,8 @@ main (int argc, char **argv)
 
 							str = g_strdup_printf (_("Could not terminate process %d"), pid);
 							g_printerr ("  %s, %s\n",
-								    str,
-								    errstr ? errstr : _("no error given"));
+							            str,
+							            errstr ? errstr : _("no error given"));
 							g_free (str);
 						} else {
 							str = g_strdup_printf (_("Terminated process %d"), pid);
@@ -314,8 +314,8 @@ main (int argc, char **argv)
 
 							str = g_strdup_printf (_("Could not kill process %d"), pid);
 							g_printerr ("  %s, %s\n",
-								    str,
-								    errstr ? errstr : _("no error given"));
+							            str,
+							            errstr ? errstr : _("no error given"));
 							g_free (str);
 						} else {
 							str = g_strdup_printf (_("Killed process %d"), pid);
@@ -342,9 +342,9 @@ main (int argc, char **argv)
 
 		/* Set log handler for library messages */
 		log_handler_id = g_log_set_handler (NULL,
-						    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
-						    log_handler,
-						    NULL);
+		                                    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
+		                                    log_handler,
+		                                    NULL);
 
 		g_log_set_default_handler (log_handler, NULL);
 
@@ -372,11 +372,11 @@ main (int argc, char **argv)
 		main_loop = g_main_loop_new (NULL, FALSE);
 
 		g_signal_connect (crawler, "check-file",
-				  G_CALLBACK (crawler_check_file_cb),
-				  &suffix);
+		                  G_CALLBACK (crawler_check_file_cb),
+		                  &suffix);
 		g_signal_connect (crawler, "finished",
-				  G_CALLBACK (crawler_finished_cb),
-				  main_loop);
+		                  G_CALLBACK (crawler_finished_cb),
+		                  main_loop);
 
 		/* Go through service files */
 		home_dir = g_getenv ("HOME");
@@ -409,11 +409,11 @@ main (int argc, char **argv)
 		main_loop = g_main_loop_new (NULL, FALSE);
 
 		g_signal_connect (crawler, "check-file",
-				  G_CALLBACK (crawler_check_file_cb),
-				  NULL);
+		                  G_CALLBACK (crawler_check_file_cb),
+		                  NULL);
 		g_signal_connect (crawler, "finished",
-				  G_CALLBACK (crawler_finished_cb),
-				  main_loop);
+		                  G_CALLBACK (crawler_finished_cb),
+		                  main_loop);
 
 		/* Go through service files */
 		home_dir = g_getenv ("HOME");
@@ -456,14 +456,14 @@ main (int argc, char **argv)
 
 			if (!tracker_miner_manager_get_status (manager, l->data, NULL, &progress)) {
 				g_printerr ("  %s: %s (%s)\n",
-					    _("Failed"),
-					    display_name,
-					    _("Could not get miner status"));
+				            _("Failed"),
+				            display_name,
+				            _("Could not get miner status"));
 			} else {
 				g_print ("  %s: %s (%3.0f%%)\n",
-					 _("Done"),
-					 display_name,
-					 progress * 100);
+				         _("Done"),
+				         display_name,
+				         progress * 100);
 			}
 
 			g_free (l->data);
diff --git a/src/tracker-extract/dummy.c b/src/tracker-extract/dummy.c
index 6702014..70e3957 100644
--- a/src/tracker-extract/dummy.c
+++ b/src/tracker-extract/dummy.c
@@ -34,7 +34,7 @@
  * Prototype of the parsing function.
  */
 static void extract_dummy (const gchar *filename,
-			   GHashTable  *metadata);
+                           GHashTable  *metadata);
 
 /*
  * Link between mimetype and parsing function
@@ -49,7 +49,7 @@ static TrackerExtractData data[] = {
  */
 static void
 extract_function (const gchar *filename,
-		  GHashTable  *metadata)
+                  GHashTable  *metadata)
 {
 
 	/*
@@ -59,8 +59,8 @@ extract_function (const gchar *filename,
 	 * hash table.
 	 */
 	g_hash_table_insert (metadata,
-			     g_strdup ("Dummy:DummyProp"),
-			     g_strdup ("Value"));
+	                     g_strdup ("Dummy:DummyProp"),
+	                     g_strdup ("Value"));
 }
 
 /*
diff --git a/src/tracker-extract/tracker-albumart-pixbuf.c b/src/tracker-extract/tracker-albumart-pixbuf.c
index 6eae43d..a8f8fb4 100644
--- a/src/tracker-extract/tracker-albumart-pixbuf.c
+++ b/src/tracker-extract/tracker-albumart-pixbuf.c
@@ -71,7 +71,7 @@ tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
 		GError *error = NULL;
 
 		g_debug ("Saving album art using GdkPixbufLoader for uri:'%s'",
-			 target);
+		         target);
 
 		loader = gdk_pixbuf_loader_new ();
 
diff --git a/src/tracker-extract/tracker-albumart.c b/src/tracker-extract/tracker-albumart.c
index 2f59a3f..1fd289f 100644
--- a/src/tracker-extract/tracker-albumart.c
+++ b/src/tracker-extract/tracker-albumart.c
@@ -53,8 +53,8 @@ typedef struct {
 } GetFileInfo;
 
 static void albumart_queue_cb (DBusGProxy     *proxy,
-			       DBusGProxyCall *call,
-			       gpointer        user_data);
+                               DBusGProxyCall *call,
+                               gpointer        user_data);
 
 static gboolean initialized;
 static gboolean disable_requests;
@@ -66,7 +66,7 @@ static DBusGProxy *albumart_proxy;
 
 static gchar *
 strcasestr (const gchar *haystack,
-	    const gchar *needle)
+            const gchar *needle)
 {
 	gchar *p;
 	gchar *startn = NULL;
@@ -99,8 +99,8 @@ strcasestr (const gchar *haystack,
  */
 static gboolean
 make_directory_with_parents (GFile         *file,
-			     GCancellable  *cancellable,
-			     GError       **error)
+                             GCancellable  *cancellable,
+                             GError       **error)
 {
 	gboolean result;
 	GFile *parent_file, *work_file;
@@ -112,56 +112,56 @@ make_directory_with_parents (GFile         *file,
 
 	result = g_file_make_directory (file, cancellable, &my_error);
 	if (result || my_error->code != G_IO_ERROR_NOT_FOUND)
-	{
-		if (my_error)
-			g_propagate_error (error, my_error);
-		return result;
-	}
+		{
+			if (my_error)
+				g_propagate_error (error, my_error);
+			return result;
+		}
 
 	work_file = file;
 
 	while (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
-	{
-		g_clear_error (&my_error);
+		{
+			g_clear_error (&my_error);
 
-		parent_file = g_file_get_parent (work_file);
-		if (parent_file == NULL)
-			break;
-		result = g_file_make_directory (parent_file, cancellable, &my_error);
+			parent_file = g_file_get_parent (work_file);
+			if (parent_file == NULL)
+				break;
+			result = g_file_make_directory (parent_file, cancellable, &my_error);
 
-		if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
-			list = g_list_prepend (list, parent_file);
+			if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
+				list = g_list_prepend (list, parent_file);
 
-		work_file = parent_file;
-	}
+			work_file = parent_file;
+		}
 
 	for (l = list; result && l; l = l->next)
-	{
-		result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
-	}
+		{
+			result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
+		}
 
 	/* Clean up */
 	while (list != NULL)
-	{
-		g_object_unref ((GFile *) list->data);
-		list = g_list_remove (list, list->data);
-	}
+		{
+			g_object_unref ((GFile *) list->data);
+			list = g_list_remove (list, list->data);
+		}
 
 	if (!result)
-	{
-		g_propagate_error (error, my_error);
-		return result;
-	}
+		{
+			g_propagate_error (error, my_error);
+			return result;
+		}
 
 	return g_file_make_directory (file, cancellable, error);
 }
 
 static gboolean
 albumart_strip_find_next_block (const gchar    *original,
-				const gunichar  open_char,
-				const gunichar  close_char,
-				gint           *open_pos,
-				gint           *close_pos)
+                                const gunichar  open_char,
+                                const gunichar  close_char,
+                                gint           *open_pos,
+                                gint           *close_pos)
 {
 	const gchar *p1, *p2;
 
@@ -241,11 +241,11 @@ albumart_strip_invalid_entities (const gchar *original)
 			blocks_done = TRUE;
 		} else {
 			/* Append the test BEFORE the block */
-                        if (pos1 > 0) {
-                                g_string_append_len (str_no_blocks, p, pos1);
-                        }
+			if (pos1 > 0) {
+				g_string_append_len (str_no_blocks, p, pos1);
+			}
 
-                        p = g_utf8_next_char (p + pos2);
+			p = g_utf8_next_char (p + pos2);
 
 			/* Do same again for position AFTER block */
 			if (*p == '\0') {
@@ -262,32 +262,32 @@ albumart_strip_invalid_entities (const gchar *original)
 	g_strdelimit (str, invalid_chars, *invalid_chars_delimiter);
 	strv = g_strsplit (str, invalid_chars_delimiter, -1);
 	g_free (str);
-        str = g_strjoinv (NULL, strv);
+	str = g_strjoinv (NULL, strv);
 	g_strfreev (strv);
 
 	/* Now convert chars */
 	g_strdelimit (str, convert_chars, *convert_chars_delimiter);
 	strv = g_strsplit (str, convert_chars_delimiter, -1);
 	g_free (str);
-        str = g_strjoinv (convert_chars_delimiter, strv);
+	str = g_strjoinv (convert_chars_delimiter, strv);
 	g_strfreev (strv);
 
-        /* Now remove double spaces */
+	/* Now remove double spaces */
 	strv = g_strsplit (str, "  ", -1);
 	g_free (str);
-        str = g_strjoinv (" ", strv);
+	str = g_strjoinv (" ", strv);
 	g_strfreev (strv);
 
-        /* Now strip leading/trailing white space */
-        g_strstrip (str);
+	/* Now strip leading/trailing white space */
+	g_strstrip (str);
 
 	return str;
 }
 
 static gchar *
 albumart_checksum_for_data (GChecksumType  checksum_type,
-			    const guchar  *data,
-			    gsize          length)
+                            const guchar  *data,
+                            gsize          length)
 {
 	GChecksum *checksum;
 	gchar *retval;
@@ -306,11 +306,11 @@ albumart_checksum_for_data (GChecksumType  checksum_type,
 
 static void
 albumart_get_path (const gchar  *artist,
-		   const gchar  *album,
-		   const gchar  *prefix,
-		   const gchar  *uri,
-		   gchar       **path,
-		   gchar       **local_uri)
+                   const gchar  *album,
+                   const gchar  *prefix,
+                   const gchar  *uri,
+                   gchar       **path,
+                   gchar       **local_uri)
 {
 	gchar *art_filename;
 	gchar *dir;
@@ -351,27 +351,27 @@ albumart_get_path (const gchar  *artist,
 	g_free (album_stripped);
 
 	dir = g_build_filename (g_get_user_cache_dir (),
-				"media-art",
-				NULL);
+	                        "media-art",
+	                        NULL);
 
 	if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
 		g_mkdir_with_parents (dir, 0770);
 	}
 
 	artist_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
-						      (const guchar *) artist_down,
-						      strlen (artist_down));
+	                                              (const guchar *) artist_down,
+	                                              strlen (artist_down));
 	album_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
-						     (const guchar *) album_down,
-						     strlen (album_down));
+	                                             (const guchar *) album_down,
+	                                             strlen (album_down));
 
 	g_free (artist_down);
 	g_free (album_down);
 
 	art_filename = g_strdup_printf ("%s-%s-%s.jpeg",
-					prefix ? prefix : "album",
-					artist_checksum,
-					album_checksum);
+	                                prefix ? prefix : "album",
+	                                artist_checksum,
+	                                album_checksum);
 
 	if (path) {
 		*path = g_build_filename (dir, art_filename, NULL);
@@ -406,10 +406,10 @@ albumart_get_path (const gchar  *artist,
 
 static gboolean
 albumart_heuristic (const gchar *artist,
-		    const gchar *album,
-		    const gchar *filename_uri,
-		    const gchar *local_uri,
-		    gboolean    *copied)
+                    const gchar *album,
+                    const gchar *filename_uri,
+                    const gchar *local_uri,
+                    gboolean    *copied)
 {
 	GFile *file, *dirf;
 	GDir *dir;
@@ -442,17 +442,17 @@ albumart_heuristic (const gchar *artist,
 
 		if (g_file_query_exists (local_file, NULL)) {
 			g_debug ("Album art being copied from local (.mediaartlocal) file:'%s'",
-				 local_uri);
+			         local_uri);
 
 			albumart_get_path (artist_stripped,
-					   album_stripped,
-					   "album", NULL,
-					   &target, NULL);
+			                   album_stripped,
+			                   "album", NULL,
+			                   &target, NULL);
 			if (target) {
 				file = g_file_new_for_path (target);
 
 				g_file_copy_async (local_file, file, 0, 0,
-						   NULL, NULL, NULL, NULL, NULL);
+				                   NULL, NULL, NULL, NULL, NULL);
 
 				g_object_unref (file);
 			}
@@ -491,8 +491,8 @@ albumart_heuristic (const gchar *artist,
 
 	if (!dir) {
 		g_debug ("Album art directory could not be opened:'%s', %s",
-			 dirname,
-			 error ? error->message : "no error given");
+		         dirname,
+		         error ? error->message : "no error given");
 
 		g_clear_error (&error);
 		g_free (artist_stripped);
@@ -515,11 +515,11 @@ albumart_heuristic (const gchar *artist,
 			    g_str_has_suffix (name, "jpg")) {
 				if (!target) {
 					albumart_get_path (artist_stripped,
-							   album_stripped,
-							   "album",
-							   NULL,
-							   &target,
-							   NULL);
+					                   album_stripped,
+					                   "album",
+					                   NULL,
+					                   &target,
+					                   NULL);
 				}
 
 				if (!file && target) {
@@ -584,7 +584,7 @@ albumart_heuristic (const gchar *artist,
 
 static void
 albumart_signal_queue_thumbnail (const gchar *file,
-				 const gchar *mime)
+                                 const gchar *mime)
 {
 	GObject *object;
 
@@ -598,17 +598,17 @@ albumart_signal_queue_thumbnail (const gchar *file,
 	}
 
 	g_message ("Album art being signaled for thumbnail queue for file:'%s', mime:'%s'",
-		   file, mime);
+	           file, mime);
 	g_signal_emit_by_name (object, "queue-thumbnail", file, mime);
 }
 
 static gboolean
 albumart_set (const unsigned char *buffer,
-	      size_t               len,
-	      const gchar         *mime,
-	      const gchar         *artist,
-	      const gchar         *album,
-	      const gchar         *uri)
+              size_t               len,
+              const gchar         *mime,
+              const gchar         *artist,
+              const gchar         *album,
+              const gchar         *uri)
 {
 	gchar *local_path;
 	gboolean retval;
@@ -630,10 +630,10 @@ albumart_set (const unsigned char *buffer,
 
 static void
 albumart_request_download (TrackerStorage *hal,
-			   const gchar    *album,
-			   const gchar    *artist,
-			   const gchar    *local_uri,
-			   const gchar    *art_path)
+                           const gchar    *album,
+                           const gchar    *artist,
+                           const gchar    *local_uri,
+                           const gchar    *art_path)
 {
 	GetFileInfo *info;
 
@@ -660,30 +660,30 @@ albumart_request_download (TrackerStorage *hal,
 
 		if (!error) {
 			albumart_proxy = dbus_g_proxy_new_for_name (connection,
-								    ALBUMARTER_SERVICE,
-								    ALBUMARTER_PATH,
-								    ALBUMARTER_INTERFACE);
+			                                            ALBUMARTER_SERVICE,
+			                                            ALBUMARTER_PATH,
+			                                            ALBUMARTER_INTERFACE);
 		} else {
 			g_error_free (error);
 		}
 	}
 
 	dbus_g_proxy_begin_call (albumart_proxy,
-				 "Queue",
-				 albumart_queue_cb,
-				 info,
-				 NULL,
-				 G_TYPE_STRING, artist,
-				 G_TYPE_STRING, album,
-				 G_TYPE_STRING, "album",
-				 G_TYPE_UINT, 0,
-				 G_TYPE_INVALID);
+	                         "Queue",
+	                         albumart_queue_cb,
+	                         info,
+	                         NULL,
+	                         G_TYPE_STRING, artist,
+	                         G_TYPE_STRING, album,
+	                         G_TYPE_STRING, "album",
+	                         G_TYPE_UINT, 0,
+	                         G_TYPE_INVALID);
 }
 
 static void
 albumart_copy_to_local (TrackerStorage *hal,
-			const gchar    *filename,
-			const gchar    *local_uri)
+                        const gchar    *filename,
+                        const gchar    *local_uri)
 {
 	GSList *removable_roots, *l;
 	gboolean on_removable_device = FALSE;
@@ -742,10 +742,10 @@ albumart_copy_to_local (TrackerStorage *hal,
 			g_object_unref (dirf);
 
 			g_debug ("Copying album art from:'%s' to:'%s'",
-				 filename, local_uri);
+			         filename, local_uri);
 
 			g_file_copy_async (from, local_file, 0, 0,
-					   NULL, NULL, NULL, NULL, NULL);
+			                   NULL, NULL, NULL, NULL, NULL);
 		}
 
 		g_object_unref (local_file);
@@ -755,8 +755,8 @@ albumart_copy_to_local (TrackerStorage *hal,
 
 static void
 albumart_queue_cb (DBusGProxy     *proxy,
-		   DBusGProxyCall *call,
-		   gpointer	   user_data)
+                   DBusGProxyCall *call,
+                   gpointer        user_data)
 {
 	GError      *error = NULL;
 	guint        handle;
@@ -765,8 +765,8 @@ albumart_queue_cb (DBusGProxy     *proxy,
 	info = user_data;
 
 	dbus_g_proxy_end_call (proxy, call, &error,
-			       G_TYPE_UINT, &handle,
-			       G_TYPE_INVALID);
+	                       G_TYPE_UINT, &handle,
+	                       G_TYPE_INVALID);
 
 	if (error) {
 		if (error->code == DBUS_GERROR_SERVICE_UNKNOWN) {
@@ -785,14 +785,14 @@ albumart_queue_cb (DBusGProxy     *proxy,
 		uri = g_filename_to_uri (info->art_path, NULL, NULL);
 
 		g_debug ("Downloaded album art using D-Bus service for uri:'%s'",
-			 uri);
+		         uri);
 
 		albumart_signal_queue_thumbnail (uri, "image/jpeg");
 		g_free (uri);
 
 		albumart_copy_to_local (info->hal,
-					info->art_path,
-					info->local_uri);
+		                        info->art_path,
+		                        info->local_uri);
 	}
 
 	g_free (info->art_path);
@@ -821,25 +821,25 @@ tracker_albumart_init (void)
 
 	/* Cache to know if we have already handled uris */
 	albumart_cache = g_hash_table_new_full (g_str_hash,
-						g_str_equal,
-						(GDestroyNotify) g_free,
-						NULL);
+	                                        g_str_equal,
+	                                        (GDestroyNotify) g_free,
+	                                        NULL);
 
 	/* Signal handler for new album art from the extractor */
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
 	}
 
 	/* Get album art downloader proxy */
 	albumart_proxy = dbus_g_proxy_new_for_name (connection,
-						    ALBUMARTER_SERVICE,
-						    ALBUMARTER_PATH,
-						    ALBUMARTER_INTERFACE);
+	                                            ALBUMARTER_SERVICE,
+	                                            ALBUMARTER_PATH,
+	                                            ALBUMARTER_INTERFACE);
 
 	initialized = TRUE;
 
@@ -870,11 +870,11 @@ tracker_albumart_shutdown (void)
 
 gboolean
 tracker_albumart_process (const unsigned char *buffer,
-			  size_t               len,
-			  const gchar         *mime,
-			  const gchar         *artist,
-			  const gchar         *album,
-			  const gchar         *filename)
+                          size_t               len,
+                          const gchar         *mime,
+                          const gchar         *artist,
+                          const gchar         *album,
+                          const gchar         *filename)
 {
 	gchar *art_path;
 	gboolean processed = TRUE;
@@ -882,11 +882,11 @@ tracker_albumart_process (const unsigned char *buffer,
 	gchar *filename_uri;
 
 	g_debug ("Processing album art, buffer is %ld bytes, artist:'%s', album:'%s', filename:'%s', mime:'%s'",
-		 (long int) len,
-		 artist ? artist : "",
-		 album ? album : "",
-		 filename,
-		 mime);
+	         (long int) len,
+	         artist ? artist : "",
+	         album ? album : "",
+	         filename,
+	         mime);
 
 	if (strstr (filename, "://")) {
 		filename_uri = g_strdup (filename);
@@ -895,11 +895,11 @@ tracker_albumart_process (const unsigned char *buffer,
 	}
 
 	albumart_get_path (artist,
-			   album,
-			   "album",
-			   filename_uri,
-			   &art_path,
-			   &local_uri);
+	                   album,
+	                   "album",
+	                   filename_uri,
+	                   &art_path,
+	                   &local_uri);
 
 	if (!art_path) {
 		g_debug ("Album art path could not be obtained, not processing any further");
@@ -914,11 +914,11 @@ tracker_albumart_process (const unsigned char *buffer,
 		/* If we have embedded album art */
 		if (buffer && len > 0) {
 			processed = albumart_set (buffer,
-						  len,
-						  mime,
-						  artist,
-						  album,
-						  filename_uri);
+			                          len,
+			                          mime,
+			                          artist,
+			                          album,
+			                          filename_uri);
 		} else {
 			/* If not, we perform a heuristic on the dir */
 			gchar *key;
@@ -932,33 +932,33 @@ tracker_albumart_process (const unsigned char *buffer,
 			g_object_unref (dirf);
 
 			key = g_strdup_printf ("%s-%s-%s",
-					       artist ? artist : "",
-					       album ? album : "",
-					       dirname ? dirname : "");
+			                       artist ? artist : "",
+			                       album ? album : "",
+			                       dirname ? dirname : "");
 
 			g_free (dirname);
 
 			if (!g_hash_table_lookup (albumart_cache, key)) {
 				if (!albumart_heuristic (artist,
-							 album,
-							 filename_uri,
-							 local_uri,
-							 NULL)) {
+				                         album,
+				                         filename_uri,
+				                         local_uri,
+				                         NULL)) {
 					/* If the heuristic failed, we
 					 * request the download the
 					 * media-art to the media-art
 					 * downloaders
 					 */
 					albumart_request_download (albumart_storage,
-								   artist,
-								   album,
-								   local_uri,
-								   art_path);
+					                           artist,
+					                           album,
+					                           local_uri,
+					                           art_path);
 				}
 
 				g_hash_table_insert (albumart_cache,
-						     key,
-						     GINT_TO_POINTER(TRUE));
+				                     key,
+				                     GINT_TO_POINTER(TRUE));
 			} else {
 				g_free (key);
 			}
@@ -969,8 +969,8 @@ tracker_albumart_process (const unsigned char *buffer,
 		}
 	} else {
 		g_debug ("Album art already exists for uri:'%s' as '%s'",
-			 filename_uri,
-			 art_path);
+		         filename_uri,
+		         art_path);
 	}
 
 	if (local_uri && !g_file_test (local_uri, G_FILE_TEST_EXISTS)) {
@@ -979,8 +979,8 @@ tracker_albumart_process (const unsigned char *buffer,
 		 */
 		if (g_file_test (art_path, G_FILE_TEST_EXISTS)) {
 			albumart_copy_to_local (albumart_storage,
-						art_path,
-						local_uri);
+			                        art_path,
+			                        local_uri);
 		}
 	}
 
diff --git a/src/tracker-extract/tracker-albumart.h b/src/tracker-extract/tracker-albumart.h
index 4aa2ff8..60982a1 100644
--- a/src/tracker-extract/tracker-albumart.h
+++ b/src/tracker-extract/tracker-albumart.h
@@ -28,11 +28,11 @@ G_BEGIN_DECLS
 gboolean tracker_albumart_init     (void);
 void     tracker_albumart_shutdown (void);
 gboolean tracker_albumart_process  (const unsigned char *buffer,
-				    size_t               len,
-				    const gchar         *mime,
-				    const gchar         *artist,
-				    const gchar         *album,
-				    const gchar         *filename);
+                                    size_t               len,
+                                    const gchar         *mime,
+                                    const gchar         *artist,
+                                    const gchar         *album,
+                                    const gchar         *filename);
 
 G_END_DECLS
 
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index b0ed351..a380bab 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -27,7 +27,7 @@
 #define TRACKER_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG, TrackerConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_GENERAL	  "General"
+#define GROUP_GENERAL     "General"
 
 /* Default values */
 #define DEFAULT_VERBOSITY 0
@@ -45,20 +45,20 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void     config_set_property         (GObject       *object,
-					     guint          param_id,
-					     const GValue  *value,
-					     GParamSpec    *pspec);
+                                             guint          param_id,
+                                             const GValue  *value,
+                                             GParamSpec    *pspec);
 static void     config_get_property         (GObject       *object,
-					     guint          param_id,
-					     GValue        *value,
-					     GParamSpec    *pspec);
+                                             guint          param_id,
+                                             GValue        *value,
+                                             GParamSpec    *pspec);
 static void     config_finalize             (GObject       *object);
 static void     config_constructed          (GObject       *object);
 static void     config_load                 (TrackerConfig *config);
 static gboolean config_save                 (TrackerConfig *config);
 static void     config_create_with_defaults (TrackerConfig *config,
-					     GKeyFile      *key_file,
-					     gboolean       overwrite);
+                                             GKeyFile      *key_file,
+                                             gboolean       overwrite);
 
 enum {
 	PROP_0,
@@ -80,19 +80,19 @@ tracker_config_class_init (TrackerConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	/* General */
 	g_object_class_install_property (object_class,
-					 PROP_VERBOSITY,
-					 g_param_spec_int ("verbosity",
-							   "Log verbosity",
-							   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
-							   0,
-							   3,
-							   DEFAULT_VERBOSITY,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_VERBOSITY,
+	                                 g_param_spec_int ("verbosity",
+	                                                   "Log verbosity",
+	                                                   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
+	                                                   0,
+	                                                   3,
+	                                                   DEFAULT_VERBOSITY,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigPrivate));
 }
@@ -103,16 +103,16 @@ tracker_config_init (TrackerConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* General */
 	case PROP_VERBOSITY:
 		tracker_config_set_verbosity (TRACKER_CONFIG (object),
-					      g_value_get_int (value));
+		                              g_value_get_int (value));
 		break;
 
 	default:
@@ -122,10 +122,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerConfigPrivate *priv;
 
@@ -163,8 +163,8 @@ config_constructed (GObject *object)
 
 static void
 config_create_with_defaults (TrackerConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gint i;
 
@@ -174,9 +174,9 @@ config_create_with_defaults (TrackerConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -184,10 +184,10 @@ config_create_with_defaults (TrackerConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		default:
@@ -195,11 +195,11 @@ config_create_with_defaults (TrackerConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-								      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -220,17 +220,17 @@ config_load (TrackerConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -260,10 +260,10 @@ config_save (TrackerConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -303,7 +303,7 @@ tracker_config_get_verbosity (TrackerConfig *config)
 
 void
 tracker_config_set_verbosity (TrackerConfig *config,
-			      gint	     value)
+                              gint           value)
 {
 	TrackerConfigPrivate *priv;
 
diff --git a/src/tracker-extract/tracker-config.h b/src/tracker-extract/tracker-config.h
index 0918240..0a823a0 100644
--- a/src/tracker-extract/tracker-config.h
+++ b/src/tracker-extract/tracker-config.h
@@ -27,14 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_CONFIG	    (tracker_config_get_type ())
-#define TRACKER_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
+#define TRACKER_TYPE_CONFIG         (tracker_config_get_type ())
+#define TRACKER_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
 #define TRACKER_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-#define TRACKER_IS_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
+#define TRACKER_IS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
 #define TRACKER_IS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
 #define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
 
-typedef struct TrackerConfig	  TrackerConfig;
+typedef struct TrackerConfig      TrackerConfig;
 typedef struct TrackerConfigClass TrackerConfigClass;
 
 struct TrackerConfig {
@@ -45,14 +45,14 @@ struct TrackerConfigClass {
 	TrackerConfigFileClass parent_class;
 };
 
-GType	       tracker_config_get_type      (void) G_GNUC_CONST;
+GType          tracker_config_get_type      (void) G_GNUC_CONST;
 
 TrackerConfig *tracker_config_new           (void);
 gboolean       tracker_config_save          (TrackerConfig *config);
 
 gint           tracker_config_get_verbosity (TrackerConfig *config);
 void           tracker_config_set_verbosity (TrackerConfig *config,
-					     gint           value);
+                                             gint           value);
 
 G_END_DECLS
 
diff --git a/src/tracker-extract/tracker-dbus.c b/src/tracker-extract/tracker-dbus.c
index a2dcd8b..1e87810 100644
--- a/src/tracker-extract/tracker-dbus.c
+++ b/src/tracker-extract/tracker-dbus.c
@@ -29,26 +29,26 @@
 
 static DBusGConnection *connection;
 static DBusGProxy      *gproxy;
-static GSList	       *objects;
+static GSList          *objects;
 
 static gboolean
 dbus_register_service (DBusGProxy  *proxy,
-		       const gchar *name)
+                       const gchar *name)
 {
 	GError *error = NULL;
-	guint	result;
+	guint   result;
 
 	g_message ("Registering D-Bus service...\n"
-		   "  Name:'%s'",
-		   name);
+	           "  Name:'%s'",
+	           name);
 
 	if (!org_freedesktop_DBus_request_name (proxy,
-						name,
-						DBUS_NAME_FLAG_DO_NOT_QUEUE,
-						&result, &error)) {
+	                                        name,
+	                                        DBUS_NAME_FLAG_DO_NOT_QUEUE,
+	                                        &result, &error)) {
 		g_critical ("Could not aquire name:'%s', %s",
-			    name,
-			    error ? error->message : "no error given");
+		            name,
+		            error ? error->message : "no error given");
 		g_error_free (error);
 
 		return FALSE;
@@ -56,8 +56,8 @@ dbus_register_service (DBusGProxy  *proxy,
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_critical ("D-Bus service name:'%s' is already taken, "
-			    "perhaps the daemon is already running?",
-			    name);
+		            "perhaps the daemon is already running?",
+		            name);
 		return FALSE;
 	}
 
@@ -65,11 +65,11 @@ dbus_register_service (DBusGProxy  *proxy,
 }
 
 static void
-dbus_register_object (DBusGConnection	    *lconnection,
-		      DBusGProxy	    *proxy,
-		      GObject		    *object,
-		      const DBusGObjectInfo *info,
-		      const gchar	    *path)
+dbus_register_object (DBusGConnection       *lconnection,
+                      DBusGProxy            *proxy,
+                      GObject               *object,
+                      const DBusGObjectInfo *info,
+                      const gchar           *path)
 {
 	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
@@ -98,7 +98,7 @@ dbus_register_names (void)
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
 	}
@@ -107,9 +107,9 @@ dbus_register_names (void)
 	 * predefined for us to just use (dbus_g_proxy_...)
 	 */
 	gproxy = dbus_g_proxy_new_for_name (connection,
-					    DBUS_SERVICE_DBUS,
-					    DBUS_PATH_DBUS,
-					    DBUS_INTERFACE_DBUS);
+	                                    DBUS_SERVICE_DBUS,
+	                                    DBUS_PATH_DBUS,
+	                                    DBUS_INTERFACE_DBUS);
 
 	/* Register the service name for org.freedesktop.Tracker1.Extract */
 	if (!dbus_register_service (gproxy, TRACKER_EXTRACT_SERVICE)) {
@@ -169,10 +169,10 @@ tracker_dbus_register_objects (gpointer object)
 	}
 
 	dbus_register_object (connection,
-			      gproxy,
-			      G_OBJECT (object),
-			      &dbus_glib_tracker_extract_object_info,
-			      TRACKER_EXTRACT_PATH);
+	                      gproxy,
+	                      G_OBJECT (object),
+	                      &dbus_glib_tracker_extract_object_info,
+	                      TRACKER_EXTRACT_PATH);
 	objects = g_slist_prepend (objects, object);
 
 	return TRUE;
diff --git a/src/tracker-extract/tracker-exif.c b/src/tracker-extract/tracker-exif.c
index 7964c52..44e10db 100644
--- a/src/tracker-extract/tracker-exif.c
+++ b/src/tracker-extract/tracker-exif.c
@@ -43,7 +43,7 @@
 #ifndef HAVE_STRCASESTR
 static gchar *
 strcasestr (const gchar *haystack,
-	    const gchar *needle)
+            const gchar *needle)
 {
 	gchar *p;
 	gchar *startn = NULL;
@@ -213,23 +213,23 @@ get_orientation (ExifData *exif, ExifTag tag)
 		for (i=0; i < 8; i++) {
 			if (g_strcmp0 (buf, ostr[i]) == 0) {
 				switch (i) {
-					case 0:
+				case 0:
 					return g_strdup ("nfo:orientation-top");
-					case 1:
+				case 1:
 					return g_strdup ("nfo:orientation-top-mirror");
-					case 2:
+				case 2:
 					return g_strdup ("nfo:orientation-bottom");
-					case 3:
+				case 3:
 					return g_strdup ("nfo:orientation-bottom-mirror");
-					case 4:
+				case 4:
 					return g_strdup ("nfo:orientation-left-mirror");
-					case 5:
+				case 5:
 					return g_strdup ("nfo:orientation-right");
-					case 6:
+				case 6:
 					return g_strdup ("nfo:orientation-right-mirror");
-					case 7:
+				case 7:
 					return g_strdup ("nfo:orientation-left");
-					default:
+				default:
 					break;
 				}
 			}
@@ -326,7 +326,7 @@ get_value (ExifData *exif, ExifTag tag)
 
 void
 tracker_read_exif (const unsigned char *buffer,
-                   size_t		len,
+                   size_t               len,
                    const gchar         *uri,
                    TrackerExifData     *data)
 {
@@ -342,12 +342,12 @@ tracker_read_exif (const unsigned char *buffer,
 	exif_data_load_data (exif, (unsigned char *) buffer, len);
 
 	/* Unused in the current only user of this code (JPeg extractor)
-	if (!data->y_dimension)
-		data->y_dimension = get_value (exif, EXIF_TAG_PIXEL_Y_DIMENSION);
-	if (!data->x_dimension)
-		data->x_dimension = get_value (exif, EXIF_TAG_PIXEL_X_DIMENSION);
-	if (!data->image_width)
-		data->image_width = get_value (exif, EXIF_TAG_RELATED_IMAGE_WIDTH);
+	   if (!data->y_dimension)
+	   data->y_dimension = get_value (exif, EXIF_TAG_PIXEL_Y_DIMENSION);
+	   if (!data->x_dimension)
+	   data->x_dimension = get_value (exif, EXIF_TAG_PIXEL_X_DIMENSION);
+	   if (!data->image_width)
+	   data->image_width = get_value (exif, EXIF_TAG_RELATED_IMAGE_WIDTH);
 	*/
 
 	if (!data->document_name)
diff --git a/src/tracker-extract/tracker-exif.h b/src/tracker-extract/tracker-exif.h
index 934c2e9..09c06f1 100644
--- a/src/tracker-extract/tracker-exif.h
+++ b/src/tracker-extract/tracker-exif.h
@@ -26,9 +26,9 @@
 
 typedef struct {
 	gchar *y_dimension, *x_dimension, *image_width, *document_name, *time, *time_original,
-	      *artist, *user_comment, *description, *make, *model, *orientation,
-	      *exposure_time, *fnumber, *flash, *focal_length, *iso_speed_ratings,
-	      *metering_mode, *white_balance, *copyright;
+		*artist, *user_comment, *description, *make, *model, *orientation,
+		*exposure_time, *fnumber, *flash, *focal_length, *iso_speed_ratings,
+		*metering_mode, *white_balance, *copyright;
 } TrackerExifData;
 
 void tracker_read_exif (const unsigned char *buffer,
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index aab16df..5f5eb0a 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -48,7 +48,7 @@
 #define RDF_TYPE RDF_PREFIX "type"
 
 static void extract_abw (const gchar *uri,
-			 TrackerSparqlBuilder   *metadata);
+                         TrackerSparqlBuilder   *metadata);
 
 static TrackerExtractData data[] = {
 	{ "application/x-abiword", extract_abw },
@@ -57,7 +57,7 @@ static TrackerExtractData data[] = {
 
 static void
 extract_abw (const gchar *uri,
-	     TrackerSparqlBuilder   *metadata)
+             TrackerSparqlBuilder   *metadata)
 {
 	FILE *f;
 	gchar *filename;
diff --git a/src/tracker-extract/tracker-extract-gstreamer-helix.c b/src/tracker-extract/tracker-extract-gstreamer-helix.c
index cece7f6..db6e80f 100644
--- a/src/tracker-extract/tracker-extract-gstreamer-helix.c
+++ b/src/tracker-extract/tracker-extract-gstreamer-helix.c
@@ -45,25 +45,25 @@ typedef enum {
 } ExtractMime;
 
 typedef struct {
-	GstElement	*playbin;
+	GstElement      *playbin;
 
-	GstTagList	*tagcache;
-	GstTagList	*audiotags;
-	GstTagList	*videotags;
+	GstTagList      *tagcache;
+	GstTagList      *audiotags;
+	GstTagList      *videotags;
 
-	GstMessageType	ignore_messages_mask;
+	GstMessageType  ignore_messages_mask;
 
-	gboolean	has_audio;
-	gboolean	has_video;
+	gboolean        has_audio;
+	gboolean        has_video;
 
-	ExtractMime	mime;
+	ExtractMime     mime;
 
-	gint		video_height;
-	gint		video_width;
-	gint		video_fps_n;
-	gint		video_fps_d;
-	gint		audio_channels;
-	gint		audio_samplerate;
+	gint            video_height;
+	gint            video_width;
+	gint            video_fps_n;
+	gint            video_fps_d;
+	gint            audio_channels;
+	gint            audio_samplerate;
 
 	unsigned char  *album_art_data;
 	guint           album_art_size;
@@ -84,13 +84,13 @@ static TrackerExtractData data[] = {
 };
 
 static void
-caps_set (GObject	    *object,
-	  MetadataExtractor *extractor,
-	  const gchar	    *type)
+caps_set (GObject           *object,
+          MetadataExtractor *extractor,
+          const gchar       *type)
 {
-	GstPad	     *pad;
+	GstPad       *pad;
 	GstStructure *s;
-	GstCaps	     *caps;
+	GstCaps              *caps;
 
 	pad = GST_PAD (object);
 
@@ -127,8 +127,8 @@ caps_set (GObject	    *object,
 }
 
 static void
-caps_set_audio (GObject		  *object,
-		MetadataExtractor *extractor)
+caps_set_audio (GObject                   *object,
+                MetadataExtractor *extractor)
 {
 	g_return_if_fail (object);
 	g_return_if_fail (extractor);
@@ -137,8 +137,8 @@ caps_set_audio (GObject		  *object,
 }
 
 static void
-caps_set_video (GObject		  *object,
-		MetadataExtractor *extractor)
+caps_set_video (GObject                   *object,
+                MetadataExtractor *extractor)
 {
 	g_return_if_fail (object);
 	g_return_if_fail (extractor);
@@ -162,8 +162,8 @@ update_stream_info (MetadataExtractor *extractor)
 	g_list_foreach (streaminfo, (GFunc) g_object_ref, NULL);
 
 	for ( ; streaminfo; streaminfo = streaminfo->next) {
-		GObject	   *info;
-		gint	    type;
+		GObject            *info;
+		gint        type;
 		GParamSpec *pspec;
 		GEnumValue *val;
 
@@ -215,9 +215,9 @@ update_stream_info (MetadataExtractor *extractor)
 }
 
 static void
-gst_bus_cb (GstBus	      *bus,
-	    GstMessage	      *message,
-	    MetadataExtractor *extractor)
+gst_bus_cb (GstBus            *bus,
+            GstMessage        *message,
+            MetadataExtractor *extractor)
 {
 	GstMessageType msg_type;
 
@@ -235,7 +235,7 @@ gst_bus_cb (GstBus	      *bus,
 
 		src_name = gst_object_get_name (message->src);
 		GST_LOG ("Ignoring %s message from element %s as requested",
-			 gst_message_type_get_name (msg_type), src_name);
+		         gst_message_type_get_name (msg_type), src_name);
 		g_free (src_name);
 
 		return;
@@ -244,8 +244,8 @@ gst_bus_cb (GstBus	      *bus,
 	switch (msg_type) {
 	case GST_MESSAGE_ERROR: {
 		GstMessage *message  = NULL;
-		GError	   *gsterror = NULL;
-		gchar	   *debug    = NULL;
+		GError     *gsterror = NULL;
+		gchar      *debug    = NULL;
 
 		gst_message_parse_error (message, &gsterror, &debug);
 		g_warning ("Error: %s (%s)", gsterror->message, debug);
@@ -262,9 +262,9 @@ gst_bus_cb (GstBus	      *bus,
 		old_state = new_state = GST_STATE_NULL;
 
 		gst_message_parse_state_changed (message,
-						 &old_state,
-						 &new_state,
-						 NULL);
+		                                 &old_state,
+		                                 &new_state,
+		                                 NULL);
 
 		if (old_state == new_state) {
 			break;
@@ -306,7 +306,7 @@ gst_bus_cb (GstBus	      *bus,
 	}
 
 	case GST_MESSAGE_TAG: {
-		GstTagList	  *tag_list, *result;
+		GstTagList        *tag_list, *result;
 		GstElementFactory *f;
 
 		tag_list = NULL;
@@ -317,8 +317,8 @@ gst_bus_cb (GstBus	      *bus,
 
 		/* All tags */
 		result = gst_tag_list_merge (extractor->tagcache,
-					     tag_list,
-					     GST_TAG_MERGE_KEEP);
+		                             tag_list,
+		                             GST_TAG_MERGE_KEEP);
 
 		if (extractor->tagcache) {
 			gst_tag_list_free (extractor->tagcache);
@@ -343,8 +343,8 @@ gst_bus_cb (GstBus	      *bus,
 
 			if (cache) {
 				result = gst_tag_list_merge (*cache,
-							     tag_list,
-							     GST_TAG_MERGE_KEEP);
+				                             tag_list,
+				                             GST_TAG_MERGE_KEEP);
 				if (*cache) {
 					gst_tag_list_free (*cache);
 				}
@@ -366,30 +366,30 @@ gst_bus_cb (GstBus	      *bus,
 
 static void
 add_int64_info (TrackerSparqlBuilder *metadata,
-		const gchar *uri,
-		const gchar	   *key,
-		gint64	    info)
+                const gchar *uri,
+                const gchar        *key,
+                gint64      info)
 {
 	tracker_statement_list_insert_with_int64 (metadata, uri, key, info);
 }
 
 static void
 add_uint_info (TrackerSparqlBuilder *metadata,
-		const gchar *uri,
-	       gchar	  *key,
-	       guint	   info)
+               const gchar *uri,
+               gchar      *key,
+               guint       info)
 {
 	tracker_statement_list_insert_with_int (metadata, uri, key, info);
 }
 
 static void
-add_string_gst_tag (TrackerSparqlBuilder	*metadata,
-		const gchar *uri,
-		    const gchar *key,
-		    GstTagList	*tag_list,
-		    const gchar *tag)
+add_string_gst_tag (TrackerSparqlBuilder        *metadata,
+                    const gchar *uri,
+                    const gchar *key,
+                    GstTagList  *tag_list,
+                    const gchar *tag)
 {
-	gchar	 *s;
+	gchar    *s;
 	gboolean  ret;
 
 	s = NULL;
@@ -406,13 +406,13 @@ add_string_gst_tag (TrackerSparqlBuilder	*metadata,
 
 static void
 add_uint_gst_tag (TrackerSparqlBuilder  *metadata,
-		const gchar *uri,
-		  const gchar *key,
-		  GstTagList  *tag_list,
-		  const gchar *tag)
+                  const gchar *uri,
+                  const gchar *key,
+                  GstTagList  *tag_list,
+                  const gchar *tag)
 {
 	gboolean ret;
-	guint	 n;
+	guint    n;
 
 	ret = gst_tag_list_get_uint (tag_list, tag, &n);
 
@@ -422,14 +422,14 @@ add_uint_gst_tag (TrackerSparqlBuilder  *metadata,
 }
 
 static void
-add_double_gst_tag (TrackerSparqlBuilder	*metadata,
-		const gchar *uri,
-		    const gchar *key,
-		    GstTagList	*tag_list,
-		    const gchar *tag)
+add_double_gst_tag (TrackerSparqlBuilder        *metadata,
+                    const gchar *uri,
+                    const gchar *key,
+                    GstTagList  *tag_list,
+                    const gchar *tag)
 {
 	gboolean ret;
-	gdouble	 n;
+	gdouble          n;
 
 	ret = gst_tag_list_get_double (tag_list, tag, &n);
 
@@ -440,12 +440,12 @@ add_double_gst_tag (TrackerSparqlBuilder	*metadata,
 
 static void
 add_year_of_gdate_gst_tag (TrackerSparqlBuilder  *metadata,
-		const gchar *uri,
-			   const gchar *key,
-			   GstTagList  *tag_list,
-			   const gchar *tag)
+                           const gchar *uri,
+                           const gchar *key,
+                           GstTagList  *tag_list,
+                           const gchar *tag)
 {
-	GDate	 *date;
+	GDate    *date;
 	gboolean  ret;
 
 	date = NULL;
@@ -456,7 +456,7 @@ add_year_of_gdate_gst_tag (TrackerSparqlBuilder  *metadata,
 
 		if (g_date_strftime (buf, 10, "%Y", date)) {
 			tracker_statement_list_insert (metadata, uri,
-						  key, buf);
+			                               key, buf);
 		}
 	}
 
@@ -468,7 +468,7 @@ add_year_of_gdate_gst_tag (TrackerSparqlBuilder  *metadata,
 static gint64
 get_media_duration (MetadataExtractor *extractor)
 {
-	gint64	  duration;
+	gint64    duration;
 	GstFormat fmt;
 
 	g_return_val_if_fail (extractor, -1);
@@ -479,8 +479,8 @@ get_media_duration (MetadataExtractor *extractor)
 	duration = -1;
 
 	if (gst_element_query_duration (extractor->playbin,
-					&fmt,
-					&duration) &&
+	                                &fmt,
+	                                &duration) &&
 	    duration >= 0) {
 		return duration / GST_SECOND;
 	} else {
@@ -510,10 +510,10 @@ get_embedded_album_art(MetadataExtractor *extractor)
 			caps_struct = gst_caps_get_structure (buffer->caps, 0);
 
 			gst_structure_get_enum (caps_struct,
-						"image-type",
-						GST_TYPE_TAG_IMAGE_TYPE,
-						&type);
-			
+			                        "image-type",
+			                        GST_TYPE_TAG_IMAGE_TYPE,
+			                        &type);
+                        
 			if ((type == GST_TAG_IMAGE_TYPE_FRONT_COVER)||
 			    ((type == GST_TAG_IMAGE_TYPE_UNDEFINED)&&(extractor->album_art_size == 0))) {
 				extractor->album_art_data = buffer->data;
@@ -532,7 +532,7 @@ get_embedded_album_art(MetadataExtractor *extractor)
 static void
 extract_metadata (MetadataExtractor *extractor,
                   const gchar *uri,
-		  TrackerSparqlBuilder  *metadata,
+                  TrackerSparqlBuilder  *metadata,
                   gchar **artist,
                   gchar **album,
                   gchar **scount)
@@ -542,32 +542,32 @@ extract_metadata (MetadataExtractor *extractor,
 
 	if (extractor->audio_channels >= 0) {
 		add_uint_info (metadata, uri,
-			       ("Audio:Channels"),
-			       extractor->audio_channels);
+		               ("Audio:Channels"),
+		               extractor->audio_channels);
 	}
 
 	if (extractor->audio_samplerate >= 0) {
 		add_uint_info (metadata, uri,
-			       ("Audio:Samplerate"),
-			       extractor->audio_samplerate);
+		               ("Audio:Samplerate"),
+		               extractor->audio_samplerate);
 	}
 
 	if (extractor->video_height >= 0) {
 		add_uint_info (metadata, uri,
-			       ("Video:Height"),
-			       extractor->video_height);
+		               ("Video:Height"),
+		               extractor->video_height);
 	}
 
 	if (extractor->video_width >= 0) {
 		add_uint_info (metadata, uri,
-			       ("Video:Width"),
-			       extractor->video_height);
+		               ("Video:Width"),
+		               extractor->video_height);
 	}
 
 	if (extractor->video_fps_n >= 0 && extractor->video_fps_d >= 0) {
 		add_uint_info (metadata, uri,
-			       ("Video:FrameRate"),
-			       ((extractor->video_fps_n + extractor->video_fps_d / 2) / extractor->video_fps_d));
+		               ("Video:FrameRate"),
+		               ((extractor->video_fps_n + extractor->video_fps_d / 2) / extractor->video_fps_d));
 	}
 
 	if (extractor->tagcache) {
@@ -610,7 +610,7 @@ extract_metadata (MetadataExtractor *extractor,
 		duration = get_media_duration (extractor);
 
 		/* FIXME Use the has_video and has_audio rather than mime type once dsp problems are solved */
-/* 		if (extractor->has_video) { */
+		/*              if (extractor->has_video) { */
 		if (extractor->mime == EXTRACT_MIME_VIDEO) {
 			add_string_gst_tag (metadata, uri, "Video:Title", extractor->tagcache, GST_TAG_TITLE);
 			add_string_gst_tag (metadata, uri, "Video:Comments", extractor->tagcache, GST_TAG_COMMENT);
@@ -622,7 +622,7 @@ extract_metadata (MetadataExtractor *extractor,
 			if (duration >= 0) {
 				add_int64_info (metadata, uri, ("Video:Duration"), duration);
 			}
-/* 		} else if (extractor->has_audio) { */
+			/*              } else if (extractor->has_audio) { */
 		} else if (extractor->mime == EXTRACT_MIME_AUDIO) {
 			/* No video? So we assume we are treating a song */
 			add_string_gst_tag (metadata,uri,  "Audio:Title", extractor->tagcache, GST_TAG_TITLE);
@@ -653,10 +653,10 @@ extract_metadata (MetadataExtractor *extractor,
 
 static gboolean
 poll_for_state_change (MetadataExtractor *extractor,
-		       GstState		  state)
+                       GstState                   state)
 {
-	GstBus	       *bus;
-	GstMessageType	events, saved_events;
+	GstBus         *bus;
+	GstMessageType  events, saved_events;
 
 	g_return_val_if_fail (extractor, FALSE);
 	g_return_val_if_fail (extractor->playbin, FALSE);
@@ -709,7 +709,7 @@ poll_for_state_change (MetadataExtractor *extractor,
 		}
 
 		case GST_MESSAGE_ERROR: {
-			gchar  *debug	 = NULL;
+			gchar  *debug    = NULL;
 			GError *gsterror = NULL;
 
 			gst_message_parse_error (message, &gsterror, &debug);
@@ -744,34 +744,34 @@ poll_for_state_change (MetadataExtractor *extractor,
  success:
 	/* State change succeeded */
 	GST_DEBUG ("state change to %s succeeded",
-		   gst_element_state_get_name (state));
+	           gst_element_state_get_name (state));
 	extractor->ignore_messages_mask = saved_events;
 	return TRUE;
 
  timed_out:
 	/* It's taking a long time to open  */
 	GST_DEBUG ("state change to %s timed out, returning success",
-		   gst_element_state_get_name (state));
+	           gst_element_state_get_name (state));
 	extractor->ignore_messages_mask = saved_events;
 	return TRUE;
 
  error:
 	/* Already set *error */
 	GST_DEBUG ("error while waiting for state change to %s",
-		   gst_element_state_get_name (state));
+	           gst_element_state_get_name (state));
 	extractor->ignore_messages_mask = saved_events;
 	return FALSE;
 }
 
 static void
 tracker_extract_gstreamer_helix (const gchar *uri,
-				 TrackerSparqlBuilder  *metadata,
-				 ExtractMime	type)
+                                 TrackerSparqlBuilder  *metadata,
+                                 ExtractMime    type)
 {
 	MetadataExtractor *extractor;
-	GstElement	  *fakesink_video;
-	GstBus		  *bus;
-	gchar		  *artist, *album, *scount;
+	GstElement        *fakesink_video;
+	GstBus            *bus;
+	gchar             *artist, *album, *scount;
 
 	g_return_if_fail (uri);
 	g_return_if_fail (metadata);
@@ -826,11 +826,11 @@ tracker_extract_gstreamer_helix (const gchar *uri,
 	extract_metadata (extractor, uri, metadata, &artist, &album, &scount);
 
 	tracker_albumart_process (extractor->album_art_data,
-				  extractor->album_art_size,
-				  NULL,
-				  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
-				  album,
-				  uri);
+	                          extractor->album_art_size,
+	                          NULL,
+	                          /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
+	                          album,
+	                          uri);
 
 	g_free (album);
 	g_free (artist);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 80b0003..77a0a41 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -99,7 +99,7 @@ typedef struct {
 
 	GstBus         *bus;
 
-	ExtractMime	mime;
+	ExtractMime     mime;
 
 
 	/* Decodebin elements and properties*/
@@ -107,12 +107,12 @@ typedef struct {
 	GList          *fsinks;
 
 	gint64          duration;
-	gint		video_height;
-	gint		video_width;
-	gint		video_fps_n;
-	gint		video_fps_d;
-	gint		audio_channels;
-	gint		audio_samplerate;
+	gint            video_height;
+	gint            video_width;
+	gint            video_fps_n;
+	gint            video_fps_d;
+	gint            audio_channels;
+	gint            audio_samplerate;
 
 	/* Tags and data */
 	GstTagList     *tagcache;
@@ -146,9 +146,9 @@ const gboolean use_tagreadbin = FALSE;
 
 static void
 add_int64_info (TrackerSparqlBuilder *metadata,
-		const gchar *uri,
-		const gchar *key,
-		gint64	    info)
+                const gchar *uri,
+                const gchar *key,
+                gint64      info)
 {
 	tracker_sparql_builder_predicate (metadata, key);
 	tracker_sparql_builder_object_int64 (metadata, info);
@@ -156,9 +156,9 @@ add_int64_info (TrackerSparqlBuilder *metadata,
 
 static void
 add_uint_info (TrackerSparqlBuilder *metadata,
-	       const gchar *uri,
-	       const gchar *key,
-	       guint	   info)
+               const gchar *uri,
+               const gchar *key,
+               guint       info)
 {
 	tracker_sparql_builder_predicate (metadata, key);
 	tracker_sparql_builder_object_int64 (metadata, info);
@@ -166,12 +166,12 @@ add_uint_info (TrackerSparqlBuilder *metadata,
 
 static void
 add_string_gst_tag (TrackerSparqlBuilder *metadata,
-		    const gchar          *uri,
-		    const gchar          *key,
-		    GstTagList	         *tag_list,
-		    const gchar          *tag)
+                    const gchar          *uri,
+                    const gchar          *key,
+                    GstTagList           *tag_list,
+                    const gchar          *tag)
 {
-	gchar	 *s;
+	gchar    *s;
 	gboolean  ret;
 
 	s = NULL;
@@ -189,13 +189,13 @@ add_string_gst_tag (TrackerSparqlBuilder *metadata,
 
 static void
 add_uint_gst_tag (TrackerSparqlBuilder   *metadata,
-		  const gchar *uri,
-		  const gchar *key,
-		  GstTagList  *tag_list,
-		  const gchar *tag)
+                  const gchar *uri,
+                  const gchar *key,
+                  GstTagList  *tag_list,
+                  const gchar *tag)
 {
 	gboolean ret;
-	guint	 n;
+	guint    n;
 
 	ret = gst_tag_list_get_uint (tag_list, tag, &n);
 
@@ -207,13 +207,13 @@ add_uint_gst_tag (TrackerSparqlBuilder   *metadata,
 
 static void
 add_int_gst_tag (TrackerSparqlBuilder   *metadata,
-		 const gchar *uri,
-		 const gchar *key,
-		 GstTagList  *tag_list,
-		 const gchar *tag)
+                 const gchar *uri,
+                 const gchar *key,
+                 GstTagList  *tag_list,
+                 const gchar *tag)
 {
 	gboolean ret;
-	gint	 n;
+	gint     n;
 
 	ret = gst_tag_list_get_int (tag_list, tag, &n);
 
@@ -224,14 +224,14 @@ add_int_gst_tag (TrackerSparqlBuilder   *metadata,
 }
 
 static void
-add_double_gst_tag (TrackerSparqlBuilder	*metadata,
-		    const gchar *uri,
-		    const gchar *key,
-		    GstTagList	*tag_list,
-		    const gchar *tag)
+add_double_gst_tag (TrackerSparqlBuilder        *metadata,
+                    const gchar *uri,
+                    const gchar *key,
+                    GstTagList  *tag_list,
+                    const gchar *tag)
 {
 	gboolean ret;
-	gdouble	 n;
+	gdouble          n;
 
 	ret = gst_tag_list_get_double (tag_list, tag, &n);
 
@@ -243,13 +243,13 @@ add_double_gst_tag (TrackerSparqlBuilder	*metadata,
 
 static void
 add_fraction_gst_tag (TrackerSparqlBuilder         *metadata,
-		      const gchar       *uri,
-		      const gchar       *key,
-		      GstTagList	*tag_list,
-		      const gchar       *tag)
+                      const gchar       *uri,
+                      const gchar       *key,
+                      GstTagList        *tag_list,
+                      const gchar       *tag)
 {
 	gboolean ret;
-	GValue	 n = {0,};
+	GValue   n = {0,};
 	gfloat   f;
 
 	ret = gst_tag_list_copy_value (&n, tag_list, tag);
@@ -265,12 +265,12 @@ add_fraction_gst_tag (TrackerSparqlBuilder         *metadata,
 
 static void
 add_y_date_gst_tag (TrackerSparqlBuilder  *metadata,
-		    const gchar *uri,
-		    const gchar *key,
-		    GstTagList  *tag_list,
-		    const gchar *tag)
+                    const gchar *uri,
+                    const gchar *key,
+                    GstTagList  *tag_list,
+                    const gchar *tag)
 {
-	GDate	 *date;
+	GDate    *date;
 	gboolean  ret;
 
 	date = NULL;
@@ -292,13 +292,13 @@ add_y_date_gst_tag (TrackerSparqlBuilder  *metadata,
 
 static void
 add_time_gst_tag (TrackerSparqlBuilder   *metadata,
-		  const gchar *uri,
-		  const gchar *key,
-		  GstTagList  *tag_list,
-		  const gchar *tag)
+                  const gchar *uri,
+                  const gchar *key,
+                  GstTagList  *tag_list,
+                  const gchar *tag)
 {
 	gboolean ret;
-	guint64	 n;
+	guint64          n;
 
 	ret = gst_tag_list_get_uint64 (tag_list, tag, &n);
 
@@ -334,9 +334,9 @@ get_embedded_album_art(MetadataExtractor *extractor)
 			caps_struct = gst_caps_get_structure (buffer->caps, 0);
 
 			gst_structure_get_enum (caps_struct,
-						"image-type",
-						GST_TYPE_TAG_IMAGE_TYPE,
-						&type);
+			                        "image-type",
+			                        GST_TYPE_TAG_IMAGE_TYPE,
+			                        &type);
 
 			if ((type == GST_TAG_IMAGE_TYPE_FRONT_COVER)||
 			    ((type == GST_TAG_IMAGE_TYPE_UNDEFINED)&&(extractor->album_art_size == 0))) {
@@ -378,8 +378,8 @@ get_embedded_album_art(MetadataExtractor *extractor)
 
 static void
 extract_stream_metadata_tagreadbin (MetadataExtractor *extractor,
-				    const gchar       *uri,
-				    TrackerSparqlBuilder         *metadata)
+                                    const gchar       *uri,
+                                    TrackerSparqlBuilder         *metadata)
 {
 	if (extractor->mime != EXTRACT_MIME_IMAGE) {
 		add_uint_gst_tag (metadata, uri, "nfo:channels", extractor->tagcache, GST_TAG_CHANNEL);
@@ -397,8 +397,8 @@ extract_stream_metadata_tagreadbin (MetadataExtractor *extractor,
 
 static void
 extract_stream_metadata_decodebin (MetadataExtractor *extractor,
-				   const gchar       *uri,
-				   TrackerSparqlBuilder         *metadata)
+                                   const gchar       *uri,
+                                   TrackerSparqlBuilder         *metadata)
 {
 	if (extractor->mime != EXTRACT_MIME_IMAGE) {
 		if (extractor->audio_channels >= 0) {
@@ -425,19 +425,19 @@ extract_stream_metadata_decodebin (MetadataExtractor *extractor,
 	if (extractor->mime == EXTRACT_MIME_VIDEO) {
 		if (extractor->video_fps_n >= 0 && extractor->video_fps_d >= 0) {
 			add_uint_info (metadata,
-				       uri, "nfo:frameRate",
-				       ((extractor->video_fps_n + extractor->video_fps_d / 2) /
-					extractor->video_fps_d));
+			               uri, "nfo:frameRate",
+			               ((extractor->video_fps_n + extractor->video_fps_d / 2) /
+			                extractor->video_fps_d));
 		}
 	}
 }
 
 static void
 extract_metadata (MetadataExtractor      *extractor,
-		  const gchar            *uri,
-		  TrackerSparqlBuilder   *metadata,
-		  gchar                 **album,
-		  gchar                 **scount)
+                  const gchar            *uri,
+                  TrackerSparqlBuilder   *metadata,
+                  gchar                 **album,
+                  gchar                 **scount)
 {
 	gchar *s;
 	gboolean ret;
@@ -639,7 +639,7 @@ dbin_dpad_cb (GstElement* e, GstPad* pad, gboolean cont, gpointer data_)
 static guint64
 get_media_duration (MetadataExtractor *extractor)
 {
-	gint64	  duration;
+	gint64    duration;
 	GstFormat fmt;
 
 	g_return_val_if_fail (extractor, -1);
@@ -650,8 +650,8 @@ get_media_duration (MetadataExtractor *extractor)
 	duration = -1;
 
 	if (gst_element_query_duration (extractor->pipeline,
-					&fmt,
-					&duration) &&
+	                                &fmt,
+	                                &duration) &&
 	    duration >= 0) {
 		return duration / GST_SECOND;
 	} else {
@@ -666,7 +666,7 @@ add_stream_tag (void *obj, void *data_)
 	GstElement        *fsink     = (GstElement *) obj;
 
 	GstStructure      *s         = NULL;
-	GstCaps	          *caps      = NULL;
+	GstCaps                   *caps      = NULL;
 
 	if ((caps = GST_PAD_CAPS (fsink))) {
 		s = gst_caps_get_structure (caps, 0);
@@ -676,11 +676,11 @@ add_stream_tag (void *obj, void *data_)
 				if ( ( (extractor->audio_channels != -1) &&
 				       (extractor->audio_samplerate != -1) ) ||
 				     !( (gst_structure_get_int (s,
-								"channels",
-								&extractor->audio_channels) ) &&
-					(gst_structure_get_int (s,
-								"rate",
-								&extractor->audio_samplerate)) ) ) {
+				                                "channels",
+				                                &extractor->audio_channels) ) &&
+				        (gst_structure_get_int (s,
+				                                "rate",
+				                                &extractor->audio_samplerate)) ) ) {
 					return;
 				}
 			} else if (g_strrstr (gst_structure_get_name (s), "video")) {
@@ -689,11 +689,11 @@ add_stream_tag (void *obj, void *data_)
 				       (extractor->video_width != -1) &&
 				       (extractor->video_height != -1) ) ||
 				     !( (gst_structure_get_fraction (s,
-								     "framerate",
-								     &extractor->video_fps_n,
-								     &extractor->video_fps_d) ) &&
-					(gst_structure_get_int (s, "width", &extractor->video_width)) &&
-					(gst_structure_get_int (s, "height", &extractor->video_height)))) {
+				                                     "framerate",
+				                                     &extractor->video_fps_n,
+				                                     &extractor->video_fps_d) ) &&
+				        (gst_structure_get_int (s, "width", &extractor->video_width)) &&
+				        (gst_structure_get_int (s, "height", &extractor->video_height)))) {
 					return;
 				}
 			}
@@ -714,8 +714,8 @@ add_tags (GstTagList *new_tags, MetadataExtractor *extractor)
 	GstTagList   *result;
 
 	result = gst_tag_list_merge (extractor->tagcache,
-				     new_tags,
-				     GST_TAG_MERGE_KEEP);
+	                             new_tags,
+	                             GST_TAG_MERGE_KEEP);
 
 	if (extractor->tagcache) {
 		gst_tag_list_free (extractor->tagcache);
@@ -727,9 +727,9 @@ add_tags (GstTagList *new_tags, MetadataExtractor *extractor)
 
 static gboolean
 poll_for_ready (MetadataExtractor *extractor,
-		GstState state,
-		gboolean ready_with_state,
-		gboolean ready_with_eos)
+                GstState state,
+                gboolean ready_with_state,
+                gboolean ready_with_eos)
 {
 	gint64              timeout   = 5 * GST_SECOND;
 	GstBus             *bus       = extractor->bus;
@@ -837,9 +837,9 @@ create_decodebin_pipeline (MetadataExtractor *extractor, const gchar *uri)
 	}
 
 	id = g_signal_connect (G_OBJECT (bin),
-			       "new-decoded-pad",
-			       G_CALLBACK (dbin_dpad_cb),
-			       extractor);
+	                       "new-decoded-pad",
+	                       G_CALLBACK (dbin_dpad_cb),
+	                       extractor);
 
 	gst_bin_add (GST_BIN (pipeline), filesrc);
 	gst_bin_add (GST_BIN (pipeline), bin);
@@ -874,8 +874,8 @@ create_tagreadbin_pipeline (MetadataExtractor *extractor, const gchar *uri)
 
 static void
 tracker_extract_gstreamer (const gchar *uri,
-			   TrackerSparqlBuilder  *metadata,
-			   ExtractMime	type)
+                           TrackerSparqlBuilder  *metadata,
+                           ExtractMime  type)
 {
 	MetadataExtractor *extractor;
 	gchar *album, *scount;
@@ -947,11 +947,11 @@ tracker_extract_gstreamer (const gchar *uri,
 	extract_metadata (extractor, uri, metadata, &album, &scount);
 
 	tracker_albumart_process (extractor->album_art_data,
-				  extractor->album_art_size,
-				  extractor->album_art_mime,
-				  /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
-				  album,
-				  uri);
+	                          extractor->album_art_size,
+	                          extractor->album_art_mime,
+	                          /* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
+	                          album,
+	                          uri);
 
 	g_free (scount);
 	g_free (album);
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index 27400be..5c2dbe5 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -44,18 +44,18 @@ typedef struct {
 } parser_data;
 
 static void extract_html (const gchar          *filename,
-			  TrackerSparqlBuilder *metadata);
+                          TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
-	{ "text/html",		   extract_html },
+	{ "text/html",             extract_html },
 	{ "application/xhtml+xml", extract_html },
 	{ NULL, NULL }
 };
 
 static gboolean
 has_attribute (const gchar **attrs,
-	       const gchar  *attr,
-	       const gchar  *val)
+               const gchar  *attr,
+               const gchar  *val)
 {
 	gint i;
 
@@ -76,7 +76,7 @@ has_attribute (const gchar **attrs,
 
 static const xmlChar *
 lookup_attribute (const gchar **attrs,
-		  const gchar  *attr)
+                  const gchar  *attr)
 {
 	gint i;
 
@@ -95,8 +95,8 @@ lookup_attribute (const gchar **attrs,
 
 static void
 parser_start_element (void           *data,
-		      const xmlChar  *name_,
-		      const xmlChar **attrs_)
+                      const xmlChar  *name_,
+                      const xmlChar **attrs_)
 {
 	parser_data *pd = data;
 	const gchar *name = (const gchar*) name_;
@@ -169,7 +169,7 @@ parser_start_element (void           *data,
 						tracker_sparql_builder_predicate (pd->metadata, "nie:keyword");
 						tracker_sparql_builder_object_unvalidated (pd->metadata, g_strstrip (keywords[i]));
 					}
-					
+                                        
 					g_strfreev (keywords);
 				}
 			}
@@ -179,8 +179,8 @@ parser_start_element (void           *data,
 
 static void
 parser_characters (void          *data,
-		   const xmlChar *ch,
-		   int		  len)
+                   const xmlChar *ch,
+                   int            len)
 {
 	parser_data *pd = data;
 
@@ -198,7 +198,7 @@ parser_characters (void          *data,
 
 static void
 extract_html (const gchar          *uri,
-	      TrackerSparqlBuilder *metadata)
+              TrackerSparqlBuilder *metadata)
 {
 	htmlDocPtr doc;
 	parser_data pd;
diff --git a/src/tracker-extract/tracker-extract-imagemagick.c b/src/tracker-extract/tracker-extract-imagemagick.c
index cabe120..b94270e 100644
--- a/src/tracker-extract/tracker-extract-imagemagick.c
+++ b/src/tracker-extract/tracker-extract-imagemagick.c
@@ -44,7 +44,7 @@
 #define RDF_TYPE RDF_PREFIX "type"
 
 static void extract_imagemagick (const gchar *uri,
-				 TrackerSparqlBuilder   *metadata);
+                                 TrackerSparqlBuilder   *metadata);
 
 static TrackerExtractData data[] = {
 	{ "image/*", extract_imagemagick },
@@ -53,7 +53,7 @@ static TrackerExtractData data[] = {
 
 static void
 extract_imagemagick (const gchar *uri,
-		     TrackerSparqlBuilder   *metadata)
+                     TrackerSparqlBuilder   *metadata)
 {
 	gchar *argv[6];
 	gchar *identify;
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index b8a8477..af41cbf 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -54,18 +54,18 @@
 #include "tracker-exif.h"
 
 #ifdef HAVE_LIBEXIF
-#define EXIF_NAMESPACE		"Exif"
-#define EXIF_NAMESPACE_LENGTH	4
+#define EXIF_NAMESPACE          "Exif"
+#define EXIF_NAMESPACE_LENGTH   4
 #endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_EXEMPI
-#define XMP_NAMESPACE		"http://ns.adobe.com/xap/1.0/\x00";
-#define XMP_NAMESPACE_LENGTH	29
+#define XMP_NAMESPACE           "http://ns.adobe.com/xap/1.0/\x00";
+#define XMP_NAMESPACE_LENGTH    29
 #endif /* HAVE_EXEMPI */
 
 #ifdef HAVE_LIBIPTCDATA
-#define PS3_NAMESPACE		"Photoshop 3.0\0"
-#define PS3_NAMESPACE_LENGTH	14
+#define PS3_NAMESPACE           "Photoshop 3.0\0"
+#define PS3_NAMESPACE_LENGTH    14
 #include <libiptcdata/iptc-jpeg.h>
 #endif /* HAVE_LIBIPTCDATA */
 
@@ -89,7 +89,7 @@ typedef struct {
 } MergeData;
 
 static void extract_jpeg (const gchar          *filename,
-			  TrackerSparqlBuilder *metadata);
+                          TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
 	{ "image/jpeg", extract_jpeg },
@@ -103,7 +103,7 @@ struct tej_error_mgr {
 
 static void
 insert_keywords (TrackerSparqlBuilder *metadata,
-		 gchar                *keywords)
+                 gchar                *keywords)
 {
 	char *saveptr, *p;
 	size_t len;
@@ -148,7 +148,7 @@ extract_jpeg_error_exit (j_common_ptr cinfo)
 
 static void
 extract_jpeg (const gchar          *uri,
-	      TrackerSparqlBuilder *metadata)
+              TrackerSparqlBuilder *metadata)
 {
 	struct jpeg_decompress_struct cinfo;
 	struct tej_error_mgr tejerr;
@@ -229,18 +229,18 @@ extract_jpeg (const gchar          *uri,
 #ifdef HAVE_LIBEXIF
 				if (strncmp (EXIF_NAMESPACE, str, EXIF_NAMESPACE_LENGTH) == 0) {
 					tracker_read_exif ((unsigned char*) marker->data,
-							   len,
-							   uri,
-							   &ed);
+					                   len,
+					                   uri,
+					                   &ed);
 				}
 #endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_EXEMPI
 				if (strncmp (XMP_NAMESPACE, str, XMP_NAMESPACE_LENGTH) == 0) {
 					tracker_read_xmp (str + XMP_NAMESPACE_LENGTH,
-							  len - XMP_NAMESPACE_LENGTH,
-							  uri,
-							  &xd);
+					                  len - XMP_NAMESPACE_LENGTH,
+					                  uri,
+					                  &xd);
 				}
 #endif /* HAVE_EXEMPI */
 
@@ -254,9 +254,9 @@ extract_jpeg (const gchar          *uri,
 					offset = iptc_jpeg_ps3_find_iptc (str, len, &sublen);
 					if (offset > 0) {
 						tracker_read_iptc (str + offset,
-								   sublen,
-								   uri,
-								   &id);
+						                   sublen,
+						                   uri,
+						                   &id);
 					}
 				}
 #endif /* HAVE_LIBIPTCDATA */
@@ -513,7 +513,7 @@ extract_jpeg (const gchar          *uri,
 		}
 
 		jpeg_destroy_decompress (&cinfo);
-fail:
+	fail:
 		tracker_file_close (f, FALSE);
 	}
 
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index 3561e2c..86734e6 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -39,26 +39,26 @@
 static void
 tracker_extract_xine (const gchar *uri, TrackerSparqlBuilder *metadata)
 {
-	xine_t		  *xine_base;
+	xine_t            *xine_base;
 	xine_audio_port_t *audio_port;
 	xine_video_port_t *video_port;
-	xine_stream_t	  *stream;
-	char		  *mrl;
+	xine_stream_t     *stream;
+	char              *mrl;
 
-	gboolean	  has_audio;
-	gboolean	  has_video;
+	gboolean          has_audio;
+	gboolean          has_video;
 
-	int		  pos_stream;
-	int		  pos_time;
-	int		  length_time;
+	int               pos_stream;
+	int               pos_time;
+	int               length_time;
 
-	const char	  *comment;
-	const char	  *title;
-	const char	  *author;
-	const char	  *album;
-	const char	  *year;
-	const char	  *genre;
-	const char	  *track;
+	const char        *comment;
+	const char        *title;
+	const char        *author;
+	const char        *album;
+	const char        *year;
+	const char        *genre;
+	const char        *track;
 
 	g_return_if_fail (uri && metadata);
 
@@ -103,41 +103,41 @@ tracker_extract_xine (const gchar *uri, TrackerSparqlBuilder *metadata)
 	has_audio = xine_get_stream_info (stream, XINE_STREAM_INFO_HAS_AUDIO);
 	has_video = xine_get_stream_info (stream, XINE_STREAM_INFO_HAS_VIDEO);
 
-        author = xine_get_meta_info (stream, XINE_META_INFO_ARTIST);
+	author = xine_get_meta_info (stream, XINE_META_INFO_ARTIST);
 	if (author) {
 		gchar *canonical_uri = tracker_uri_printf_escaped ("urn:artist:%s", author);
 
-                tracker_sparql_builder_subject_iri (metadata, canonical_uri);
-                tracker_sparql_builder_predicate (metadata, "a");
-                tracker_sparql_builder_object (metadata, "nmm:Artist");
+		tracker_sparql_builder_subject_iri (metadata, canonical_uri);
+		tracker_sparql_builder_predicate (metadata, "a");
+		tracker_sparql_builder_object (metadata, "nmm:Artist");
 
 		g_free (canonical_uri);
 	}
 
 	album = xine_get_meta_info (stream, XINE_META_INFO_ALBUM);
 	if (album) {
-                gchar *canonical_uri = tracker_uri_printf_escaped ("urn:album:%s", album);
+		gchar *canonical_uri = tracker_uri_printf_escaped ("urn:album:%s", album);
 
-                tracker_sparql_builder_subject_iri (metadata, canonical_uri);
-                tracker_sparql_builder_predicate (metadata, "a");
-                tracker_sparql_builder_object (metadata, "nmm:MusicAlbum");
-                tracker_sparql_builder_predicate (metadata, "nmm:albumTitle");
-                tracker_sparql_builder_object_unvalidated (metadata, album);
+		tracker_sparql_builder_subject_iri (metadata, canonical_uri);
+		tracker_sparql_builder_predicate (metadata, "a");
+		tracker_sparql_builder_object (metadata, "nmm:MusicAlbum");
+		tracker_sparql_builder_predicate (metadata, "nmm:albumTitle");
+		tracker_sparql_builder_object_unvalidated (metadata, album);
 
-                g_free (canonical_uri);
+		g_free (canonical_uri);
 	}
 
-        tracker_sparql_builder_subject_iri (metadata, uri);
-        tracker_sparql_builder_predicate (metadata, "a");
+	tracker_sparql_builder_subject_iri (metadata, uri);
+	tracker_sparql_builder_predicate (metadata, "a");
 
-        if (has_video) {
-                tracker_sparql_builder_object (metadata, "nmm:Video");
-        } else if (has_audio) {
-                tracker_sparql_builder_object (metadata, "nmm:MusicPiece");
-                tracker_sparql_builder_object (metadata, "nfo:Audio");
-        } else {
-                tracker_sparql_builder_object (metadata, "nfo:FileDataObject");
-        }
+	if (has_video) {
+		tracker_sparql_builder_object (metadata, "nmm:Video");
+	} else if (has_audio) {
+		tracker_sparql_builder_object (metadata, "nmm:MusicPiece");
+		tracker_sparql_builder_object (metadata, "nfo:Audio");
+	} else {
+		tracker_sparql_builder_object (metadata, "nfo:FileDataObject");
+	}
 
 	if (xine_get_pos_length (stream, &pos_stream, &pos_time, &length_time)) {
 		if (length_time >= 0) {
@@ -146,9 +146,9 @@ tracker_extract_xine (const gchar *uri, TrackerSparqlBuilder *metadata)
 			duration = (guint32) length_time / 1000; /* from miliseconds to seconds */
 
 			if (has_video || has_audio) {
-                                tracker_sparql_builder_predicate (metadata, "nfo:duration");
-                                tracker_sparql_builder_object_int64 (metadata, (gint64) duration);
-                        }
+				tracker_sparql_builder_predicate (metadata, "nfo:duration");
+				tracker_sparql_builder_object_int64 (metadata, (gint64) duration);
+			}
 		}
 	}
 
@@ -159,59 +159,59 @@ tracker_extract_xine (const gchar *uri, TrackerSparqlBuilder *metadata)
 		n  = xine_get_stream_info (stream, XINE_STREAM_INFO_VIDEO_HEIGHT);
 		n0 = xine_get_stream_info (stream, XINE_STREAM_INFO_VIDEO_WIDTH);
 		if (n > 0 && n0 > 0) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:height");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n);
+			tracker_sparql_builder_predicate (metadata, "nfo:height");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n);
 
-                        tracker_sparql_builder_predicate (metadata, "nfo:width");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n0);
+			tracker_sparql_builder_predicate (metadata, "nfo:width");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n0);
 		}
 
 		n = xine_get_stream_info (stream, XINE_STREAM_INFO_FRAME_DURATION);
 		if (n > 0) {
 			/* 90000 because it is how is done in Xine! */
-                        tracker_sparql_builder_predicate (metadata, "nfo:frameRate");
-                        tracker_sparql_builder_object_double (metadata, (gdouble) 90000 / n);
+			tracker_sparql_builder_predicate (metadata, "nfo:frameRate");
+			tracker_sparql_builder_object_double (metadata, (gdouble) 90000 / n);
 		}
 
 		n = xine_get_stream_info (stream, XINE_STREAM_INFO_VIDEO_BITRATE);
 		if (n > 0) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n);
+			tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n);
 		}
 
 		video_codec = xine_get_meta_info (stream, XINE_META_INFO_VIDEOCODEC);
 		if (video_codec) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:codec");
-                        tracker_sparql_builder_object_unvalidated (metadata, video_codec);
+			tracker_sparql_builder_predicate (metadata, "nfo:codec");
+			tracker_sparql_builder_object_unvalidated (metadata, video_codec);
 		}
 	}
 
-        if (has_audio) {
+	if (has_audio) {
 		guint32   n;
 		const char *audio_codec;
 
 		n = xine_get_stream_info (stream, XINE_STREAM_INFO_AUDIO_BITRATE);
 		if (n > 0) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n);
+			tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n);
 		}
 
 		n = xine_get_stream_info (stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE);
 		if (n > 0) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:samplerate");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n);
+			tracker_sparql_builder_predicate (metadata, "nfo:samplerate");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n);
 		}
 
 		n = xine_get_stream_info (stream, XINE_STREAM_INFO_AUDIO_CHANNELS);
 		if (n > 0) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:channels");
-                        tracker_sparql_builder_object_int64 (metadata, (gint64) n);
+			tracker_sparql_builder_predicate (metadata, "nfo:channels");
+			tracker_sparql_builder_object_int64 (metadata, (gint64) n);
 		}
 
 		audio_codec = xine_get_meta_info (stream, XINE_META_INFO_AUDIOCODEC);
 		if (audio_codec) {
-                        tracker_sparql_builder_predicate (metadata, "nfo:codec");
-                        tracker_sparql_builder_object_unvalidated (metadata, audio_codec);
+			tracker_sparql_builder_predicate (metadata, "nfo:codec");
+			tracker_sparql_builder_object_unvalidated (metadata, audio_codec);
 		}
 	}
 
@@ -220,38 +220,38 @@ tracker_extract_xine (const gchar *uri, TrackerSparqlBuilder *metadata)
 
 	comment = xine_get_meta_info (stream, XINE_META_INFO_COMMENT);
 	if (comment && (has_video || has_audio)) {
-                tracker_sparql_builder_predicate (metadata, "nie:comment");
-                tracker_sparql_builder_object_unvalidated (metadata, comment);
+		tracker_sparql_builder_predicate (metadata, "nie:comment");
+		tracker_sparql_builder_object_unvalidated (metadata, comment);
 	}
 
 	title = xine_get_meta_info (stream, XINE_META_INFO_TITLE);
 	if (title && (has_video || has_audio)) {
-                tracker_sparql_builder_predicate (metadata, "nie:title");
-                tracker_sparql_builder_object_unvalidated (metadata, title);
+		tracker_sparql_builder_predicate (metadata, "nie:title");
+		tracker_sparql_builder_object_unvalidated (metadata, title);
 	}
 
 	year = xine_get_meta_info (stream, XINE_META_INFO_YEAR);
 	if (year) {
-                tracker_sparql_builder_predicate (metadata, "nie:contentCreated");
-                tracker_sparql_builder_object_unvalidated (metadata, year);
+		tracker_sparql_builder_predicate (metadata, "nie:contentCreated");
+		tracker_sparql_builder_object_unvalidated (metadata, year);
 	}
 
 	genre = xine_get_meta_info (stream, XINE_META_INFO_GENRE);
 	if (genre) {
-                tracker_sparql_builder_predicate (metadata, "nfo:genre");
-                tracker_sparql_builder_object_unvalidated (metadata, genre);
+		tracker_sparql_builder_predicate (metadata, "nfo:genre");
+		tracker_sparql_builder_object_unvalidated (metadata, genre);
 	}
 
 	track = xine_get_meta_info (stream, XINE_META_INFO_TRACK_NUMBER);
 	if (track) {
-                tracker_sparql_builder_predicate (metadata, "nmm:trackNumber");
-                tracker_sparql_builder_object_unvalidated (metadata, track);
+		tracker_sparql_builder_predicate (metadata, "nmm:trackNumber");
+		tracker_sparql_builder_object_unvalidated (metadata, track);
 	}
 
 #if 0
 	/* FIXME: "Video.Copyright" seems missing */
-        tracker_sparql_builder_predicate (metadata, "nie:copyright");
-        tracker_sparql_builder_object_unvalidated (metadata, NULL);
+	tracker_sparql_builder_predicate (metadata, "nie:copyright");
+	tracker_sparql_builder_object_unvalidated (metadata, NULL);
 #endif
 
 	xine_dispose (stream);
diff --git a/src/tracker-extract/tracker-extract-mockup.c b/src/tracker-extract/tracker-extract-mockup.c
index a68647a..e545d6a 100644
--- a/src/tracker-extract/tracker-extract-mockup.c
+++ b/src/tracker-extract/tracker-extract-mockup.c
@@ -25,7 +25,7 @@
 #include "tracker-main.h"
 
 static void extract_mockup (const gchar          *uri,
-			    TrackerSparqlBuilder *metadata);
+                            TrackerSparqlBuilder *metadata);
 
 typedef struct {
 	gchar *key;
@@ -54,7 +54,7 @@ static TrackerExtractData data[] = {
 
 static void
 extract_mockup (const gchar           *uri,
-		TrackerSparqlBuilder  *metadata)
+                TrackerSparqlBuilder  *metadata)
 {
 	MockupTag *p;
 
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index b2cc996..828e067 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -65,7 +65,7 @@
  * there.
  */
 
-#define MAX_FILE_READ	  1024 * 1024 * 5
+#define MAX_FILE_READ     1024 * 1024 * 5
 #define MAX_MP3_SCAN_DEEP 16768
 
 #define MAX_FRAMES_SCAN   512
@@ -174,7 +174,7 @@ typedef struct {
 } MP3Data;
 
 static void extract_mp3 (const gchar           *filename,
-			 TrackerSparqlBuilder  *metadata);
+                         TrackerSparqlBuilder  *metadata);
 
 enum {
 	MPEG_ERR,
@@ -431,7 +431,7 @@ static TrackerExtractData extract_data[] = {
 
 static char *
 read_id3v1_buffer (int     fd,
-		   goffset size)
+                   goffset size)
 {
 	char *buffer;
 	guint bytes_read;
@@ -455,8 +455,8 @@ read_id3v1_buffer (int     fd,
 
 	while (bytes_read < ID3V1_SIZE) {
 		rc = read (fd,
-			   buffer + bytes_read,
-			   ID3V1_SIZE - bytes_read);
+		           buffer + bytes_read,
+		           ID3V1_SIZE - bytes_read);
 		if (rc == -1) {
 			if (errno != EINTR) {
 				g_free (buffer);
@@ -476,30 +476,30 @@ read_id3v1_buffer (int     fd,
 static gchar *
 ucs2_to_utf8(const gchar *data, guint len)
 {
-        const gchar   *encoding = NULL;
-        guint16  c;
+	const gchar   *encoding = NULL;
+	guint16  c;
 	gboolean be;
-        gchar   *utf8 = NULL;
+	gchar   *utf8 = NULL;
 
-        memcpy (&c, data, 2);
+	memcpy (&c, data, 2);
 
 	switch (c) {
-        case 0xfeff:
-        case 0xfffe:
+	case 0xfeff:
+	case 0xfffe:
 		be = (G_BYTE_ORDER == G_BIG_ENDIAN);
 		be = (c == 0xfeff) ? be : !be;
 		encoding = be ? "UCS-2BE" : "UCS-2LE";
-                data += 2;
-                len -= 2;
-                break;
-        default:
-                encoding = "UCS-2";
-                break;
-        }
+		data += 2;
+		len -= 2;
+		break;
+	default:
+		encoding = "UCS-2";
+		break;
+	}
 
-        utf8 = g_convert (data, len, "UTF-8", encoding, NULL, NULL, NULL);
+	utf8 = g_convert (data, len, "UTF-8", encoding, NULL, NULL, NULL);
 
-        return utf8;
+	return utf8;
 }
 
 /* Get the genre codes from regular expressions */
@@ -558,9 +558,9 @@ get_genre_name (guint number)
 
 static void
 un_unsync (const unsigned char *source,
-	   size_t               size,
-	   unsigned char      **destination,
-	   size_t              *dest_size)
+           size_t               size,
+           unsigned char      **destination,
+           size_t              *dest_size)
 {
 	size_t offset;
 	gchar *dest;
@@ -588,8 +588,8 @@ un_unsync (const unsigned char *source,
 
 static char*
 get_encoding (const char *data,
-	      gssize      size,
-	      gboolean   *encoding_found)
+              gssize      size,
+              gboolean   *encoding_found)
 {
 	gchar *encoding = NULL;
 #ifdef HAVE_ENCA
@@ -617,7 +617,7 @@ get_encoding (const char *data,
 			}
 
 			encoding = g_strdup (enca_charset_name (eencoding.charset,
-								ENCA_NAME_STYLE_ICONV));
+			                                        ENCA_NAME_STYLE_ICONV));
 		}
 
 		enca_analyser_free (analyser);
@@ -635,12 +635,12 @@ get_encoding (const char *data,
 
 static gchar *
 convert_to_encoding (const gchar  *str,
-		     gssize        len,
-		     const gchar  *to_codeset,
-		     const gchar  *from_codeset,
-		     gsize        *bytes_read,
-		     gsize        *bytes_written,
-		     GError      **error_out)
+                     gssize        len,
+                     const gchar  *to_codeset,
+                     const gchar  *from_codeset,
+                     gsize        *bytes_read,
+                     gsize        *bytes_written,
+                     GError      **error_out)
 {
 	GError *error = NULL;
 	gchar *word;
@@ -648,12 +648,12 @@ convert_to_encoding (const gchar  *str,
 	/* g_print ("%s for %s\n", from_codeset, str); */
 
 	word = g_convert (str,
-			  len,
-			  to_codeset,
-			  from_codeset,
-			  bytes_read,
-			  bytes_written,
-			  &error);
+	                  len,
+	                  to_codeset,
+	                  from_codeset,
+	                  bytes_read,
+	                  bytes_written,
+	                  &error);
 
 	if (error) {
 		gchar *encoding;
@@ -662,12 +662,12 @@ convert_to_encoding (const gchar  *str,
 		g_free (word);
 
 		word = g_convert (str,
-				  len,
-				  to_codeset,
-				  encoding,
-				  bytes_read,
-				  bytes_written,
-				  error_out);
+		                  len,
+		                  to_codeset,
+		                  encoding,
+		                  bytes_read,
+		                  bytes_written,
+		                  error_out);
 
 		g_free (encoding);
 		g_error_free (error);
@@ -678,8 +678,8 @@ convert_to_encoding (const gchar  *str,
 
 static gboolean
 get_id3 (const gchar *data,
-	 size_t       size,
-	 id3tag      *id3)
+         size_t       size,
+         id3tag      *id3)
 {
 #ifdef HAVE_ENCA
 	GString *s;
@@ -772,11 +772,11 @@ get_id3 (const gchar *data,
 
 static gboolean
 mp3_parse_header (const gchar          *data,
-		  size_t                size,
-		  size_t                seek_pos,
-		  const gchar          *uri,
-		  TrackerSparqlBuilder *metadata,
-		  MP3Data              *filedata)
+                  size_t                size,
+                  size_t                seek_pos,
+                  const gchar          *uri,
+                  TrackerSparqlBuilder *metadata,
+                  MP3Data              *filedata)
 {
 	guint header;
 	gchar mpeg_ver = 0;
@@ -916,11 +916,11 @@ mp3_parse_header (const gchar          *data,
 
 static void
 mp3_parse (const gchar          *data,
-	   size_t                size,
-	   size_t                offset,
-	   const gchar          *uri,
-	   TrackerSparqlBuilder *metadata,
-	   MP3Data              *filedata)
+           size_t                size,
+           size_t                offset,
+           const gchar          *uri,
+           TrackerSparqlBuilder *metadata,
+           MP3Data              *filedata)
 {
 	guint header;
 	guint counter = 0;
@@ -948,8 +948,8 @@ mp3_parse (const gchar          *data,
 
 static gchar *
 id3v24_text_to_utf8 (const gchar  encoding,
-		     const gchar *text,
-		     gssize       len)
+                     const gchar *text,
+                     gssize       len)
 {
 	/* This byte describes the encoding
 	 * try to convert strings to UTF-8
@@ -959,22 +959,22 @@ id3v24_text_to_utf8 (const gchar  encoding,
 	switch (encoding) {
 	case 0x00:
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "ISO-8859-1",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "ISO-8859-1",
+		                            NULL, NULL, NULL);
 	case 0x01 :
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "UTF-16",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "UTF-16",
+		                            NULL, NULL, NULL);
 	case 0x02 :
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "UTF-16BE",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "UTF-16BE",
+		                            NULL, NULL, NULL);
 	case 0x03 :
 		return strndup (text, len);
 
@@ -984,17 +984,17 @@ id3v24_text_to_utf8 (const gchar  encoding,
 		 * iso-8859-1
 		 */
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "ISO-8859-1",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "ISO-8859-1",
+		                            NULL, NULL, NULL);
 	}
 }
 
 static gchar *
 id3v2_text_to_utf8 (const gchar  encoding,
-		    const gchar *text,
-		    gssize       len)
+                    const gchar *text,
+                    gssize       len)
 {
 	/* This byte describes the encoding
 	 * try to convert strings to UTF-8
@@ -1004,16 +1004,16 @@ id3v2_text_to_utf8 (const gchar  encoding,
 	switch (encoding) {
 	case 0x00:
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "ISO-8859-1",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "ISO-8859-1",
+		                            NULL, NULL, NULL);
 	case 0x01 :
-/* 		return g_convert (text, */
-/* 				  len, */
-/* 				  "UTF-8", */
-/* 				  "UCS-2", */
-/* 				  NULL, NULL, NULL); */
+		/*              return g_convert (text, */
+		/*                                len, */
+		/*                                "UTF-8", */
+		/*                                "UCS-2", */
+		/*                                NULL, NULL, NULL); */
 		return ucs2_to_utf8 (text, len);
 
 	default:
@@ -1022,10 +1022,10 @@ id3v2_text_to_utf8 (const gchar  encoding,
 		 * iso-8859-1
 		 */
 		return convert_to_encoding (text,
-					    len,
-					    "UTF-8",
-					    "ISO-8859-1",
-					    NULL, NULL, NULL);
+		                            len,
+		                            "UTF-8",
+		                            "ISO-8859-1",
+		                            NULL, NULL, NULL);
 	}
 }
 
@@ -1089,11 +1089,11 @@ id3v2_get_frame (const gchar *name)
 
 static void
 get_id3v24_tags (const gchar          *data,
-		 size_t                size,
- 		 id3tag               *info,
-		 const gchar          *uri,
-		 TrackerSparqlBuilder *metadata,
-		 MP3Data              *filedata)
+                 size_t                size,
+                 id3tag               *info,
+                 const gchar          *uri,
+                 TrackerSparqlBuilder *metadata,
+                 MP3Data              *filedata)
 {
 	id3v2tag *tag = &filedata->id3v24;
 	guint pos = 0;
@@ -1110,12 +1110,12 @@ get_id3v24_tags (const gchar          *data,
 		frame = id3v24_get_frame (&data[pos]);
 
 		csize = (((data[pos+4] & 0x7F) << 21) |
-			 ((data[pos+5] & 0x7F) << 14) |
-			 ((data[pos+6] & 0x7F) << 7) |
-			 ((data[pos+7] & 0x7F) << 0));
+		         ((data[pos+5] & 0x7F) << 14) |
+		         ((data[pos+6] & 0x7F) << 7) |
+		         ((data[pos+7] & 0x7F) << 0));
 
 		flags = (((unsigned char) (data[pos + 8]) << 8) +
-			 ((unsigned char) (data[pos + 9])));
+		         ((unsigned char) (data[pos + 9])));
 
 		pos += 10;
 
@@ -1295,11 +1295,11 @@ get_id3v24_tags (const gchar          *data,
 
 static void
 get_id3v23_tags (const gchar          *data,
-		 size_t                size,
-		 id3tag               *info,
-		 const gchar          *uri,
-		 TrackerSparqlBuilder *metadata,
-		 MP3Data              *filedata)
+                 size_t                size,
+                 id3tag               *info,
+                 const gchar          *uri,
+                 TrackerSparqlBuilder *metadata,
+                 MP3Data              *filedata)
 {
 	id3v2tag *tag = &filedata->id3v23;
 	guint pos = 0;
@@ -1316,12 +1316,12 @@ get_id3v23_tags (const gchar          *data,
 		frame = id3v24_get_frame (&data[pos]);
 
 		csize = (((unsigned char)(data[pos + 4]) << 24) |
-			 ((unsigned char)(data[pos + 5]) << 16) |
-			 ((unsigned char)(data[pos + 6]) << 8)  |
-			 ((unsigned char)(data[pos + 7]) << 0) );
+		         ((unsigned char)(data[pos + 5]) << 16) |
+		         ((unsigned char)(data[pos + 6]) << 8)  |
+		         ((unsigned char)(data[pos + 7]) << 0) );
 
 		flags = (((unsigned char)(data[pos + 8]) << 8) +
-			 ((unsigned char)(data[pos + 9])));
+		         ((unsigned char)(data[pos + 9])));
 
 		pos += 10;
 
@@ -1494,11 +1494,11 @@ get_id3v23_tags (const gchar          *data,
 
 static void
 get_id3v20_tags (const gchar          *data,
-		 size_t	               size,
-		 id3tag               *info,
-		 const gchar          *uri,
-		 TrackerSparqlBuilder *metadata,
-		 MP3Data              *filedata)
+                 size_t                        size,
+                 id3tag               *info,
+                 const gchar          *uri,
+                 TrackerSparqlBuilder *metadata,
+                 MP3Data              *filedata)
 {
 	id3v2tag *tag = &filedata->id3v22;
 	guint pos = 0;
@@ -1514,8 +1514,8 @@ get_id3v20_tags (const gchar          *data,
 		frame = id3v2_get_frame (&data[pos]);
 
 		csize = (((unsigned char)(data[pos + 3]) << 16) +
-			 ((unsigned char)(data[pos + 4]) << 8) +
-			 ((unsigned char)(data[pos + 5]) ) );
+		         ((unsigned char)(data[pos + 4]) << 8) +
+		         ((unsigned char)(data[pos + 5]) ) );
 
 		pos += 6;
 
@@ -1628,12 +1628,12 @@ get_id3v20_tags (const gchar          *data,
 
 static void
 parse_id3v24 (const gchar           *data,
-	      size_t                 size,
-	      id3tag                *info,
-	      const gchar           *uri,
-	      TrackerSparqlBuilder  *metadata,
-	      MP3Data               *filedata,
-	      size_t                *offset_delta)
+              size_t                 size,
+              id3tag                *info,
+              const gchar           *uri,
+              TrackerSparqlBuilder  *metadata,
+              MP3Data               *filedata,
+              size_t                *offset_delta)
 {
 	gint unsync;
 	gint ext_header;
@@ -1658,9 +1658,9 @@ parse_id3v24 (const gchar           *data,
 	experimental = (data[5] & 0x20) > 0;
 	footer = (data[5] & 0x10) > 0;
 	tsize = (((data[6] & 0x7F) << 21) |
-		 ((data[7] & 0x7F) << 14) |
-		 ((data[8] & 0x7F) << 7) |
-		 ((data[9] & 0x7F) << 0));
+	         ((data[7] & 0x7F) << 14) |
+	         ((data[8] & 0x7F) << 7) |
+	         ((data[9] & 0x7F) << 0));
 
 	if ((tsize + 10 > size) || (experimental)) {
 		return;
@@ -1671,9 +1671,9 @@ parse_id3v24 (const gchar           *data,
 
 	if (ext_header) {
 		ext_header_size = (((data[10] & 0x7F) << 21) |
-				   ((data[11] & 0x7F) << 14) |
-				   ((data[12] & 0x7F) << 7) |
-				   ((data[13] & 0x7F) << 0));
+		                   ((data[11] & 0x7F) << 14) |
+		                   ((data[12] & 0x7F) << 7) |
+		                   ((data[13] & 0x7F) << 0));
 		pos += ext_header_size;
 
 		if (pos + tsize > size) {
@@ -1698,12 +1698,12 @@ parse_id3v24 (const gchar           *data,
 
 static void
 parse_id3v23 (const gchar          *data,
-	      size_t                size,
-	      id3tag               *info,
-	      const gchar          *uri,
-	      TrackerSparqlBuilder *metadata,
-	      MP3Data              *filedata,
-	      size_t               *offset_delta)
+              size_t                size,
+              id3tag               *info,
+              const gchar          *uri,
+              TrackerSparqlBuilder *metadata,
+              MP3Data              *filedata,
+              size_t               *offset_delta)
 {
 	gint unsync;
 	gint ext_header;
@@ -1726,9 +1726,9 @@ parse_id3v23 (const gchar          *data,
 	ext_header = (data[5] & 0x40) > 0;
 	experimental = (data[5] & 0x20) > 0;
 	tsize = (((data[6] & 0x7F) << 21) |
-		 ((data[7] & 0x7F) << 14) |
-		 ((data[8] & 0x7F) << 7) |
-		 ((data[9] & 0x7F) << 0));
+	         ((data[7] & 0x7F) << 14) |
+	         ((data[8] & 0x7F) << 7) |
+	         ((data[9] & 0x7F) << 0));
 
 	if ((tsize + 10 > size) || (experimental)) {
 		return;
@@ -1739,14 +1739,14 @@ parse_id3v23 (const gchar          *data,
 
 	if (ext_header) {
 		ext_header_size = (((unsigned char)(data[10]) << 24) |
-				   ((unsigned char)(data[11]) << 16) |
-				   ((unsigned char)(data[12]) << 8) |
-				   ((unsigned char)(data[12]) << 0));
+		                   ((unsigned char)(data[11]) << 16) |
+		                   ((unsigned char)(data[12]) << 8) |
+		                   ((unsigned char)(data[12]) << 0));
 
-		padding	= (((unsigned char)(data[15]) << 24) |
-			   ((unsigned char)(data[16]) << 16) |
-			   ((unsigned char)(data[17]) << 8) |
-			   ((unsigned char)(data[18]) << 0));
+		padding         = (((unsigned char)(data[15]) << 24) |
+		                   ((unsigned char)(data[16]) << 16) |
+		                   ((unsigned char)(data[17]) << 8) |
+		                   ((unsigned char)(data[18]) << 0));
 
 		pos += 4 + ext_header_size;
 
@@ -1778,12 +1778,12 @@ parse_id3v23 (const gchar          *data,
 
 static void
 parse_id3v20 (const gchar          *data,
-	      size_t                size,
-	      id3tag               *info,
-	      const gchar          *uri,
-	      TrackerSparqlBuilder *metadata,
-	      MP3Data              *filedata,
-	      size_t               *offset_delta)
+              size_t                size,
+              id3tag               *info,
+              const gchar          *uri,
+              TrackerSparqlBuilder *metadata,
+              MP3Data              *filedata,
+              size_t               *offset_delta)
 {
 	gint unsync;
 	guint tsize;
@@ -1800,11 +1800,11 @@ parse_id3v20 (const gchar          *data,
 
 	unsync = (data[5] & 0x80) > 0;
 	tsize = (((data[6] & 0x7F) << 21) |
-		 ((data[7] & 0x7F) << 14) |
-		 ((data[8] & 0x7F) << 07) |
-		 ((data[9] & 0x7F) << 00));
+	         ((data[7] & 0x7F) << 14) |
+	         ((data[8] & 0x7F) << 07) |
+	         ((data[9] & 0x7F) << 00));
 
-	if (tsize + 10 > size)	{
+	if (tsize + 10 > size)  {
 		return;
 	}
 	pos = 10;
@@ -1825,11 +1825,11 @@ parse_id3v20 (const gchar          *data,
 
 static goffset
 parse_id3v2 (const gchar          *data,
-	     size_t	           size,
-	     id3tag               *info,
-	     const gchar          *uri,
-	     TrackerSparqlBuilder *metadata,
-	     MP3Data              *filedata)
+             size_t                size,
+             id3tag               *info,
+             const gchar          *uri,
+             TrackerSparqlBuilder *metadata,
+             MP3Data              *filedata)
 {
 	gboolean done = FALSE;
 	size_t offset = 0;
@@ -1854,7 +1854,7 @@ parse_id3v2 (const gchar          *data,
 
 static void
 extract_mp3 (const gchar          *uri,
-	     TrackerSparqlBuilder *metadata)
+             TrackerSparqlBuilder *metadata)
 {
 	gchar *filename;
 	int fd;
@@ -1902,11 +1902,11 @@ extract_mp3 (const gchar          *uri,
 #ifndef G_OS_WIN32
 	/* We don't use GLib's mmap because size can not be specified */
 	buffer = mmap (NULL,
-		       buffer_size,
-		       PROT_READ,
-		       MAP_PRIVATE,
-		       fd,
-		       0);
+	               buffer_size,
+	               PROT_READ,
+	               MAP_PRIVATE,
+	               fd,
+	               0);
 #endif
 
 	id3v1_buffer = read_id3v1_buffer (fd, size);
@@ -1941,29 +1941,29 @@ extract_mp3 (const gchar          *uri,
 	}
 
 	md.performer = tracker_coalesce (7,
-					 md.id3v24.performer1, md.id3v24.performer2,
-					 md.id3v23.performer1, md.id3v23.performer2,
-					 md.id3v22.performer1, md.id3v22.performer2,
-					 md.id3v1.artist);
+	                                 md.id3v24.performer1, md.id3v24.performer2,
+	                                 md.id3v23.performer1, md.id3v23.performer2,
+	                                 md.id3v22.performer1, md.id3v22.performer2,
+	                                 md.id3v1.artist);
 	md.album = tracker_coalesce (4, md.id3v24.album, md.id3v23.album, md.id3v22.album, md.id3v1.album);
 	md.genre = tracker_coalesce (7,
-				     md.id3v24.content_type, md.id3v24.title1,
-				     md.id3v23.content_type, md.id3v23.title1,
-				     md.id3v22.content_type, md.id3v22.title1,
-				     md.id3v1.genre);
+	                             md.id3v24.content_type, md.id3v24.title1,
+	                             md.id3v23.content_type, md.id3v23.title1,
+	                             md.id3v22.content_type, md.id3v22.title1,
+	                             md.id3v1.genre);
 	md.recording_time = tracker_coalesce (7,
-					      md.id3v24.recording_time, md.id3v24.release_time,
-					      md.id3v23.recording_time, md.id3v23.release_time,
-					      md.id3v22.recording_time, md.id3v22.release_time,
-					      md.id3v1.recording_time);
+	                                      md.id3v24.recording_time, md.id3v24.release_time,
+	                                      md.id3v23.recording_time, md.id3v23.release_time,
+	                                      md.id3v22.recording_time, md.id3v22.release_time,
+	                                      md.id3v1.recording_time);
 	md.publisher = tracker_coalesce (3, md.id3v24.publisher, md.id3v23.publisher, md.id3v22.publisher);
 	md.text = tracker_coalesce (3, md.id3v24.text, md.id3v23.text, md.id3v22.text);
 	md.copyright = tracker_coalesce (3, md.id3v24.copyright, md.id3v23.copyright, md.id3v22.copyright);
 	md.comment = tracker_coalesce (7,
-				       md.id3v24.title3, md.id3v24.comment,
-				       md.id3v23.title3, md.id3v23.comment,
-				       md.id3v22.title3, md.id3v22.comment,
-				       md.id3v1.comment);
+	                               md.id3v24.title3, md.id3v24.comment,
+	                               md.id3v23.title3, md.id3v23.comment,
+	                               md.id3v22.title3, md.id3v22.comment,
+	                               md.id3v1.comment);
 
 	if (md.id3v24.track_number != 0) {
 		md.track_number = md.id3v24.track_number;
@@ -2082,11 +2082,11 @@ extract_mp3 (const gchar          *uri,
 	mp3_parse (buffer, buffer_size, audio_offset, uri, metadata, &md);
 
 	tracker_albumart_process (md.albumart_data,
-				  md.albumart_size,
-				  md.albumart_mime,
-				  NULL,
-				  md.title,
-				  filename);
+	                          md.albumart_size,
+	                          md.albumart_mime,
+	                          NULL,
+	                          md.title,
+	                          filename);
 
 	g_free (md.title);
 	g_free (md.albumart_data);
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index 7ce4921..b0f5078 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -42,7 +42,7 @@
 #define RDF_TYPE RDF_PREFIX "type"
 
 static void extract_mplayer (const gchar *uri,
-			     TrackerSparqlBuilder   *metadata);
+                             TrackerSparqlBuilder   *metadata);
 
 static TrackerExtractData extract_data[] = {
 	{ "audio/*", extract_mplayer },
@@ -51,20 +51,20 @@ static TrackerExtractData extract_data[] = {
 };
 
 static const gchar *video_tags[][2] = {
-	{ "ID_VIDEO_HEIGHT",	"nfo:height"         },
-	{ "ID_VIDEO_WIDTH",	"nfo:width"          },
-	{ "ID_VIDEO_FPS",	"nfo:frameRate"      },
-	{ "ID_VIDEO_CODEC",	"nfo:codec"          },
-	{ "ID_VIDEO_BITRATE",	"nfo:averageBitrate" },
-	{ NULL,			NULL                 }
+	{ "ID_VIDEO_HEIGHT",    "nfo:height"         },
+	{ "ID_VIDEO_WIDTH",     "nfo:width"          },
+	{ "ID_VIDEO_FPS",       "nfo:frameRate"      },
+	{ "ID_VIDEO_CODEC",     "nfo:codec"          },
+	{ "ID_VIDEO_BITRATE",   "nfo:averageBitrate" },
+	{ NULL,                         NULL                 }
 };
 
 static const gchar *audio_tags[][2] = {
-	{ "ID_AUDIO_BITRATE",	"nfo:averageBitrate" },
-	{ "ID_AUDIO_RATE",	"nfo:sampleRate"     },
-	{ "ID_AUDIO_CODEC",	"nfo:codec"          },
-	{ "ID_AUDIO_NCH",	"nfo:channels"       },
-	{ NULL,			NULL                 }
+	{ "ID_AUDIO_BITRATE",   "nfo:averageBitrate" },
+	{ "ID_AUDIO_RATE",      "nfo:sampleRate"     },
+	{ "ID_AUDIO_CODEC",     "nfo:codec"          },
+	{ "ID_AUDIO_NCH",       "nfo:channels"       },
+	{ NULL,                         NULL                 }
 };
 
 /* Some of "info_tags" tags can belong to Audio or/and video or none, so 3 cases :
@@ -74,15 +74,15 @@ static const gchar *audio_tags[][2] = {
  *    tag to Video, otherwise to Audio if it has audio.
  */
 static const gchar *info_tags[][2] = {
-	{ "Comment",		"nie:comment"        },
-	{ "Title",		"nie:title"          },
-	{ "Genre",		"nfo:genre"          },
-	{ "Track",		"nmm:trackNumber"    },
-	{ "Artist",		"nmm:performer"      },
-	{ "Album",		"nie:title"          },
-	{ "Year",		"nie:contentCreated" },
-	{ "copyright",		"nie:copyright"      },
-	{ NULL,			NULL,                }
+	{ "Comment",            "nie:comment"        },
+	{ "Title",              "nie:title"          },
+	{ "Genre",              "nfo:genre"          },
+	{ "Track",              "nmm:trackNumber"    },
+	{ "Artist",             "nmm:performer"      },
+	{ "Album",              "nie:title"          },
+	{ "Year",               "nie:contentCreated" },
+	{ "copyright",          "nie:copyright"      },
+	{ NULL,                         NULL,                }
 };
 
 typedef struct {
@@ -92,8 +92,8 @@ typedef struct {
 
 static void
 copy_hash_table_entry (gpointer key,
-		       gpointer value,
-		       gpointer user_data)
+                       gpointer value,
+                       gpointer user_data)
 {
 	ForeachCopyInfo *info = user_data;
 
@@ -117,7 +117,7 @@ copy_hash_table_entry (gpointer key,
 
 static void
 extract_mplayer (const gchar *uri,
-		 TrackerSparqlBuilder  *metadata)
+                 TrackerSparqlBuilder  *metadata)
 {
 	gchar *argv[10];
 	gchar *mplayer;
@@ -144,8 +144,8 @@ extract_mplayer (const gchar *uri,
 		GHashTable    *tmp_metadata_audio;
 		GHashTable    *tmp_metadata_video;
 		gboolean       has_audio, has_video;
-		gchar	      *duration;
-		gchar	     **lines, **line;
+		gchar         *duration;
+		gchar        **lines, **line;
 
 		pattern_ID_AUDIO_ID = g_pattern_spec_new ("ID_AUDIO_ID=*");
 		pattern_ID_VIDEO_ID = g_pattern_spec_new ("ID_VIDEO_ID=*");
@@ -179,8 +179,8 @@ extract_mplayer (const gchar *uri,
 				for (i = 0; audio_tags[i][0]; i++) {
 					if (g_str_has_prefix (*line, audio_tags[i][0])) {
 						g_hash_table_insert (tmp_metadata_audio,
-								     g_strdup (audio_tags[i][1]),
-								     g_strdup ((*line) + strlen (audio_tags[i][0]) + 1));
+						                     g_strdup (audio_tags[i][1]),
+						                     g_strdup ((*line) + strlen (audio_tags[i][0]) + 1));
 						break;
 					}
 				}
@@ -192,8 +192,8 @@ extract_mplayer (const gchar *uri,
 				for (i = 0; video_tags[i][0]; i++) {
 					if (g_str_has_prefix (*line, video_tags[i][0])) {
 						g_hash_table_insert (tmp_metadata_video,
-								     g_strdup (video_tags[i][1]),
-								     g_strdup ((*line) + strlen (video_tags[i][0]) + 1));
+						                     g_strdup (video_tags[i][1]),
+						                     g_strdup ((*line) + strlen (video_tags[i][0]) + 1));
 						break;
 					}
 				}
@@ -219,8 +219,8 @@ extract_mplayer (const gchar *uri,
 								if (data) {
 									if (data[0] != '\0') {
 										g_hash_table_insert (tmp_metadata_audio,
-												     g_strdup (info_tags[i][1]),
-												     data);
+										                     g_strdup (info_tags[i][1]),
+										                     data);
 									} else {
 										g_free (data);
 									}
@@ -260,8 +260,8 @@ extract_mplayer (const gchar *uri,
 			if (tmp_metadata_video) {
 				ForeachCopyInfo info = { metadata, uri };
 				g_hash_table_foreach (tmp_metadata_video,
-						      copy_hash_table_entry,
-						      &info);
+				                      copy_hash_table_entry,
+				                      &info);
 				g_hash_table_unref (tmp_metadata_video);
 				tmp_metadata_video = NULL;
 			}
@@ -280,8 +280,8 @@ extract_mplayer (const gchar *uri,
 			if (tmp_metadata_audio) {
 				ForeachCopyInfo info = { metadata, uri };
 				g_hash_table_foreach (tmp_metadata_audio,
-						      copy_hash_table_entry,
-						      &info);
+				                      copy_hash_table_entry,
+				                      &info);
 				g_hash_table_unref (tmp_metadata_audio);
 				tmp_metadata_audio = NULL;
 			}
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index 50befe4..d5f8df7 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -53,36 +53,36 @@
 
 
 /*
-* Powerpoint files comprise of structures. Each structure contains a header.
-* Within that header is a record type that specifies what strcture it is. It is
-* called record type.
-*
-* Here are are some record types and description of the structure (called atom)
-* they contain.
-*/
+ * Powerpoint files comprise of structures. Each structure contains a header.
+ * Within that header is a record type that specifies what strcture it is. It is
+ * called record type.
+ *
+ * Here are are some record types and description of the structure (called atom)
+ * they contain.
+ */
 
 /*
-* An atom record that specifies Unicode characters with no high byte of a UTF-16
-* Unicode character. High byte is always 0.
-*/
+ * An atom record that specifies Unicode characters with no high byte of a UTF-16
+ * Unicode character. High byte is always 0.
+ */
 #define TEXTBYTESATOM_RECORD_TYPE               0x0FA0
 
 /*
-* An atom record that specifies Unicode characters.
-*/
+ * An atom record that specifies Unicode characters.
+ */
 #define TEXTCHARSATOM_RECORD_TYPE               0x0FA8
 
 /*
-* A container record that specifies information about the powerpoint document.
-*/
+ * A container record that specifies information about the powerpoint document.
+ */
 #define DOCUMENTCONTAINER_RECORD_TYPE           0x1000
 
 /*
-* Variant type of record. Within Powerpoint text extraction we are interested
-* of SlideListWithTextContainer type that contains the textual content
-* of the slide(s).
-*
-*/
+ * Variant type of record. Within Powerpoint text extraction we are interested
+ * of SlideListWithTextContainer type that contains the textual content
+ * of the slide(s).
+ *
+ */
 
 #define SLIDELISTWITHTEXT_RECORD_TYPE           0x0FF0
 
@@ -95,7 +95,7 @@ static void extract_powerpoint (const gchar          *uri,
 
 static TrackerExtractData data[] = {
 	{ "application/msword",            extract_msoffice },
-	 /* Powerpoint files */
+	/* Powerpoint files */
 	{ "application/vnd.ms-powerpoint", extract_powerpoint },
 	{ "application/vnd.ms-*",          extract_msoffice },
 	{ NULL, NULL }
@@ -237,8 +237,8 @@ metadata_cb (gpointer key,
 
 static void
 doc_metadata_cb (gpointer key,
-		 gpointer value,
-		 gpointer user_data)
+                 gpointer value,
+                 gpointer user_data)
 {
 	ForeachInfo          *info = user_data;
 	gchar                *name;
@@ -258,10 +258,10 @@ doc_metadata_cb (gpointer key,
 }
 
 /**
-* @brief Read 16 bit unsigned integer
-* @param buffer data to read integer from
-* @return 16 bit unsigned integer
-*/
+ * @brief Read 16 bit unsigned integer
+ * @param buffer data to read integer from
+ * @return 16 bit unsigned integer
+ */
 static gint
 read_16bit (const guint8* buffer)
 {
@@ -269,10 +269,10 @@ read_16bit (const guint8* buffer)
 }
 
 /**
-* @brief Read 32 bit unsigned integer
-* @param buffer data to read integer from
-* @return 32 bit unsigned integer
-*/
+ * @brief Read 32 bit unsigned integer
+ * @param buffer data to read integer from
+ * @return 32 bit unsigned integer
+ */
 static gint
 read_32bit (const guint8* buffer)
 {
@@ -280,45 +280,45 @@ read_32bit (const guint8* buffer)
 }
 
 /**
-* @brief Header for all powerpoint structures
-*
-* A structure at the beginning of each container record and each atom record in
-* the file. The values in the record header and the context of the record are
-* used to identify and interpret the record data that follows.
-*/
+ * @brief Header for all powerpoint structures
+ *
+ * A structure at the beginning of each container record and each atom record in
+ * the file. The values in the record header and the context of the record are
+ * used to identify and interpret the record data that follows.
+ */
 typedef struct {
 	/**
-	* @brief An unsigned integer that specifies the version of the record
-	* data that follows the record header. A value of 0xF specifies that the
-	* record is a container record.
-	*/
+	 * @brief An unsigned integer that specifies the version of the record
+	 * data that follows the record header. A value of 0xF specifies that the
+	 * record is a container record.
+	 */
 	guint recVer;
 
 	/**
-	* @brief An unsigned integer that specifies the record instance data.
-	* Interpretation of the value is dependent on the particular record
-	* type.
-	*/
+	 * @brief An unsigned integer that specifies the record instance data.
+	 * Interpretation of the value is dependent on the particular record
+	 * type.
+	 */
 	guint recInstance;
 
 	/**
-	* @brief A RecordType enumeration that specifies the type of the record
-	* data that follows the record header.
-	*/
+	 * @brief A RecordType enumeration that specifies the type of the record
+	 * data that follows the record header.
+	 */
 	gint recType;
 
 	/**
-	* @brief An unsigned integer that specifies the length, in bytes, of the
-	* record data that follows the record header.
-	*/
+	 * @brief An unsigned integer that specifies the length, in bytes, of the
+	 * record data that follows the record header.
+	 */
 	guint recLen;
 }RecordHeader;
 
 /**
-* @brief Read header data from given stream
-* @param stream Stream to read header data
-* @param header Pointer to header where to store results
-*/
+ * @brief Read header data from given stream
+ * @param stream Stream to read header data
+ * @param header Pointer to header where to store results
+ */
 static gboolean
 read_header (GsfInput *stream, RecordHeader *header) {
 	guint8 buffer[8] = {0};
@@ -332,18 +332,18 @@ read_header (GsfInput *stream, RecordHeader *header) {
 	g_return_val_if_fail(gsf_input_read(stream,8,buffer),FALSE);
 
 	/*
-	* Then parse individual details
-	*
-	* Record header is 8 bytes long. Data is split as follows:
-	* recVer (4 bits)
-	* recInstance (12 bits)
-	* recType (2 bytes)
-	* recLen (4 bytes)
-	*
-	* See RecordHeader for more detailed explanation of each field.
-	*
-	* Here we parse each of those fields.
-	*/
+	 * Then parse individual details
+	 *
+	 * Record header is 8 bytes long. Data is split as follows:
+	 * recVer (4 bits)
+	 * recInstance (12 bits)
+	 * recType (2 bytes)
+	 * recLen (4 bytes)
+	 *
+	 * See RecordHeader for more detailed explanation of each field.
+	 *
+	 * Here we parse each of those fields.
+	 */
 
 	header->recType = read_16bit(&buffer[2]);
 	header->recLen = read_32bit(&buffer[4]);
@@ -354,24 +354,24 @@ read_header (GsfInput *stream, RecordHeader *header) {
 }
 
 /**
-* @brief Read powerpoint text from given stream.
-*
-* Powerpoint contains texts in either TextBytesAtom or TextCharsAtom. Below
-* are excerpt from [MS-PPT].pdf file describing the ppt file struture:
-*
-* TextCharsAtom contains an array of UTF-16 Unicode [RFC2781] characters that
-* specifies the characters of the corresponding text. The length, in bytes, of
-* the array is specified by rh.recLen. The array MUST NOT contain the NUL
-* character 0x0000.
-*
-* TextBytesAtom contains an array of bytes that specifies the characters of the
-* corresponding text. Each item represents the low byte of a UTF-16 Unicode
-* [RFC2781] character whose high byte is 0x00. The length, in bytes, of the
-* array is specified by rh.recLen. The array MUST NOT contain a 0x00 byte.
-*
-* @param stream Stream to read text bytes/chars atom
-* @return read text or NULL if no text was read. Has to be freed by the caller
-*/
+ * @brief Read powerpoint text from given stream.
+ *
+ * Powerpoint contains texts in either TextBytesAtom or TextCharsAtom. Below
+ * are excerpt from [MS-PPT].pdf file describing the ppt file struture:
+ *
+ * TextCharsAtom contains an array of UTF-16 Unicode [RFC2781] characters that
+ * specifies the characters of the corresponding text. The length, in bytes, of
+ * the array is specified by rh.recLen. The array MUST NOT contain the NUL
+ * character 0x0000.
+ *
+ * TextBytesAtom contains an array of bytes that specifies the characters of the
+ * corresponding text. Each item represents the low byte of a UTF-16 Unicode
+ * [RFC2781] character whose high byte is 0x00. The length, in bytes, of the
+ * array is specified by rh.recLen. The array MUST NOT contain a 0x00 byte.
+ *
+ * @param stream Stream to read text bytes/chars atom
+ * @return read text or NULL if no text was read. Has to be freed by the caller
+ */
 static gchar*
 read_text (GsfInput *stream)
 {
@@ -384,17 +384,17 @@ read_text (GsfInput *stream)
 	g_return_val_if_fail (stream,NULL);
 
 	/*
-	* First read the header that describes the structures type
-	* (TextBytesAtom or TextCharsAtom) and it's length.
-	*/
+	 * First read the header that describes the structures type
+	 * (TextBytesAtom or TextCharsAtom) and it's length.
+	 */
 	g_return_val_if_fail (read_header(stream, &header),NULL);
 
 	/*
-	* We only want header with type either TEXTBYTESATOM_RECORD_TYPE
-	* (TextBytesAtom) or TEXTCHARSATOM_RECORD_TYPE (TextCharsAtom).
-	*
-	* We don't care about anything else
-	*/
+	 * We only want header with type either TEXTBYTESATOM_RECORD_TYPE
+	 * (TextBytesAtom) or TEXTCHARSATOM_RECORD_TYPE (TextCharsAtom).
+	 *
+	 * We don't care about anything else
+	 */
 	if (header.recType != TEXTBYTESATOM_RECORD_TYPE &&
 	    header.recType != TEXTCHARSATOM_RECORD_TYPE) {
 		return NULL;
@@ -403,10 +403,10 @@ read_text (GsfInput *stream)
 	/* Then we'll allocate data for the actual texts */
 	if (header.recType == TEXTBYTESATOM_RECORD_TYPE) {
 		/*
-		* TextBytesAtom doesn't include high bytes propably in order to
-		* save space on the ppt files. We'll have to allocate double the
-		* size for it to get the high bytes
-		*/
+		 * TextBytesAtom doesn't include high bytes propably in order to
+		 * save space on the ppt files. We'll have to allocate double the
+		 * size for it to get the high bytes
+		 */
 		data = g_try_new0 (guint8,header.recLen * 2);
 	} else {
 		data = g_try_new0 (guint8,header.recLen);
@@ -422,17 +422,17 @@ read_text (GsfInput *stream)
 
 
 	/*
-	* Again if we are reading TextBytesAtom we'll need to add those utf16
-	* high bytes ourselves. They are zero as specified in [MS-PPT].pdf
-	* and this function's comments
-	*/
+	 * Again if we are reading TextBytesAtom we'll need to add those utf16
+	 * high bytes ourselves. They are zero as specified in [MS-PPT].pdf
+	 * and this function's comments
+	 */
 	if (header.recType == TEXTBYTESATOM_RECORD_TYPE) {
 		for(i = 0; i < header.recLen; i++) {
 
 			/*
-			* We'll add an empty 0 byte between each byte in the
-			* array
-			*/
+			 * We'll add an empty 0 byte between each byte in the
+			 * array
+			 */
 			data[(header.recLen - i - 1) * 2] = data[header.recLen - i - 1];
 			if ((header.recLen - i - 1) % 2) {
 				data[header.recLen - i - 1] = 0;
@@ -440,15 +440,15 @@ read_text (GsfInput *stream)
 		}
 
 		/*
-		* Then double the recLen now that we have the high bytes added
-		* between read bytes
-		*/
+		 * Then double the recLen now that we have the high bytes added
+		 * between read bytes
+		 */
 		header.recLen *= 2;
 	}
 
 	/*
-	* Then we'll convert the text from UTF-16 to UTF-8 for the tracker
-	*/
+	 * Then we'll convert the text from UTF-16 to UTF-8 for the tracker
+	 */
 	converted = g_convert(data,header.recLen,
 	                      "UTF-8",
 	                      "UTF-16",
@@ -457,8 +457,8 @@ read_text (GsfInput *stream)
 	                      NULL);
 
 	/*
-	* And free the data
-	*/
+	 * And free the data
+	 */
 	g_free(data);
 
 	/* Return read text */
@@ -466,15 +466,15 @@ read_text (GsfInput *stream)
 }
 
 /**
-* @brief Find a specific header from given stream
-* @param stream Stream to parse headers from
-* @param type1 first type of header to look for
-* @param type2 convenience parameter if we are looking for either of two
-* header types
-* @param rewind if a proper header is found should this function seek
-* to the start of the header (TRUE)
-* @return TRUE if either of specified headers was found
-*/
+ * @brief Find a specific header from given stream
+ * @param stream Stream to parse headers from
+ * @param type1 first type of header to look for
+ * @param type2 convenience parameter if we are looking for either of two
+ * header types
+ * @param rewind if a proper header is found should this function seek
+ * to the start of the header (TRUE)
+ * @return TRUE if either of specified headers was found
+ */
 static gboolean
 seek_header (GsfInput *stream,
              gint      type1,
@@ -486,24 +486,24 @@ seek_header (GsfInput *stream,
 	g_return_val_if_fail(stream,FALSE);
 
 	/*
-	* Read until we reach eof
-	*/
+	 * Read until we reach eof
+	 */
 	while(!gsf_input_eof(stream)) {
 
 		/*
-		* Read first header
-		*/
+		 * Read first header
+		 */
 		g_return_val_if_fail(read_header(stream, &header),FALSE);
 
 		/*
-		* Check if it's the correct type
-		*/
+		 * Check if it's the correct type
+		 */
 		if (header.recType == type1 || header.recType == type2) {
 
 			/*
-			* Sometimes it's needed to rewind to the start of the
-			* header
-			*/
+			 * Sometimes it's needed to rewind to the start of the
+			 * header
+			 */
 			if (rewind) {
 				gsf_input_seek(stream,-8,G_SEEK_CUR);
 			}
@@ -511,9 +511,9 @@ seek_header (GsfInput *stream,
 		}
 
 		/*
-		* If it's not the correct type, seek to the beginning of the
-		* next header
-		*/
+		 * If it's not the correct type, seek to the beginning of the
+		 * next header
+		 */
 		g_return_val_if_fail(!gsf_input_seek(stream,
 		                                     header.recLen,
 		                                     G_SEEK_CUR),
@@ -524,13 +524,13 @@ seek_header (GsfInput *stream,
 }
 
 /**
-* @brief Normalize and append given text to all_texts variable
-* @param text text to append
-* @param all_texts GString to append text after normalizing it
-* @param words number of words already in all_texts
-* @param max_words maximum number of words allowed in all_texts
-* @return number of words appended to all_text
-*/
+ * @brief Normalize and append given text to all_texts variable
+ * @param text text to append
+ * @param all_texts GString to append text after normalizing it
+ * @param words number of words already in all_texts
+ * @param max_words maximum number of words allowed in all_texts
+ * @return number of words appended to all_text
+ */
 static gint
 append_text (gchar   *text,
              GString *all_texts,
@@ -549,11 +549,11 @@ append_text (gchar   *text,
 
 	if (normalized_text) {
 		/*
-		* If the last added text didn't end in a space, we'll append a
-		* space between this text and previous text so the last word of
-		* previous text and first word of this text don't become one big
-		* word.
-		*/
+		 * If the last added text didn't end in a space, we'll append a
+		 * space between this text and previous text so the last word of
+		 * previous text and first word of this text don't become one big
+		 * word.
+		 */
 		if (all_texts->len > 0 &&
 		    all_texts->str[all_texts->len-1] != ' ') {
 
@@ -574,64 +574,64 @@ read_powerpoint (GsfInfile            *infile,
                  gint                  max_words)
 {
 	/*
-	* Try to find Powerpoint Document stream
-	*/
+	 * Try to find Powerpoint Document stream
+	 */
 	gsf_off_t  lastDocumentContainer = -1;
 	GsfInput  *stream = gsf_infile_child_by_name(infile,
-	                                            "PowerPoint Document");
+	                                             "PowerPoint Document");
 
 	g_return_if_fail (stream);
 
 	/*
-	* Powerpoint documents have a "editing history" stored within them.
-	* There is a structure that defines what changes were made each time
-	* but it is just easier to get the current/latest version just by
-	* finding the last occurrence of DocumentContainer structure
-	*/
+	 * Powerpoint documents have a "editing history" stored within them.
+	 * There is a structure that defines what changes were made each time
+	 * but it is just easier to get the current/latest version just by
+	 * finding the last occurrence of DocumentContainer structure
+	 */
 
 	lastDocumentContainer = -1;
 
 	/*
-	* Read until we reach eof.
-	*/
+	 * Read until we reach eof.
+	 */
 	while(!gsf_input_eof (stream)) {
 		RecordHeader header;
 
 		/*
-		* We only read headers of data structures
-		*/
+		 * We only read headers of data structures
+		 */
 		if (!read_header (stream,&header)) {
 			break;
 		}
 
 		/*
-		* And we only care about headers with type 1000,
-		* DocumentContainer
-		*/
+		 * And we only care about headers with type 1000,
+		 * DocumentContainer
+		 */
 
 		if (header.recType == DOCUMENTCONTAINER_RECORD_TYPE) {
 			lastDocumentContainer = gsf_input_tell(stream);
 		}
 
 		/*
-		* and then seek to the start of the next data structure so it is
-		* fast and we don't have to read through the whole file
-		*/
+		 * and then seek to the start of the next data structure so it is
+		 * fast and we don't have to read through the whole file
+		 */
 		if (gsf_input_seek (stream, header.recLen, G_SEEK_CUR)) {
 			break;
 		}
 	}
 
 	/*
-	* If a DocumentContainer was found and we are able to seek to it.
-	*
-	* Then we'll have to find the second header with type
-	* SLIDELISTWITHTEXT_RECORD_TYPE since DocumentContainer contains
-	* MasterListWithTextContainer and SlideListWithTextContainer structures
-	* with both having the same header type. We however only want
-	* SlideListWithTextContainer which contains the textual content
-	* of the power point file.
-	*/
+	 * If a DocumentContainer was found and we are able to seek to it.
+	 *
+	 * Then we'll have to find the second header with type
+	 * SLIDELISTWITHTEXT_RECORD_TYPE since DocumentContainer contains
+	 * MasterListWithTextContainer and SlideListWithTextContainer structures
+	 * with both having the same header type. We however only want
+	 * SlideListWithTextContainer which contains the textual content
+	 * of the power point file.
+	 */
 	if (lastDocumentContainer >= 0 &&
 	    !gsf_input_seek(stream,lastDocumentContainer,G_SEEK_SET) &&
 	    seek_header (stream,
@@ -647,10 +647,10 @@ read_powerpoint (GsfInfile            *infile,
 		int word_count = 0;
 
 		/*
-		* Read while we have either TextBytesAtom or
-		* TextCharsAtom and we have read less than max_words
-		* amount of words
-		*/
+		 * Read while we have either TextBytesAtom or
+		 * TextCharsAtom and we have read less than max_words
+		 * amount of words
+		 */
 		while(seek_header (stream,
 		                   TEXTBYTESATOM_RECORD_TYPE,
 		                   TEXTCHARSATOM_RECORD_TYPE,
@@ -672,12 +672,12 @@ read_powerpoint (GsfInfile            *infile,
 		}
 
 		/*
-		* If we have any text read
-		*/
+		 * If we have any text read
+		 */
 		if (all_texts->len > 0) {
 			/*
-			* Send it to tracker
-			*/
+			 * Send it to tracker
+			 */
 			tracker_sparql_builder_predicate (metadata,
 			                                  "nie:plainTextContent");
 			tracker_sparql_builder_object_unvalidated (metadata,
@@ -692,9 +692,9 @@ read_powerpoint (GsfInfile            *infile,
 }
 
 /**
-* @brief get maximum number of words to index
-* @return maximum number of words to index
-*/
+ * @brief get maximum number of words to index
+ * @return maximum number of words to index
+ */
 static gint
 max_words (void)
 {
@@ -703,11 +703,11 @@ max_words (void)
 }
 
 /**
-* @brief Extract summary OLE stream from specified uri
-* @param metadata where to store summary
-* @param infile file to read summary from
-* @param uri uri of the file
-*/
+ * @brief Extract summary OLE stream from specified uri
+ * @param metadata where to store summary
+ * @param infile file to read summary from
+ * @param uri uri of the file
+ */
 static void
 extract_summary (TrackerSparqlBuilder *metadata,
                  GsfInfile            *infile,
@@ -777,10 +777,10 @@ extract_summary (TrackerSparqlBuilder *metadata,
 }
 
 /**
-* @brief Open specified uri for reading and initialize gsf
-* @param uri URI of the file to open
-* @return GsfInFile of the opened file or NULL if failed to open file
-*/
+ * @brief Open specified uri for reading and initialize gsf
+ * @param uri URI of the file to open
+ * @return GsfInFile of the opened file or NULL if failed to open file
+ */
 static GsfInfile *
 open_uri (const gchar *uri)
 {
@@ -814,12 +814,12 @@ open_uri (const gchar *uri)
 }
 
 /**
-* @brief Extract data from generic office files
-*
-* At the moment only extracts document summary from summary OLE stream.
-* @param uri URI of the file to extract data
-* @param metadata where to store extracted data to
-*/
+ * @brief Extract data from generic office files
+ *
+ * At the moment only extracts document summary from summary OLE stream.
+ * @param uri URI of the file to extract data
+ * @param metadata where to store extracted data to
+ */
 static void
 extract_msoffice (const gchar          *uri,
                   TrackerSparqlBuilder *metadata)
@@ -832,12 +832,12 @@ extract_msoffice (const gchar          *uri,
 
 
 /**
-* @brief Extract data from powerpoin files
-*
-* At the moment can extract textual content and summary.
-* @param uri URI of the file to extract data
-* @param metadata where to store extracted data to
-*/
+ * @brief Extract data from powerpoin files
+ *
+ * At the moment can extract textual content and summary.
+ * @param uri URI of the file to extract data
+ * @param metadata where to store extracted data to
+ */
 static void
 extract_powerpoint (const gchar          *uri,
                     TrackerSparqlBuilder *metadata)
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index a51218e..b7c5830 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -54,23 +54,23 @@ typedef struct {
 	const gchar *uri;
 } ODTParseInfo;
 
-static void start_element_handler (GMarkupParseContext	*context,
-				   const gchar		*element_name,
-				   const gchar	       **attribute_names,
-				   const gchar	       **attribute_values,
-				   gpointer		 user_data,
-				   GError	       **error);
-static void end_element_handler   (GMarkupParseContext	*context,
-				   const gchar		*element_name,
-				   gpointer		 user_data,
-				   GError	       **error);
-static void text_handler	  (GMarkupParseContext	*context,
-				   const gchar		*text,
-				   gsize		 text_len,
-				   gpointer		 user_data,
-				   GError	       **error);
-static void extract_oasis	  (const gchar		*filename,
-				   TrackerSparqlBuilder		*metadata);
+static void start_element_handler (GMarkupParseContext  *context,
+                                   const gchar          *element_name,
+                                   const gchar         **attribute_names,
+                                   const gchar         **attribute_values,
+                                   gpointer              user_data,
+                                   GError              **error);
+static void end_element_handler   (GMarkupParseContext  *context,
+                                   const gchar          *element_name,
+                                   gpointer              user_data,
+                                   GError              **error);
+static void text_handler          (GMarkupParseContext  *context,
+                                   const gchar          *text,
+                                   gsize                 text_len,
+                                   gpointer              user_data,
+                                   GError              **error);
+static void extract_oasis         (const gchar          *filename,
+                                   TrackerSparqlBuilder                 *metadata);
 
 static TrackerExtractData extract_data[] = {
 	{ "application/vnd.oasis.opendocument.*", extract_oasis },
@@ -79,7 +79,7 @@ static TrackerExtractData extract_data[] = {
 
 static gchar *
 extract_content (const gchar *path,
-		 guint        n_words)
+                 guint        n_words)
 {
 	gchar *command, *output, *text;
 	GError *error = NULL;
@@ -104,10 +104,10 @@ extract_content (const gchar *path,
 
 static void
 extract_oasis (const gchar *uri,
-	       TrackerSparqlBuilder   *metadata)
+               TrackerSparqlBuilder   *metadata)
 {
-	gchar	      *argv[5];
-	gchar	      *xml;
+	gchar         *argv[5];
+	gchar         *xml;
 	gchar *filename = g_filename_from_uri (uri, NULL, NULL);
 	gchar *content;
 	TrackerFTSConfig *fts_config;
@@ -130,7 +130,7 @@ extract_oasis (const gchar *uri,
 
 	if (tracker_spawn (argv, 10, &xml, NULL)) {
 		GMarkupParseContext *context;
-		GMarkupParser	     parser = {
+		GMarkupParser        parser = {
 			start_element_handler,
 			end_element_handler,
 			text_handler,
@@ -164,11 +164,11 @@ extract_oasis (const gchar *uri,
 
 void
 start_element_handler (GMarkupParseContext  *context,
-		       const gchar	    *element_name,
-		       const gchar	   **attribute_names,
-		       const gchar	   **attribute_values,
-		       gpointer		     user_data,
-		       GError		   **error)
+                       const gchar          *element_name,
+                       const gchar         **attribute_names,
+                       const gchar         **attribute_values,
+                       gpointer                      user_data,
+                       GError              **error)
 {
 	ODTParseInfo *data = user_data;
 
@@ -220,19 +220,19 @@ start_element_handler (GMarkupParseContext  *context,
 
 void
 end_element_handler (GMarkupParseContext  *context,
-		     const gchar	  *element_name,
-		     gpointer		   user_data,
-		     GError		 **error)
+                     const gchar          *element_name,
+                     gpointer              user_data,
+                     GError              **error)
 {
 	((ODTParseInfo*) user_data)->current = -1;
 }
 
 void
 text_handler (GMarkupParseContext  *context,
-	      const gchar	   *text,
-	      gsize		    text_len,
-	      gpointer		    user_data,
-	      GError		  **error)
+              const gchar          *text,
+              gsize                 text_len,
+              gpointer              user_data,
+              GError              **error)
 {
 	ODTParseInfo *data;
 	TrackerSparqlBuilder    *metadata;
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index c349937..9c0beeb 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -45,7 +45,7 @@ typedef struct {
 } PDFData;
 
 static void extract_pdf (const gchar          *uri,
-			 TrackerSparqlBuilder *metadata);
+                         TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
 	{ "application/pdf", extract_pdf },
@@ -54,7 +54,7 @@ static TrackerExtractData data[] = {
 
 static void
 insert_keywords (TrackerSparqlBuilder *metadata,
-		 gchar                *keywords)
+                 gchar                *keywords)
 {
 	char *saveptr, *p;
 	size_t len;
@@ -91,7 +91,7 @@ insert_keywords (TrackerSparqlBuilder *metadata,
 
 static gchar *
 extract_content (PopplerDocument *document,
-		 guint            n_words)
+                 guint            n_words)
 {
 	PopplerPage *page;
 	PopplerRectangle rect;
@@ -127,7 +127,7 @@ extract_content (PopplerDocument *document,
 
 static void
 write_pdf_data (PDFData               data,
-		TrackerSparqlBuilder *metadata)
+                TrackerSparqlBuilder *metadata)
 {
 	if (!tracker_is_empty_string (data.title)) {
 		tracker_sparql_builder_predicate (metadata, "nie:title");
@@ -166,7 +166,7 @@ write_pdf_data (PDFData               data,
 
 static void
 extract_pdf (const gchar          *uri,
-	     TrackerSparqlBuilder *metadata)
+             TrackerSparqlBuilder *metadata)
 {
 	TrackerFTSConfig *fts_config;
 	GTime creation_date;
@@ -185,8 +185,8 @@ extract_pdf (const gchar          *uri,
 
 	if (error) {
 		g_warning ("Couldn't create PopplerDocument from uri:'%s', %s",
-			   uri,
-			   error->message ? error->message : "no error given");
+		           uri,
+		           error->message ? error->message : "no error given");
 		g_error_free (error);
 
 		return;
@@ -194,8 +194,8 @@ extract_pdf (const gchar          *uri,
 
 	if (!document) {
 		g_warning ("Could not create PopplerDocument from uri:'%s', "
-			   "NULL returned without an error",
-			   uri);
+		           "NULL returned without an error",
+		           uri);
 		return;
 	}
 
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index e3bbf99..9fcc8c5 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -39,8 +39,8 @@
 #define PLAYLIST_PROPERTY_NO_TRACKS "entryCounter"
 #define PLAYLIST_PROPERTY_DURATION  "listDuration"
 /*
- FIXME Decide what to do with this in nepomuk
-#define PLAYLIST_PROPERTY_CALCULATED "Playlist:ValidDuration"
+  FIXME Decide what to do with this in nepomuk
+  #define PLAYLIST_PROPERTY_CALCULATED "Playlist:ValidDuration"
 */
 
 #define PLAYLIST_DEFAULT_NO_TRACKS 0
@@ -59,7 +59,7 @@ typedef struct {
 } PlaylistMetadata;
 
 static void extract_playlist (const gchar *uri,
-			      TrackerSparqlBuilder   *metadata);
+                              TrackerSparqlBuilder   *metadata);
 
 
 static TrackerExtractData playlist_data[] = {
@@ -113,7 +113,7 @@ entry_parsed (TotemPlParser *parser, const gchar *to_uri, GHashTable *to_metadat
 
 static void
 extract_playlist (const gchar *uri,
-		  TrackerSparqlBuilder   *metadata)
+                  TrackerSparqlBuilder   *metadata)
 {
 	TotemPlParser       *pl;
 	TotemPlParserResult  result;
@@ -124,9 +124,9 @@ extract_playlist (const gchar *uri,
 	g_object_set (pl, "recurse", FALSE, "disable-unsafe", TRUE, NULL);
 
 	g_signal_connect (G_OBJECT (pl), "entry-parsed",
-			  G_CALLBACK (entry_parsed), &data);
+	                  G_CALLBACK (entry_parsed), &data);
 
-        tracker_sparql_builder_subject_iri (metadata, uri);
+	tracker_sparql_builder_subject_iri (metadata, uri);
 	tracker_sparql_builder_predicate (metadata, "a");
 	tracker_sparql_builder_object (metadata, "nfo:MediaList");
 
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 8020cd8..cc84901 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -61,12 +61,12 @@ typedef struct {
 
 typedef struct {
 	gchar *author, *creator, *description, *comment, *copyright,
-	      *creation_time, *title, *disclaimer;
+		*creation_time, *title, *disclaimer;
 } PngData;
 
-static gchar *rfc1123_to_iso8601_date (gchar	   *rfc_date);
-static void   extract_png	      (const gchar *filename,
-				       TrackerSparqlBuilder   *metadata);
+static gchar *rfc1123_to_iso8601_date (gchar       *rfc_date);
+static void   extract_png             (const gchar *filename,
+                                       TrackerSparqlBuilder   *metadata);
 
 static TrackerExtractData data[] = {
 	{ "image/png", extract_png },
@@ -118,7 +118,7 @@ insert_keywords (TrackerSparqlBuilder *metadata, const gchar *uri, gchar *keywor
 static void
 read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, TrackerSparqlBuilder *metadata)
 {
-	gint	     num_text;
+	gint         num_text;
 	png_textp    text_ptr;
 	PngNeedsMergeData merge_data = { 0 };
 	PngData png_data = { 0 };
@@ -143,8 +143,8 @@ read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, Tracke
 				 * called multiple times */
 
 				tracker_read_xmp (text_ptr[i].text,
-						  text_ptr[i].itxt_length,
-						  uri, &xmp_data);
+				                  text_ptr[i].itxt_length,
+				                  uri, &xmp_data);
 
 				continue;
 			}
@@ -202,7 +202,7 @@ read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, Tracke
 		                                         xmp_data.rights);
 
 		merge_data.license = tracker_coalesce (2, png_data.disclaimer,
-		                                         xmp_data.license);
+		                                       xmp_data.license);
 
 		merge_data.description = tracker_coalesce (2, png_data.description,
 		                                           xmp_data.description);
@@ -402,18 +402,18 @@ read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, Tracke
 
 static void
 extract_png (const gchar *uri,
-	     TrackerSparqlBuilder   *metadata)
+             TrackerSparqlBuilder   *metadata)
 {
 	goffset      size;
-	FILE	    *f;
+	FILE        *f;
 	png_structp  png_ptr;
 	png_infop    info_ptr;
 	png_infop    end_ptr;
 	png_bytepp   row_pointers;
 	guint        row;
 	png_uint_32  width, height;
-	gint	     bit_depth, color_type;
-	gint	     interlace_type, compression_type, filter_type;
+	gint         bit_depth, color_type;
+	gint         interlace_type, compression_type, filter_type;
 	gchar       *filename = g_filename_from_uri (uri, NULL, NULL);
 
 	size = tracker_file_get_size (filename);
@@ -426,9 +426,9 @@ extract_png (const gchar *uri,
 
 	if (f) {
 		png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
-						  NULL,
-						  NULL,
-						  NULL);
+		                                  NULL,
+		                                  NULL,
+		                                  NULL);
 		if (!png_ptr) {
 			tracker_file_close (f, FALSE);
 			g_free (filename);
@@ -461,14 +461,14 @@ extract_png (const gchar *uri,
 		png_read_info (png_ptr, info_ptr);
 
 		if (!png_get_IHDR (png_ptr,
-				   info_ptr,
-				   &width,
-				   &height,
-				   &bit_depth,
-				   &color_type,
-				   &interlace_type,
-				   &compression_type,
-				   &filter_type)) {
+		                   info_ptr,
+		                   &width,
+		                   &height,
+		                   &bit_depth,
+		                   &color_type,
+		                   &interlace_type,
+		                   &compression_type,
+		                   &filter_type)) {
 			png_destroy_read_struct (&png_ptr, &info_ptr, &end_ptr);
 			tracker_file_close (f, FALSE);
 			g_free (filename);
@@ -482,7 +482,7 @@ extract_png (const gchar *uri,
 
 		for (row = 0; row < height; row++) {
 			row_pointers[row] = png_malloc (png_ptr,
-							png_get_rowbytes (png_ptr,info_ptr));
+			                                png_get_rowbytes (png_ptr,info_ptr));
 		}
 
 		png_read_image (png_ptr, row_pointers);
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index 1451d68..ed3a0b2 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -58,16 +58,16 @@
 
 #ifdef USING_UNZIPPSFILES
 static void extract_ps_gz (const gchar *uri,
-			   TrackerSparqlBuilder *metadata);
+                           TrackerSparqlBuilder *metadata);
 #endif
-static void extract_ps	  (const gchar *uri,
-			   TrackerSparqlBuilder *metadata);
+static void extract_ps    (const gchar *uri,
+                           TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
 #ifdef USING_UNZIPPSFILES
-	{ "application/x-gzpostscript",	extract_ps_gz },
+	{ "application/x-gzpostscript",         extract_ps_gz },
 #endif /* USING_UNZIPPSFILES */
-	{ "application/postscript",	extract_ps    },
+	{ "application/postscript",     extract_ps    },
 	{ NULL, NULL }
 };
 
@@ -75,9 +75,9 @@ static TrackerExtractData data[] = {
 
 static ssize_t
 igetdelim (gchar  **linebuf,
-	   size_t  *linebufsz,
-	   gint     delimiter,
-	   FILE    *file)
+           size_t  *linebufsz,
+           gint     delimiter,
+           FILE    *file)
 {
 	gint ch;
 	gint idx;
@@ -129,8 +129,8 @@ igetdelim (gchar  **linebuf,
 
 static gint
 getline (gchar **s,
-	 guint	*lim,
-	 FILE	*stream)
+         guint  *lim,
+         FILE   *stream)
 {
 	return igetdelim (s, lim, '\n', stream);
 }
@@ -207,7 +207,7 @@ date_to_iso8601 (const gchar *date)
 
 static void
 extract_ps (const gchar          *uri,
-	    TrackerSparqlBuilder *metadata)
+            TrackerSparqlBuilder *metadata)
 {
 	FILE *f;
 	gchar *filename;
@@ -293,7 +293,7 @@ extract_ps (const gchar          *uri,
 
 static void
 extract_ps_gz (const gchar          *uri,
-	       TrackerSparqlBuilder *metadata)
+               TrackerSparqlBuilder *metadata)
 {
 	FILE *fz, *f;
 	GError *error = NULL;
@@ -305,8 +305,8 @@ extract_ps_gz (const gchar          *uri,
 	gchar *filename;
 
 	fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
-			      &gunzipped,
-			      &error);
+	                      &gunzipped,
+	                      &error);
 
 	if (error) {
 		g_error_free (error);
@@ -323,16 +323,16 @@ extract_ps_gz (const gchar          *uri,
 	argv[3] = NULL;
 
 	ptat = g_spawn_async_with_pipes (g_get_tmp_dir (),
-					 (gchar **) argv,
-					 NULL,
-					 G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
-					 tracker_spawn_child_func,
-					 GINT_TO_POINTER (10),
-					 NULL,
-					 NULL,
-					 &fdz,
-					 NULL,
-					 &error);
+	                                 (gchar **) argv,
+	                                 NULL,
+	                                 G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+	                                 tracker_spawn_child_func,
+	                                 GINT_TO_POINTER (10),
+	                                 NULL,
+	                                 NULL,
+	                                 &fdz,
+	                                 NULL,
+	                                 &error);
 
 	if (!ptat) {
 		g_free (filename);
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 6f40777..7437cac 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -34,7 +34,7 @@
 #define TEXT_CHECK_SIZE 65535    /* bytes */
 
 static void extract_text (const gchar          *uri,
-			  TrackerSparqlBuilder *metadata);
+                          TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
 	{ "text/plain",       extract_text },
@@ -49,7 +49,7 @@ static TrackerExtractData data[] = {
 
 static gboolean
 get_file_is_utf8 (GString *s,
-		  gssize  *bytes_valid)
+                  gssize  *bytes_valid)
 {
 	const gchar *end;
 
@@ -82,20 +82,20 @@ get_file_in_locale (GString *s)
 {
 	GError *error = NULL;
 	gchar  *str;
-	gsize	bytes_read;
-	gsize	bytes_written;
+	gsize   bytes_read;
+	gsize   bytes_written;
 
 	str = g_locale_to_utf8 (s->str,
-				s->len,
-				&bytes_read,
-				&bytes_written,
-				&error);
+	                        s->len,
+	                        &bytes_read,
+	                        &bytes_written,
+	                        &error);
 	if (error) {
 		g_debug ("  Conversion to UTF-8 read %d bytes, wrote %d bytes",
-			 bytes_read,
-			 bytes_written);
+		         bytes_read,
+		         bytes_written);
 		g_message ("Could not convert file from locale to UTF-8, %s",
-			   error->message);
+		           error->message);
 		g_error_free (error);
 		g_free (str);
 	} else {
@@ -111,26 +111,26 @@ get_file_in_locale (GString *s)
 static gchar *
 get_file_content (const gchar *uri)
 {
-	GFile		 *file;
+	GFile            *file;
 	GFileInputStream *stream;
-	GError		 *error = NULL;
-	GString		 *s;
-	gssize		  bytes;
-	gssize		  bytes_valid;
-	gssize		  bytes_read_total;
-	gssize		  buf_size;
-	gchar		  buf[TEXT_CHECK_SIZE];
-	gboolean	  has_more_data;
-	gboolean	  has_reached_max;
-	gboolean	  is_utf8;
+	GError           *error = NULL;
+	GString                  *s;
+	gssize            bytes;
+	gssize            bytes_valid;
+	gssize            bytes_read_total;
+	gssize            buf_size;
+	gchar             buf[TEXT_CHECK_SIZE];
+	gboolean          has_more_data;
+	gboolean          has_reached_max;
+	gboolean          is_utf8;
 
 	file = g_file_new_for_uri (uri);
 	stream = g_file_read (file, NULL, &error);
 
 	if (error) {
 		g_message ("Could not get read file:'%s', %s",
-			   uri,
-			   error->message);
+		           uri,
+		           error->message);
 		g_error_free (error);
 		g_object_unref (file);
 
@@ -158,10 +158,10 @@ get_file_content (const gchar *uri)
 		/* Loop until we hit the maximum */
 		for (bytes = -1; bytes != 0 && !error; ) {
 			bytes = g_input_stream_read (G_INPUT_STREAM (stream),
-						     buf,
-						     bytes_remaining,
-						     NULL,
-						     &error);
+			                             buf,
+			                             bytes_remaining,
+			                             NULL,
+			                             &error);
 
 			bytes_read += bytes;
 			bytes_remaining -= bytes;
@@ -186,7 +186,7 @@ get_file_content (const gchar *uri)
 			if (bytes_read == buf_size &&
 			    strchr (buf, '\n') == NULL) {
 				g_debug ("  No '\\n' in the first %" G_GSSIZE_FORMAT " bytes, not indexing file",
-					 buf_size);
+				         buf_size);
 				break;
 			} else if (bytes_read <= 2) {
 				g_debug ("  File has less than 3 characters in it, not indexing file");
@@ -210,13 +210,13 @@ get_file_content (const gchar *uri)
 		}
 
 		g_debug ("  Read "
-			 "%" G_GSSIZE_FORMAT " bytes total, "
-			 "%" G_GSSIZE_FORMAT " bytes this time, "
-			 "more data:%s, reached max:%s",
-			 bytes_read_total,
-			 bytes_read,
-			 has_more_data ? "yes" : "no",
-			 has_reached_max ? "yes" : "no");
+		         "%" G_GSSIZE_FORMAT " bytes total, "
+		         "%" G_GSSIZE_FORMAT " bytes this time, "
+		         "more data:%s, reached max:%s",
+		         bytes_read_total,
+		         bytes_read,
+		         has_more_data ? "yes" : "no",
+		         has_reached_max ? "yes" : "no");
 
 		/* The + 1 is for the NULL terminating byte */
 		s = g_string_append_len (s, buf, bytes_read + 1);
@@ -228,8 +228,8 @@ get_file_content (const gchar *uri)
 
 	if (error) {
 		g_message ("Could not read input stream for:'%s', %s",
-			   uri,
-			   error->message);
+		           uri,
+		           error->message);
 		g_error_free (error);
 		g_string_free (s, TRUE);
 		g_object_unref (stream);
@@ -253,16 +253,16 @@ get_file_content (const gchar *uri)
 		s = get_file_in_locale (s);
 	} else {
 		g_debug ("  Truncating to last valid UTF-8 character (%d/%d bytes)",
-			 bytes_valid,
-			 s->len);
+		         bytes_valid,
+		         s->len);
 		s = g_string_truncate (s, bytes_valid);
 	}
-#else	/* TRY_LOCALE_TO_UTF8_CONVERSION */
+#else   /* TRY_LOCALE_TO_UTF8_CONVERSION */
 	g_debug ("  Truncating to last valid UTF-8 character (%" G_GSSIZE_FORMAT "/%" G_GSSIZE_FORMAT " bytes)",
-		 bytes_valid,
-		 s->len);
+	         bytes_valid,
+	         s->len);
 	s = g_string_truncate (s, bytes_valid);
-#endif	/* TRY_LOCALE_TO_UTF8_CONVERSION */
+#endif  /* TRY_LOCALE_TO_UTF8_CONVERSION */
 
 	g_object_unref (stream);
 	g_object_unref (file);
@@ -277,7 +277,7 @@ get_file_content (const gchar *uri)
 
 static void
 extract_text (const gchar          *uri,
-	      TrackerSparqlBuilder *metadata)
+              TrackerSparqlBuilder *metadata)
 {
 	gchar *content;
 
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 4d336c1..592f9f7 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -43,7 +43,7 @@
 #include "tracker-iptc.h"
 #include "tracker-exif.h"
 
-#define EXIF_DATE_FORMAT	"%Y:%m:%d %H:%M:%S"
+#define EXIF_DATE_FORMAT        "%Y:%m:%d %H:%M:%S"
 
 #define NMM_PREFIX TRACKER_NMM_PREFIX
 #define NFO_PREFIX TRACKER_NFO_PREFIX
@@ -63,14 +63,14 @@ typedef enum {
 
 typedef struct {
 	gchar *camera, *title, *orientation, *copyright, *white_balance,
-	      *fnumber, *flash, *focal_length, *artist,
-	      *exposure_time, *iso_speed_ratings, *date, *description,
-	      *metering_mode, *creator, *x_dimension, *y_dimension;
+		*fnumber, *flash, *focal_length, *artist,
+		*exposure_time, *iso_speed_ratings, *date, *description,
+		*metering_mode, *creator, *x_dimension, *y_dimension;
 } TiffNeedsMergeData;
 
 typedef struct {
 	gchar *artist, *copyright, *datetime, *documentname, *imagedescription,
-	      *imagewidth, *imagelength, *make, *model, *orientation;
+		*imagewidth, *imagelength, *make, *model, *orientation;
 } TiffData;
 
 static void extract_tiff (const gchar *filename,
@@ -88,24 +88,24 @@ get_flash (TIFF *image)
 
 	if (TIFFGetField (image, EXIFTAG_FLASH, &varui16)) {
 		switch (varui16) {
-			case 0x0001:
-			case 0x0009:
-			case 0x000D:
-			case 0x000F:
-			case 0x0019:
-			case 0x001D:
-			case 0x001F:
-			case 0x0041:
-			case 0x0045:
-			case 0x0047:
-			case 0x0049:
-			case 0x004D:
-			case 0x004F:
-			case 0x0059:
-			case 0x005F:
-			case 0x005D:
+		case 0x0001:
+		case 0x0009:
+		case 0x000D:
+		case 0x000F:
+		case 0x0019:
+		case 0x001D:
+		case 0x001F:
+		case 0x0041:
+		case 0x0045:
+		case 0x0047:
+		case 0x0049:
+		case 0x004D:
+		case 0x004F:
+		case 0x0059:
+		case 0x005F:
+		case 0x005D:
 			return g_strdup ("nmm:flash-on");
-			default:
+		default:
 			return g_strdup ("nmm:flash-off");
 		}
 	}
@@ -120,22 +120,22 @@ get_orientation (TIFF *image)
 
 	if (TIFFGetField (image, TIFFTAG_ORIENTATION, &varui16)) {
 		switch (varui16) {
-			default:
-			case 0:
+		default:
+		case 0:
 			return  g_strdup ("nfo:orientation-top");
-			case 1:
+		case 1:
 			return  g_strdup ("nfo:orientation-top-mirror");
-			case 2:
+		case 2:
 			return  g_strdup ("nfo:orientation-bottom");
-			case 3:
+		case 3:
 			return  g_strdup ("nfo:orientation-bottom-mirror");
-			case 4:
+		case 4:
 			return  g_strdup ("nfo:orientation-left-mirror");
-			case 5:
+		case 5:
 			return  g_strdup ("nfo:orientation-right");
-			case 6:
+		case 6:
 			return  g_strdup ("nfo:orientation-right-mirror");
-			case 7:
+		case 7:
 			return  g_strdup ("nfo:orientation-left");
 		}
 	}
@@ -151,19 +151,19 @@ get_metering_mode (TIFF *image)
 
 	if (TIFFGetField (image, EXIFTAG_METERINGMODE, &varui16)) {
 		switch (varui16) {
-			case 1:
+		case 1:
 			return g_strdup ("nmm:meteringMode-average");
-			case 2:
+		case 2:
 			return g_strdup ("nmm:meteringMode-center-weighted-average");
-			case 3:
+		case 3:
 			return g_strdup ("nmm:meteringMode-spot");
-			case 4:
+		case 4:
 			return g_strdup ("nmm:meteringMode-multispot");
-			case 5:
+		case 5:
 			return g_strdup ("nmm:meteringMode-pattern");
-			case 6:
+		case 6:
 			return g_strdup ("nmm:meteringMode-partial");
-			default:
+		default:
 			return g_strdup ("nmm:meteringMode-other");
 		}
 	}
@@ -200,33 +200,33 @@ get_value (TIFF *image, guint tag, guint type)
 	void *data = NULL;
 
 	switch (type) {
-		case TIFF_TAGTYPE_STRING:
-			if (TIFFGetField (image, tag, &text)) {
-				return g_strdup (text);
-			}
-			break;
-		case TIFF_TAGTYPE_UINT16:
-			if (TIFFGetField (image, tag, &varui16)) {
-				return g_strdup_printf ("%i", varui16);
-			}
-			break;
-		case TIFF_TAGTYPE_UINT32:
-			if (TIFFGetField (image, tag, &varui32)) {
-				return g_strdup_printf ("%i", varui32);
-			}
-			break;
-		case TIFF_TAGTYPE_DOUBLE:
-			if (TIFFGetField (image, tag, &vardouble)) {
-				return g_strdup_printf ("%f", vardouble);
-			}
-			break;
-		case TIFF_TAGTYPE_C16_UINT16:
-			if (TIFFGetField (image, tag, &count16, &data)) {
-				return g_strdup_printf ("%i", * (guint16 *) data);
-			}
-			break;
-		default:
-			break;
+	case TIFF_TAGTYPE_STRING:
+		if (TIFFGetField (image, tag, &text)) {
+			return g_strdup (text);
+		}
+		break;
+	case TIFF_TAGTYPE_UINT16:
+		if (TIFFGetField (image, tag, &varui16)) {
+			return g_strdup_printf ("%i", varui16);
+		}
+		break;
+	case TIFF_TAGTYPE_UINT32:
+		if (TIFFGetField (image, tag, &varui32)) {
+			return g_strdup_printf ("%i", varui32);
+		}
+		break;
+	case TIFF_TAGTYPE_DOUBLE:
+		if (TIFFGetField (image, tag, &vardouble)) {
+			return g_strdup_printf ("%f", vardouble);
+		}
+		break;
+	case TIFF_TAGTYPE_C16_UINT16:
+		if (TIFFGetField (image, tag, &count16, &data)) {
+			return g_strdup_printf ("%i", * (guint16 *) data);
+		}
+		break;
+	default:
+		break;
 	}
 
 	return NULL;
@@ -303,8 +303,8 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
 		if (TIFFIsByteSwapped(image) != 0)
 			TIFFSwabArrayOfLong((uint32 *) iptcOffset,(unsigned long) iptcSize);
 		tracker_read_iptc (iptcOffset,
-				   4*iptcSize,
-				   uri, &iptc_data);
+		                   4*iptcSize,
+		                   uri, &iptc_data);
 	}
 #endif /* HAVE_LIBIPTCDATA */
 
@@ -313,9 +313,9 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
 #ifdef HAVE_EXEMPI
 	if (TIFFGetField (image, TIFFTAG_XMLPACKET, &size, &xmpOffset)) {
 		tracker_read_xmp (xmpOffset,
-				  size,
-				  uri,
-				  &xmp_data);
+		                  size,
+		                  uri,
+		                  &xmp_data);
 	}
 #endif /* HAVE_EXEMPI */
 
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index ba76556..e2c9e59 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -39,23 +39,23 @@
 #define RDF_TYPE RDF_PREFIX "type"
 
 static const gchar *tags[][2] = {
-	{ "TOTEM_INFO_VIDEO_HEIGHT",		"nfo:height"	},
-	{ "TOTEM_INFO_VIDEO_WIDTH",		"nfo:width"	},
-	{ "TOTEM_INFO_FPS",			"nfo:frameRate"	},
-	{ "TOTEM_INFO_VIDEO_CODEC",		"nfo:codec"	},
-	{ "TOTEM_INFO_VIDEO_BITRATE",		"nfo:averageBitrate"	},
-	{ "TOTEM_INFO_TITLE",			"nie:title"	},
-	{ "TOTEM_INFO_ARTIST",			"nco:creator"	},
-	{ "TOTEM_INFO_ALBUM",			"nmm:musicAlbum"	},
-	{ "TOTEM_INFO_AUDIO_BITRATE",		"nmm:averageBitrate"	},
-	{ "TOTEM_INFO_AUDIO_SAMPLE_RATE",	"nfo:sampleRate"		},
-	{ "TOTEM_INFO_AUDIO_CODEC",		"nfo:codec"		},
-	{ "TOTEM_INFO_AUDIO_CHANNELS",		"nfo:channels"		},
-	{ NULL,					NULL			}
+	{ "TOTEM_INFO_VIDEO_HEIGHT",            "nfo:height"    },
+	{ "TOTEM_INFO_VIDEO_WIDTH",             "nfo:width"     },
+	{ "TOTEM_INFO_FPS",                     "nfo:frameRate"         },
+	{ "TOTEM_INFO_VIDEO_CODEC",             "nfo:codec"     },
+	{ "TOTEM_INFO_VIDEO_BITRATE",           "nfo:averageBitrate"    },
+	{ "TOTEM_INFO_TITLE",                   "nie:title"     },
+	{ "TOTEM_INFO_ARTIST",                  "nco:creator"   },
+	{ "TOTEM_INFO_ALBUM",                   "nmm:musicAlbum"        },
+	{ "TOTEM_INFO_AUDIO_BITRATE",           "nmm:averageBitrate"    },
+	{ "TOTEM_INFO_AUDIO_SAMPLE_RATE",       "nfo:sampleRate"                },
+	{ "TOTEM_INFO_AUDIO_CODEC",             "nfo:codec"             },
+	{ "TOTEM_INFO_AUDIO_CHANNELS",          "nfo:channels"          },
+	{ NULL,                                         NULL                    }
 };
 
 static void extract_totem (const gchar *uri,
-			   TrackerSparqlBuilder   *metadata);
+                           TrackerSparqlBuilder   *metadata);
 
 static TrackerExtractData data[] = {
 	{ "audio/*", extract_totem },
@@ -65,8 +65,8 @@ static TrackerExtractData data[] = {
 
 static void
 metadata_write_foreach (gpointer key,
-			gpointer value,
-			gpointer user_data)
+                        gpointer value,
+                        gpointer user_data)
 {
 	TrackerSparqlBuilder *metadata = user_data;
 
@@ -76,7 +76,7 @@ metadata_write_foreach (gpointer key,
 
 static void
 extract_totem (const gchar *uri,
-	       TrackerSparqlBuilder   *metadata)
+               TrackerSparqlBuilder   *metadata)
 {
 	gchar *argv[3];
 	gchar *totem;
@@ -88,9 +88,9 @@ extract_totem (const gchar *uri,
 	argv[2] = NULL;
 
 	tmp_metadata = g_hash_table_new_full (g_str_hash,
-					      g_str_equal,
-					      (GDestroyNotify) g_free,
-					      (GDestroyNotify) g_free);
+	                                      g_str_equal,
+	                                      (GDestroyNotify) g_free,
+	                                      (GDestroyNotify) g_free);
 
 	if (tracker_spawn (argv, 10, &totem, NULL)) {
 		gchar **lines, **line;
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index f189571..9b2b89d 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -50,11 +50,11 @@ typedef struct {
 
 typedef struct {
 	gchar *title,*artist,*album,*albumartist, *trackcount, *tracknumber,
-	      *DiscNo, *Performer, *TrackGain, *TrackPeakGain, *AlbumGain,
-	      *AlbumPeakGain, *date, *comment, *genre, *Codec, *CodecVersion,
-	      *Samplerate ,*Channels, *MBAlbumID, *MBArtistID, *MBAlbumArtistID,
-	      *MBTrackID, *Lyrics, *Copyright, *License, *Organization, *Location,
-	      *Publisher;
+		*DiscNo, *Performer, *TrackGain, *TrackPeakGain, *AlbumGain,
+		*AlbumPeakGain, *date, *comment, *genre, *Codec, *CodecVersion,
+		*Samplerate ,*Channels, *MBAlbumID, *MBArtistID, *MBAlbumArtistID,
+		*MBTrackID, *Lyrics, *Copyright, *License, *Organization, *Location,
+		*Publisher;
 } VorbisData;
 
 static TrackerExtractData extract_data[] = {
@@ -84,7 +84,7 @@ static void
 extract_vorbis (const char *uri,
                 TrackerSparqlBuilder *metadata)
 {
-	FILE	       *f;
+	FILE           *f;
 	OggVorbis_File  vf;
 	vorbis_comment *comment;
 	vorbis_info    *vi;
@@ -93,7 +93,7 @@ extract_vorbis (const char *uri,
 	gchar          *filename;
 	VorbisData      vorbis_data = { 0 };
 	VorbisNeedsMergeData merge_data = { 0 };
-        gchar *artist_uri = NULL, *album_uri = NULL;
+	gchar *artist_uri = NULL, *album_uri = NULL;
 
 	filename = g_filename_from_uri (uri, NULL, NULL);
 	f = tracker_file_open (filename, "r", FALSE);
@@ -154,7 +154,7 @@ extract_vorbis (const char *uri,
 		tracker_sparql_builder_object (metadata, "nmm:Artist");
 		tracker_sparql_builder_predicate (metadata, "nmm:artistName");
 		tracker_sparql_builder_object_unvalidated (metadata, merge_data.creator);
-        }
+	}
 
 	if (vorbis_data.album) {
 		album_uri = tracker_uri_printf_escaped ("urn:album:%s", vorbis_data.album);
@@ -166,46 +166,46 @@ extract_vorbis (const char *uri,
 		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.album);
 
 
-                if (vorbis_data.trackcount) {
-                        tracker_sparql_builder_predicate (metadata, "nmm:albumTrackCount");
-                        tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.trackcount);
-                        g_free (vorbis_data.trackcount);
-                }
-        }
+		if (vorbis_data.trackcount) {
+			tracker_sparql_builder_predicate (metadata, "nmm:albumTrackCount");
+			tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.trackcount);
+			g_free (vorbis_data.trackcount);
+		}
+	}
 
-        tracker_sparql_builder_subject_iri (metadata, uri);
+	tracker_sparql_builder_subject_iri (metadata, uri);
 	tracker_sparql_builder_predicate (metadata, "a");
 	tracker_sparql_builder_object (metadata, "nmm:MusicPiece");
 	tracker_sparql_builder_object (metadata, "nfo:Audio");
 
-        tracker_sparql_builder_predicate (metadata, "nmm:performer");
-        tracker_sparql_builder_object_unvalidated (metadata, artist_uri);
+	tracker_sparql_builder_predicate (metadata, "nmm:performer");
+	tracker_sparql_builder_object_unvalidated (metadata, artist_uri);
 
-        tracker_sparql_builder_predicate (metadata, "nmm:musicAlbum");
-        tracker_sparql_builder_object_unvalidated (metadata, album_uri);
+	tracker_sparql_builder_predicate (metadata, "nmm:musicAlbum");
+	tracker_sparql_builder_object_unvalidated (metadata, album_uri);
 
 	if (vorbis_data.title) {
-                tracker_sparql_builder_predicate (metadata, "nie:title");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.title);
+		tracker_sparql_builder_predicate (metadata, "nie:title");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.title);
 		g_free (vorbis_data.title);
 	}
 
 	if (vorbis_data.tracknumber) {
-                tracker_sparql_builder_predicate (metadata, "nmm:trackNumber");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.tracknumber);
+		tracker_sparql_builder_predicate (metadata, "nmm:trackNumber");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.tracknumber);
 		g_free (vorbis_data.tracknumber);
 	}
 
 	if (vorbis_data.DiscNo) {
 #if 0
-                /* nmm:setNumber is of domain nmm:MusicAlbum, but there could be several of these... */
-                tracker_sparql_builder_predicate (metadata, "nmm:setNumber");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.DiscNo);
+		/* nmm:setNumber is of domain nmm:MusicAlbum, but there could be several of these... */
+		tracker_sparql_builder_predicate (metadata, "nmm:setNumber");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.DiscNo);
 #endif
 		g_free (vorbis_data.DiscNo);
 	}
 
-        if (vorbis_data.TrackGain) {
+	if (vorbis_data.TrackGain) {
 		/* tracker_statement_list_insert (metadata, uri, _PREFIX "", vorbis_data.); */
 		g_free (vorbis_data.TrackGain);
 	}
@@ -215,38 +215,38 @@ extract_vorbis (const char *uri,
 	}
 
 	if (vorbis_data.AlbumGain) {
-                tracker_sparql_builder_predicate (metadata, "nmm:albumGain");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.AlbumGain);
+		tracker_sparql_builder_predicate (metadata, "nmm:albumGain");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.AlbumGain);
 		g_free (vorbis_data.AlbumGain);
 	}
 
 	if (vorbis_data.AlbumPeakGain) {
-                tracker_sparql_builder_predicate (metadata, "nmm:albumPeakGain");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.AlbumPeakGain);
+		tracker_sparql_builder_predicate (metadata, "nmm:albumPeakGain");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.AlbumPeakGain);
 		g_free (vorbis_data.AlbumPeakGain);
 	}
 
 	if (vorbis_data.comment) {
-                tracker_sparql_builder_predicate (metadata, "nie:comment");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.comment);
+		tracker_sparql_builder_predicate (metadata, "nie:comment");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.comment);
 		g_free (vorbis_data.comment);
 	}
 
 	if (vorbis_data.date) {
-                tracker_sparql_builder_predicate (metadata, "nie:contentCreated");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.date);
+		tracker_sparql_builder_predicate (metadata, "nie:contentCreated");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.date);
 		g_free (vorbis_data.date);
 	}
 
 	if (vorbis_data.genre) {
-                tracker_sparql_builder_predicate (metadata, "nfo:genre");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.genre);
+		tracker_sparql_builder_predicate (metadata, "nfo:genre");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.genre);
 		g_free (vorbis_data.genre);
 	}
 
 	if (vorbis_data.Codec) {
-                tracker_sparql_builder_predicate (metadata, "nfo:codec");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Codec);
+		tracker_sparql_builder_predicate (metadata, "nfo:codec");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Codec);
 		g_free (vorbis_data.Codec);
 	}
 
@@ -256,14 +256,14 @@ extract_vorbis (const char *uri,
 	}
 
 	if (vorbis_data.Samplerate) {
-                tracker_sparql_builder_predicate (metadata, "nfo:sampleRate");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Samplerate);
+		tracker_sparql_builder_predicate (metadata, "nfo:sampleRate");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Samplerate);
 		g_free (vorbis_data.Samplerate);
 	}
 
 	if (vorbis_data.Channels) {
-                tracker_sparql_builder_predicate (metadata, "nfo:channels");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Channels);
+		tracker_sparql_builder_predicate (metadata, "nfo:channels");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Channels);
 		g_free (vorbis_data.Channels);
 	}
 
@@ -288,20 +288,20 @@ extract_vorbis (const char *uri,
 	}
 
 	if (vorbis_data.Lyrics) {
-                tracker_sparql_builder_predicate (metadata, "nie:plainTextContent");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Lyrics);
+		tracker_sparql_builder_predicate (metadata, "nie:plainTextContent");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Lyrics);
 		g_free (vorbis_data.Lyrics);
 	}
 
 	if (vorbis_data.Copyright) {
-                tracker_sparql_builder_predicate (metadata, "nie:copyright");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Copyright);
+		tracker_sparql_builder_predicate (metadata, "nie:copyright");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Copyright);
 		g_free (vorbis_data.Copyright);
 	}
 
 	if (vorbis_data.License) {
-                tracker_sparql_builder_predicate (metadata, "nie:license");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.License);
+		tracker_sparql_builder_predicate (metadata, "nie:license");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.License);
 		g_free (vorbis_data.License);
 	}
 
@@ -310,48 +310,48 @@ extract_vorbis (const char *uri,
 		g_free (vorbis_data.Organization);
 	}
 
- 	if (vorbis_data.Location) {
+	if (vorbis_data.Location) {
 		/* tracker_statement_list_insert (metadata, uri, _PREFIX "", vorbis_data.Location); */
 		g_free (vorbis_data.Location);
 	}
 
 	if (vorbis_data.Publisher) {
-                tracker_sparql_builder_predicate (metadata, "dc:publisher");
+		tracker_sparql_builder_predicate (metadata, "dc:publisher");
 
-                tracker_sparql_builder_object_blank_open (metadata);
-                tracker_sparql_builder_predicate (metadata, "a");
-                tracker_sparql_builder_object (metadata, "nco:Contact");
+		tracker_sparql_builder_object_blank_open (metadata);
+		tracker_sparql_builder_predicate (metadata, "a");
+		tracker_sparql_builder_object (metadata, "nco:Contact");
 
-                tracker_sparql_builder_predicate (metadata, "nco:fullname");
-                tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Publisher);
-                tracker_sparql_builder_object_blank_close (metadata);
+		tracker_sparql_builder_predicate (metadata, "nco:fullname");
+		tracker_sparql_builder_object_unvalidated (metadata, vorbis_data.Publisher);
+		tracker_sparql_builder_object_blank_close (metadata);
 		g_free (vorbis_data.Publisher);
 	}
 
 	if ((vi = ov_info (&vf, 0)) != NULL ) {
 		bitrate = vi->bitrate_nominal / 1000;
 
-                tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
-                tracker_sparql_builder_object_int64 (metadata, (gint64) bitrate);
+		tracker_sparql_builder_predicate (metadata, "nfo:averageBitrate");
+		tracker_sparql_builder_object_int64 (metadata, (gint64) bitrate);
 
-                /*
-                tracker_statement_list_insert_with_int (metadata, uri, "Audio.CodecVersion", vi->version);
-		tracker_statement_list_insert_with_int (metadata, uri, NFO_PREFIX "channels", vi->channels);
-		tracker_statement_list_insert_with_int (metadata, uri, NFO_PREFIX "sampleRate", vi->rate);
-                */
+		/*
+		  tracker_statement_list_insert_with_int (metadata, uri, "Audio.CodecVersion", vi->version);
+		  tracker_statement_list_insert_with_int (metadata, uri, NFO_PREFIX "channels", vi->channels);
+		  tracker_statement_list_insert_with_int (metadata, uri, NFO_PREFIX "sampleRate", vi->rate);
+		*/
 	}
 
 	/* Duration */
 	if ((time = ov_time_total (&vf, -1)) != OV_EINVAL) {
-                tracker_sparql_builder_predicate (metadata, "nfo:duration");
-                tracker_sparql_builder_object_int64 (metadata, (gint64) time);
+		tracker_sparql_builder_predicate (metadata, "nfo:duration");
+		tracker_sparql_builder_object_int64 (metadata, (gint64) time);
 	}
 
 	/* NOTE: This calls fclose on the file */
 	ov_clear (&vf);
 
-        g_free (artist_uri);
-        g_free (album_uri);
+	g_free (artist_uri);
+	g_free (album_uri);
 }
 
 TrackerExtractData *
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index b59dcae..74e341f 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -79,15 +79,15 @@ tracker_extract_class_init (TrackerExtractClass *klass)
 
 	signals[QUEUE_THUMBNAIL] =
 		g_signal_new ("queue-thumbnail",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_STRING,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRING,
-			      G_TYPE_STRING);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__STRING_STRING,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_STRING,
+		              G_TYPE_STRING);
 
 	g_type_class_add_private (object_class, sizeof (TrackerExtractPrivate));
 }
@@ -119,7 +119,7 @@ tracker_extract_finalize (GObject *object)
 
 TrackerExtract *
 tracker_extract_new (gboolean disable_shutdown,
-		     gboolean force_internal_extractors)
+                     gboolean force_internal_extractors)
 {
 	TrackerExtract *object;
 	TrackerExtractPrivate *priv;
@@ -154,12 +154,12 @@ tracker_extract_new (gboolean disable_shutdown,
 	}
 #endif /* HAVE_STREAMANALYZER */
 	specific_extractors = g_array_new (FALSE,
-					   TRUE,
-					   sizeof (ModuleData));
+	                                   TRUE,
+	                                   sizeof (ModuleData));
 
 	generic_extractors = g_array_new (FALSE,
-					  TRUE,
-					  sizeof (ModuleData));
+	                                  TRUE,
+	                                  sizeof (ModuleData));
 
 	while ((name = g_dir_read_name (dir)) != NULL) {
 		TrackerExtractDataFunc func;
@@ -176,8 +176,8 @@ tracker_extract_new (gboolean disable_shutdown,
 
 		if (!module) {
 			g_warning ("Could not load module '%s': %s",
-				   name,
-				   g_module_error ());
+			           name,
+			           g_module_error ());
 			g_free (module_path);
 			continue;
 		}
@@ -191,16 +191,16 @@ tracker_extract_new (gboolean disable_shutdown,
 			mdata.edata = (func) ();
 
 			g_message ("Adding extractor:'%s' with:",
-				   g_module_name ((GModule*) mdata.module));
+			           g_module_name ((GModule*) mdata.module));
 
 			for (; mdata.edata->mime; mdata.edata++) {
 				if (G_UNLIKELY (strchr (mdata.edata->mime, '*') != NULL)) {
 					g_message ("  Generic  match for mime:'%s'",
-						   mdata.edata->mime);
+					           mdata.edata->mime);
 					g_array_append_val (generic_extractors, mdata);
 				} else {
 					g_message ("  Specific match for mime:'%s'",
-						   mdata.edata->mime);
+					           mdata.edata->mime);
 					g_array_append_val (specific_extractors, mdata);
 				}
 			}
@@ -227,9 +227,9 @@ tracker_extract_new (gboolean disable_shutdown,
 
 static TrackerSparqlBuilder *
 get_file_metadata (TrackerExtract *extract,
-		   guint           request_id,
-		   const gchar    *uri,
-		   const gchar    *mime)
+                   guint           request_id,
+                   const gchar    *uri,
+                   const gchar    *mime)
 {
 	TrackerExtractPrivate *priv;
 	TrackerSparqlBuilder *statements;
@@ -246,7 +246,7 @@ get_file_metadata (TrackerExtract *extract,
 #ifdef HAVE_LIBSTREAMANALYZER
 	if (!priv->force_internal_extractors) {
 		tracker_dbus_request_comment (request_id,
-					      "  Extracting with libstreamanalyzer...");
+		                              "  Extracting with libstreamanalyzer...");
 
 		tracker_topanalyzer_extract (uri, statements, &content_type);
 
@@ -257,7 +257,7 @@ get_file_metadata (TrackerExtract *extract,
 		}
 	} else {
 		tracker_dbus_request_comment (request_id,
-					      "  Extracting with internal extractors ONLY...");
+		                              "  Extracting with internal extractors ONLY...");
 	}
 #endif /* HAVE_LIBSTREAMANALYZER */
 
@@ -277,21 +277,21 @@ get_file_metadata (TrackerExtract *extract,
 		file = g_file_new_for_uri (uri);
 		if (!file) {
 			g_warning ("Could not create GFile for uri:'%s'",
-				   uri);
+			           uri);
 			g_object_unref (statements);
 			return NULL;
 		}
 
 		info = g_file_query_info (file,
-					  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-					  G_FILE_QUERY_INFO_NONE,
-					  NULL,
-					  &error);
+		                          G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+		                          G_FILE_QUERY_INFO_NONE,
+		                          NULL,
+		                          &error);
 
 		if (error || !info) {
 			tracker_dbus_request_comment (request_id,
-						      "  Could not create GFileInfo for file size check, %s",
-						      error ? error->message : "no error given");
+			                              "  Could not create GFileInfo for file size check, %s",
+			                              error ? error->message : "no error given");
 			g_error_free (error);
 
 			if (info) {
@@ -306,9 +306,9 @@ get_file_metadata (TrackerExtract *extract,
 		mime_used = g_strdup (g_file_info_get_content_type (info));
 
 		tracker_dbus_request_comment (request_id,
-					      "  Guessing mime type as '%s' for uri:'%s'",
-					      mime_used,
-					      uri);
+		                              "  Guessing mime type as '%s' for uri:'%s'",
+		                              mime_used,
+		                              uri);
 
 		g_object_unref (info);
 		g_object_unref (file);
@@ -331,16 +331,16 @@ get_file_metadata (TrackerExtract *extract,
 				gint items;
 
 				tracker_dbus_request_comment (request_id,
-							      "  Extracting with module:'%s'",
-							      g_module_name ((GModule*) mdata.module));
+				                              "  Extracting with module:'%s'",
+				                              g_module_name ((GModule*) mdata.module));
 
 				(*edata->extract) (uri, statements);
 
 				items = tracker_sparql_builder_get_length (statements);
 
 				tracker_dbus_request_comment (request_id,
-							      "  Found %d metadata items",
-							      items);
+				                              "  Found %d metadata items",
+				                              items);
 				if (items == 0) {
 					continue;
 				}
@@ -364,16 +364,16 @@ get_file_metadata (TrackerExtract *extract,
 				gint items;
 
 				tracker_dbus_request_comment (request_id,
-							      "  Extracting with module:'%s'",
-							      g_module_name ((GModule*) mdata.module));
+				                              "  Extracting with module:'%s'",
+				                              g_module_name ((GModule*) mdata.module));
 
 				(*edata->extract) (uri, statements);
 
 				items = tracker_sparql_builder_get_length (statements);
 
 				tracker_dbus_request_comment (request_id,
-							      "  Found %d metadata items",
-							      items);
+				                              "  Found %d metadata items",
+				                              items);
 				if (items == 0) {
 					continue;
 				}
@@ -389,10 +389,10 @@ get_file_metadata (TrackerExtract *extract,
 		g_free (mime_used);
 
 		tracker_dbus_request_comment (request_id,
-					      "  Could not find any extractors to handle metadata type");
+		                              "  Could not find any extractors to handle metadata type");
 	} else {
 		tracker_dbus_request_comment (request_id,
-					      "  No mime available, not extracting data");
+		                              "  No mime available, not extracting data");
 	}
 
 	tracker_sparql_builder_insert_close (statements);
@@ -402,8 +402,8 @@ get_file_metadata (TrackerExtract *extract,
 
 void
 tracker_extract_get_metadata_by_cmdline (TrackerExtract *object,
-					 const gchar    *uri,
-					 const gchar    *mime)
+                                         const gchar    *uri,
+                                         const gchar    *mime)
 {
 	guint       request_id;
 	TrackerSparqlBuilder *statements = NULL;
@@ -413,17 +413,17 @@ tracker_extract_get_metadata_by_cmdline (TrackerExtract *object,
 	g_return_if_fail (uri != NULL);
 
 	tracker_dbus_request_new (request_id,
-				  "Command line request to extract metadata, "
-				  "uri:'%s', mime:%s",
-				  uri,
-				  mime);
+	                          "Command line request to extract metadata, "
+	                          "uri:'%s', mime:%s",
+	                          uri,
+	                          mime);
 
 	/* NOTE: Don't reset the timeout to shutdown here */
 	statements = get_file_metadata (object, request_id, uri, mime);
 
 	if (statements) {
 		tracker_dbus_request_info (request_id, "%s",
-					   tracker_sparql_builder_get_result (statements));
+		                           tracker_sparql_builder_get_result (statements));
 		g_object_unref (statements);
 	}
 
@@ -431,9 +431,9 @@ tracker_extract_get_metadata_by_cmdline (TrackerExtract *object,
 }
 
 void
-tracker_extract_get_pid (TrackerExtract	        *object,
-			 DBusGMethodInvocation  *context,
-			 GError		       **error)
+tracker_extract_get_pid (TrackerExtract                 *object,
+                         DBusGMethodInvocation  *context,
+                         GError                        **error)
 {
 	guint request_id;
 	pid_t value;
@@ -441,11 +441,11 @@ tracker_extract_get_pid (TrackerExtract	        *object,
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to get PID");
+	                          "D-Bus request to get PID");
 
 	value = getpid ();
 	tracker_dbus_request_debug (request_id,
-				    "PID is %d", value);
+	                            "PID is %d", value);
 
 	dbus_g_method_return (context, value);
 
@@ -453,11 +453,11 @@ tracker_extract_get_pid (TrackerExtract	        *object,
 }
 
 void
-tracker_extract_get_metadata (TrackerExtract	     *object,
-			      const gchar            *uri,
-			      const gchar            *mime,
-			      DBusGMethodInvocation  *context,
-			      GError		    **error)
+tracker_extract_get_metadata (TrackerExtract         *object,
+                              const gchar            *uri,
+                              const gchar            *mime,
+                              DBusGMethodInvocation  *context,
+                              GError                **error)
 {
 	guint request_id;
 	TrackerExtractPrivate *priv;
@@ -468,13 +468,13 @@ tracker_extract_get_metadata (TrackerExtract	     *object,
 	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to extract metadata, "
-				  "uri:'%s', mime:%s",
-				  uri,
-				  mime);
+	                          "D-Bus request to extract metadata, "
+	                          "uri:'%s', mime:%s",
+	                          uri,
+	                          mime);
 
 	tracker_dbus_request_debug (request_id,
-				    "  Resetting shutdown timeout");
+	                            "  Resetting shutdown timeout");
 
 	priv = TRACKER_EXTRACT_GET_PRIVATE (object);
 
@@ -498,10 +498,10 @@ tracker_extract_get_metadata (TrackerExtract	     *object,
 		GError *actual_error = NULL;
 
 		tracker_dbus_request_failed (request_id,
-					     &actual_error,
-					     "Could not get any metadata for uri:'%s' and mime:'%s'",
-					     uri,
-					     mime);
+		                             &actual_error,
+		                             "Could not get any metadata for uri:'%s' and mime:'%s'",
+		                             uri,
+		                             mime);
 		dbus_g_method_return_error (context, actual_error);
 		g_error_free (actual_error);
 	}
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 92119eb..6445b01 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -25,20 +25,20 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#define TRACKER_EXTRACT_SERVICE	       "org.freedesktop.Tracker1.Extract"
-#define TRACKER_EXTRACT_PATH	       "/org/freedesktop/Tracker1/Extract"
+#define TRACKER_EXTRACT_SERVICE                "org.freedesktop.Tracker1.Extract"
+#define TRACKER_EXTRACT_PATH           "/org/freedesktop/Tracker1/Extract"
 #define TRACKER_EXTRACT_INTERFACE      "org.freedesktop.Tracker1.Extract"
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_EXTRACT	       (tracker_extract_get_type ())
-#define TRACKER_EXTRACT(object)	       (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_EXTRACT, TrackerExtract))
+#define TRACKER_TYPE_EXTRACT           (tracker_extract_get_type ())
+#define TRACKER_EXTRACT(object)                (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_EXTRACT, TrackerExtract))
 #define TRACKER_EXTRACT_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_EXTRACT, TrackerExtractClass))
 #define TRACKER_IS_EXTRACT(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_EXTRACT))
 #define TRACKER_IS_EXTRACT_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_EXTRACT))
 #define TRACKER_EXTRACT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_EXTRACT, TrackerExtractClass))
 
-typedef struct TrackerExtract	   TrackerExtract;
+typedef struct TrackerExtract      TrackerExtract;
 typedef struct TrackerExtractClass TrackerExtractClass;
 
 struct TrackerExtract {
@@ -51,20 +51,20 @@ struct TrackerExtractClass {
 
 GType           tracker_extract_get_type                (void);
 TrackerExtract *tracker_extract_new                     (gboolean                disable_shutdown,
-							 gboolean                force_internal_extractors);
+                                                         gboolean                force_internal_extractors);
 void            tracker_extract_get_pid                 (TrackerExtract         *object,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void            tracker_extract_get_metadata            (TrackerExtract         *object,
-							 const gchar            *uri,
-							 const gchar            *mime,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *uri,
+                                                         const gchar            *mime,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 
 /* Not DBus API */
 void            tracker_extract_get_metadata_by_cmdline (TrackerExtract         *object,
-							 const gchar            *path,
-							 const gchar            *mime);
+                                                         const gchar            *path,
+                                                         const gchar            *mime);
 
 G_END_DECLS
 
diff --git a/src/tracker-extract/tracker-fts-config.c b/src/tracker-extract/tracker-fts-config.c
index 9849f59..4612980 100644
--- a/src/tracker-extract/tracker-fts-config.c
+++ b/src/tracker-extract/tracker-fts-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -33,11 +33,11 @@
 #define TRACKER_FTS_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_INDEXING		   "Indexing"
+#define GROUP_INDEXING             "Indexing"
 
 /* Default values */
-#define DEFAULT_MIN_WORD_LENGTH	   3	  /* 0->30 */
-#define DEFAULT_MAX_WORD_LENGTH	   30	  /* 0->200 */
+#define DEFAULT_MIN_WORD_LENGTH            3      /* 0->30 */
+#define DEFAULT_MAX_WORD_LENGTH            30     /* 0->200 */
 #define DEFAULT_MAX_WORDS_TO_INDEX 10000
 
 typedef struct {
@@ -55,18 +55,18 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void config_set_property         (GObject       *object,
-					 guint          param_id,
-					 const GValue  *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         const GValue  *value,
+                                         GParamSpec    *pspec);
 static void config_get_property         (GObject       *object,
-					 guint          param_id,
-					 GValue        *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         GValue        *value,
+                                         GParamSpec    *pspec);
 static void config_finalize             (GObject       *object);
 static void config_constructed          (GObject       *object);
 static void config_create_with_defaults (TrackerFTSConfig *config,
-					 GKeyFile      *key_file,
-					 gboolean       overwrite);
+                                         GKeyFile      *key_file,
+                                         gboolean       overwrite);
 static void config_load                 (TrackerFTSConfig *config);
 
 enum {
@@ -95,37 +95,37 @@ tracker_fts_config_class_init (TrackerFTSConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	/* Indexing */
 	g_object_class_install_property (object_class,
-					 PROP_MIN_WORD_LENGTH,
-					 g_param_spec_int ("min-word-length",
-							   "Minimum word length",
-							   " Set the minimum length of words to index (0->30, default=3)",
-							   0,
-							   30,
-							   DEFAULT_MIN_WORD_LENGTH,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MIN_WORD_LENGTH,
+	                                 g_param_spec_int ("min-word-length",
+	                                                   "Minimum word length",
+	                                                   " Set the minimum length of words to index (0->30, default=3)",
+	                                                   0,
+	                                                   30,
+	                                                   DEFAULT_MIN_WORD_LENGTH,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_MAX_WORD_LENGTH,
-					 g_param_spec_int ("max-word-length",
-							   "Maximum word length",
-							   " Set the maximum length of words to index (0->200, default=30)",
-							   0,
-							   200, /* Is this a reasonable limit? */
-							   DEFAULT_MAX_WORD_LENGTH,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MAX_WORD_LENGTH,
+	                                 g_param_spec_int ("max-word-length",
+	                                                   "Maximum word length",
+	                                                   " Set the maximum length of words to index (0->200, default=30)",
+	                                                   0,
+	                                                   200, /* Is this a reasonable limit? */
+	                                                   DEFAULT_MAX_WORD_LENGTH,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_MAX_WORDS_TO_INDEX,
-					 g_param_spec_int ("max-words-to-index",
-							   "Maximum words to index",
-							   " Maximum unique words to index from a file's content (default=10000)",
-							   0,
-							   G_MAXINT,
-							   DEFAULT_MAX_WORDS_TO_INDEX,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_MAX_WORDS_TO_INDEX,
+	                                 g_param_spec_int ("max-words-to-index",
+	                                                   "Maximum words to index",
+	                                                   " Maximum unique words to index from a file's content (default=10000)",
+	                                                   0,
+	                                                   G_MAXINT,
+	                                                   DEFAULT_MAX_WORDS_TO_INDEX,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerFTSConfigPrivate));
 }
@@ -136,24 +136,24 @@ tracker_fts_config_init (TrackerFTSConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* Indexing */
 	case PROP_MIN_WORD_LENGTH:
 		tracker_fts_config_set_min_word_length (TRACKER_FTS_CONFIG (object),
-							g_value_get_int (value));
+		                                        g_value_get_int (value));
 		break;
 	case PROP_MAX_WORD_LENGTH:
 		tracker_fts_config_set_max_word_length (TRACKER_FTS_CONFIG (object),
-							g_value_get_int (value));
+		                                        g_value_get_int (value));
 		break;
 	case PROP_MAX_WORDS_TO_INDEX:
 		tracker_fts_config_set_max_words_to_index (TRACKER_FTS_CONFIG (object),
-							   g_value_get_int (value));
+		                                           g_value_get_int (value));
 		break;
 
 	default:
@@ -163,10 +163,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -210,8 +210,8 @@ config_constructed (GObject *object)
 
 static void
 config_create_with_defaults (TrackerFTSConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gint i;
 
@@ -221,9 +221,9 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -231,10 +231,10 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		default:
@@ -243,11 +243,11 @@ config_create_with_defaults (TrackerFTSConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-								      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -268,17 +268,17 @@ config_load (TrackerFTSConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -308,10 +308,10 @@ config_save (TrackerFTSConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		default:
@@ -327,8 +327,8 @@ TrackerFTSConfig *
 tracker_fts_config_new (void)
 {
 	return g_object_new (TRACKER_TYPE_FTS_CONFIG,
-			     "domain", "tracker-fts",
-			     NULL);
+	                     "domain", "tracker-fts",
+	                     NULL);
 }
 
 gboolean
@@ -377,7 +377,7 @@ tracker_fts_config_get_max_words_to_index (TrackerFTSConfig *config)
 
 void
 tracker_fts_config_set_min_word_length (TrackerFTSConfig *config,
-					gint	          value)
+                                        gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -395,7 +395,7 @@ tracker_fts_config_set_min_word_length (TrackerFTSConfig *config,
 
 void
 tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
-					gint	          value)
+                                        gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
@@ -413,7 +413,7 @@ tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
 
 void
 tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
-					   gint  	     value)
+                                           gint              value)
 {
 	TrackerFTSConfigPrivate *priv;
 
diff --git a/src/tracker-extract/tracker-fts-config.h b/src/tracker-extract/tracker-fts-config.h
index 1919472..87d684f 100644
--- a/src/tracker-extract/tracker-fts-config.h
+++ b/src/tracker-extract/tracker-fts-config.h
@@ -27,14 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_FTS_CONFIG	        (tracker_fts_config_get_type ())
-#define TRACKER_FTS_CONFIG(o)	        (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfig))
+#define TRACKER_TYPE_FTS_CONFIG                 (tracker_fts_config_get_type ())
+#define TRACKER_FTS_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfig))
 #define TRACKER_FTS_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigClass))
 #define TRACKER_IS_FTS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FTS_CONFIG))
 #define TRACKER_IS_FTS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FTS_CONFIG))
 #define TRACKER_FTS_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_FTS_CONFIG, TrackerFTSConfigClass))
 
-typedef struct TrackerFTSConfig	     TrackerFTSConfig;
+typedef struct TrackerFTSConfig              TrackerFTSConfig;
 typedef struct TrackerFTSConfigClass TrackerFTSConfigClass;
 
 struct TrackerFTSConfig {
@@ -53,11 +53,11 @@ gint              tracker_fts_config_get_min_word_length    (TrackerFTSConfig *c
 gint              tracker_fts_config_get_max_word_length    (TrackerFTSConfig *config);
 gint              tracker_fts_config_get_max_words_to_index (TrackerFTSConfig *config);
 void              tracker_fts_config_set_min_word_length    (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 void              tracker_fts_config_set_max_word_length    (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 void              tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
-							     gint              value);
+                                                             gint              value);
 
 G_END_DECLS
 
diff --git a/src/tracker-extract/tracker-iptc.c b/src/tracker-extract/tracker-iptc.c
index 00de234..5687cea 100644
--- a/src/tracker-extract/tracker-iptc.c
+++ b/src/tracker-extract/tracker-iptc.c
@@ -41,7 +41,7 @@ fix_iptc_orientation (const gchar *orientation)
 	if (strcmp(orientation, "P")==0) {
 		return "nfo:orientation-left";
 	}
-	
+        
 	return "nfo:orientation-top"; /* We take this as default */
 }
 
@@ -50,19 +50,19 @@ fix_iptc_orientation (const gchar *orientation)
 
 void
 tracker_read_iptc (const unsigned char *buffer,
-		   size_t		len,
-		   const gchar         *uri,
-		   TrackerIptcData     *data)
+                   size_t               len,
+                   const gchar         *uri,
+                   TrackerIptcData     *data)
 {
 #ifdef HAVE_LIBIPTCDATA
 	guint i;
 	IptcData *iptc = NULL;
 	IptcTag   p[6] = { IPTC_TAG_KEYWORDS, 
-	         /* 01 */  IPTC_TAG_DATE_CREATED,
-	         /* 02 */  IPTC_TAG_BYLINE,
-	         /* 03 */  IPTC_TAG_CREDIT,
-	         /* 04 */  IPTC_TAG_COPYRIGHT_NOTICE,
-	         /* 05 */  IPTC_TAG_IMAGE_ORIENTATION};
+	                   /* 01 */  IPTC_TAG_DATE_CREATED,
+	                   /* 02 */  IPTC_TAG_BYLINE,
+	                   /* 03 */  IPTC_TAG_CREDIT,
+	                   /* 04 */  IPTC_TAG_COPYRIGHT_NOTICE,
+	                   /* 05 */  IPTC_TAG_IMAGE_ORIENTATION};
 
 	/* FIXME According to valgrind this is leaking (together with the unref).
 	 * Problem in libiptc */
@@ -86,35 +86,35 @@ tracker_read_iptc (const unsigned char *buffer,
 			iptc_dataset_get_as_str (dataset, mbuffer, 1024);
 
 			switch (p[i]) {
-				case IPTC_TAG_KEYWORDS:
-					if (!data->keywords)
-						data->keywords = g_strdup (mbuffer);
-					break;
-				case IPTC_TAG_DATE_CREATED:
-					if (!data->date_created) {
-						/* From: ex; date "2007:04:15 15:35:58"
-						* To : ex. "2007-04-15T17:35:58+0200 where +0200 is localtime */
-						data->date_created = tracker_date_format_to_iso8601 (mbuffer, IPTC_DATE_FORMAT);
-					}
-					break;
-				case IPTC_TAG_BYLINE:
-					if (!data->byline)
-						data->byline = g_strdup (mbuffer);
-					break;
-				case IPTC_TAG_CREDIT:
-					if (!data->credit)
-						data->credit = g_strdup (mbuffer);
-					break;
-				case IPTC_TAG_COPYRIGHT_NOTICE:
-					if (!data->copyright_notice)
-						data->copyright_notice = g_strdup (mbuffer);
-					break;
-				case IPTC_TAG_IMAGE_ORIENTATION:
-					if (!data->image_orientation)
-						data->image_orientation = g_strdup (fix_iptc_orientation (mbuffer));
-					break;
-				default:
-					break;
+			case IPTC_TAG_KEYWORDS:
+				if (!data->keywords)
+					data->keywords = g_strdup (mbuffer);
+				break;
+			case IPTC_TAG_DATE_CREATED:
+				if (!data->date_created) {
+					/* From: ex; date "2007:04:15 15:35:58"
+					 * To : ex. "2007-04-15T17:35:58+0200 where +0200 is localtime */
+					data->date_created = tracker_date_format_to_iso8601 (mbuffer, IPTC_DATE_FORMAT);
+				}
+				break;
+			case IPTC_TAG_BYLINE:
+				if (!data->byline)
+					data->byline = g_strdup (mbuffer);
+				break;
+			case IPTC_TAG_CREDIT:
+				if (!data->credit)
+					data->credit = g_strdup (mbuffer);
+				break;
+			case IPTC_TAG_COPYRIGHT_NOTICE:
+				if (!data->copyright_notice)
+					data->copyright_notice = g_strdup (mbuffer);
+				break;
+			case IPTC_TAG_IMAGE_ORIENTATION:
+				if (!data->image_orientation)
+					data->image_orientation = g_strdup (fix_iptc_orientation (mbuffer));
+				break;
+			default:
+				break;
 			}
 		}
 	}
diff --git a/src/tracker-extract/tracker-iptc.h b/src/tracker-extract/tracker-iptc.h
index 8bb6fa7..724328a 100644
--- a/src/tracker-extract/tracker-iptc.h
+++ b/src/tracker-extract/tracker-iptc.h
@@ -26,7 +26,7 @@
 
 typedef struct {
 	gchar *keywords, *date_created, *byline, *credit, *copyright_notice,
-	      *image_orientation;
+		*image_orientation;
 } TrackerIptcData;
 
 void tracker_read_iptc (const unsigned char *buffer,
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 6069559..a7b5523 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -54,14 +54,14 @@
 #include "tracker-dbus.h"
 #include "tracker-extract.h"
 
-#define ABOUT								  \
+#define ABOUT	  \
 	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE								  \
+#define LICENSE	  \
 	"This program is free software and comes without any warranty.\n" \
-	"It is licensed under version 2 or later of the General Public "  \
-	"License which can be viewed at:\n"				  \
-	"\n"								  \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
 	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 #define QUIT_TIMEOUT 30 /* 1/2 minutes worth of seconds */
@@ -131,8 +131,8 @@ tracker_main_quit_timeout_reset (void)
 	}
 
 	quit_timeout_id = g_timeout_add_seconds (QUIT_TIMEOUT,
-						 quit_timeout_cb,
-						 NULL);
+	                                         quit_timeout_cb,
+	                                         NULL);
 }
 
 static void
@@ -154,7 +154,7 @@ initialize_priority (void)
 		const gchar *str = g_strerror (errno);
 
 		g_message ("Couldn't set nice value to 19, %s",
-			   str ? str : "no error given");
+		           str ? str : "no error given");
 	}
 }
 
@@ -168,8 +168,8 @@ initialize_directories (void)
 	 */
 
 	user_data_dir = g_build_filename (g_get_user_data_dir (),
-					  "tracker",
-					  NULL);
+	                                  "tracker",
+	                                  NULL);
 
 	/* g_message ("Checking directory exists:'%s'", user_data_dir); */
 	g_mkdir_with_parents (user_data_dir, 00755);
@@ -201,8 +201,8 @@ signal_handler (int signo)
 		if (g_strsignal (signo)) {
 			g_print ("\n");
 			g_print ("Received signal:%d->'%s'\n",
-				 signo,
-				 g_strsignal (signo));
+			         signo,
+			         g_strsignal (signo));
 		}
 		break;
 	}
@@ -213,7 +213,7 @@ initialize_signal_handler (void)
 {
 #ifndef G_OS_WIN32
 	struct sigaction act;
-	sigset_t	 empty_mask;
+	sigset_t         empty_mask;
 
 	sigemptyset (&empty_mask);
 	act.sa_handler = signal_handler;
@@ -230,9 +230,9 @@ initialize_signal_handler (void)
 
 static void
 log_handler (const gchar    *domain,
-	     GLogLevelFlags  log_level,
-	     const gchar    *message,
-	     gpointer	     user_data)
+             GLogLevelFlags  log_level,
+             const gchar    *message,
+             gpointer        user_data)
 {
 	if (!tracker_log_should_handle (log_level, verbosity)) {
 		return;
@@ -279,9 +279,9 @@ run_standalone (void)
 
 	/* Set log handler for library messages */
 	log_handler_id = g_log_set_handler (NULL,
-					    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
-					    log_handler,
-					    NULL);
+	                                    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
+	                                    log_handler,
+	                                    NULL);
 
 	g_log_set_default_handler (log_handler, NULL);
 
@@ -299,7 +299,7 @@ run_standalone (void)
 	uri = g_file_get_uri (file);
 
 	object = tracker_extract_new (disable_shutdown,
-				      force_internal_extractors);
+	                              force_internal_extractors);
 
 	if (!object) {
 		g_free (uri);
@@ -330,15 +330,15 @@ main (int argc, char *argv[])
 	GOptionContext *context;
 	GError         *error = NULL;
 	TrackerConfig  *config;
-        TrackerExtract *object;
+	TrackerExtract *object;
 	gchar          *log_filename = NULL;
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	/* Translators: this message will appear immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this message will appear immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new (_("- Extract file meta data"));
 
 	g_option_context_add_main_entries (context, entries, NULL);
@@ -348,7 +348,7 @@ main (int argc, char *argv[])
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("Filename and mime type must be provided together"));
+		            _("Filename and mime type must be provided together"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -369,7 +369,7 @@ main (int argc, char *argv[])
 
 	if (!filename) {
 		g_print ("  Shutdown after 30 seconds of inactivitiy is %s\n",
-			 disable_shutdown ? "disabled" : "enabled");
+		         disable_shutdown ? "disabled" : "enabled");
 	}
 
 	initialize_signal_handler ();
@@ -416,7 +416,7 @@ main (int argc, char *argv[])
 	}
 
 	object = tracker_extract_new (disable_shutdown,
-				      force_internal_extractors);
+	                              force_internal_extractors);
 
 	if (!object) {
 		g_object_unref (config);
diff --git a/src/tracker-extract/tracker-main.h b/src/tracker-extract/tracker-main.h
index a562fef..ea5de1b 100644
--- a/src/tracker-extract/tracker-main.h
+++ b/src/tracker-extract/tracker-main.h
@@ -38,7 +38,7 @@ struct TrackerExtractData {
 	const gchar *mime;
 
 	void (* extract) (const gchar *path,
-			  TrackerSparqlBuilder *metadata);
+	                  TrackerSparqlBuilder *metadata);
 };
 
 /* This is defined in each extract */
diff --git a/src/tracker-extract/tracker-topanalyzer.h b/src/tracker-extract/tracker-topanalyzer.h
index 999b0ab..02a766b 100644
--- a/src/tracker-extract/tracker-topanalyzer.h
+++ b/src/tracker-extract/tracker-topanalyzer.h
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  *
-  * Authors: Philip Van Hoof <philip codeminded be>
+ * Authors: Philip Van Hoof <philip codeminded be>
  */
 
 #ifndef _TRACKER_TOPANALYZER_H_
diff --git a/src/tracker-extract/tracker-xmp.c b/src/tracker-extract/tracker-xmp.c
index 879089b..084dc2c 100644
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/tracker-extract/tracker-xmp.c
@@ -45,16 +45,16 @@
 #include <exempi/xmpconsts.h>
 
 static void tracker_xmp_iter        (XmpPtr                xmp,
-				     XmpIteratorPtr        iter,
-				     const gchar          *uri,
-				     TrackerXmpData       *data,
-				     gboolean              append);
+                                     XmpIteratorPtr        iter,
+                                     const gchar          *uri,
+                                     TrackerXmpData       *data,
+                                     gboolean              append);
 static void tracker_xmp_iter_simple (const gchar          *uri,
-				     TrackerXmpData       *data,
-				     const gchar          *schema,
-				     const gchar          *path,
-				     const gchar          *value,
-				     gboolean              append);
+                                     TrackerXmpData       *data,
+                                     const gchar          *schema,
+                                     const gchar          *path,
+                                     const gchar          *value,
+                                     gboolean              append);
 
 static const gchar *
 fix_metering_mode (const gchar *mode)
@@ -114,10 +114,10 @@ fix_white_balance (const gchar *wb)
  */
 static void
 tracker_xmp_iter_array (XmpPtr                xmp,
-			const gchar          *uri,
-			TrackerXmpData       *data,
-			const gchar          *schema,
-			const gchar          *path)
+                        const gchar          *uri,
+                        TrackerXmpData       *data,
+                        const gchar          *schema,
+                        const gchar          *path)
 {
 	XmpIteratorPtr iter;
 
@@ -130,10 +130,10 @@ tracker_xmp_iter_array (XmpPtr                xmp,
 /* We have an array, now recursively iterate over it's children.  Set 'append' to false so that only one item is used. */
 static void
 tracker_xmp_iter_alt_text (XmpPtr                xmp,
-			   const gchar          *uri,
-			   TrackerXmpData       *data,
-			   const gchar          *schema,
-			   const gchar          *path)
+                           const gchar          *uri,
+                           TrackerXmpData       *data,
+                           const gchar          *schema,
+                           const gchar          *path)
 {
 	XmpIteratorPtr iter;
 
@@ -145,12 +145,12 @@ tracker_xmp_iter_alt_text (XmpPtr                xmp,
 /* We have a simple element, but need to iterate over the qualifiers */
 static void
 tracker_xmp_iter_simple_qual (XmpPtr                xmp,
-			      const gchar          *uri,
-			      TrackerXmpData       *data,
-			      const gchar          *schema,
-			      const gchar          *path,
-			      const gchar          *value,
-			      gboolean              append)
+                              const gchar          *uri,
+                              TrackerXmpData       *data,
+                              const gchar          *schema,
+                              const gchar          *path,
+                              const gchar          *value,
+                              gboolean              append)
 {
 	XmpIteratorPtr iter;
 	XmpStringPtr the_path;
@@ -220,22 +220,22 @@ fix_orientation (const gchar *orientation)
 	for (i=0; i < 8; i++) {
 		if (orientation && ostr[i] && g_ascii_strcasecmp (orientation, ostr[i]) == 0) {
 			switch (i) {
-				default:
-				case 0:
+			default:
+			case 0:
 				return  "nfo:orientation-top";
-				case 1:
+			case 1:
 				return  "nfo:orientation-top-mirror"; // not sure
-				case 2:
+			case 2:
 				return  "nfo:orientation-bottom-mirror"; // not sure
-				case 3:
+			case 3:
 				return  "nfo:orientation-bottom";
-				case 4:
+			case 4:
 				return  "nfo:orientation-left-mirror";
-				case 5:
+			case 5:
 				return  "nfo:orientation-right";
-				case 6:
+			case 6:
 				return  "nfo:orientation-right-mirror";
-				case 7:
+			case 7:
 				return  "nfo:orientation-left";
 			}
 		}
@@ -250,11 +250,11 @@ fix_orientation (const gchar *orientation)
  */
 static void
 tracker_xmp_iter_simple (const gchar          *uri,
-			 TrackerXmpData       *data,
-			 const gchar          *schema,
-			 const gchar          *path,
-			 const gchar          *value,
-			 gboolean              append)
+                         TrackerXmpData       *data,
+                         const gchar          *schema,
+                         const gchar          *path,
+                         const gchar          *value,
+                         gboolean              append)
 {
 	gchar *name;
 	const gchar *index_;
@@ -284,7 +284,7 @@ tracker_xmp_iter_simple (const gchar          *uri,
 			data->date = g_strdup (value);
 		}
 		else if (g_ascii_strcasecmp (name, "keywords") == 0 && !data->keywords) {
-			 data->keywords = g_strdup (value);
+			data->keywords = g_strdup (value);
 		}
 		else if (g_ascii_strcasecmp (name, "subject") == 0 && !data->subject) {
 			data->subject = g_strdup (value);
@@ -335,10 +335,10 @@ tracker_xmp_iter_simple (const gchar          *uri,
 		else if (g_ascii_strcasecmp (name, "Artist") == 0 && !data->Artist) {
 			data->Artist = g_strdup (value);
 		}
-/*		else if (g_ascii_strcasecmp (name, "Software") == 0) {
-			tracker_statement_list_insert (metadata, uri,
-						  "Image:Software", value);
-		}*/
+		/*              else if (g_ascii_strcasecmp (name, "Software") == 0) {
+		                tracker_statement_list_insert (metadata, uri,
+		                "Image:Software", value);
+		                }*/
 		else if (g_ascii_strcasecmp (name, "Make") == 0 && !data->Make) {
 			data->Make = g_strdup (value);
 		}
@@ -355,9 +355,9 @@ tracker_xmp_iter_simple (const gchar          *uri,
 			data->MeteringMode = g_strdup (fix_metering_mode (value));
 		}
 		/*else if (g_ascii_strcasecmp (name, "ExposureProgram") == 0) {
-			tracker_statement_list_insert (metadata, uri,
-						  "Image:ExposureProgram", value);
-		}*/
+		  tracker_statement_list_insert (metadata, uri,
+		  "Image:ExposureProgram", value);
+		  }*/
 		else if (g_ascii_strcasecmp (name, "ExposureTime") == 0 && !data->ExposureTime) {
 			data->ExposureTime = g_strdup (value);
 		}
@@ -376,66 +376,66 @@ tracker_xmp_iter_simple (const gchar          *uri,
 		else if (g_ascii_strcasecmp (name, "Copyright") == 0 && !data->Copyright) {
 			data->Copyright = g_strdup (value);
 		}
-	} else 	/* PDF*/ if (g_ascii_strcasecmp (schema, NS_PDF) == 0) {
-		if (g_ascii_strcasecmp (name, "keywords") == 0 && !data->keywords) {
-			data->keywords = g_strdup (value);
-		} else if (g_ascii_strcasecmp (name, "title") == 0 && !data->title) {
-			data->title = g_strdup (value);
+	} else          /* PDF*/ if (g_ascii_strcasecmp (schema, NS_PDF) == 0) {
+			if (g_ascii_strcasecmp (name, "keywords") == 0 && !data->keywords) {
+				data->keywords = g_strdup (value);
+			} else if (g_ascii_strcasecmp (name, "title") == 0 && !data->title) {
+				data->title = g_strdup (value);
+			}
 		}
-	}
 
 	/* XAP (XMP)scheme */
 	/*else if (g_ascii_strcasecmp (schema, NS_XAP) == 0) {
-	        if (g_ascii_strcasecmp (name, "Rating") == 0) {
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Rating", value);
-		}
-		if (g_ascii_strcasecmp (name, "MetadataDate") == 0) {
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Date", value);
-		}
-	}*/
+	  if (g_ascii_strcasecmp (name, "Rating") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Rating", value);
+	  }
+	  if (g_ascii_strcasecmp (name, "MetadataDate") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Date", value);
+	  }
+	  }*/
 	/* IPTC4XMP scheme */
 
 	/*
-	 GeoClue / location stuff, TODO
-	 else if (g_ascii_strcasecmp (schema,  NS_IPTC4XMP) == 0) {
-	        if (g_ascii_strcasecmp (name, "Location") == 0) {
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Location", value);
-
-			/ Added to the valid keywords *
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Keywords", value);
-		}
-		if (g_ascii_strcasecmp (name, "Sublocation") == 0) {
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Sublocation", value);
-
-			/ Added to the valid keywords *
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Keywords", value);
-		}
-	}
-	/ Photoshop scheme *
-	else if (g_ascii_strcasecmp (schema,  NS_PHOTOSHOP) == 0) {
-	        if (g_ascii_strcasecmp (name, "City") == 0) {
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:City", value);
-
-			/ Added to the valid keywords *
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Keywords", value);
-		}
-		else if (g_ascii_strcasecmp (name, "Country") == 0) {
-			tracker_statement_list_insert (metadata, uri,
-						  "Image:Country", value);
-
-			/ Added to the valid keywords *
-		        tracker_statement_list_insert (metadata, uri,
-						  "Image:Keywords", value);
-		}
-	}
+	  GeoClue / location stuff, TODO
+	  else if (g_ascii_strcasecmp (schema,  NS_IPTC4XMP) == 0) {
+	  if (g_ascii_strcasecmp (name, "Location") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Location", value);
+
+	  / Added to the valid keywords *
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Keywords", value);
+	  }
+	  if (g_ascii_strcasecmp (name, "Sublocation") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Sublocation", value);
+
+	  / Added to the valid keywords *
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Keywords", value);
+	  }
+	  }
+	  / Photoshop scheme *
+	  else if (g_ascii_strcasecmp (schema,  NS_PHOTOSHOP) == 0) {
+	  if (g_ascii_strcasecmp (name, "City") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:City", value);
+
+	  / Added to the valid keywords *
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Keywords", value);
+	  }
+	  else if (g_ascii_strcasecmp (name, "Country") == 0) {
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Country", value);
+
+	  / Added to the valid keywords *
+	  tracker_statement_list_insert (metadata, uri,
+	  "Image:Keywords", value);
+	  }
+	  }
 	*/
 
 	g_free (name);
@@ -447,10 +447,10 @@ tracker_xmp_iter_simple (const gchar          *uri,
  */
 void
 tracker_xmp_iter (XmpPtr                xmp,
-		  XmpIteratorPtr        iter,
-		  const gchar          *uri,
-		  TrackerXmpData       *data,
-		  gboolean              append)
+                  XmpIteratorPtr        iter,
+                  const gchar          *uri,
+                  TrackerXmpData       *data,
+                  gboolean              append)
 {
 	XmpStringPtr the_schema = xmp_string_new ();
 	XmpStringPtr the_path = xmp_string_new ();
@@ -491,9 +491,9 @@ tracker_xmp_iter (XmpPtr                xmp,
 
 void
 tracker_read_xmp (const gchar          *buffer,
-		  size_t                len,
-		  const gchar          *uri,
-		  TrackerXmpData       *data)
+                  size_t                len,
+                  const gchar          *uri,
+                  TrackerXmpData       *data)
 {
 #ifdef HAVE_EXEMPI
 	XmpPtr xmp;
diff --git a/src/tracker-extract/tracker-xmp.h b/src/tracker-extract/tracker-xmp.h
index e298b31..9522642 100644
--- a/src/tracker-extract/tracker-xmp.h
+++ b/src/tracker-extract/tracker-xmp.h
@@ -25,16 +25,16 @@
 typedef struct {
 	/* NS_DC */
 	gchar *title, *rights, *creator, *description, *date, *keywords, *subject,
-	      *publisher, *contributor, *type, *format, *identifier, *source,
-	      *language, *relation, *coverage;
+		*publisher, *contributor, *type, *format, *identifier, *source,
+		*language, *relation, *coverage;
 
 	/* NS_CC */
 	gchar *license;
 
 	/* NS_EXIF */
 	gchar *Title, *DateTimeOriginal, *Artist, *Make, *Model, *Orientation,
-	      *Flash, *MeteringMode, *ExposureTime, *FNumber, *FocalLength,
-	      *ISOSpeedRatings, *WhiteBalance, *Copyright;
+		*Flash, *MeteringMode, *ExposureTime, *FNumber, *FocalLength,
+		*ISOSpeedRatings, *WhiteBalance, *Copyright;
 
 	/* TODO NS_XAP*/
 	/* TODO NS_IPTC4XMP */
diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
index 7af17f9..8d80fb3 100644
--- a/src/tracker-miner-fs/tracker-config.c
+++ b/src/tracker-miner-fs/tracker-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -35,28 +35,28 @@
 #define TRACKER_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG, TrackerConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_GENERAL				 "General"
-#define GROUP_MONITORS				 "Monitors"
-#define GROUP_INDEXING				 "Indexing"
+#define GROUP_GENERAL                            "General"
+#define GROUP_MONITORS                           "Monitors"
+#define GROUP_INDEXING                           "Indexing"
 
 /* Default values */
-#define DEFAULT_VERBOSITY			 0
-#define DEFAULT_INITIAL_SLEEP			 15	  /* 0->1000 */
-#define DEFAULT_ENABLE_MONITORS			 TRUE
-#define DEFAULT_THROTTLE			 0	  /* 0->20 */
-#define DEFAULT_SCAN_TIMEOUT			 0	  /* 0->1000 */
-#define DEFAULT_CACHE_TIMEOUT			 60	  /* 0->1000 */
-#define DEFAULT_ENABLE_THUMBNAILS		 TRUE
-#define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
-#define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
+#define DEFAULT_VERBOSITY                        0
+#define DEFAULT_INITIAL_SLEEP                    15       /* 0->1000 */
+#define DEFAULT_ENABLE_MONITORS                          TRUE
+#define DEFAULT_THROTTLE                         0        /* 0->20 */
+#define DEFAULT_SCAN_TIMEOUT                     0        /* 0->1000 */
+#define DEFAULT_CACHE_TIMEOUT                    60       /* 0->1000 */
+#define DEFAULT_ENABLE_THUMBNAILS                TRUE
+#define DEFAULT_INDEX_MOUNTED_DIRECTORIES        TRUE
+#define DEFAULT_INDEX_REMOVABLE_DEVICES                  TRUE
 #define DEFAULT_INDEX_ON_BATTERY                 FALSE
 #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
-#define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
+#define DEFAULT_LOW_DISK_SPACE_LIMIT             1        /* 0->100 / -1 */
 
 typedef struct {
 	/* General */
-	gint	  verbosity;
-	gint	  initial_sleep;
+	gint      verbosity;
+	gint      initial_sleep;
 
 	/* Monitors */
 	gboolean  enable_monitors;
@@ -64,15 +64,15 @@ typedef struct {
 	gint      cache_timeout;
 
 	/* Indexing */
-	gint	  throttle;
+	gint      throttle;
 	gboolean  enable_thumbnails;
 	gboolean  index_on_battery;
 	gboolean  index_on_battery_first_time;
 	gboolean  index_mounted_directories;
 	gboolean  index_removable_devices;
-	gint	  low_disk_space_limit;
+	gint      low_disk_space_limit;
 	GSList   *index_recursive_directories;
-	GSList	 *index_single_directories;
+	GSList   *index_single_directories;
 	GSList   *ignored_directories;
 	GSList   *ignored_directories_with_content;
 	GSList   *ignored_files;
@@ -92,21 +92,21 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void     config_set_property         (GObject           *object,
-					     guint              param_id,
-					     const GValue      *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             const GValue      *value,
+                                             GParamSpec        *pspec);
 static void     config_get_property         (GObject           *object,
-					     guint              param_id,
-					     GValue            *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             GValue            *value,
+                                             GParamSpec        *pspec);
 static void     config_finalize             (GObject           *object);
 static void     config_constructed          (GObject           *object);
 static void     config_changed              (TrackerConfigFile *file);
 static void     config_load                 (TrackerConfig     *config);
 static gboolean config_save                 (TrackerConfig     *config);
 static void     config_create_with_defaults (TrackerConfig     *config,
-					     GKeyFile          *key_file,
-					     gboolean           overwrite);
+                                             GKeyFile          *key_file,
+                                             gboolean           overwrite);
 
 enum {
 	PROP_0,
@@ -168,156 +168,156 @@ tracker_config_class_init (TrackerConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	config_file_class->changed = config_changed;
 
 	/* General */
 	g_object_class_install_property (object_class,
-					 PROP_VERBOSITY,
-					 g_param_spec_int ("verbosity",
-							   "Log verbosity",
-							   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
-							   0,
-							   3,
-							   DEFAULT_VERBOSITY,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_VERBOSITY,
+	                                 g_param_spec_int ("verbosity",
+	                                                   "Log verbosity",
+	                                                   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
+	                                                   0,
+	                                                   3,
+	                                                   DEFAULT_VERBOSITY,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INITIAL_SLEEP,
-					 g_param_spec_int ("initial-sleep",
-							   "Initial sleep",
-							   " Time in seconds before crawling filesystem (0->1000)",
-							   0,
-							   1000,
-							   DEFAULT_INITIAL_SLEEP,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INITIAL_SLEEP,
+	                                 g_param_spec_int ("initial-sleep",
+	                                                   "Initial sleep",
+	                                                   " Time in seconds before crawling filesystem (0->1000)",
+	                                                   0,
+	                                                   1000,
+	                                                   DEFAULT_INITIAL_SLEEP,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	/* Monitors */
 	g_object_class_install_property (object_class,
-					 PROP_ENABLE_MONITORS,
-					 g_param_spec_boolean ("enable-monitors",
-							       "Enable monitors",
-							       " Set to false to completely disable any monitoring",
-							       DEFAULT_ENABLE_MONITORS,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_ENABLE_MONITORS,
+	                                 g_param_spec_boolean ("enable-monitors",
+	                                                       "Enable monitors",
+	                                                       " Set to false to completely disable any monitoring",
+	                                                       DEFAULT_ENABLE_MONITORS,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_SCAN_TIMEOUT,
-					 g_param_spec_int ("scan-timeout",
-							   "Scan Timeout",
-							   " Time in seconds between same events to prevent flooding (0->1000)",
-							   0,
-							   1000,
-							   DEFAULT_SCAN_TIMEOUT,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_SCAN_TIMEOUT,
+	                                 g_param_spec_int ("scan-timeout",
+	                                                   "Scan Timeout",
+	                                                   " Time in seconds between same events to prevent flooding (0->1000)",
+	                                                   0,
+	                                                   1000,
+	                                                   DEFAULT_SCAN_TIMEOUT,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_CACHE_TIMEOUT,
-					 g_param_spec_int ("cache-timeout",
-							   "Scan Timeout",
-							   " Time in seconds for events to be cached (0->1000)",
-							   0,
-							   1000,
-							   DEFAULT_CACHE_TIMEOUT,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_CACHE_TIMEOUT,
+	                                 g_param_spec_int ("cache-timeout",
+	                                                   "Scan Timeout",
+	                                                   " Time in seconds for events to be cached (0->1000)",
+	                                                   0,
+	                                                   1000,
+	                                                   DEFAULT_CACHE_TIMEOUT,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	/* Indexing */
 	g_object_class_install_property (object_class,
-					 PROP_THROTTLE,
-					 g_param_spec_int ("throttle",
-							   "Throttle",
-							   " Sets the indexing speed (0->20, where 20=slowest speed)",
-							   0,
-							   20,
-							   DEFAULT_THROTTLE,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_THROTTLE,
+	                                 g_param_spec_int ("throttle",
+	                                                   "Throttle",
+	                                                   " Sets the indexing speed (0->20, where 20=slowest speed)",
+	                                                   0,
+	                                                   20,
+	                                                   DEFAULT_THROTTLE,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_ENABLE_THUMBNAILS,
-					 g_param_spec_boolean ("enable-thumbnails",
-							       "Enable thumbnails",
-							       " Set to false to completely disable thumbnail generation",
-							       DEFAULT_ENABLE_THUMBNAILS,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_ENABLE_THUMBNAILS,
+	                                 g_param_spec_boolean ("enable-thumbnails",
+	                                                       "Enable thumbnails",
+	                                                       " Set to false to completely disable thumbnail generation",
+	                                                       DEFAULT_ENABLE_THUMBNAILS,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	;
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_ON_BATTERY,
-					 g_param_spec_boolean ("index-on-battery",
-							       "Index on battery",
-							       " Set to true to index while running on battery",
-							       DEFAULT_INDEX_ON_BATTERY,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_ON_BATTERY,
+	                                 g_param_spec_boolean ("index-on-battery",
+	                                                       "Index on battery",
+	                                                       " Set to true to index while running on battery",
+	                                                       DEFAULT_INDEX_ON_BATTERY,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_ON_BATTERY_FIRST_TIME,
-					 g_param_spec_boolean ("index-on-battery-first-time",
-							       "Index on battery first time",
-							       " Set to true to index while running on battery for the first time only",
-							       DEFAULT_INDEX_ON_BATTERY_FIRST_TIME,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_ON_BATTERY_FIRST_TIME,
+	                                 g_param_spec_boolean ("index-on-battery-first-time",
+	                                                       "Index on battery first time",
+	                                                       " Set to true to index while running on battery for the first time only",
+	                                                       DEFAULT_INDEX_ON_BATTERY_FIRST_TIME,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_MOUNTED_DIRECTORIES,
-					 g_param_spec_boolean ("index-mounted-directories",
-							       "Index mounted directories",
-							       " Set to true to enable traversing mounted directories on other file systems\n"
-							       " (this excludes removable devices)",
-							       DEFAULT_INDEX_MOUNTED_DIRECTORIES,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_MOUNTED_DIRECTORIES,
+	                                 g_param_spec_boolean ("index-mounted-directories",
+	                                                       "Index mounted directories",
+	                                                       " Set to true to enable traversing mounted directories on other file systems\n"
+	                                                       " (this excludes removable devices)",
+	                                                       DEFAULT_INDEX_MOUNTED_DIRECTORIES,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_REMOVABLE_DEVICES,
-					 g_param_spec_boolean ("index-removable-devices",
-							       "index removable devices",
-							       " Set to true to enable traversing mounted directories for removable devices",
-							       DEFAULT_INDEX_REMOVABLE_DEVICES,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_REMOVABLE_DEVICES,
+	                                 g_param_spec_boolean ("index-removable-devices",
+	                                                       "index removable devices",
+	                                                       " Set to true to enable traversing mounted directories for removable devices",
+	                                                       DEFAULT_INDEX_REMOVABLE_DEVICES,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_LOW_DISK_SPACE_LIMIT,
-					 g_param_spec_int ("low-disk-space-limit",
-							   "Low disk space limit",
-							   " Pause indexer when disk space is <= this value\n"
-							   " (0->100, value is in % of $HOME file system, -1=disable pausing)",
-							   -1,
-							   100,
-							   DEFAULT_LOW_DISK_SPACE_LIMIT,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_LOW_DISK_SPACE_LIMIT,
+	                                 g_param_spec_int ("low-disk-space-limit",
+	                                                   "Low disk space limit",
+	                                                   " Pause indexer when disk space is <= this value\n"
+	                                                   " (0->100, value is in % of $HOME file system, -1=disable pausing)",
+	                                                   -1,
+	                                                   100,
+	                                                   DEFAULT_LOW_DISK_SPACE_LIMIT,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_RECURSIVE_DIRECTORIES,
-					 g_param_spec_pointer ("index-recursive-directories",
-							       "Index recursive directories",
-							       " List of directories to crawl recursively for indexing (separator=;)\n"
-							       " Special values include: (see /etc/xdg/user-dirs.defaults & $HOME/.config/user-dirs.default)\n"
-							       "   &DESKTOP\n"
-							       "   &DOCUMENTS\n"
-							       "   &DOWNLOAD\n"
-							       "   &MUSIC\n"
-							       "   &PICTURES\n"
-							       "   &PUBLIC_SHARE\n"
-							       "   &TEMPLATES\n"
-							       "   &VIDEOS\n"
-							       " If $HOME is the default below, it is because $HOME/.config/user-dirs.default was missing.",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_RECURSIVE_DIRECTORIES,
+	                                 g_param_spec_pointer ("index-recursive-directories",
+	                                                       "Index recursive directories",
+	                                                       " List of directories to crawl recursively for indexing (separator=;)\n"
+	                                                       " Special values include: (see /etc/xdg/user-dirs.defaults & $HOME/.config/user-dirs.default)\n"
+	                                                       "   &DESKTOP\n"
+	                                                       "   &DOCUMENTS\n"
+	                                                       "   &DOWNLOAD\n"
+	                                                       "   &MUSIC\n"
+	                                                       "   &PICTURES\n"
+	                                                       "   &PUBLIC_SHARE\n"
+	                                                       "   &TEMPLATES\n"
+	                                                       "   &VIDEOS\n"
+	                                                       " If $HOME is the default below, it is because $HOME/.config/user-dirs.default was missing.",
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_INDEX_SINGLE_DIRECTORIES,
-					 g_param_spec_pointer ("index-single-directories",
-							       "Index single directories",
-							       " List of directories to index but not sub-directories for changes (separator=;)\n"
-							       " Special values used for IndexRecursiveDirectories can also be used here",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_INDEX_SINGLE_DIRECTORIES,
+	                                 g_param_spec_pointer ("index-single-directories",
+	                                                       "Index single directories",
+	                                                       " List of directories to index but not sub-directories for changes (separator=;)\n"
+	                                                       " Special values used for IndexRecursiveDirectories can also be used here",
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_IGNORED_DIRECTORIES,
-					 g_param_spec_pointer ("ignored-directories",
-							       "Ignored directories",
-							       " List of directories to NOT crawl for indexing (separator=;)",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_IGNORED_DIRECTORIES,
+	                                 g_param_spec_pointer ("ignored-directories",
+	                                                       "Ignored directories",
+	                                                       " List of directories to NOT crawl for indexing (separator=;)",
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_IGNORED_DIRECTORIES_WITH_CONTENT,
-					 g_param_spec_pointer ("ignored-directories-with-content",
-							       "Ignored directories with content",
-							       " List of directories to NOT crawl for indexing based on child files (separator=;)",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_IGNORED_DIRECTORIES_WITH_CONTENT,
+	                                 g_param_spec_pointer ("ignored-directories-with-content",
+	                                                       "Ignored directories with content",
+	                                                       " List of directories to NOT crawl for indexing based on child files (separator=;)",
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_IGNORED_FILES,
-					 g_param_spec_pointer ("ignored-files",
-							       "Ignored files",
-							       " List of files to NOT index (separator=;)",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_IGNORED_FILES,
+	                                 g_param_spec_pointer ("ignored-files",
+	                                                       "Ignored files",
+	                                                       " List of files to NOT index (separator=;)",
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigPrivate));
 }
@@ -328,84 +328,84 @@ tracker_config_init (TrackerConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* General */
 	case PROP_VERBOSITY:
 		tracker_config_set_verbosity (TRACKER_CONFIG (object),
-					      g_value_get_int (value));
+		                              g_value_get_int (value));
 		break;
 	case PROP_INITIAL_SLEEP:
 		tracker_config_set_initial_sleep (TRACKER_CONFIG (object),
-						  g_value_get_int (value));
+		                                  g_value_get_int (value));
 		break;
 
 		/* Monitors */
 	case PROP_ENABLE_MONITORS:
 		tracker_config_set_enable_monitors (TRACKER_CONFIG (object),
-						    g_value_get_boolean (value));
+		                                    g_value_get_boolean (value));
 		break;
 	case PROP_SCAN_TIMEOUT:
 		tracker_config_set_scan_timeout (TRACKER_CONFIG (object),
-						 g_value_get_int (value));
+		                                 g_value_get_int (value));
 		break;
 	case PROP_CACHE_TIMEOUT:
 		tracker_config_set_cache_timeout (TRACKER_CONFIG (object),
-						  g_value_get_int (value));
+		                                  g_value_get_int (value));
 		break;
 
 		/* Indexing */
 	case PROP_THROTTLE:
 		tracker_config_set_throttle (TRACKER_CONFIG (object),
-					     g_value_get_int (value));
+		                             g_value_get_int (value));
 		break;
 	case PROP_ENABLE_THUMBNAILS:
 		tracker_config_set_enable_thumbnails (TRACKER_CONFIG (object),
-						      g_value_get_boolean (value));
+		                                      g_value_get_boolean (value));
 		break;
 	case PROP_INDEX_ON_BATTERY:
 		tracker_config_set_index_on_battery (TRACKER_CONFIG (object),
-						     g_value_get_boolean (value));
+		                                     g_value_get_boolean (value));
 		break;
 	case PROP_INDEX_ON_BATTERY_FIRST_TIME:
 		tracker_config_set_index_on_battery_first_time (TRACKER_CONFIG (object),
-								g_value_get_boolean (value));
+		                                                g_value_get_boolean (value));
 		break;
 	case PROP_INDEX_MOUNTED_DIRECTORIES:
 		tracker_config_set_index_mounted_directories (TRACKER_CONFIG (object),
-							      g_value_get_boolean (value));
+		                                              g_value_get_boolean (value));
 		break;
 	case PROP_INDEX_REMOVABLE_DEVICES:
 		tracker_config_set_index_removable_devices (TRACKER_CONFIG (object),
-							    g_value_get_boolean (value));
+		                                            g_value_get_boolean (value));
 		break;
 	case PROP_LOW_DISK_SPACE_LIMIT:
 		tracker_config_set_low_disk_space_limit (TRACKER_CONFIG (object),
-							 g_value_get_int (value));
+		                                         g_value_get_int (value));
 		break;
 	case PROP_INDEX_RECURSIVE_DIRECTORIES:
 		tracker_config_set_index_recursive_directories (TRACKER_CONFIG (object),
-								g_value_get_pointer (value));
+		                                                g_value_get_pointer (value));
 		break;
 	case PROP_INDEX_SINGLE_DIRECTORIES:
 		tracker_config_set_index_single_directories (TRACKER_CONFIG (object),
-							     g_value_get_pointer (value));
+		                                             g_value_get_pointer (value));
 		break;
 	case PROP_IGNORED_DIRECTORIES:
 		tracker_config_set_ignored_directories (TRACKER_CONFIG (object),
-							g_value_get_pointer (value));
+		                                        g_value_get_pointer (value));
 		break;
 	case PROP_IGNORED_DIRECTORIES_WITH_CONTENT:
 		tracker_config_set_ignored_directories_with_content (TRACKER_CONFIG (object),
-								     g_value_get_pointer (value));
+		                                                     g_value_get_pointer (value));
 		break;
 	case PROP_IGNORED_FILES:
 		tracker_config_set_ignored_files (TRACKER_CONFIG (object),
-						  g_value_get_pointer (value));
+		                                  g_value_get_pointer (value));
 		break;
 
 	default:
@@ -415,10 +415,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerConfigPrivate *priv;
 
@@ -496,23 +496,23 @@ config_finalize (GObject *object)
 	priv = TRACKER_CONFIG_GET_PRIVATE (object);
 
 	g_slist_foreach (priv->ignored_file_patterns,
-			 (GFunc) g_pattern_spec_free,
-			 NULL);
+	                 (GFunc) g_pattern_spec_free,
+	                 NULL);
 	g_slist_free (priv->ignored_file_patterns);
 
 	g_slist_foreach (priv->ignored_file_paths,
-			 (GFunc) g_free,
-			 NULL);
+	                 (GFunc) g_free,
+	                 NULL);
 	g_slist_free (priv->ignored_file_paths);
 
 	g_slist_foreach (priv->ignored_directory_patterns,
-			 (GFunc) g_pattern_spec_free,
-			 NULL);
+	                 (GFunc) g_pattern_spec_free,
+	                 NULL);
 	g_slist_free (priv->ignored_directory_patterns);
 
 	g_slist_foreach (priv->ignored_directory_paths,
-			 (GFunc) g_free,
-			 NULL);
+	                 (GFunc) g_free,
+	                 NULL);
 	g_slist_free (priv->ignored_directory_paths);
 
 	g_slist_foreach (priv->ignored_files, (GFunc) g_free, NULL);
@@ -550,8 +550,8 @@ config_changed (TrackerConfigFile *file)
 
 static void
 config_create_with_defaults (TrackerConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gboolean added_home_recursively = FALSE;
 	gint i;
@@ -562,9 +562,9 @@ config_create_with_defaults (TrackerConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -572,18 +572,18 @@ config_create_with_defaults (TrackerConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		case G_TYPE_BOOLEAN:
 			g_key_file_set_boolean (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_boolean (config,
-											conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_boolean (config,
+			                                                                conversions[i].property));
 			break;
 
 		case G_TYPE_POINTER:
@@ -626,9 +626,9 @@ config_create_with_defaults (TrackerConfig *config,
 						path = "&VIDEOS";
 						break;
 
-					/* We are not interested in
-					 * TEMPLATES or PUBLIC_SHAREs
-					 */
+						/* We are not interested in
+						 * TEMPLATES or PUBLIC_SHAREs
+						 */
 					case G_USER_DIRECTORY_PUBLIC_SHARE:
 					case G_USER_DIRECTORY_TEMPLATES:
 					case G_USER_N_DIRECTORIES:
@@ -654,10 +654,10 @@ config_create_with_defaults (TrackerConfig *config,
 				g_slist_free (paths);
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    (const gchar * const *) string_list,
-							    g_strv_length (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            (const gchar * const *) string_list,
+				                            g_strv_length (string_list));
 
 				g_strfreev (string_list);
 			} else if (g_strcmp0 (conversions[i].property, "index-single-directories") == 0) {
@@ -672,10 +672,10 @@ config_create_with_defaults (TrackerConfig *config,
 				g_slist_free (paths);
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    (const gchar * const *) string_list,
-							    g_strv_length (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            (const gchar * const *) string_list,
+				                            g_strv_length (string_list));
 
 				g_strfreev (string_list);
 			} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
@@ -685,10 +685,10 @@ config_create_with_defaults (TrackerConfig *config,
 				};
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    string_list,
-							    G_N_ELEMENTS (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            string_list,
+				                            G_N_ELEMENTS (string_list));
 			} else if (g_strcmp0 (conversions[i].property, "ignored-directories-with-content") == 0) {
 				const gchar *string_list[] = {
 					"backup.metadata",
@@ -696,35 +696,35 @@ config_create_with_defaults (TrackerConfig *config,
 				};
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    string_list,
-							    G_N_ELEMENTS (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            string_list,
+				                            G_N_ELEMENTS (string_list));
 			} else if (g_strcmp0 (conversions[i].property, "ignored-files") == 0) {
 				const gchar *string_list[] = {
 					"*~", "*.o", "*.la", "*.lo", "*.loT", "*.in",
 					"*.csproj", "*.m4", "*.rej", "*.gmo", "*.orig",
-					"*.pc",	"*.omf", "*.aux", "*.tmp", "*.po",
+					"*.pc",         "*.omf", "*.aux", "*.tmp", "*.po",
 					"*.vmdk", "*.vm*", "*.nvram", "*.part",
 					"*.rcore", "lzo", "autom4te", "conftest",
-					"confstat", "Makefile",	"SCCS",	"litmain.sh",
+					"confstat", "Makefile",         "SCCS",         "litmain.sh",
 					"libtool", "config.status", "confdefs.h",
 					NULL
 				};
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    string_list,
-							    G_N_ELEMENTS (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            string_list,
+				                            G_N_ELEMENTS (string_list));
 			} else {
 				const gchar *string_list[] = { NULL };
 
 				g_key_file_set_string_list (key_file,
-							    conversions[i].group,
-							    conversions[i].key,
-							    string_list,
-							    G_N_ELEMENTS (string_list));
+				                            conversions[i].group,
+				                            conversions[i].key,
+				                            string_list,
+				                            G_N_ELEMENTS (string_list));
 			}
 
 			break;
@@ -734,11 +734,11 @@ config_create_with_defaults (TrackerConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-								      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -753,13 +753,13 @@ config_set_ignored_file_conveniences (TrackerConfig *config)
 	priv = TRACKER_CONFIG_GET_PRIVATE (config);
 
 	g_slist_foreach (priv->ignored_file_patterns,
-			 (GFunc) g_pattern_spec_free,
-			 NULL);
+	                 (GFunc) g_pattern_spec_free,
+	                 NULL);
 	g_slist_free (priv->ignored_file_patterns);
 
 	g_slist_foreach (priv->ignored_file_paths,
-			 (GFunc) g_free,
-			 NULL);
+	                 (GFunc) g_free,
+	                 NULL);
 	g_slist_free (priv->ignored_file_paths);
 
 	for (l = priv->ignored_files; l; l = l->next) {
@@ -794,13 +794,13 @@ config_set_ignored_directory_conveniences (TrackerConfig *config)
 	priv = TRACKER_CONFIG_GET_PRIVATE (config);
 
 	g_slist_foreach (priv->ignored_directory_patterns,
-			 (GFunc) g_pattern_spec_free,
-			 NULL);
+	                 (GFunc) g_pattern_spec_free,
+	                 NULL);
 	g_slist_free (priv->ignored_directory_patterns);
 
 	g_slist_foreach (priv->ignored_directory_paths,
-			 (GFunc) g_free,
-			 NULL);
+	                 (GFunc) g_free,
+	                 NULL);
 	g_slist_free (priv->ignored_directory_paths);
 
 	for (l = priv->ignored_directories; l; l = l->next) {
@@ -842,25 +842,25 @@ config_load (TrackerConfig *config)
 		gboolean is_directory_list;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_load_boolean (G_OBJECT (file),
-							     conversions[i].property,
-							     file->key_file,
-							     conversions[i].group,
-							     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 
 		case G_TYPE_POINTER: {
@@ -870,11 +870,11 @@ config_load (TrackerConfig *config)
 			is_directory_list = TRUE;
 
 			tracker_keyfile_object_load_string_list (G_OBJECT (file),
-								 conversions[i].property,
-								 file->key_file,
-								 conversions[i].group,
-								 conversions[i].key,
-								 is_directory_list);
+			                                         conversions[i].property,
+			                                         file->key_file,
+			                                         conversions[i].group,
+			                                         conversions[i].key,
+			                                         is_directory_list);
 
 			if (strcmp (conversions[i].property, "index-recursive-directories") != 0 &&
 			    strcmp (conversions[i].property, "index-single-directories") != 0) {
@@ -953,18 +953,18 @@ config_save (TrackerConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_save_boolean (file,
-							     conversions[i].property,
-							     file->key_file,
-							     conversions[i].group,
-							     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 
 		case G_TYPE_POINTER:
@@ -1015,10 +1015,10 @@ config_save (TrackerConfig *config)
 			}
 
 			tracker_keyfile_object_save_string_list (file,
-								 conversions[i].property,
-								 file->key_file,
-								 conversions[i].group,
-								 conversions[i].key);
+			                                         conversions[i].property,
+			                                         file->key_file,
+			                                         conversions[i].group,
+			                                         conversions[i].key);
 			break;
 
 		default:
@@ -1257,7 +1257,7 @@ tracker_config_get_ignored_files (TrackerConfig *config)
 
 void
 tracker_config_set_verbosity (TrackerConfig *config,
-			      gint	     value)
+                              gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1275,7 +1275,7 @@ tracker_config_set_verbosity (TrackerConfig *config,
 
 void
 tracker_config_set_initial_sleep (TrackerConfig *config,
-				  gint		 value)
+                                  gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1293,7 +1293,7 @@ tracker_config_set_initial_sleep (TrackerConfig *config,
 
 void
 tracker_config_set_enable_monitors (TrackerConfig *config,
-				    gboolean       value)
+                                    gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1307,7 +1307,7 @@ tracker_config_set_enable_monitors (TrackerConfig *config,
 
 void
 tracker_config_set_scan_timeout (TrackerConfig *config,
-				 gint           value)
+                                 gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1325,7 +1325,7 @@ tracker_config_set_scan_timeout (TrackerConfig *config,
 
 void
 tracker_config_set_cache_timeout (TrackerConfig *config,
-				  gint           value)
+                                  gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1343,7 +1343,7 @@ tracker_config_set_cache_timeout (TrackerConfig *config,
 
 void
 tracker_config_set_throttle (TrackerConfig *config,
-			     gint	    value)
+                             gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1361,7 +1361,7 @@ tracker_config_set_throttle (TrackerConfig *config,
 
 void
 tracker_config_set_enable_thumbnails (TrackerConfig *config,
-				      gboolean	     value)
+                                      gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1375,7 +1375,7 @@ tracker_config_set_enable_thumbnails (TrackerConfig *config,
 
 void
 tracker_config_set_index_on_battery (TrackerConfig *config,
-				     gboolean       value)
+                                     gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1389,7 +1389,7 @@ tracker_config_set_index_on_battery (TrackerConfig *config,
 
 void
 tracker_config_set_index_on_battery_first_time (TrackerConfig *config,
-						gboolean       value)
+                                                gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1403,7 +1403,7 @@ tracker_config_set_index_on_battery_first_time (TrackerConfig *config,
 
 void
 tracker_config_set_index_mounted_directories (TrackerConfig *config,
-					      gboolean	     value)
+                                              gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1417,7 +1417,7 @@ tracker_config_set_index_mounted_directories (TrackerConfig *config,
 
 void
 tracker_config_set_index_removable_devices (TrackerConfig *config,
-					    gboolean	   value)
+                                            gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1431,7 +1431,7 @@ tracker_config_set_index_removable_devices (TrackerConfig *config,
 
 void
 tracker_config_set_low_disk_space_limit (TrackerConfig *config,
-					 gint		value)
+                                         gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1450,7 +1450,7 @@ tracker_config_set_low_disk_space_limit (TrackerConfig *config,
 
 void
 tracker_config_set_index_recursive_directories (TrackerConfig *config,
-						GSList        *roots)
+                                                GSList        *roots)
 {
 	TrackerConfigPrivate *priv;
 	GSList               *l;
@@ -1476,7 +1476,7 @@ tracker_config_set_index_recursive_directories (TrackerConfig *config,
 
 void
 tracker_config_set_index_single_directories (TrackerConfig *config,
-					     GSList        *roots)
+                                             GSList        *roots)
 {
 	TrackerConfigPrivate *priv;
 	GSList               *l;
@@ -1502,7 +1502,7 @@ tracker_config_set_index_single_directories (TrackerConfig *config,
 
 void
 tracker_config_set_ignored_directories (TrackerConfig *config,
-					GSList        *roots)
+                                        GSList        *roots)
 {
 	TrackerConfigPrivate *priv;
 	GSList               *l;
@@ -1531,7 +1531,7 @@ tracker_config_set_ignored_directories (TrackerConfig *config,
 
 void
 tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
-						     GSList        *roots)
+                                                     GSList        *roots)
 {
 	TrackerConfigPrivate *priv;
 	GSList               *l;
@@ -1557,7 +1557,7 @@ tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
 
 void
 tracker_config_set_ignored_files (TrackerConfig *config,
-				  GSList        *files)
+                                  GSList        *files)
 {
 	TrackerConfigPrivate *priv;
 	GSList               *l;
diff --git a/src/tracker-miner-fs/tracker-config.h b/src/tracker-miner-fs/tracker-config.h
index 42f5f9f..3fab5c8 100644
--- a/src/tracker-miner-fs/tracker-config.h
+++ b/src/tracker-miner-fs/tracker-config.h
@@ -27,14 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_CONFIG	    (tracker_config_get_type ())
-#define TRACKER_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
+#define TRACKER_TYPE_CONFIG         (tracker_config_get_type ())
+#define TRACKER_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
 #define TRACKER_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-#define TRACKER_IS_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
+#define TRACKER_IS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
 #define TRACKER_IS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
 #define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
 
-typedef struct TrackerConfig	  TrackerConfig;
+typedef struct TrackerConfig      TrackerConfig;
 typedef struct TrackerConfigClass TrackerConfigClass;
 
 struct TrackerConfig {
@@ -45,7 +45,7 @@ struct TrackerConfigClass {
 	TrackerConfigFileClass parent_class;
 };
 
-GType	       tracker_config_get_type				   (void) G_GNUC_CONST;
+GType          tracker_config_get_type                             (void) G_GNUC_CONST;
 
 TrackerConfig *tracker_config_new                                  (void);
 TrackerConfig *tracker_config_new_with_domain                      (const gchar *domain);
@@ -71,39 +71,39 @@ GSList *       tracker_config_get_ignored_directories_with_content (TrackerConfi
 GSList *       tracker_config_get_ignored_files                    (TrackerConfig *config);
 
 void           tracker_config_set_verbosity                        (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 void           tracker_config_set_initial_sleep                    (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 void           tracker_config_set_enable_monitors                  (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_scan_timeout                     (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 void           tracker_config_set_cache_timeout                    (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 void           tracker_config_set_throttle                         (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 void           tracker_config_set_enable_thumbnails                (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_index_on_battery                 (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_index_on_battery_first_time      (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_index_removable_devices          (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_index_mounted_directories        (TrackerConfig *config,
-								    gboolean       value);
+                                                                    gboolean       value);
 void           tracker_config_set_low_disk_space_limit             (TrackerConfig *config,
-								    gint           value);
-void	       tracker_config_set_index_recursive_directories      (TrackerConfig *config,
-								    GSList        *files);
-void	       tracker_config_set_index_single_directories         (TrackerConfig *config,
-								    GSList        *files);
-void	       tracker_config_set_ignored_directories              (TrackerConfig *config,
-								    GSList        *files);
-void	       tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
-								    GSList        *files);
-void	       tracker_config_set_ignored_files                    (TrackerConfig *config,
-								    GSList        *files);
+                                                                    gint           value);
+void           tracker_config_set_index_recursive_directories      (TrackerConfig *config,
+                                                                    GSList        *files);
+void           tracker_config_set_index_single_directories         (TrackerConfig *config,
+                                                                    GSList        *files);
+void           tracker_config_set_ignored_directories              (TrackerConfig *config,
+                                                                    GSList        *files);
+void           tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
+                                                                    GSList        *files);
+void           tracker_config_set_ignored_files                    (TrackerConfig *config,
+                                                                    GSList        *files);
 
 /*
  * Convenience functions:
diff --git a/src/tracker-miner-fs/tracker-main.c b/src/tracker-miner-fs/tracker-main.c
index 5edee5a..57d6508 100644
--- a/src/tracker-miner-fs/tracker-main.c
+++ b/src/tracker-miner-fs/tracker-main.c
@@ -49,14 +49,14 @@
 #include "tracker-miner-files.h"
 #include "tracker-thumbnailer.h"
 
-#define ABOUT								  \
+#define ABOUT	  \
 	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE								  \
+#define LICENSE	  \
 	"This program is free software and comes without any warranty.\n" \
-	"It is licensed under version 2 or later of the General Public "  \
-	"License which can be viewed at:\n"				  \
-	"\n"								  \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
 	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static GMainLoop    *main_loop;
@@ -65,8 +65,8 @@ static GSList       *current_miner;
 static gboolean      finished_miners;
 
 static gboolean      version;
-static gint	     verbosity = -1;
-static gint	     initial_sleep = -1;
+static gint          verbosity = -1;
+static gint          initial_sleep = -1;
 
 static GOptionEntry  entries[] = {
 	{ "version", 'V', 0,
@@ -91,24 +91,24 @@ sanity_check_option_values (TrackerConfig *config)
 {
 	g_message ("General options:");
 	g_message ("  Verbosity  ............................  %d",
-		   tracker_config_get_verbosity (config));
+	           tracker_config_get_verbosity (config));
 	g_message ("  Initial Sleep  ........................  %d",
-		   tracker_config_get_initial_sleep (config));
+	           tracker_config_get_initial_sleep (config));
 
 	g_message ("Indexer options:");
 	g_message ("  Throttle level  .......................  %d",
-		   tracker_config_get_throttle (config));
+	           tracker_config_get_throttle (config));
 	g_message ("  Thumbnail indexing enabled  ...........  %s",
-		   tracker_config_get_enable_thumbnails (config) ? "yes" : "no");
+	           tracker_config_get_enable_thumbnails (config) ? "yes" : "no");
 	g_message ("  Indexing while on battery  ............  %s (first time only = %s)",
-		   tracker_config_get_index_on_battery (config) ? "yes" : "no",
-		   tracker_config_get_index_on_battery_first_time (config) ? "yes" : "no");
+	           tracker_config_get_index_on_battery (config) ? "yes" : "no",
+	           tracker_config_get_index_on_battery_first_time (config) ? "yes" : "no");
 
 	if (tracker_config_get_low_disk_space_limit (config) == -1) {
 		g_message ("  Low disk space limit  .................  Disabled");
 	} else {
 		g_message ("  Low disk space limit  .................  %d%%",
-			   tracker_config_get_low_disk_space_limit (config));
+		           tracker_config_get_low_disk_space_limit (config));
 	}
 }
 
@@ -132,8 +132,8 @@ signal_handler (int signo)
 		if (g_strsignal (signo)) {
 			g_print ("\n");
 			g_print ("Received signal:%d->'%s'\n",
-                                 signo,
-                                 g_strsignal (signo));
+			         signo,
+			         g_strsignal (signo));
 		}
 		break;
 	}
@@ -144,7 +144,7 @@ initialize_signal_handler (void)
 {
 #ifndef G_OS_WIN32
 	struct sigaction act;
-	sigset_t	 empty_mask;
+	sigset_t         empty_mask;
 
 	sigemptyset (&empty_mask);
 	act.sa_handler = signal_handler;
@@ -176,35 +176,35 @@ initialize_priority (void)
 		const gchar *str = g_strerror (errno);
 
 		g_message ("Couldn't set nice value to 19, %s",
-			   str ? str : "no error given");
+		           str ? str : "no error given");
 	}
 }
 
 static void
 miner_handle_next (void)
 {
-        if (finished_miners) {
-                return;
-        }
-
-        if (!current_miner) {
-                current_miner = miners;
-        } else {
-                current_miner = current_miner->next;
-        }
-
-        if (!current_miner) {
-                finished_miners = TRUE;
-
-                g_message ("All miners are now finished");
-                tracker_thumbnailer_queue_send ();
-                return;
-        }
-
-        if (!tracker_miner_is_started (current_miner->data)) {
-                g_message ("Starting next miner...");
-                tracker_miner_start (current_miner->data);
-        }
+	if (finished_miners) {
+		return;
+	}
+
+	if (!current_miner) {
+		current_miner = miners;
+	} else {
+		current_miner = current_miner->next;
+	}
+
+	if (!current_miner) {
+		finished_miners = TRUE;
+
+		g_message ("All miners are now finished");
+		tracker_thumbnailer_queue_send ();
+		return;
+	}
+
+	if (!tracker_miner_is_started (current_miner->data)) {
+		g_message ("Starting next miner...");
+		tracker_miner_start (current_miner->data);
+	}
 }
 
 static void
@@ -217,18 +217,18 @@ miner_finished_cb (TrackerMinerFS *fs,
                    gpointer        user_data)
 {
 	g_message ("Finished mining in seconds:%f, total directories:%d, total files:%d",
-                   seconds_elapsed,
-                   total_directories_found + total_directories_ignored,
-                   total_files_found + total_files_ignored);
+	           seconds_elapsed,
+	           total_directories_found + total_directories_ignored,
+	           total_files_found + total_files_ignored);
 
-        miner_handle_next ();
+	miner_handle_next ();
 }
 
 int
 main (gint argc, gchar *argv[])
 {
 	TrackerConfig *config;
-        TrackerMiner *miner_applications, *miner_files;
+	TrackerMiner *miner_applications, *miner_files;
 	GOptionContext *context;
 	GError *error = NULL;
 	gchar *log_filename = NULL;
@@ -257,10 +257,10 @@ main (gint argc, gchar *argv[])
 	g_option_context_parse (context, &argc, &argv, &error);
 	g_option_context_free (context);
 
-        if (version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
-                return EXIT_SUCCESS;
-        }
+	if (version) {
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
+		return EXIT_SUCCESS;
+	}
 
 	g_print ("Initializing tracker-miner-fs...\n");
 
@@ -289,7 +289,7 @@ main (gint argc, gchar *argv[])
 	 * successfully when called upon from the daemon.
 	 */
 	tracker_log_init (tracker_config_get_verbosity (config),
-                          &log_filename);
+	                  &log_filename);
 	g_print ("Starting log:\n  File:'%s'\n", log_filename);
 	g_free (log_filename);
 
@@ -308,28 +308,28 @@ main (gint argc, gchar *argv[])
 
 		str = g_strerror (errno);
 		g_message ("Couldn't set nice value to 19, %s",
-			   str ? str : "no error given");
+		           str ? str : "no error given");
 	}
 
-        tracker_thumbnailer_init ();
+	tracker_thumbnailer_init ();
 
-        /* Create miner for applications */
-        miner_applications = tracker_miner_applications_new ();
-        miners = g_slist_append (miners, miner_applications);
+	/* Create miner for applications */
+	miner_applications = tracker_miner_applications_new ();
+	miners = g_slist_append (miners, miner_applications);
 
 	g_signal_connect (miner_applications, "finished",
-			  G_CALLBACK (miner_finished_cb),
-			  NULL);
+	                  G_CALLBACK (miner_finished_cb),
+	                  NULL);
 
-        /* Create miner for files */
-        miner_files = tracker_miner_files_new (config);
-        miners = g_slist_append (miners, miner_files);
+	/* Create miner for files */
+	miner_files = tracker_miner_files_new (config);
+	miners = g_slist_append (miners, miner_files);
 
 	g_signal_connect (miner_files, "finished",
-			  G_CALLBACK (miner_finished_cb),
-			  NULL);
+	                  G_CALLBACK (miner_finished_cb),
+	                  NULL);
 
-        miner_handle_next ();
+	miner_handle_next ();
 
 	main_loop = g_main_loop_new (NULL, FALSE);
 	g_main_loop_run (main_loop);
@@ -339,10 +339,10 @@ main (gint argc, gchar *argv[])
 	g_main_loop_unref (main_loop);
 	g_object_unref (config);
 
-        g_slist_foreach (miners, (GFunc) g_object_unref, NULL);
-        g_slist_free (miners);
+	g_slist_foreach (miners, (GFunc) g_object_unref, NULL);
+	g_slist_free (miners);
         
-        tracker_thumbnailer_shutdown ();
+	tracker_thumbnailer_shutdown ();
 	tracker_log_shutdown ();
 
 	g_print ("\nOK\n\n");
diff --git a/src/tracker-miner-fs/tracker-miner-applications.c b/src/tracker-miner-fs/tracker-miner-applications.c
index 6533fa0..4760a77 100644
--- a/src/tracker-miner-fs/tracker-miner-applications.c
+++ b/src/tracker-miner-fs/tracker-miner-applications.c
@@ -25,31 +25,31 @@
 
 #include "tracker-miner-applications.h"
 
-#define RDF_TYPE 	             TRACKER_RDF_PREFIX "type"
-#define NFO_PREFIX	             TRACKER_NFO_PREFIX
-#define NIE_PREFIX	             TRACKER_NIE_PREFIX
-#define MAEMO_PREFIX	             TRACKER_MAEMO_PREFIX
+#define RDF_TYPE                     TRACKER_RDF_PREFIX "type"
+#define NFO_PREFIX                   TRACKER_NFO_PREFIX
+#define NIE_PREFIX                   TRACKER_NIE_PREFIX
+#define MAEMO_PREFIX                 TRACKER_MAEMO_PREFIX
 
 #define GROUP_DESKTOP_ENTRY          "Desktop Entry"
 
 #define APPLICATION_DATASOURCE_URN   "urn:nepomuk:datasource:84f20000-1241-11de-8c30-0800200c9a66"
-#define APPLET_DATASOURCE_URN	     "urn:nepomuk:datasource:192bd060-1f9a-11de-8c30-0800200c9a66"
+#define APPLET_DATASOURCE_URN        "urn:nepomuk:datasource:192bd060-1f9a-11de-8c30-0800200c9a66"
 #define SOFTWARE_CATEGORY_URN_PREFIX "urn:software-category:"
-#define THEME_ICON_URN_PREFIX	     "urn:theme-icon:"
+#define THEME_ICON_URN_PREFIX        "urn:theme-icon:"
 
 static void     miner_applications_finalize          (GObject              *object);
 static void     miner_applications_constructed       (GObject              *object);
 
 static gboolean miner_applications_check_file        (TrackerMinerFS       *fs,
-						      GFile                *file);
+                                                      GFile                *file);
 static gboolean miner_applications_check_directory   (TrackerMinerFS       *fs,
-						      GFile                *file);
+                                                      GFile                *file);
 static gboolean miner_applications_process_file      (TrackerMinerFS       *fs,
-						      GFile                *file,
-						      TrackerSparqlBuilder *sparql,
-						      GCancellable         *cancellable);
+                                                      GFile                *file,
+                                                      TrackerSparqlBuilder *sparql,
+                                                      GCancellable         *cancellable);
 static gboolean miner_applications_monitor_directory (TrackerMinerFS       *fs,
-						      GFile                *file);
+                                                      GFile                *file);
 
 static GQuark miner_applications_error_quark = 0;
 
@@ -69,16 +69,16 @@ G_DEFINE_TYPE (TrackerMinerApplications, tracker_miner_applications, TRACKER_TYP
 static void
 tracker_miner_applications_class_init (TrackerMinerApplicationsClass *klass)
 {
-        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-        TrackerMinerFSClass *miner_fs_class = TRACKER_MINER_FS_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	TrackerMinerFSClass *miner_fs_class = TRACKER_MINER_FS_CLASS (klass);
 
-        object_class->finalize = miner_applications_finalize;
+	object_class->finalize = miner_applications_finalize;
 	object_class->constructed = miner_applications_constructed;
 
 	miner_fs_class->check_file = miner_applications_check_file;
 	miner_fs_class->check_directory = miner_applications_check_directory;
 	miner_fs_class->monitor_directory = miner_applications_monitor_directory;
-        miner_fs_class->process_file = miner_applications_process_file;
+	miner_fs_class->process_file = miner_applications_process_file;
 
 	miner_applications_error_quark = g_quark_from_static_string ("TrackerMinerApplications");
 }
@@ -91,7 +91,7 @@ tracker_miner_applications_init (TrackerMinerApplications *ma)
 static void
 miner_applications_finalize (GObject *object)
 {
-        G_OBJECT_CLASS (tracker_miner_applications_parent_class)->finalize (object);
+	G_OBJECT_CLASS (tracker_miner_applications_parent_class)->finalize (object);
 }
 
 static void
@@ -99,14 +99,14 @@ miner_applications_constructed (GObject *object)
 {
 	GFile *file;
 
-        G_OBJECT_CLASS (tracker_miner_applications_parent_class)->constructed (object);
+	G_OBJECT_CLASS (tracker_miner_applications_parent_class)->constructed (object);
 
 	file = g_file_new_for_path ("/usr/share/applications/");
-        tracker_miner_fs_add_directory (TRACKER_MINER_FS (object), file, TRUE);
+	tracker_miner_fs_add_directory (TRACKER_MINER_FS (object), file, TRUE);
 	g_object_unref (file);
 
 	file = g_file_new_for_path ("/usr/share/desktop-directories/");
-        tracker_miner_fs_add_directory (TRACKER_MINER_FS (object), file, TRUE);
+	tracker_miner_fs_add_directory (TRACKER_MINER_FS (object), file, TRUE);
 	g_object_unref (file);
 
 	/* FIXME: Check XDG_DATA_DIRS and also process applications in there */
@@ -114,11 +114,11 @@ miner_applications_constructed (GObject *object)
 
 static void
 insert_data_from_desktop_file (TrackerSparqlBuilder *sparql,
-			       const gchar          *subject,
-			       const gchar          *metadata_key,
-			       GKeyFile             *desktop_file,
-			       const gchar          *key,
-			       gboolean		     use_locale)
+                               const gchar          *subject,
+                               const gchar          *metadata_key,
+                               GKeyFile             *desktop_file,
+                               const gchar          *key,
+                               gboolean                      use_locale)
 {
 	gchar *str;
 
@@ -138,7 +138,7 @@ insert_data_from_desktop_file (TrackerSparqlBuilder *sparql,
 
 static gboolean
 miner_applications_check_file (TrackerMinerFS *fs,
-			       GFile          *file)
+                               GFile          *file)
 {
 	gboolean retval = FALSE;
 	gchar *basename;
@@ -158,7 +158,7 @@ miner_applications_check_file (TrackerMinerFS *fs,
 
 static gboolean
 miner_applications_check_directory (TrackerMinerFS *fs,
-				    GFile          *file)
+                                    GFile          *file)
 {
 	/* We want to inspect all the passed dirs and their children */
 	return TRUE;
@@ -166,7 +166,7 @@ miner_applications_check_directory (TrackerMinerFS *fs,
 
 static gboolean
 miner_applications_monitor_directory (TrackerMinerFS *fs,
-				      GFile          *file)
+                                      GFile          *file)
 {
 	/* We want to monitor all the passed dirs and their children */
 	return TRUE;
@@ -174,8 +174,8 @@ miner_applications_monitor_directory (TrackerMinerFS *fs,
 
 static GKeyFile *
 get_desktop_key_file (GFile   *file,
-		      gchar  **type,
-		      GError **error)
+                      gchar  **type,
+                      GError **error)
 {
 	GKeyFile *key_file;
 	gchar *path;
@@ -283,7 +283,7 @@ miner_applications_process_file_cb (gpointer user_data)
 		tracker_sparql_builder_predicate (sparql, "nie:dataSource");
 		tracker_sparql_builder_object_iri (sparql, APPLICATION_DATASOURCE_URN);
 
-	/* This matches SomeApplet as Type= */
+		/* This matches SomeApplet as Type= */
 	} else if (name && g_str_has_suffix (type, "Applet")) {
 		/* The URI of the InformationElement should be a UUID URN */
 		uri = g_file_get_uri (data->file);
@@ -394,9 +394,9 @@ miner_applications_process_file_cb (gpointer user_data)
 	}
 
 	file_info = g_file_query_info (data->file,
-				       G_FILE_ATTRIBUTE_TIME_MODIFIED,
-				       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-				       NULL, NULL);
+	                               G_FILE_ATTRIBUTE_TIME_MODIFIED,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL, NULL);
 
 	if (file_info) {
 		guint64 time;
@@ -436,9 +436,9 @@ process_application_data_free (ProcessApplicationData *data)
 
 static gboolean
 miner_applications_process_file (TrackerMinerFS       *fs,
-				 GFile                *file,
-				 TrackerSparqlBuilder *sparql,
-				 GCancellable         *cancellable)
+                                 GFile                *file,
+                                 TrackerSparqlBuilder *sparql,
+                                 GCancellable         *cancellable)
 {
 	ProcessApplicationData *data;
 	GKeyFile *key_file;
@@ -459,9 +459,9 @@ miner_applications_process_file (TrackerMinerFS       *fs,
 	data->type = type;
 
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-			 miner_applications_process_file_cb,
-			 data,
-			 (GDestroyNotify) process_application_data_free);
+	                 miner_applications_process_file_cb,
+	                 data,
+	                 (GDestroyNotify) process_application_data_free);
 
 	return TRUE;
 }
@@ -470,6 +470,6 @@ TrackerMiner *
 tracker_miner_applications_new (void)
 {
 	return g_object_new (TRACKER_TYPE_MINER_APPLICATIONS,
-			     "name", "Applications",
-                             NULL);
+	                     "name", "Applications",
+	                     NULL);
 }
diff --git a/src/tracker-miner-fs/tracker-miner-applications.h b/src/tracker-miner-fs/tracker-miner-applications.h
index 6657547..38c9588 100644
--- a/src/tracker-miner-fs/tracker-miner-applications.h
+++ b/src/tracker-miner-fs/tracker-miner-applications.h
@@ -36,11 +36,11 @@ typedef struct _TrackerMinerApplications TrackerMinerApplications;
 typedef struct _TrackerMinerApplicationsClass TrackerMinerApplicationsClass;
 
 struct _TrackerMinerApplications {
-        TrackerMinerFS parent_instance;
+	TrackerMinerFS parent_instance;
 };
 
 struct _TrackerMinerApplicationsClass {
-        TrackerMinerFSClass parent_class;
+	TrackerMinerFSClass parent_class;
 };
 
 GType          tracker_miner_applications_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 54c0379..87ddd31 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -55,8 +55,8 @@ struct ProcessFileData {
 };
 
 struct TrackerMinerFilesPrivate {
-        TrackerConfig *config;
-        TrackerStorage *storage;
+	TrackerConfig *config;
+	TrackerStorage *storage;
 	TrackerPower *power;
 
 	GVolumeMonitor *volume_monitor;
@@ -75,101 +75,101 @@ enum {
 };
 
 enum {
-        PROP_0,
-        PROP_CONFIG
+	PROP_0,
+	PROP_CONFIG
 };
 
 static void     miner_files_set_property      (GObject              *object,
-					       guint                 param_id,
-					       const GValue         *value,
-					       GParamSpec           *pspec);
+                                               guint                 param_id,
+                                               const GValue         *value,
+                                               GParamSpec           *pspec);
 static void     miner_files_get_property      (GObject              *object,
-					       guint                 param_id,
-					       GValue               *value,
-					       GParamSpec           *pspec);
+                                               guint                 param_id,
+                                               GValue               *value,
+                                               GParamSpec           *pspec);
 static void     miner_files_finalize          (GObject              *object);
 static void     miner_files_constructed       (GObject              *object);
 
 static void     mount_pre_unmount_cb          (GVolumeMonitor       *volume_monitor,
-					       GMount               *mount,
-					       TrackerMinerFiles    *mf);
+                                               GMount               *mount,
+                                               TrackerMinerFiles    *mf);
 
 #ifdef HAVE_HAL
 static void     mount_point_added_cb          (TrackerStorage       *storage,
-					       const gchar          *udi,
-					       const gchar          *mount_point,
-					       gpointer              user_data);
+                                               const gchar          *udi,
+                                               const gchar          *mount_point,
+                                               gpointer              user_data);
 static void     mount_point_removed_cb        (TrackerStorage       *storage,
-					       const gchar          *udi,
-					       const gchar          *mount_point,
-					       gpointer              user_data);
+                                               const gchar          *udi,
+                                               const gchar          *mount_point,
+                                               gpointer              user_data);
 
 static void     check_battery_status          (TrackerMinerFiles    *fs);
 static void     battery_status_cb             (GObject              *object,
-					       GParamSpec           *pspec,
-					       gpointer              user_data);
+                                               GParamSpec           *pspec,
+                                               gpointer              user_data);
 #endif
 
 static void     init_mount_points             (TrackerMinerFiles *miner);
 static void     disk_space_check_start        (TrackerMinerFiles    *mf);
 static void     disk_space_check_stop         (TrackerMinerFiles    *mf);
 static void     low_disk_space_limit_cb       (GObject              *gobject,
-					       GParamSpec           *arg1,
-					       gpointer              user_data);
+                                               GParamSpec           *arg1,
+                                               gpointer              user_data);
 
 static DBusGProxy * extractor_create_proxy    (void);
 static void    extractor_queue_thumbnail_cb   (DBusGProxy           *proxy,
-					       const gchar          *filename,
-					       const gchar          *mime_type,
-					       gpointer              user_data);
+                                               const gchar          *filename,
+                                               const gchar          *mime_type,
+                                               gpointer              user_data);
 
 static gboolean miner_files_check_file        (TrackerMinerFS       *fs,
-					       GFile                *file);
+                                               GFile                *file);
 static gboolean miner_files_check_directory   (TrackerMinerFS       *fs,
-					       GFile                *file);
+                                               GFile                *file);
 static gboolean miner_files_check_directory_contents (TrackerMinerFS       *fs,
-						      GFile                *parent,
-						      GList                *children);
+                                                      GFile                *parent,
+                                                      GList                *children);
 static gboolean miner_files_process_file      (TrackerMinerFS       *fs,
-					       GFile                *file,
-					       TrackerSparqlBuilder *sparql,
-					       GCancellable         *cancellable);
+                                               GFile                *file,
+                                               TrackerSparqlBuilder *sparql,
+                                               GCancellable         *cancellable);
 static gboolean miner_files_monitor_directory (TrackerMinerFS       *fs,
-					       GFile                *file);
+                                               GFile                *file);
 static gboolean miner_files_writeback_file    (TrackerMinerFS       *fs,
-					       GFile                *file,
-					       TrackerSparqlBuilder *sparql,
-					       GCancellable         *cancellable);
+                                               GFile                *file,
+                                               TrackerSparqlBuilder *sparql,
+                                               GCancellable         *cancellable);
 
 G_DEFINE_TYPE (TrackerMinerFiles, tracker_miner_files, TRACKER_TYPE_MINER_FS)
 
 static void
 tracker_miner_files_class_init (TrackerMinerFilesClass *klass)
 {
-        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-        TrackerMinerFSClass *miner_fs_class = TRACKER_MINER_FS_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	TrackerMinerFSClass *miner_fs_class = TRACKER_MINER_FS_CLASS (klass);
 
-        object_class->finalize = miner_files_finalize;
-        object_class->get_property = miner_files_get_property;
-        object_class->set_property = miner_files_set_property;
-        object_class->constructed = miner_files_constructed;
+	object_class->finalize = miner_files_finalize;
+	object_class->get_property = miner_files_get_property;
+	object_class->set_property = miner_files_set_property;
+	object_class->constructed = miner_files_constructed;
 
-        miner_fs_class->check_file = miner_files_check_file;
+	miner_fs_class->check_file = miner_files_check_file;
 	miner_fs_class->check_directory = miner_files_check_directory;
 	miner_fs_class->check_directory_contents = miner_files_check_directory_contents;
 	miner_fs_class->monitor_directory = miner_files_monitor_directory;
-        miner_fs_class->process_file = miner_files_process_file;
-        miner_fs_class->writeback_file = miner_files_writeback_file;
+	miner_fs_class->process_file = miner_files_process_file;
+	miner_fs_class->writeback_file = miner_files_writeback_file;
 
-       	g_object_class_install_property (object_class,
-					 PROP_CONFIG,
-					 g_param_spec_object ("config",
-							      "Config",
-							      "Config",
-                                                              TRACKER_TYPE_CONFIG,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (object_class,
+	                                 PROP_CONFIG,
+	                                 g_param_spec_object ("config",
+	                                                      "Config",
+	                                                      "Config",
+	                                                      TRACKER_TYPE_CONFIG,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-        g_type_class_add_private (klass, sizeof (TrackerMinerFilesPrivate));
+	g_type_class_add_private (klass, sizeof (TrackerMinerFilesPrivate));
 
 	miner_files_error_quark = g_quark_from_static_string ("TrackerMinerFiles");
 }
@@ -177,16 +177,16 @@ tracker_miner_files_class_init (TrackerMinerFilesClass *klass)
 static void
 tracker_miner_files_init (TrackerMinerFiles *mf)
 {
-        TrackerMinerFilesPrivate *priv;
+	TrackerMinerFilesPrivate *priv;
 
-        priv = mf->private = TRACKER_MINER_FILES_GET_PRIVATE (mf);
+	priv = mf->private = TRACKER_MINER_FILES_GET_PRIVATE (mf);
 
 #ifdef HAVE_HAL
-        priv->storage = tracker_storage_new ();
+	priv->storage = tracker_storage_new ();
 
-        g_signal_connect (priv->storage, "mount-point-added",
-                          G_CALLBACK (mount_point_added_cb),
-			  mf);
+	g_signal_connect (priv->storage, "mount-point-added",
+	                  G_CALLBACK (mount_point_added_cb),
+	                  mf);
 
 	g_signal_connect (priv->storage, "mount-point-removed",
 	                  G_CALLBACK (mount_point_removed_cb),
@@ -195,77 +195,77 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
 	priv->power = tracker_power_new ();
 
 	g_signal_connect (priv->power, "notify::on-low-battery",
-			  G_CALLBACK (battery_status_cb),
-			  mf);
+	                  G_CALLBACK (battery_status_cb),
+	                  mf);
 	g_signal_connect (priv->power, "notify::on-battery",
-			  G_CALLBACK (battery_status_cb),
-			  mf);
+	                  G_CALLBACK (battery_status_cb),
+	                  mf);
 #endif /* HAVE_HAL */
 
 	priv->volume_monitor = g_volume_monitor_get ();
 	g_signal_connect (priv->volume_monitor, "mount-pre-unmount",
-			  G_CALLBACK (mount_pre_unmount_cb),
-			  mf);
+	                  G_CALLBACK (mount_pre_unmount_cb),
+	                  mf);
 
 	/* Set up extractor and signals */
 	priv->extractor_proxy = extractor_create_proxy ();
 
 	dbus_g_object_register_marshaller (tracker_marshal_VOID__STRING_STRING,
-					   G_TYPE_NONE,
-					   G_TYPE_STRING,
-					   G_TYPE_STRING,
-					   G_TYPE_INVALID);
+	                                   G_TYPE_NONE,
+	                                   G_TYPE_STRING,
+	                                   G_TYPE_STRING,
+	                                   G_TYPE_INVALID);
 
 	dbus_g_proxy_add_signal (priv->extractor_proxy, "QueueThumbnail",
-				 G_TYPE_STRING,
-				 G_TYPE_STRING,
-				 G_TYPE_INVALID);
+	                         G_TYPE_STRING,
+	                         G_TYPE_STRING,
+	                         G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (priv->extractor_proxy, "QueueThumbnail",
-				     G_CALLBACK (extractor_queue_thumbnail_cb),
-				     NULL, NULL);
+	                             G_CALLBACK (extractor_queue_thumbnail_cb),
+	                             NULL, NULL);
 
 	init_mount_points (mf);
 }
 
 static void
 miner_files_set_property (GObject      *object,
-			  guint         prop_id,
-			  const GValue *value,
-			  GParamSpec   *pspec)
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
 {
-        TrackerMinerFilesPrivate *priv;
+	TrackerMinerFilesPrivate *priv;
 
-        priv = TRACKER_MINER_FILES_GET_PRIVATE (object);
+	priv = TRACKER_MINER_FILES_GET_PRIVATE (object);
 
-        switch (prop_id) {
-        case PROP_CONFIG:
-                priv->config = g_value_dup_object (value);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	switch (prop_id) {
+	case PROP_CONFIG:
+		priv->config = g_value_dup_object (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
-        }
+	}
 }
 
 static void
 miner_files_get_property (GObject    *object,
-			  guint       prop_id,
-			  GValue     *value,
-			  GParamSpec *pspec)
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
 {
-        TrackerMinerFilesPrivate *priv;
+	TrackerMinerFilesPrivate *priv;
 
-        priv = TRACKER_MINER_FILES_GET_PRIVATE (object);
+	priv = TRACKER_MINER_FILES_GET_PRIVATE (object);
 
-        switch (prop_id) {
-        case PROP_CONFIG:
-                g_value_set_object (value, priv->config);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	switch (prop_id) {
+	case PROP_CONFIG:
+		g_value_set_object (value, priv->config);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
-        }
+	}
 }
 
 static void
@@ -278,64 +278,64 @@ miner_files_finalize (GObject *object)
 	priv = mf->private;
 
 	dbus_g_proxy_disconnect_signal (priv->extractor_proxy, "QueueThumbnail",
-					G_CALLBACK (extractor_queue_thumbnail_cb),
-					NULL);
+	                                G_CALLBACK (extractor_queue_thumbnail_cb),
+	                                NULL);
 
 	g_object_unref (priv->extractor_proxy);
 
 	g_signal_handlers_disconnect_by_func (priv->config,
-					      low_disk_space_limit_cb,
-					      NULL);
+	                                      low_disk_space_limit_cb,
+	                                      NULL);
 
 	g_object_unref (priv->config);
 
 	disk_space_check_stop (TRACKER_MINER_FILES (object));
 
 #ifdef HAVE_HAL
-        g_object_unref (priv->power);
-        g_object_unref (priv->storage);
+	g_object_unref (priv->power);
+	g_object_unref (priv->storage);
 #endif /* HAVE_HAL */
 
 	g_signal_handlers_disconnect_by_func (priv->volume_monitor,
-					      mount_pre_unmount_cb,
-					      object);
+	                                      mount_pre_unmount_cb,
+	                                      object);
 	g_object_unref (priv->volume_monitor);
 
-        G_OBJECT_CLASS (tracker_miner_files_parent_class)->finalize (object);
+	G_OBJECT_CLASS (tracker_miner_files_parent_class)->finalize (object);
 }
 
 static void
 miner_files_constructed (GObject *object)
 {
-        TrackerMinerFiles *mf;
-        TrackerMinerFS *fs;
-        GSList *dirs;
+	TrackerMinerFiles *mf;
+	TrackerMinerFS *fs;
+	GSList *dirs;
 	GSList *mounts = NULL, *m;
 
 	G_OBJECT_CLASS (tracker_miner_files_parent_class)->constructed (object);
 
-        mf = TRACKER_MINER_FILES (object);
-        fs = TRACKER_MINER_FS (object);
+	mf = TRACKER_MINER_FILES (object);
+	fs = TRACKER_MINER_FS (object);
 
-        if (!mf->private->config) {
-                g_critical ("No config. This is mandatory");
-                g_assert_not_reached ();
-        }
+	if (!mf->private->config) {
+		g_critical ("No config. This is mandatory");
+		g_assert_not_reached ();
+	}
 
 #ifdef HAVE_HAL
-        if (tracker_config_get_index_removable_devices (mf->private->config)) {
-                mounts = tracker_storage_get_removable_device_roots (mf->private->storage);
-        }
+	if (tracker_config_get_index_removable_devices (mf->private->config)) {
+		mounts = tracker_storage_get_removable_device_roots (mf->private->storage);
+	}
 
 	check_battery_status (mf);
 #endif /* HAVE_HAL */
 
 	g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
 
-        /* Fill in directories to inspect */
-        dirs = tracker_config_get_index_single_directories (mf->private->config);
+	/* Fill in directories to inspect */
+	dirs = tracker_config_get_index_single_directories (mf->private->config);
 
-        for (; dirs; dirs = dirs->next) {
+	for (; dirs; dirs = dirs->next) {
 		GFile *file;
 
 		/* Do some simple checks for silly locations */
@@ -360,22 +360,22 @@ miner_files_constructed (GObject *object)
 
 			if (found) {
 				g_message ("  Duplicate found:'%s' - same as removable device path",
-					   (gchar*) dirs->data);
+				           (gchar*) dirs->data);
 				continue;
 			}
 		}
 
 		g_message ("  Adding:'%s'", (gchar*) dirs->data);
 		file = g_file_new_for_path (dirs->data);
-                tracker_miner_fs_add_directory (fs, file, FALSE);
+		tracker_miner_fs_add_directory (fs, file, FALSE);
 		g_object_unref (file);
-        }
+	}
 
 	g_message ("Setting up directories to iterate from config (IndexRecursiveDirectory)");
 
-        dirs = tracker_config_get_index_recursive_directories (mf->private->config);
+	dirs = tracker_config_get_index_recursive_directories (mf->private->config);
 
-        for (; dirs; dirs = dirs->next) {
+	for (; dirs; dirs = dirs->next) {
 		GFile *file;
 
 		/* Do some simple checks for silly locations */
@@ -400,16 +400,16 @@ miner_files_constructed (GObject *object)
 
 			if (found) {
 				g_message ("  Duplicate found:'%s' - same as removable device path",
-					   (gchar*) dirs->data);
+				           (gchar*) dirs->data);
 				continue;
 			}
 		}
 
 		g_message ("  Adding:'%s'", (gchar*) dirs->data);
 		file = g_file_new_for_path (dirs->data);
-                tracker_miner_fs_add_directory (fs, file, TRUE);
+		tracker_miner_fs_add_directory (fs, file, TRUE);
 		g_object_unref (file);
-        }
+	}
 
 	/* Add removable media */
 	g_message ("Setting up directories to iterate which are removable devices");
@@ -419,14 +419,14 @@ miner_files_constructed (GObject *object)
 
 		g_message ("  Adding:'%s'", (gchar*) m->data);
 		tracker_miner_fs_add_directory (TRACKER_MINER_FS (mf),
-						file,
-						TRUE);
+		                                file,
+		                                TRUE);
 		g_object_unref (file);
 	}
 
 	g_signal_connect (mf->private->config, "notify::low-disk-space-limit",
-			  G_CALLBACK (low_disk_space_limit_cb),
-			  mf);
+	                  G_CALLBACK (low_disk_space_limit_cb),
+	                  mf);
 
 	g_slist_foreach (mounts, (GFunc) g_free, NULL);
 	g_slist_free (mounts);
@@ -448,7 +448,7 @@ set_up_mount_point_cb (GObject      *source,
 
 	if (error) {
 		g_critical ("Could not set up mount point '%s': %s",
-			    removable_device_urn, error->message);
+		            removable_device_urn, error->message);
 		g_error_free (error);
 	}
 
@@ -527,10 +527,10 @@ set_up_mount_point (TrackerMinerFiles *miner,
 		g_string_append_printf (accumulator, "%s ", queries->str);
 	} else {
 		tracker_miner_execute_update (TRACKER_MINER (miner),
-					      queries->str,
-					      NULL,
-					      set_up_mount_point_cb,
-					      g_strdup (removable_device_urn));
+		                              queries->str,
+		                              NULL,
+		                              set_up_mount_point_cb,
+		                              g_strdup (removable_device_urn));
 	}
 
 	g_string_free (queries, TRUE);
@@ -549,7 +549,7 @@ init_mount_points_cb (GObject      *source,
 
 	if (error) {
 		g_critical ("Could not initialize currently active mount points: %s",
-			    error->message);
+		            error->message);
 		g_error_free (error);
 	}
 }
@@ -651,14 +651,14 @@ query_mount_points_cb (GObject      *source,
 			if (urn) {
 				if (mount_point) {
 					g_debug ("URN '%s' (mount point: %s) was not reported to be mounted, but now it is, updating state",
-						 urn, mount_point);
+					         urn, mount_point);
 				} else {
 					g_debug ("URN '%s' was not reported to be mounted, but now it is, updating state", urn);
 				}
 				set_up_mount_point (TRACKER_MINER_FILES (miner), urn, mount_point, TRUE, accumulator);
 			}
 		} else if (!(state & VOLUME_MOUNTED) &&
-			   (state & VOLUME_MOUNTED_IN_STORE)) {
+		           (state & VOLUME_MOUNTED_IN_STORE)) {
 			if (urn) {
 				g_debug ("URN '%s' was reported to be mounted, but it isn't anymore, updating state", urn);
 				set_up_mount_point (TRACKER_MINER_FILES (miner), urn, NULL, FALSE, accumulator);
@@ -668,10 +668,10 @@ query_mount_points_cb (GObject      *source,
 
 	if (accumulator->str[0] != '\0') {
 		tracker_miner_execute_update (miner,
-					      accumulator->str,
-					      NULL,
-					      init_mount_points_cb,
-					      NULL);
+		                              accumulator->str,
+		                              NULL,
+		                              init_mount_points_cb,
+		                              NULL);
 	}
 
 	g_string_free (accumulator, TRUE);
@@ -685,19 +685,19 @@ init_mount_points (TrackerMinerFiles *miner)
 
 	/* First, get all mounted volumes, according to tracker-store */
 	tracker_miner_execute_sparql (TRACKER_MINER (miner),
-				      "SELECT ?v WHERE { ?v a tracker:Volume ; tracker:isMounted true }",
-				      NULL,
-				      query_mount_points_cb,
-				      NULL);
+	                              "SELECT ?v WHERE { ?v a tracker:Volume ; tracker:isMounted true }",
+	                              NULL,
+	                              query_mount_points_cb,
+	                              NULL);
 }
 
 #ifdef HAVE_HAL
 
 static void
 mount_point_removed_cb (TrackerStorage *storage,
-			const gchar    *udi,
-			const gchar    *mount_point,
-			gpointer        user_data)
+                        const gchar    *udi,
+                        const gchar    *mount_point,
+                        gpointer        user_data)
 {
 	TrackerMinerFiles *miner = user_data;
 	gchar *urn;
@@ -719,21 +719,21 @@ mount_point_added_cb (TrackerStorage *storage,
 	TrackerMinerFiles *miner = user_data;
 	TrackerMinerFilesPrivate *priv;
 	gchar *urn;
-        gboolean index_removable_devices;
+	gboolean index_removable_devices;
 
-        priv = TRACKER_MINER_FILES_GET_PRIVATE (miner);
+	priv = TRACKER_MINER_FILES_GET_PRIVATE (miner);
 
-        index_removable_devices = tracker_config_get_index_removable_devices (priv->config);
+	index_removable_devices = tracker_config_get_index_removable_devices (priv->config);
 
-        if (index_removable_devices) {
+	if (index_removable_devices) {
 		GFile *file;
 
 		file = g_file_new_for_path (mount_point);
-                tracker_miner_fs_add_directory (TRACKER_MINER_FS (user_data),
-						file,
-						TRUE);
+		tracker_miner_fs_add_directory (TRACKER_MINER_FS (user_data),
+		                                file,
+		                                TRUE);
 		g_object_unref (file);
-        }
+	}
 
 	g_debug ("Configuring added mount point '%s'", mount_point);
 
@@ -745,7 +745,7 @@ mount_point_added_cb (TrackerStorage *storage,
 
 static void
 set_up_throttle (TrackerMinerFiles *mf,
-		 gboolean           enable)
+                 gboolean           enable)
 {
 	gdouble throttle;
 	gint config_throttle;
@@ -793,15 +793,15 @@ check_battery_status (TrackerMinerFiles *mf)
 		if (mf->private->low_battery_pause_cookie == 0) {
 			mf->private->low_battery_pause_cookie =
 				tracker_miner_pause (TRACKER_MINER (mf),
-						     _("Low battery"),
-						     NULL);
+				                     _("Low battery"),
+				                     NULL);
 		}
 	} else {
 		/* Don't try to resume again */
 		if (mf->private->low_battery_pause_cookie != 0) {
 			tracker_miner_resume (TRACKER_MINER (mf),
-					      mf->private->low_battery_pause_cookie,
-					      NULL);
+			                      mf->private->low_battery_pause_cookie,
+			                      NULL);
 			mf->private->low_battery_pause_cookie = 0;
 		}
 	}
@@ -811,8 +811,8 @@ check_battery_status (TrackerMinerFiles *mf)
 
 static void
 battery_status_cb (GObject    *object,
-		   GParamSpec *pspec,
-		   gpointer    user_data)
+                   GParamSpec *pspec,
+                   gpointer    user_data)
 {
 	TrackerMinerFiles *mf = user_data;
 
@@ -823,8 +823,8 @@ battery_status_cb (GObject    *object,
 
 static void
 mount_pre_unmount_cb (GVolumeMonitor    *volume_monitor,
-		      GMount            *mount,
-		      TrackerMinerFiles *mf)
+                      GMount            *mount,
+                      TrackerMinerFiles *mf)
 {
 	GFile *mount_root;
 
@@ -858,8 +858,8 @@ disk_space_check (TrackerMinerFiles *mf)
 
 	if (((long long) st.f_bavail * 100 / st.f_blocks) <= limit) {
 		g_message ("WARNING: Available disk space is below configured "
-			   "threshold for acceptable working (%d%%)",
-			   limit);
+		           "threshold for acceptable working (%d%%)",
+		           limit);
 		return TRUE;
 	}
 
@@ -876,15 +876,15 @@ disk_space_check_cb (gpointer user_data)
 		if (mf->private->disk_space_pause_cookie == 0) {
 			mf->private->disk_space_pause_cookie =
 				tracker_miner_pause (TRACKER_MINER (mf),
-						     _("Low disk space"),
-						     NULL);
+				                     _("Low disk space"),
+				                     NULL);
 		}
 	} else {
 		/* Don't try to resume again */
 		if (mf->private->disk_space_pause_cookie != 0) {
 			tracker_miner_resume (TRACKER_MINER (mf),
-					      mf->private->disk_space_pause_cookie,
-					      NULL);
+			                      mf->private->disk_space_pause_cookie,
+			                      NULL);
 			mf->private->disk_space_pause_cookie = 0;
 		}
 	}
@@ -905,11 +905,11 @@ disk_space_check_start (TrackerMinerFiles *mf)
 
 	if (limit != -1) {
 		g_message ("Starting disk space check for every %d seconds",
-			   DISK_SPACE_CHECK_FREQUENCY);
+		           DISK_SPACE_CHECK_FREQUENCY);
 		mf->private->disk_space_check_id =
 			g_timeout_add_seconds (DISK_SPACE_CHECK_FREQUENCY,
-					       disk_space_check_cb,
-					       mf);
+			                       disk_space_check_cb,
+			                       mf);
 
 		/* Call the function now too to make sure we have an
 		 * initial value too!
@@ -932,8 +932,8 @@ disk_space_check_stop (TrackerMinerFiles *mf)
 
 static void
 low_disk_space_limit_cb (GObject    *gobject,
-			 GParamSpec *arg1,
-			 gpointer    user_data)
+                         GParamSpec *arg1,
+                         gpointer    user_data)
 {
 	TrackerMinerFiles *mf = user_data;
 
@@ -942,7 +942,7 @@ low_disk_space_limit_cb (GObject    *gobject,
 
 static gboolean
 miner_files_check_file (TrackerMinerFS *fs,
-			GFile          *file)
+                        GFile          *file)
 {
 	TrackerMinerFiles *mf;
 	GFileInfo *file_info;
@@ -957,9 +957,9 @@ miner_files_check_file (TrackerMinerFS *fs,
 	path = NULL;
 
 	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
-                                       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                       NULL, NULL);
+	                               G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL, NULL);
 
 	if (file_info && g_file_info_get_is_hidden (file_info)) {
 		/* Ignore hidden files */
@@ -987,7 +987,7 @@ miner_files_check_file (TrackerMinerFS *fs,
 
 	should_process = TRUE;
 
-done:
+ done:
 	g_free (basename);
 	g_free (path);
 
@@ -1000,7 +1000,7 @@ done:
 
 static gboolean
 miner_files_check_directory (TrackerMinerFS *fs,
-			     GFile          *file)
+                             GFile          *file)
 {
 	TrackerMinerFiles *mf;
 	GFileInfo *file_info;
@@ -1014,9 +1014,9 @@ miner_files_check_directory (TrackerMinerFS *fs,
 
 	/* Most common things to ignore */
 	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
-                                       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                       NULL, NULL);
+	                               G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL, NULL);
 
 	path = g_file_get_path (file);
 
@@ -1067,7 +1067,7 @@ miner_files_check_directory (TrackerMinerFS *fs,
 	/* Check module directory ignore patterns */
 	should_process = TRUE;
 
-done:
+ done:
 	g_free (basename);
 	g_free (path);
 
@@ -1080,8 +1080,8 @@ done:
 
 static gboolean
 miner_files_check_directory_contents (TrackerMinerFS *fs,
-				      GFile          *parent,
-				      GList          *children)
+                                      GFile          *parent,
+                                      GList          *children)
 {
 	TrackerMinerFiles *mf;
 	GSList *ignored_content, *l;
@@ -1104,7 +1104,7 @@ miner_files_check_directory_contents (TrackerMinerFS *fs,
 
 				parent_uri = g_file_get_uri (parent);
 				g_debug ("Directory '%s' ignored since it contains a file named '%s'",
-					 parent_uri, basename);
+				         parent_uri, basename);
 
 				g_free (parent_uri);
 				g_free (basename);
@@ -1122,7 +1122,7 @@ miner_files_check_directory_contents (TrackerMinerFS *fs,
 
 static gboolean
 miner_files_monitor_directory (TrackerMinerFS *fs,
-			       GFile          *file)
+                               GFile          *file)
 {
 	TrackerMinerFiles *mf;
 
@@ -1140,14 +1140,14 @@ miner_files_monitor_directory (TrackerMinerFS *fs,
 
 static void
 miner_files_add_to_datasource (TrackerMinerFiles    *mf,
-			       GFile                *file,
-			       TrackerSparqlBuilder *sparql)
+                               GFile                *file,
+                               TrackerSparqlBuilder *sparql)
 {
-        TrackerMinerFilesPrivate *priv;
+	TrackerMinerFilesPrivate *priv;
 	const gchar *removable_device_udi;
 	gchar *removable_device_urn, *uri;
 
-        priv = TRACKER_MINER_FILES_GET_PRIVATE (mf);
+	priv = TRACKER_MINER_FILES_GET_PRIVATE (mf);
 	uri = g_file_get_uri (file);
 
 #ifdef HAVE_HAL
@@ -1158,7 +1158,7 @@ miner_files_add_to_datasource (TrackerMinerFiles    *mf,
 
 	if (removable_device_udi) {
 		removable_device_urn = g_strdup_printf (TRACKER_DATASOURCE_URN_PREFIX "%s",
-						        removable_device_udi);
+		                                        removable_device_udi);
 	} else {
 		removable_device_urn = g_strdup (TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN);
 	}
@@ -1167,11 +1167,11 @@ miner_files_add_to_datasource (TrackerMinerFiles    *mf,
 	tracker_sparql_builder_predicate (sparql, "a");
 	tracker_sparql_builder_object (sparql, "nfo:FileDataObject");
 
-        tracker_sparql_builder_predicate (sparql, "nie:dataSource");
-        tracker_sparql_builder_object_iri (sparql, removable_device_urn);
+	tracker_sparql_builder_predicate (sparql, "nie:dataSource");
+	tracker_sparql_builder_object_iri (sparql, removable_device_urn);
 
-        tracker_sparql_builder_predicate (sparql, "tracker:available");
-        tracker_sparql_builder_object_boolean (sparql, TRUE);
+	tracker_sparql_builder_predicate (sparql, "tracker:available");
+	tracker_sparql_builder_object_boolean (sparql, TRUE);
 
 	g_free (removable_device_urn);
 	g_free (uri);
@@ -1198,16 +1198,16 @@ extractor_create_proxy (void)
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
 	}
 
 	/* Get proxy for the extractor */
 	proxy = dbus_g_proxy_new_for_name (connection,
-					   "org.freedesktop.Tracker1.Extract",
-					   "/org/freedesktop/Tracker1/Extract",
-					   "org.freedesktop.Tracker1.Extract");
+	                                   "org.freedesktop.Tracker1.Extract",
+	                                   "/org/freedesktop/Tracker1/Extract",
+	                                   "org.freedesktop.Tracker1.Extract");
 
 	if (!proxy) {
 		g_critical ("Could not create a DBusGProxy to the extract service");
@@ -1218,18 +1218,18 @@ extractor_create_proxy (void)
 
 static void
 extractor_queue_thumbnail_cb (DBusGProxy  *proxy,
-			      const gchar *filename,
-			      const gchar *mime_type,
-			      gpointer     user_data)
+                              const gchar *filename,
+                              const gchar *mime_type,
+                              gpointer     user_data)
 {
 	tracker_thumbnailer_queue_add (filename, mime_type);
 }
 
 static void
 extractor_get_embedded_metadata_cb (DBusGProxy *proxy,
-				    gchar      *sparql,
-				    GError     *error,
-				    gpointer    user_data)
+                                    gchar      *sparql,
+                                    GError     *error,
+                                    gpointer    user_data)
 {
 	ProcessFileData *data = user_data;
 
@@ -1253,13 +1253,13 @@ extractor_get_embedded_metadata_cb (DBusGProxy *proxy,
 
 static void
 extractor_get_embedded_metadata_cancel (GCancellable    *cancellable,
-					ProcessFileData *data)
+                                        ProcessFileData *data)
 {
 	GError *error;
 
 	/* Cancel extractor call */
 	dbus_g_proxy_cancel_call (data->miner->private->extractor_proxy,
-				  data->call);
+	                          data->call);
 
 	error = g_error_new_literal (miner_files_error_quark, 0, "Embedded metadata extraction was cancelled");
 	tracker_miner_fs_notify_file (TRACKER_MINER_FS (data->miner), data->file, error);
@@ -1270,22 +1270,22 @@ extractor_get_embedded_metadata_cancel (GCancellable    *cancellable,
 
 static void
 extractor_get_embedded_metadata (ProcessFileData *data,
-				 const gchar     *uri,
-				 const gchar     *mime_type)
+                                 const gchar     *uri,
+                                 const gchar     *mime_type)
 {
 	data->call = org_freedesktop_Tracker1_Extract_get_metadata_async (data->miner->private->extractor_proxy,
-									  uri,
-									  mime_type,
-									  extractor_get_embedded_metadata_cb,
-									  data);
+	                                                                  uri,
+	                                                                  mime_type,
+	                                                                  extractor_get_embedded_metadata_cb,
+	                                                                  data);
 	g_signal_connect (data->cancellable, "cancelled",
-			  G_CALLBACK (extractor_get_embedded_metadata_cancel), data);
+	                  G_CALLBACK (extractor_get_embedded_metadata_cancel), data);
 }
 
 static void
 process_file_cb (GObject      *object,
-		 GAsyncResult *result,
-		 gpointer      user_data)
+                 GAsyncResult *result,
+                 gpointer      user_data)
 {
 	TrackerSparqlBuilder *sparql;
 	ProcessFileData *data;
@@ -1312,9 +1312,9 @@ process_file_cb (GObject      *object,
 	uri = g_file_get_uri (file);
 	mime_type = g_file_info_get_content_type (file_info);
 
-        tracker_sparql_builder_insert_open (sparql, uri);
+	tracker_sparql_builder_insert_open (sparql, uri);
 
-        tracker_sparql_builder_subject_iri (sparql, uri);
+	tracker_sparql_builder_subject_iri (sparql, uri);
 	tracker_sparql_builder_predicate (sparql, "a");
 	tracker_sparql_builder_object (sparql, "nfo:FileDataObject");
 
@@ -1338,7 +1338,7 @@ process_file_cb (GObject      *object,
 	tracker_sparql_builder_object_date (sparql, (time_t *) &time_);
 
 	time_ = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_ACCESS);
-        tracker_sparql_builder_predicate (sparql, "nfo:fileLastAccessed");
+	tracker_sparql_builder_predicate (sparql, "nfo:fileLastAccessed");
 	tracker_sparql_builder_object_date (sparql, (time_t *) &time_);
 
 	tracker_sparql_builder_subject_iri (sparql, uri); /* Change to URN */
@@ -1355,7 +1355,7 @@ process_file_cb (GObject      *object,
 	tracker_sparql_builder_predicate (sparql, "nie:mimeType");
 	tracker_sparql_builder_object_string (sparql, mime_type);
 
-        miner_files_add_to_datasource (data->miner, file, sparql);
+	miner_files_add_to_datasource (data->miner, file, sparql);
 
 	tracker_sparql_builder_insert_close (sparql);
 
@@ -1373,9 +1373,9 @@ process_file_cb (GObject      *object,
 
 static gboolean
 miner_files_process_file (TrackerMinerFS       *fs,
-			  GFile                *file,
-			  TrackerSparqlBuilder *sparql,
-			  GCancellable         *cancellable)
+                          GFile                *file,
+                          TrackerSparqlBuilder *sparql,
+                          GCancellable         *cancellable)
 {
 	ProcessFileData *data;
 	const gchar *attrs;
@@ -1394,12 +1394,12 @@ miner_files_process_file (TrackerMinerFS       *fs,
 		G_FILE_ATTRIBUTE_TIME_ACCESS;
 
 	g_file_query_info_async (file,
-				 attrs,
-				 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-				 G_PRIORITY_DEFAULT,
-				 cancellable,
-				 process_file_cb,
-				 data);
+	                         attrs,
+	                         G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                         G_PRIORITY_DEFAULT,
+	                         cancellable,
+	                         process_file_cb,
+	                         data);
 
 	return TRUE;
 }
@@ -1472,9 +1472,9 @@ miner_files_writeback_file (TrackerMinerFS       *fs,
 TrackerMiner *
 tracker_miner_files_new (TrackerConfig *config)
 {
-        return g_object_new (TRACKER_TYPE_MINER_FILES,
-                             "name", "Files",
-                             "config", config,
-			     "process-pool-limit", 10,
-                             NULL);
+	return g_object_new (TRACKER_TYPE_MINER_FILES,
+	                     "name", "Files",
+	                     "config", config,
+	                     "process-pool-limit", 10,
+	                     NULL);
 }
diff --git a/src/tracker-miner-fs/tracker-miner-files.h b/src/tracker-miner-fs/tracker-miner-files.h
index 37333d9..9917530 100644
--- a/src/tracker-miner-fs/tracker-miner-files.h
+++ b/src/tracker-miner-fs/tracker-miner-files.h
@@ -39,12 +39,12 @@ typedef struct TrackerMinerFilesClass TrackerMinerFilesClass;
 typedef struct TrackerMinerFilesPrivate TrackerMinerFilesPrivate;
 
 struct TrackerMinerFiles {
-        TrackerMinerFS parent_instance;
+	TrackerMinerFS parent_instance;
 	TrackerMinerFilesPrivate *private;
 };
 
 struct TrackerMinerFilesClass {
-        TrackerMinerFSClass parent_class;
+	TrackerMinerFSClass parent_class;
 };
 
 GType          tracker_miner_files_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-miner-fs/tracker-thumbnailer.c b/src/tracker-miner-fs/tracker-thumbnailer.c
index 07a5f80..162299a 100644
--- a/src/tracker-miner-fs/tracker-thumbnailer.c
+++ b/src/tracker-miner-fs/tracker-thumbnailer.c
@@ -26,12 +26,12 @@
 
 #include "tracker-thumbnailer.h"
 
-#define THUMBNAILER_SERVICE	 "org.freedesktop.thumbnailer"
-#define THUMBNAILER_PATH	 "/org/freedesktop/thumbnailer/Generic"
-#define THUMBNAILER_INTERFACE	 "org.freedesktop.thumbnailer.Generic"
+#define THUMBNAILER_SERVICE      "org.freedesktop.thumbnailer"
+#define THUMBNAILER_PATH         "/org/freedesktop/thumbnailer/Generic"
+#define THUMBNAILER_INTERFACE    "org.freedesktop.thumbnailer.Generic"
 
-#define THUMBMAN_PATH		 "/org/freedesktop/thumbnailer/Manager"
-#define THUMBMAN_INTERFACE	 "org.freedesktop.thumbnailer.Manager"
+#define THUMBMAN_PATH            "/org/freedesktop/thumbnailer/Manager"
+#define THUMBMAN_INTERFACE       "org.freedesktop.thumbnailer.Manager"
 
 #define THUMBNAIL_REQUEST_LIMIT 50
 
@@ -79,7 +79,7 @@ private_free (gpointer data)
 
 inline static gboolean
 should_be_thumbnailed (GStrv        list,
-		       const gchar *mime)
+                       const gchar *mime)
 {
 	gboolean should_thumbnail;
 	guint i;
@@ -113,8 +113,8 @@ tracker_thumbnailer_init (void)
 	private->request_id = 1;
 
 	g_static_private_set (&private_key,
-			      private,
-			      private_free);
+	                      private,
+	                      private_free);
 
 	g_message ("Thumbnailer connections being set up...");
 
@@ -122,7 +122,7 @@ tracker_thumbnailer_init (void)
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 
 		private->service_is_available = FALSE;
@@ -132,25 +132,25 @@ tracker_thumbnailer_init (void)
 
 	private->requester_proxy =
 		dbus_g_proxy_new_for_name (connection,
-					   THUMBNAILER_SERVICE,
-					   THUMBNAILER_PATH,
-					   THUMBNAILER_INTERFACE);
+		                           THUMBNAILER_SERVICE,
+		                           THUMBNAILER_PATH,
+		                           THUMBNAILER_INTERFACE);
 
 	private->manager_proxy =
 		dbus_g_proxy_new_for_name (connection,
-					   THUMBNAILER_SERVICE,
-					   THUMBMAN_PATH,
-					   THUMBMAN_INTERFACE);
+		                           THUMBNAILER_SERVICE,
+		                           THUMBMAN_PATH,
+		                           THUMBMAN_INTERFACE);
 
 	dbus_g_proxy_call (private->manager_proxy,
-			   "GetSupported", &error,
-			   G_TYPE_INVALID,
-			   G_TYPE_STRV, &mime_types,
-			   G_TYPE_INVALID);
+	                   "GetSupported", &error,
+	                   G_TYPE_INVALID,
+	                   G_TYPE_STRV, &mime_types,
+	                   G_TYPE_INVALID);
 
 	if (error) {
 		g_message ("Thumbnailer service did not return supported mime types, %s",
-			   error->message);
+		           error->message);
 
 		g_error_free (error);
 
@@ -167,7 +167,7 @@ tracker_thumbnailer_init (void)
 		return FALSE;
 	} else if (mime_types) {
 		g_message ("Thumbnailer supports %d mime types",
-			   g_strv_length (mime_types));
+		           g_strv_length (mime_types));
 
 		private->supported_mime_types = mime_types;
 		private->service_is_available = TRUE;
@@ -184,8 +184,8 @@ tracker_thumbnailer_shutdown (void)
 
 gboolean
 tracker_thumbnailer_move (const gchar *from_uri,
-			  const gchar *mime_type,
-			  const gchar *to_uri)
+                          const gchar *mime_type,
+                          const gchar *to_uri)
 {
 	TrackerThumbnailerPrivate *private;
 	gchar *to[2] = { NULL, NULL };
@@ -209,9 +209,9 @@ tracker_thumbnailer_move (const gchar *from_uri,
 	private->request_id++;
 
 	g_debug ("Thumbnailer request to move uri from:'%s' to:'%s', request_id:%d...",
-		 from_uri,
-		 to_uri,
-		 private->request_id);
+	         from_uri,
+	         to_uri,
+	         private->request_id);
 
 	if (!strstr (to_uri, "://")) {
 		to[0] = g_filename_to_uri (to_uri, NULL, NULL);
@@ -226,11 +226,11 @@ tracker_thumbnailer_move (const gchar *from_uri,
 	}
 
 	dbus_g_proxy_call_no_reply (private->requester_proxy,
-				    "Move",
-				    G_TYPE_STRV, from,
-				    G_TYPE_STRV, to,
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
+	                            "Move",
+	                            G_TYPE_STRV, from,
+	                            G_TYPE_STRV, to,
+	                            G_TYPE_INVALID,
+	                            G_TYPE_INVALID);
 
 	g_free (from[0]);
 	g_free (to[0]);
@@ -240,7 +240,7 @@ tracker_thumbnailer_move (const gchar *from_uri,
 
 gboolean
 tracker_thumbnailer_remove (const gchar *uri,
-			    const gchar *mime_type)
+                            const gchar *mime_type)
 {
 	TrackerThumbnailerPrivate *private;
 	gchar *uris[2] = { NULL, NULL };
@@ -269,14 +269,14 @@ tracker_thumbnailer_remove (const gchar *uri,
 	}
 
 	g_debug ("Thumbnailer request to remove uri:'%s', request_id:%d...",
-		 uri,
-		 private->request_id);
+	         uri,
+	         private->request_id);
 
 	dbus_g_proxy_call_no_reply (private->requester_proxy,
-				    "Delete",
-				    G_TYPE_STRV, uris,
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
+	                            "Delete",
+	                            G_TYPE_STRV, uris,
+	                            G_TYPE_INVALID,
+	                            G_TYPE_INVALID);
 
 	g_free (uris[0]);
 
@@ -300,22 +300,22 @@ tracker_thumbnailer_cleanup (const gchar *uri_prefix)
 	private->request_id++;
 
 	g_debug ("Thumbnailer cleaning up uri:'%s', request_id:%d...",
-		 uri_prefix,
-		 private->request_id);
+	         uri_prefix,
+	         private->request_id);
 
 	dbus_g_proxy_call_no_reply (private->requester_proxy,
-				    "Cleanup",
-				    G_TYPE_STRING, uri_prefix,
-				    G_TYPE_UINT, 0,
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
+	                            "Cleanup",
+	                            G_TYPE_STRING, uri_prefix,
+	                            G_TYPE_UINT, 0,
+	                            G_TYPE_INVALID,
+	                            G_TYPE_INVALID);
 
 	return TRUE;
 }
 
 gboolean
 tracker_thumbnailer_queue_add (const gchar *uri,
-			       const gchar *mime_type)
+                               const gchar *mime_type)
 {
 	TrackerThumbnailerPrivate *private;
 	gchar *used_uri;
@@ -352,8 +352,8 @@ tracker_thumbnailer_queue_add (const gchar *uri,
 	private->mime_types = g_slist_append (private->mime_types, used_mime_type);
 
 	g_debug ("Thumbnailer queue appended with uri:'%s', mime type:'%s'",
-		 used_uri,
-		 used_mime_type);
+	         used_uri,
+	         used_mime_type);
 
 	return TRUE;
 }
@@ -379,19 +379,19 @@ tracker_thumbnailer_queue_send (void)
 	}
 
 	g_message ("Thumbnailer queue sent with %d items to thumbnailer daemon, request ID:%d...",
-		   g_slist_length (private->uris),
-		   private->request_id++);
+	           g_slist_length (private->uris),
+	           private->request_id++);
 
 	uri_strv = tracker_dbus_slist_to_strv (private->uris);
 	mime_type_strv = tracker_dbus_slist_to_strv (private->mime_types);
 
 	dbus_g_proxy_call_no_reply (private->requester_proxy,
-				    "Queue",
-				    G_TYPE_STRV, uri_strv,
-				    G_TYPE_STRV, mime_type_strv,
-				    G_TYPE_UINT, 0,
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
+	                            "Queue",
+	                            G_TYPE_STRV, uri_strv,
+	                            G_TYPE_STRV, mime_type_strv,
+	                            G_TYPE_UINT, 0,
+	                            G_TYPE_INVALID,
+	                            G_TYPE_INVALID);
 
 	/* Clean up newly created GStrv */
 	g_strfreev (uri_strv);
diff --git a/src/tracker-miner-fs/tracker-thumbnailer.h b/src/tracker-miner-fs/tracker-thumbnailer.h
index 2ca7550..749d981 100644
--- a/src/tracker-miner-fs/tracker-thumbnailer.h
+++ b/src/tracker-miner-fs/tracker-thumbnailer.h
@@ -27,13 +27,13 @@ G_BEGIN_DECLS
 gboolean tracker_thumbnailer_init       (void);
 void     tracker_thumbnailer_shutdown   (void);
 gboolean tracker_thumbnailer_queue_add  (const gchar *uri,
-					 const gchar *mime);
+                                         const gchar *mime);
 void     tracker_thumbnailer_queue_send (void);
 gboolean tracker_thumbnailer_move       (const gchar *from_uri,
-					 const gchar *mime_type,
-					 const gchar *to_uri);
+                                         const gchar *mime_type,
+                                         const gchar *to_uri);
 gboolean tracker_thumbnailer_remove     (const gchar *uri,
-					 const gchar *mime_type);
+                                         const gchar *mime_type);
 gboolean tracker_thumbnailer_cleanup    (const gchar *uri_prefix);
 
 G_END_DECLS
diff --git a/src/tracker-miner-fs/tracker-volume-cleanup.c b/src/tracker-miner-fs/tracker-volume-cleanup.c
index dcdc9b7..0d0fceb 100644
--- a/src/tracker-miner-fs/tracker-volume-cleanup.c
+++ b/src/tracker-miner-fs/tracker-volume-cleanup.c
@@ -77,12 +77,12 @@ check_for_volumes_to_cleanup (gpointer user_data)
 	iface = tracker_db_manager_get_db_interface ();
 
 	query = g_strdup_printf ("SELECT ?o ?m WHERE { "
-				   "?o a tracker:Volume ; "
-				   "tracker:mountPoint ?m ; "
-				   "tracker:unmountDate ?z ; "
-				   "tracker:isMounted false . "
-				 "FILTER (?z < \"%s\") }",
-				 three_days_ago_as_string);
+	                         "?o a tracker:Volume ; "
+	                         "tracker:mountPoint ?m ; "
+	                         "tracker:unmountDate ?z ; "
+	                         "tracker:isMounted false . "
+	                         "FILTER (?z < \"%s\") }",
+	                         three_days_ago_as_string);
 
 	result_set = tracker_data_query_sparql (query, NULL);
 
@@ -104,7 +104,7 @@ check_for_volumes_to_cleanup (gpointer user_data)
 
 			if (mount_point_uri) {
 				g_message ("  Cleaning up volumes with mount point:'%s'",
-					   mount_point_uri);
+				           mount_point_uri);
 
 				/* Add cleanup items here */
 				tracker_thumbnailer_cleanup (mount_point_uri);
@@ -144,8 +144,8 @@ tracker_volume_cleanup_init (void)
 	private = g_new0 (TrackerCleanupPrivate, 1);
 
 	g_static_private_set (&private_key,
-			      private,
-			      private_free);
+	                      private,
+	                      private_free);
 
 	check_for_volumes_to_cleanup (private);
 
@@ -159,8 +159,8 @@ tracker_volume_cleanup_init (void)
 
 	private->timeout_id =
 		g_timeout_add_seconds (SECONDS_PER_DAY + 1,
-				       check_for_volumes_to_cleanup,
-				       private);
+		                       check_for_volumes_to_cleanup,
+		                       private);
 }
 
 void
diff --git a/src/tracker-search-bar/tracker-aligned-window.c b/src/tracker-search-bar/tracker-aligned-window.c
index 63c05ba..bceb412 100644
--- a/src/tracker-search-bar/tracker-aligned-window.c
+++ b/src/tracker-search-bar/tracker-aligned-window.c
@@ -28,16 +28,16 @@
 
 #include "tracker-aligned-window.h"
 
-#define TRACKER_ALIGNED_WINDOW_GET_PRIVATE(obj)	(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowPrivate))
+#define TRACKER_ALIGNED_WINDOW_GET_PRIVATE(obj)         (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowPrivate))
 
 struct _TrackerAlignedWindowPrivate {
-        GtkWidget *align_widget;
-        guint motion_id;
+	GtkWidget *align_widget;
+	guint motion_id;
 };
 
 enum {
-        PROP_0,
-        PROP_ALIGN_WIDGET
+	PROP_0,
+	PROP_ALIGN_WIDGET
 };
 
 static void     tracker_aligned_window_finalize         (GObject              *object);
@@ -60,42 +60,42 @@ G_DEFINE_TYPE (TrackerAlignedWindow, tracker_aligned_window, GTK_TYPE_WINDOW);
 static void
 tracker_aligned_window_class_init (TrackerAlignedWindowClass *klass)
 {
-        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   
-        gobject_class->set_property = tracker_aligned_window_set_property;
-        gobject_class->get_property = tracker_aligned_window_get_property;
-        gobject_class->finalize = tracker_aligned_window_finalize;
+	gobject_class->set_property = tracker_aligned_window_set_property;
+	gobject_class->get_property = tracker_aligned_window_get_property;
+	gobject_class->finalize = tracker_aligned_window_finalize;
   
-        widget_class->realize = tracker_aligned_window_realize;
-        widget_class->show = tracker_aligned_window_show;
+	widget_class->realize = tracker_aligned_window_realize;
+	widget_class->show = tracker_aligned_window_show;
   
-        g_object_class_install_property (gobject_class, PROP_ALIGN_WIDGET,
-                                         g_param_spec_object ("align-widget",
-                                                              "Align Widget",
-                                                              "The widget the window should align to",
-                                                              GTK_TYPE_WIDGET,
-                                                              G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class, PROP_ALIGN_WIDGET,
+	                                 g_param_spec_object ("align-widget",
+	                                                      "Align Widget",
+	                                                      "The widget the window should align to",
+	                                                      GTK_TYPE_WIDGET,
+	                                                      G_PARAM_READWRITE));
   
-        g_type_class_add_private (klass, sizeof (TrackerAlignedWindowPrivate));
+	g_type_class_add_private (klass, sizeof (TrackerAlignedWindowPrivate));
 }
 
 static void
 tracker_aligned_window_init (TrackerAlignedWindow *aligned_window)
 {
-        TrackerAlignedWindowPrivate *priv = TRACKER_ALIGNED_WINDOW_GET_PRIVATE (aligned_window);
-        GtkWindow *window = GTK_WINDOW (aligned_window);
+	TrackerAlignedWindowPrivate *priv = TRACKER_ALIGNED_WINDOW_GET_PRIVATE (aligned_window);
+	GtkWindow *window = GTK_WINDOW (aligned_window);
   
-        aligned_window->private = priv;
+	aligned_window->private = priv;
   
-        priv->align_widget = NULL;
-        priv->motion_id = 0;
+	priv->align_widget = NULL;
+	priv->motion_id = 0;
   
-        /* set window properties */
-        window->type = GTK_WINDOW_TOPLEVEL;
+	/* set window properties */
+	window->type = GTK_WINDOW_TOPLEVEL;
 
-        gtk_window_set_decorated (window, FALSE);
-        gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DOCK);
+	gtk_window_set_decorated (window, FALSE);
+	gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DOCK);
 }
 
 static void
@@ -104,16 +104,16 @@ tracker_aligned_window_get_property (GObject    *object,
                                      GValue     *value,
                                      GParamSpec *pspec)
 {
-        TrackerAlignedWindow *aligned_window = TRACKER_ALIGNED_WINDOW (object);
+	TrackerAlignedWindow *aligned_window = TRACKER_ALIGNED_WINDOW (object);
   
-        switch (prop_id) {
-        case PROP_ALIGN_WIDGET:
-                g_value_set_object (value, aligned_window->private->align_widget);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
+	switch (prop_id) {
+	case PROP_ALIGN_WIDGET:
+		g_value_set_object (value, aligned_window->private->align_widget);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -122,110 +122,110 @@ tracker_aligned_window_set_property (GObject      *object,
                                      const GValue *value,
                                      GParamSpec   *pspec)
 {
-        TrackerAlignedWindow *aligned_window = TRACKER_ALIGNED_WINDOW (object);
+	TrackerAlignedWindow *aligned_window = TRACKER_ALIGNED_WINDOW (object);
   
-        switch (prop_id) {
-        case PROP_ALIGN_WIDGET:
-                tracker_aligned_window_set_widget (aligned_window,
-                                                   g_value_get_object (value));
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
+	switch (prop_id) {
+	case PROP_ALIGN_WIDGET:
+		tracker_aligned_window_set_widget (aligned_window,
+		                                   g_value_get_object (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
 tracker_aligned_window_position (TrackerAlignedWindow *window)
 {
-        TrackerAlignedWindowPrivate *priv;
-        GtkWidget *align_widget;
-        gint our_width, our_height;
-        gint entry_x, entry_y, entry_width, entry_height;
-        gint x, y;
-        GdkGravity gravity = GDK_GRAVITY_NORTH_WEST;
-
-        g_assert (TRACKER_IS_ALIGNED_WINDOW (window));
-        priv = window->private;
-
-        if (!priv->align_widget) {
-                return;
-        }
+	TrackerAlignedWindowPrivate *priv;
+	GtkWidget *align_widget;
+	gint our_width, our_height;
+	gint entry_x, entry_y, entry_width, entry_height;
+	gint x, y;
+	GdkGravity gravity = GDK_GRAVITY_NORTH_WEST;
+
+	g_assert (TRACKER_IS_ALIGNED_WINDOW (window));
+	priv = window->private;
+
+	if (!priv->align_widget) {
+		return;
+	}
 
-        align_widget = priv->align_widget;
+	align_widget = priv->align_widget;
 
-        gdk_flush ();
+	gdk_flush ();
   
-        gdk_window_get_geometry (GTK_WIDGET (window)->window,
-                                 NULL,
-                                 NULL,
-                                 &our_width,
-                                 &our_height,
-                                 NULL);
+	gdk_window_get_geometry (GTK_WIDGET (window)->window,
+	                         NULL,
+	                         NULL,
+	                         &our_width,
+	                         &our_height,
+	                         NULL);
   
-        /* stick, skip taskbar and pager */
-        gtk_window_stick (GTK_WINDOW (window));
-        gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE);
-        gtk_window_set_skip_pager_hint (GTK_WINDOW (window), TRUE);
+	/* stick, skip taskbar and pager */
+	gtk_window_stick (GTK_WINDOW (window));
+	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE);
+	gtk_window_set_skip_pager_hint (GTK_WINDOW (window), TRUE);
 
-        /* make sure the align_widget is realized before we do anything */
-        gtk_widget_realize (align_widget);
+	/* make sure the align_widget is realized before we do anything */
+	gtk_widget_realize (align_widget);
   
-        /* get the positional and dimensional attributes of the align widget */
-        gdk_window_get_origin (align_widget->window,
-                               &entry_x,
-                               &entry_y);
-        gdk_window_get_geometry (align_widget->window,
-                                 NULL,
-                                 NULL,
-                                 &entry_width,
-                                 &entry_height,
-                                 NULL);
+	/* get the positional and dimensional attributes of the align widget */
+	gdk_window_get_origin (align_widget->window,
+	                       &entry_x,
+	                       &entry_y);
+	gdk_window_get_geometry (align_widget->window,
+	                         NULL,
+	                         NULL,
+	                         &entry_width,
+	                         &entry_height,
+	                         NULL);
   
-        if (entry_x + our_width < gdk_screen_width ()) {
-                x = entry_x + 1;
-        } else {
-                x = entry_x + entry_width - our_width - 1;
+	if (entry_x + our_width < gdk_screen_width ()) {
+		x = entry_x + 1;
+	} else {
+		x = entry_x + entry_width - our_width - 1;
       
-                gravity = GDK_GRAVITY_NORTH_EAST;
-        }
+		gravity = GDK_GRAVITY_NORTH_EAST;
+	}
   
-        if (entry_y + entry_height + our_height < gdk_screen_height ()) {
-                y = entry_y + entry_height + 1;
-        } else {
-                y = entry_y - our_height + 1;
+	if (entry_y + entry_height + our_height < gdk_screen_height ()) {
+		y = entry_y + entry_height + 1;
+	} else {
+		y = entry_y - our_height + 1;
       
-                if (gravity == GDK_GRAVITY_NORTH_EAST) {
-                        gravity = GDK_GRAVITY_SOUTH_EAST;
-                } else {
-                        gravity = GDK_GRAVITY_SOUTH_WEST;
-                }
-        }
+		if (gravity == GDK_GRAVITY_NORTH_EAST) {
+			gravity = GDK_GRAVITY_SOUTH_EAST;
+		} else {
+			gravity = GDK_GRAVITY_SOUTH_WEST;
+		}
+	}
   
-        gtk_window_set_gravity (GTK_WINDOW (window), gravity);
-        gtk_window_move (GTK_WINDOW (window), x, y);
+	gtk_window_set_gravity (GTK_WINDOW (window), gravity);
+	gtk_window_move (GTK_WINDOW (window), x, y);
 }
 
 static void
 tracker_aligned_window_realize (GtkWidget *widget)
 {
-        GTK_WIDGET_CLASS (tracker_aligned_window_parent_class)->realize (widget);
+	GTK_WIDGET_CLASS (tracker_aligned_window_parent_class)->realize (widget);
 
-        tracker_aligned_window_position (TRACKER_ALIGNED_WINDOW (widget));
+	tracker_aligned_window_position (TRACKER_ALIGNED_WINDOW (widget));
 }
 
 static void
 tracker_aligned_window_show (GtkWidget *widget)
 {
-        tracker_aligned_window_position (TRACKER_ALIGNED_WINDOW (widget));
+	tracker_aligned_window_position (TRACKER_ALIGNED_WINDOW (widget));
   
-        GTK_WIDGET_CLASS (tracker_aligned_window_parent_class)->show (widget);
+	GTK_WIDGET_CLASS (tracker_aligned_window_parent_class)->show (widget);
 }
 
 static void
 tracker_aligned_window_finalize (GObject *object)
 {
-        G_OBJECT_CLASS (tracker_aligned_window_parent_class)->finalize (object);
+	G_OBJECT_CLASS (tracker_aligned_window_parent_class)->finalize (object);
 }
 
 static gboolean
@@ -233,21 +233,21 @@ tracker_aligned_window_motion_notify_cb (GtkWidget            *widget,
                                          GdkEventMotion       *event,
                                          TrackerAlignedWindow *aligned_window)
 {
-        GtkAllocation alloc;
-        GdkRectangle rect;
+	GtkAllocation alloc;
+	GdkRectangle rect;
 
-        alloc = GTK_WIDGET (aligned_window)->allocation;
+	alloc = GTK_WIDGET (aligned_window)->allocation;
   
-        rect.x = 0;
-        rect.y = 0;
-        rect.width = alloc.width;
-        rect.height = alloc.height;
-
-        gdk_window_invalidate_rect (GTK_WIDGET (aligned_window)->window,
-                                    &rect,
-                                    FALSE);
+	rect.x = 0;
+	rect.y = 0;
+	rect.width = alloc.width;
+	rect.height = alloc.height;
+
+	gdk_window_invalidate_rect (GTK_WIDGET (aligned_window)->window,
+	                            &rect,
+	                            FALSE);
   
-        return FALSE;
+	return FALSE;
 }
 
 /**
@@ -261,9 +261,9 @@ tracker_aligned_window_motion_notify_cb (GtkWidget            *widget,
 GtkWidget *
 tracker_aligned_window_new (GtkWidget *align_widget)
 {
-        return g_object_new (TRACKER_TYPE_ALIGNED_WINDOW,
-                             "align-widget", align_widget,
-                             NULL);
+	return g_object_new (TRACKER_TYPE_ALIGNED_WINDOW,
+	                     "align-widget", align_widget,
+	                     NULL);
 }
 
 /**
@@ -281,31 +281,31 @@ void
 tracker_aligned_window_set_widget (TrackerAlignedWindow *aligned_window,
                                    GtkWidget          *align_widget)
 {
-        TrackerAlignedWindowPrivate *priv;
+	TrackerAlignedWindowPrivate *priv;
   
-        g_return_if_fail (TRACKER_IS_ALIGNED_WINDOW (aligned_window));
-        g_return_if_fail (GTK_IS_WIDGET (align_widget));
+	g_return_if_fail (TRACKER_IS_ALIGNED_WINDOW (aligned_window));
+	g_return_if_fail (GTK_IS_WIDGET (align_widget));
 
 #if 0  
-        if (GTK_WIDGET_NO_WINDOW (align_widget))
-        {
-                g_warning ("Attempting to set a widget of class '%s' as the "
-                           "align widget, but widgets of this class does not "
-                           "have a GdkWindow.",
-                           g_type_name (G_OBJECT_TYPE (align_widget)));
+	if (GTK_WIDGET_NO_WINDOW (align_widget))
+		{
+			g_warning ("Attempting to set a widget of class '%s' as the "
+			           "align widget, but widgets of this class does not "
+			           "have a GdkWindow.",
+			           g_type_name (G_OBJECT_TYPE (align_widget)));
       
-                return;
-        }
+			return;
+		}
 #endif
 
-        priv = TRACKER_ALIGNED_WINDOW_GET_PRIVATE (aligned_window);
+	priv = TRACKER_ALIGNED_WINDOW_GET_PRIVATE (aligned_window);
   
-        if (priv->align_widget) {
-                g_signal_handler_disconnect (priv->align_widget, priv->motion_id);
-                priv->align_widget = NULL;
-        }
+	if (priv->align_widget) {
+		g_signal_handler_disconnect (priv->align_widget, priv->motion_id);
+		priv->align_widget = NULL;
+	}
 
-        priv->align_widget = align_widget;
+	priv->align_widget = align_widget;
 
 	/* FIXME: This causes problems when the pointer goes out of the
 	 * window after it is removed using escape.
@@ -315,8 +315,8 @@ tracker_aligned_window_set_widget (TrackerAlignedWindow *aligned_window,
 	 */
 	if (0) {
 		priv->motion_id = g_signal_connect (priv->align_widget, "motion-notify-event",
-						    G_CALLBACK (tracker_aligned_window_motion_notify_cb),
-						    aligned_window);
+		                                    G_CALLBACK (tracker_aligned_window_motion_notify_cb),
+		                                    aligned_window);
 	}
 }
 
@@ -331,7 +331,7 @@ tracker_aligned_window_set_widget (TrackerAlignedWindow *aligned_window,
 GtkWidget *
 tracker_aligned_window_get_widget (TrackerAlignedWindow *aligned_window)
 {
-        g_return_val_if_fail (TRACKER_IS_ALIGNED_WINDOW (aligned_window), NULL);
+	g_return_val_if_fail (TRACKER_IS_ALIGNED_WINDOW (aligned_window), NULL);
   
-        return aligned_window->private->align_widget;
+	return aligned_window->private->align_widget;
 }
diff --git a/src/tracker-search-bar/tracker-aligned-window.h b/src/tracker-search-bar/tracker-aligned-window.h
index ef2b92d..6442e96 100644
--- a/src/tracker-search-bar/tracker-aligned-window.h
+++ b/src/tracker-search-bar/tracker-aligned-window.h
@@ -25,25 +25,25 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_ALIGNED_WINDOW		(tracker_aligned_window_get_type ())
-#define TRACKER_ALIGNED_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindow))
-#define TRACKER_IS_ALIGNED_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_ALIGNED_WINDOW))
-#define TRACKER_ALIGNED_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowClass))
-#define TRACKER_IS_ALIGNED_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_ALIGNED_WINDOW))
-#define TRACKER_ALIGNED_WINDOW_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowClass))
+#define TRACKER_TYPE_ALIGNED_WINDOW             (tracker_aligned_window_get_type ())
+#define TRACKER_ALIGNED_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindow))
+#define TRACKER_IS_ALIGNED_WINDOW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_ALIGNED_WINDOW))
+#define TRACKER_ALIGNED_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowClass))
+#define TRACKER_IS_ALIGNED_WINDOW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_ALIGNED_WINDOW))
+#define TRACKER_ALIGNED_WINDOW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_ALIGNED_WINDOW, TrackerAlignedWindowClass))
 
 typedef struct _TrackerAlignedWindow        TrackerAlignedWindow;
 typedef struct _TrackerAlignedWindowClass   TrackerAlignedWindowClass;
 typedef struct _TrackerAlignedWindowPrivate TrackerAlignedWindowPrivate;
 
 struct _TrackerAlignedWindow {
-        GtkWindow parent_instance;
+	GtkWindow parent_instance;
  
-        TrackerAlignedWindowPrivate *private;
+	TrackerAlignedWindowPrivate *private;
 };
 
 struct _TrackerAlignedWindowClass {
-        GtkWindowClass parent_class;
+	GtkWindowClass parent_class;
 };
 
 GType      tracker_aligned_window_get_type   (void) G_GNUC_CONST;
diff --git a/src/tracker-search-bar/tracker-applet.c b/src/tracker-search-bar/tracker-applet.c
index f40e5d0..b090aa4 100644
--- a/src/tracker-search-bar/tracker-applet.c
+++ b/src/tracker-search-bar/tracker-applet.c
@@ -34,8 +34,8 @@
 #include "tracker-results-window.h"
 
 static void applet_about_cb (BonoboUIComponent *uic,
-			     TrackerApplet     *applet,
-			     const gchar       *verb_name);
+                             TrackerApplet     *applet,
+                             const gchar       *verb_name);
 
 static const BonoboUIVerb applet_menu_verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("about", applet_about_cb),
@@ -44,8 +44,8 @@ static const BonoboUIVerb applet_menu_verbs [] = {
 
 static void
 applet_about_cb (BonoboUIComponent *uic,
-		 TrackerApplet     *applet,
-		 const gchar       *verb_name)
+                 TrackerApplet     *applet,
+                 const gchar       *verb_name)
 {
 	GObject *object;
 	GtkWidget *dialog;
@@ -56,17 +56,17 @@ applet_about_cb (BonoboUIComponent *uic,
 	dialog = GTK_WIDGET (object);
 
 	g_signal_connect_swapped (object,
-				  "response",
-				  G_CALLBACK (gtk_widget_destroy),
-				  dialog);
+	                          "response",
+	                          G_CALLBACK (gtk_widget_destroy),
+	                          dialog);
 
 	gtk_widget_show_all (dialog);
 }
 
 static gboolean
 applet_event_box_button_press_event_cb (GtkWidget      *widget,
-					GdkEventButton *event,
-					TrackerApplet  *applet)
+                                        GdkEventButton *event,
+                                        TrackerApplet  *applet)
 {
 	if (applet->results) {
 		gtk_widget_destroy (applet->results);
@@ -114,7 +114,7 @@ applet_entry_start_search_cb (gpointer user_data)
 
 static void
 applet_entry_activate_cb (GtkEntry      *entry,
-			  TrackerApplet *applet)
+                          TrackerApplet *applet)
 {
 	if (applet->new_search_id) {
 		g_source_remove (applet->new_search_id);
@@ -126,8 +126,8 @@ applet_entry_activate_cb (GtkEntry      *entry,
 
 static gboolean
 applet_entry_button_press_event_cb (GtkWidget      *widget,
-				    GdkEventButton *event,
-				    TrackerApplet  *applet)
+                                    GdkEventButton *event,
+                                    TrackerApplet  *applet)
 {
 	panel_applet_request_focus (PANEL_APPLET (applet->parent), event->time);
 
@@ -136,8 +136,8 @@ applet_entry_button_press_event_cb (GtkWidget      *widget,
 
 static gboolean
 applet_entry_key_press_event_cb (GtkWidget     *widget,
-				 GdkEventKey   *event,
-				 TrackerApplet *applet)
+                                 GdkEventKey   *event,
+                                 TrackerApplet *applet)
 {
 	if (event->keyval == GDK_Escape) {
 		if (!applet->results) {
@@ -159,8 +159,8 @@ applet_entry_key_press_event_cb (GtkWidget     *widget,
 
 		applet->new_search_id =
 			g_timeout_add (300,
-				       applet_entry_start_search_cb,
-				       applet);
+			               applet_entry_start_search_cb,
+			               applet);
 	}
 
 	return FALSE;
@@ -196,30 +196,30 @@ applet_draw (gpointer user_data)
 	gtk_box_pack_start (GTK_BOX (applet->box), applet->event_box, FALSE, FALSE, 0);
 
 	g_signal_connect (applet->event_box,
-			  "button_press_event",
-			  G_CALLBACK (applet_event_box_button_press_event_cb), applet);
+	                  "button_press_event",
+	                  G_CALLBACK (applet_event_box_button_press_event_cb), applet);
 
 	applet->image = gtk_image_new ();
 	gtk_container_add (GTK_CONTAINER (applet->event_box), applet->image);
 	gtk_image_set_from_stock (GTK_IMAGE (applet->image),
-				  GTK_STOCK_FIND,
-				  GTK_ICON_SIZE_SMALL_TOOLBAR);
+	                          GTK_STOCK_FIND,
+	                          GTK_ICON_SIZE_SMALL_TOOLBAR);
 	gtk_widget_show (applet->image);
 
 	applet->entry = gtk_entry_new ();
 	gtk_box_pack_start (GTK_BOX (applet->box), applet->entry, TRUE, TRUE, 0);
 	gtk_entry_set_width_chars (GTK_ENTRY (applet->entry), 12);
- 	gtk_widget_show (applet->entry);
+	gtk_widget_show (applet->entry);
 
 	g_signal_connect (applet->entry,
-			  "activate",
-			  G_CALLBACK (applet_entry_activate_cb), applet);
+	                  "activate",
+	                  G_CALLBACK (applet_entry_activate_cb), applet);
 	g_signal_connect (applet->entry,
-			  "button_press_event",
-			  G_CALLBACK (applet_entry_button_press_event_cb), applet);
+	                  "button_press_event",
+	                  G_CALLBACK (applet_entry_button_press_event_cb), applet);
 	g_signal_connect (applet->entry,
-			  "key_press_event",
-			  G_CALLBACK (applet_entry_key_press_event_cb), applet);
+	                  "key_press_event",
+	                  G_CALLBACK (applet_entry_key_press_event_cb), applet);
 
 	applet->idle_draw_id = 0;
 
@@ -235,8 +235,8 @@ applet_queue_draw (TrackerApplet *applet)
 
 static void
 applet_change_orient_cb (GtkWidget         *widget,
-			 PanelAppletOrient  orient,
-			 gpointer           user_data)
+                         PanelAppletOrient  orient,
+                         gpointer           user_data)
 {
 	TrackerApplet *applet;
 	guint new_size;
@@ -266,22 +266,22 @@ applet_change_orient_cb (GtkWidget         *widget,
 
 static void
 applet_size_allocate_cb (GtkWidget     *widget,
-			 GtkAllocation *allocation,
-			 gpointer       user_data)
+                         GtkAllocation *allocation,
+                         gpointer       user_data)
 {
 	TrackerApplet *applet;
 	PanelAppletOrient orient;
-        gint new_size;
+	gint new_size;
 
 	applet = user_data;
 
 	orient = panel_applet_get_orient (PANEL_APPLET (widget));
-        if (orient == PANEL_APPLET_ORIENT_LEFT ||
-            orient == PANEL_APPLET_ORIENT_RIGHT) {
-                new_size = allocation->width;
-        } else {
-                new_size = allocation->height;
-        }
+	if (orient == PANEL_APPLET_ORIENT_LEFT ||
+	    orient == PANEL_APPLET_ORIENT_RIGHT) {
+		new_size = allocation->width;
+	} else {
+		new_size = allocation->height;
+	}
 
 	if (applet->size != new_size) {
 		applet->size = new_size;
@@ -289,13 +289,13 @@ applet_size_allocate_cb (GtkWidget     *widget,
 		gtk_image_set_pixel_size (GTK_IMAGE (applet->image), applet->size - 2);
 
 		/* re-scale the icon, if it was found */
-		if (applet->icon)	{
+		if (applet->icon)       {
 			GdkPixbuf *scaled;
 
 			scaled = gdk_pixbuf_scale_simple (applet->icon,
-							  applet->size - 5,
-							  applet->size - 5,
-							  GDK_INTERP_BILINEAR);
+			                                  applet->size - 5,
+			                                  applet->size - 5,
+			                                  GDK_INTERP_BILINEAR);
 
 			gtk_image_set_from_pixbuf (GTK_IMAGE (applet->image), scaled);
 			g_object_unref (scaled);
@@ -306,7 +306,7 @@ applet_size_allocate_cb (GtkWidget     *widget,
 
 static void
 applet_destroy_cb (BonoboObject  *object,
-		   TrackerApplet *applet)
+                   TrackerApplet *applet)
 {
 	if (applet->builder) {
 		g_object_unref (applet->builder);
@@ -363,33 +363,33 @@ applet_new (PanelApplet *parent_applet)
 	applet->builder = builder;
 
 	applet->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-						 GTK_STOCK_FIND,
-						 48,
-						 0,
-						 NULL);
+	                                         GTK_STOCK_FIND,
+	                                         48,
+	                                         0,
+	                                         NULL);
 
 	applet_queue_draw (applet);
 
 	panel_applet_set_flags (PANEL_APPLET (applet->parent),
-				PANEL_APPLET_EXPAND_MINOR);
+	                        PANEL_APPLET_EXPAND_MINOR);
 	panel_applet_set_background_widget (PANEL_APPLET (applet->parent),
-					    GTK_WIDGET (applet->parent));
+	                                    GTK_WIDGET (applet->parent));
 
-  	panel_applet_setup_menu_from_file (PANEL_APPLET (applet->parent),
-					   NULL,
-					   PKGDATADIR "/GNOME_Search_Bar_Applet.xml",
-					   NULL,
-					   applet_menu_verbs,
-					   applet);
+	panel_applet_setup_menu_from_file (PANEL_APPLET (applet->parent),
+	                                   NULL,
+	                                   PKGDATADIR "/GNOME_Search_Bar_Applet.xml",
+	                                   NULL,
+	                                   applet_menu_verbs,
+	                                   applet);
 
 	gtk_widget_show (applet->parent);
 
 	g_signal_connect (applet->parent, "size_allocate",
-			  G_CALLBACK (applet_size_allocate_cb), applet);
+	                  G_CALLBACK (applet_size_allocate_cb), applet);
 	g_signal_connect (applet->parent, "change_orient",
-			  G_CALLBACK (applet_change_orient_cb), applet);
+	                  G_CALLBACK (applet_change_orient_cb), applet);
 	g_signal_connect (panel_applet_get_control (PANEL_APPLET (applet->parent)), "destroy",
-			  G_CALLBACK (applet_destroy_cb), applet);
+	                  G_CALLBACK (applet_destroy_cb), applet);
 
 	/* Initialise other modules */
 
@@ -402,8 +402,8 @@ applet_new (PanelApplet *parent_applet)
  */
 static gboolean
 applet_factory (PanelApplet *applet,
-		const gchar *iid,
-		gpointer     data)
+                const gchar *iid,
+                gpointer     data)
 {
 	if (!strcmp (iid, "OAFIID:GNOME_Search_Bar_Applet")) {
 		g_print ("Creating applet\n");
diff --git a/src/tracker-search-bar/tracker-results-window.c b/src/tracker-search-bar/tracker-results-window.c
index 73b1300..bacdcc7 100644
--- a/src/tracker-search-bar/tracker-results-window.c
+++ b/src/tracker-search-bar/tracker-results-window.c
@@ -38,127 +38,127 @@
 
 #define MAX_ITEMS 10
 
-#define MUSIC_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Audio ;"				\
-	"  nfo:fileName ?title ;"			\
-	"  nfo:belongsToContainer ?tooltip ."		\
-	"  ?urn fts:match \"%s*\" "			\
-	"}"						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define MUSIC_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Audio ;" \
+	"  nfo:fileName ?title ;" \
+	"  nfo:belongsToContainer ?tooltip ." \
+	"  ?urn fts:match \"%s*\" " \
+	"}" \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define IMAGE_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Image ;"				\
-	"  nfo:fileName ?title ;"			\
-	"  nfo:belongsToContainer ?tooltip ."		\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define IMAGE_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Image ;" \
+	"  nfo:fileName ?title ;" \
+	"  nfo:belongsToContainer ?tooltip ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define VIDEO_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nmm:Video ;"				\
-	"  nfo:fileName ?title ;"			\
-	"  nfo:belongsToContainer ?tooltip ."		\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define VIDEO_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nmm:Video ;" \
+	"  nfo:fileName ?title ;" \
+	"  nfo:belongsToContainer ?tooltip ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define DOCUMENT_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Document ;"			\
-	"  nfo:fileName ?title ;"			\
-	"  nfo:belongsToContainer ?tooltip ."		\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define DOCUMENT_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Document ;" \
+	"  nfo:fileName ?title ;" \
+	"  nfo:belongsToContainer ?tooltip ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define FOLDER_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Folder ;"				\
-	"  nfo:fileName ?title ;"			\
-	"  nfo:belongsToContainer ?tooltip ."		\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define FOLDER_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?urn fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Folder ;" \
+	"  nfo:fileName ?title ;" \
+	"  nfo:belongsToContainer ?tooltip ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define APP_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?tooltip ?link fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Software ;"			\
-	"  nie:title ?title ;"				\
-	"  nie:comment ?tooltip ;"			\
-	"  nfo:softwareCmdLine ?link ."			\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define APP_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?tooltip ?link fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Software ;" \
+	"  nie:title ?title ;" \
+	"  nie:comment ?tooltip ;" \
+	"  nfo:softwareCmdLine ?link ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define TAGS_QUERY					\
-	"SELECT"					\
+#define TAGS_QUERY	  \
+	"SELECT" \
 	"  ?urn ?title ?title ?urn fts:rank(?urn) " \
-	"WHERE {"					\
-	"  ?urn a nao:Tag ;"				\
-	"  nao:prefLabel ?title ."			\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+	"WHERE {" \
+	"  ?urn a nao:Tag ;" \
+	"  nao:prefLabel ?title ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-/* #define TAGS_QUERY					\ */
-/* 	"SELECT"					\ */
-/* 	"  ?urn ?title COUNT(?files) ?urn fts:rank(?urn) " \ */
-/* 	"WHERE {"					\ */
-/* 	"  ?urn a nao:Tag ;"				\ */
-/* 	"  nao:prefLabel ?title ."			\ */
-/* 	"  ?urn fts:match \"%s*\" ."			\ */
-/* 	"  ?files nao:hasTag ?urn "			\ */
-/* 	"} "						\ */
-/* 	"GROUP BY ?urn "				\ */
-/* 	"ORDER BY DESC(fts:rank(?urn)) "		\ */
-/* 	"OFFSET 0 LIMIT %d" */
-#define BOOKMARK_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?link ?link fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Bookmark ;"			\
-	"  nie:title ?title ;"				\
-	"  nie:links ?link ."				\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+/* #define TAGS_QUERY                                   \ */
+/*      "SELECT"                                        \ */
+/*      "  ?urn ?title COUNT(?files) ?urn fts:rank(?urn) " \ */
+/*      "WHERE {"                                       \ */
+/*      "  ?urn a nao:Tag ;"                            \ */
+/*      "  nao:prefLabel ?title ."                      \ */
+/*      "  ?urn fts:match \"%s*\" ."                    \ */
+/*      "  ?files nao:hasTag ?urn "                     \ */
+/*      "} "                                            \ */
+/*      "GROUP BY ?urn "                                \ */
+/*      "ORDER BY DESC(fts:rank(?urn)) "                \ */
+/*      "OFFSET 0 LIMIT %d" */
+#define BOOKMARK_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?link ?link fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Bookmark ;" \
+	"  nie:title ?title ;" \
+	"  nie:links ?link ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define WEBSITE_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?link ?link fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nfo:Website ;"			\
-	"  nie:title ?title ;"				\
-	"  nie:links ?link ."				\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define WEBSITE_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?link ?link fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nfo:Website ;" \
+	"  nie:title ?title ;" \
+	"  nie:links ?link ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
-#define CONTACT_QUERY					\
-	"SELECT"					\
-	"  ?urn ?title ?link ?link fts:rank(?urn) "	\
-	"WHERE {"					\
-	"  ?urn a nco:Contact ;"			\
-	"  nco:fullname ?title ;"			\
-	"  nco:hasEmailAddress ?link ."			\
-	"  ?urn fts:match \"%s*\" "			\
-	"} "						\
-	"ORDER BY DESC(fts:rank(?urn)) "		\
+#define CONTACT_QUERY	  \
+	"SELECT" \
+	"  ?urn ?title ?link ?link fts:rank(?urn) " \
+	"WHERE {" \
+	"  ?urn a nco:Contact ;" \
+	"  nco:fullname ?title ;" \
+	"  nco:hasEmailAddress ?link ." \
+	"  ?urn fts:match \"%s*\" " \
+	"} " \
+	"ORDER BY DESC(fts:rank(?urn)) " \
 	"OFFSET 0 LIMIT %d"
 
 #undef USE_SEPARATOR_FOR_SPACING
@@ -224,24 +224,24 @@ struct FindCategory {
 static void     results_window_constructed        (GObject              *object);
 static void     results_window_finalize           (GObject              *object);
 static void     results_window_set_property       (GObject              *object,
-						   guint                 prop_id,
-						   const GValue         *value,
-						   GParamSpec           *pspec);
+                                                   guint                 prop_id,
+                                                   const GValue         *value,
+                                                   GParamSpec           *pspec);
 static void     results_window_get_property       (GObject              *object,
-						   guint                 prop_id,
-						   GValue               *value,
-						   GParamSpec           *pspec);
+                                                   guint                 prop_id,
+                                                   GValue               *value,
+                                                   GParamSpec           *pspec);
 static gboolean results_window_key_press_event    (GtkWidget            *widget,
-						   GdkEventKey          *event);
+                                                   GdkEventKey          *event);
 static gboolean results_window_button_press_event (GtkWidget            *widget,
-						   GdkEventButton       *event);
+                                                   GdkEventButton       *event);
 static void     results_window_size_request       (GtkWidget            *widget,
-						   GtkRequisition       *requisition);
+                                                   GtkRequisition       *requisition);
 static void     results_window_screen_changed     (GtkWidget            *widget,
-						   GdkScreen            *prev_screen);
+                                                   GdkScreen            *prev_screen);
 static void     model_set_up                      (TrackerResultsWindow *window);
 static void     search_get                        (TrackerResultsWindow *window,
-						   TrackerCategory       category);
+                                                   TrackerCategory       category);
 static void     search_start                      (TrackerResultsWindow *window);
 static gchar *  category_to_string                (TrackerCategory       category);
 
@@ -280,19 +280,19 @@ tracker_results_window_class_init (TrackerResultsWindowClass *klass)
 	widget_class->screen_changed = results_window_screen_changed;
 
 	g_object_class_install_property (object_class,
-					 PROP_QUERY,
-					 g_param_spec_string ("query",
-							      "Query",
-							      "Query",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_QUERY,
+	                                 g_param_spec_string ("query",
+	                                                      "Query",
+	                                                      "Query",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerResultsWindowPrivate));
 }
 
 static gboolean
 launch_application_for_uri (GtkWidget   *widget,
-			    const gchar *uri)
+                            const gchar *uri)
 {
 	GdkAppLaunchContext *launch_context;
 	GdkScreen *screen;
@@ -305,12 +305,12 @@ launch_application_for_uri (GtkWidget   *widget,
 	gdk_app_launch_context_set_screen (launch_context, screen);
 
 	g_app_info_launch_default_for_uri (uri,
-					   G_APP_LAUNCH_CONTEXT (launch_context),
-					   &error);
+	                                   G_APP_LAUNCH_CONTEXT (launch_context),
+	                                   &error);
 
 	if (error) {
 		g_critical ("Could not launch application for uri '%s': %s",
-			    uri, error->message);
+		            uri, error->message);
 		g_error_free (error);
 		success = FALSE;
 	} else {
@@ -324,9 +324,9 @@ launch_application_for_uri (GtkWidget   *widget,
 
 static void
 tree_view_row_activated_cb (GtkTreeView       *treeview,
-			    GtkTreePath       *path,
-			    GtkTreeViewColumn *column,
-			    gpointer           user_data)
+                            GtkTreePath       *path,
+                            GtkTreeViewColumn *column,
+                            gpointer           user_data)
 {
 	TrackerResultsWindowPrivate *priv;
 	TrackerResultsWindow *window;
@@ -344,14 +344,14 @@ tree_view_row_activated_cb (GtkTreeView       *treeview,
 	}
 
 	gtk_tree_model_get (model, &iter,
-			    COL_LINK, &link,
-			    -1);
+	                    COL_LINK, &link,
+	                    -1);
 
 	if (!link) {
 		return;
 	}
 
-        if (tracker_regex_match (TRACKER_REGEX_ALL, link, NULL, NULL) > 0) {
+	if (tracker_regex_match (TRACKER_REGEX_ALL, link, NULL, NULL) > 0) {
 		success = launch_application_for_uri (GTK_WIDGET (window), link);
 	} else {
 		GError *error = NULL;
@@ -360,8 +360,8 @@ tree_view_row_activated_cb (GtkTreeView       *treeview,
 
 		if (error) {
 			g_critical ("Could not launch command line:'%s', %s",
-				    link,
-				    error->message);
+			            link,
+			            error->message);
 			g_error_free (error);
 		}
 	}
@@ -397,14 +397,14 @@ tracker_results_window_init (TrackerResultsWindow *window)
 	priv->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
 	gtk_container_add (GTK_CONTAINER (vbox), priv->scrolled_window);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
+	                                GTK_POLICY_AUTOMATIC,
+	                                GTK_POLICY_AUTOMATIC);
 
 	priv->treeview = gtk_tree_view_new ();
 	gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->treeview);
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE);
 	g_signal_connect (priv->treeview, "row-activated",
-			  G_CALLBACK (tree_view_row_activated_cb), window);
+	                  G_CALLBACK (tree_view_row_activated_cb), window);
 
 	priv->label = gtk_label_new (NULL);
 	gtk_widget_set_sensitive (priv->label, FALSE);
@@ -445,9 +445,9 @@ results_window_finalize (GObject *object)
 
 static void
 results_window_set_property (GObject      *object,
-			     guint         prop_id,
-			     const GValue *value,
-			     GParamSpec   *pspec)
+                             guint         prop_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
 {
 	TrackerResultsWindowPrivate *priv;
 
@@ -463,16 +463,16 @@ results_window_set_property (GObject      *object,
 		search_start (TRACKER_RESULTS_WINDOW (object));
 		break;
 	default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
 	}
 }
 
 static void
 results_window_get_property (GObject    *object,
-			     guint       prop_id,
-			     GValue     *value,
-			     GParamSpec *pspec)
+                             guint       prop_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
 {
 	TrackerResultsWindowPrivate *priv;
 
@@ -483,14 +483,14 @@ results_window_get_property (GObject    *object,
 		g_value_set_string (value, priv->query);
 		break;
 	default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
 	}
 }
 
 static gboolean
 results_window_key_press_event (GtkWidget   *widget,
-				GdkEventKey *event)
+                                GdkEventKey *event)
 {
 	TrackerResultsWindowPrivate *priv;
 
@@ -511,7 +511,7 @@ results_window_key_press_event (GtkWidget   *widget,
 
 static gboolean
 results_window_button_press_event (GtkWidget      *widget,
-				   GdkEventButton *event)
+                                   GdkEventButton *event)
 {
 	if (event->x < 0 || event->x > widget->allocation.width ||
 	    event->y < 0 || event->y > widget->allocation.height) {
@@ -530,7 +530,7 @@ results_window_button_press_event (GtkWidget      *widget,
 
 static void
 results_window_size_request (GtkWidget      *widget,
-			     GtkRequisition *requisition)
+                             GtkRequisition *requisition)
 {
 	GtkRequisition child_req;
 	guint border_width;
@@ -559,7 +559,7 @@ results_window_size_request (GtkWidget      *widget,
 
 static void
 results_window_screen_changed (GtkWidget *widget,
-			       GdkScreen *prev_screen)
+                               GdkScreen *prev_screen)
 {
 	TrackerResultsWindowPrivate *priv;
 	GdkScreen *screen;
@@ -582,10 +582,10 @@ results_window_screen_changed (GtkWidget *widget,
 
 static ItemData *
 item_data_new (const gchar     *urn,
-	       const gchar     *title,
-	       const gchar     *tooltip,
-	       const gchar     *link,
-	       TrackerCategory  category)
+               const gchar     *title,
+               const gchar     *tooltip,
+               const gchar     *link,
+               TrackerCategory  category)
 {
 	ItemData *id;
 
@@ -613,8 +613,8 @@ item_data_free (ItemData *id)
 
 static SearchQuery *
 search_query_new (gint                  request_id,
-		  TrackerCategory       category,
-		  TrackerResultsWindow *window)
+                  TrackerCategory       category,
+                  TrackerResultsWindow *window)
 {
 	SearchQuery *sq;
 
@@ -662,7 +662,7 @@ category_to_string (TrackerCategory category)
 
 inline static void
 category_from_string (const gchar *type,
-		      guint       *categories)
+                      guint       *categories)
 {
 	if (g_str_has_suffix (type, "nao#Tag")) {
 		*categories |= CATEGORY_TAG;
@@ -721,14 +721,14 @@ category_from_string (const gchar *type,
 
 static GdkPixbuf *
 pixbuf_get (TrackerResultsWindow *window,
-	    const gchar          *urn,
-	    gboolean              is_image)
+            const gchar          *urn,
+            gboolean              is_image)
 {
 	TrackerResultsWindowPrivate *priv;
 	const gchar *attributes;
 	GFile *file;
 	GFileInfo *info;
-        GIcon *icon;
+	GIcon *icon;
 	GdkPixbuf *pixbuf = NULL;
 	GError *error = NULL;
 
@@ -744,8 +744,8 @@ pixbuf_get (TrackerResultsWindow *window,
 
 		if (error) {
 			g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
-				    urn,
-				    error->message);
+			            urn,
+			            error->message);
 			g_clear_error (&error);
 		} else {
 			g_object_unref (file);
@@ -760,39 +760,39 @@ pixbuf_get (TrackerResultsWindow *window,
 		G_FILE_ATTRIBUTE_STANDARD_ICON;
 
 	info = g_file_query_info (file,
-				  attributes,
-				  G_FILE_QUERY_INFO_NONE,
-				  NULL,
-				  &error);
+	                          attributes,
+	                          G_FILE_QUERY_INFO_NONE,
+	                          NULL,
+	                          &error);
 
 
-        if (error) {
+	if (error) {
 		g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
-			    urn,
-			    error->message);
+		            urn,
+		            error->message);
 		g_object_unref (file);
-                g_error_free (error);
+		g_error_free (error);
 
-                return NULL;
-        }
+		return NULL;
+	}
 
-        icon = g_file_info_get_icon (info);
+	icon = g_file_info_get_icon (info);
 
-        if (icon && G_IS_THEMED_ICON (icon)) {
-                GtkIconInfo *icon_info;
+	if (icon && G_IS_THEMED_ICON (icon)) {
+		GtkIconInfo *icon_info;
 		const gchar **names;
 
 		names = (const gchar**) g_themed_icon_get_names (G_THEMED_ICON (icon));
 		icon_info = gtk_icon_theme_choose_icon (priv->icon_theme,
-                                                        names,
-                                                        24,
-							GTK_ICON_LOOKUP_USE_BUILTIN);
+		                                        names,
+		                                        24,
+		                                        GTK_ICON_LOOKUP_USE_BUILTIN);
 
-                if (icon_info) {
-                        pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
-                        gtk_icon_info_free (icon_info);
-                }
-        }
+		if (icon_info) {
+			pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+			gtk_icon_info_free (icon_info);
+		}
+	}
 
 	g_object_unref (info);
 	g_object_unref (file);
@@ -802,10 +802,10 @@ pixbuf_get (TrackerResultsWindow *window,
 
 static void
 model_category_cell_data_func (GtkTreeViewColumn    *tree_column,
-			       GtkCellRenderer      *cell,
-			       GtkTreeModel         *model,
-			       GtkTreeIter          *iter,
-			       TrackerResultsWindow *window)
+                               GtkCellRenderer      *cell,
+                               GtkTreeModel         *model,
+                               GtkTreeIter          *iter,
+                               TrackerResultsWindow *window)
 {
 	GtkTreePath *path;
 	GtkTreeIter prev_iter;
@@ -824,8 +824,8 @@ model_category_cell_data_func (GtkTreeViewColumn    *tree_column,
 		print = TRUE;
 	} else if (previous_path && gtk_tree_model_get_iter (model, &prev_iter, path)) {
 		gtk_tree_model_get (model, &prev_iter,
-				    COL_CATEGORY_ID, &prev_category,
-				    -1);
+		                    COL_CATEGORY_ID, &prev_category,
+		                    -1);
 
 		if (prev_category == CATEGORY_NONE) {
 			print = TRUE;
@@ -833,19 +833,19 @@ model_category_cell_data_func (GtkTreeViewColumn    *tree_column,
 	}
 
 	g_object_set (cell,
-		      "text", print ? category_to_string (category) : "",
-		      "visible", print,
-		      NULL);
+	              "text", print ? category_to_string (category) : "",
+	              "visible", print,
+	              NULL);
 
 	gtk_tree_path_free (path);
 }
 
 static void
 model_pixbuf_cell_data_func (GtkTreeViewColumn    *tree_column,
-			     GtkCellRenderer      *cell,
-			     GtkTreeModel         *model,
-			     GtkTreeIter          *iter,
-			     TrackerResultsWindow *window)
+                             GtkCellRenderer      *cell,
+                             GtkTreeModel         *model,
+                             GtkTreeIter          *iter,
+                             TrackerResultsWindow *window)
 {
 	GdkPixbuf *pixbuf = NULL;
 	gboolean requested = FALSE;
@@ -857,9 +857,9 @@ model_pixbuf_cell_data_func (GtkTreeViewColumn    *tree_column,
 		gchar *urn;
 
 		gtk_tree_model_get (model, iter,
-				    COL_CATEGORY_ID, &category,
-				    COL_URN, &urn,
-				    -1);
+		                    COL_CATEGORY_ID, &category,
+		                    COL_URN, &urn,
+		                    -1);
 
 		if (urn) {
 			/* FIXME: Should use category */
@@ -869,9 +869,9 @@ model_pixbuf_cell_data_func (GtkTreeViewColumn    *tree_column,
 
 		/* Cache it in the store */
 		gtk_list_store_set (GTK_LIST_STORE (model), iter,
-				    COL_IMAGE, pixbuf,
-				    COL_IMAGE_REQUESTED, TRUE,
-				    -1);
+		                    COL_IMAGE, pixbuf,
+		                    COL_IMAGE_REQUESTED, TRUE,
+		                    -1);
 	} else {
 		/* We do this because there may be no image for a file
 		 * and we don't want to keep requesting the same
@@ -881,9 +881,9 @@ model_pixbuf_cell_data_func (GtkTreeViewColumn    *tree_column,
 	}
 
 	g_object_set (cell,
-		      "visible", TRUE,
-		      "pixbuf", pixbuf,
-		      NULL);
+	              "visible", TRUE,
+	              "pixbuf", pixbuf,
+	              NULL);
 
 	if (pixbuf) {
 		g_object_unref (pixbuf);
@@ -892,8 +892,8 @@ model_pixbuf_cell_data_func (GtkTreeViewColumn    *tree_column,
 
 static gboolean
 model_separator_func (GtkTreeModel *model,
-		      GtkTreeIter  *iter,
-		      gpointer      user_data)
+                      GtkTreeIter  *iter,
+                      gpointer      user_data)
 {
 #ifdef USE_SEPARATOR_FOR_SPACING
 	gchar *urn;
@@ -914,10 +914,10 @@ model_separator_func (GtkTreeModel *model,
 
 static gboolean
 model_selection_func (GtkTreeSelection *selection,
-		      GtkTreeModel     *model,
-		      GtkTreePath      *path,
-		      gboolean          path_currently_selected,
-		      gpointer          data)
+                      GtkTreeModel     *model,
+                      GtkTreePath      *path,
+                      gboolean          path_currently_selected,
+                      gpointer          data)
 {
 	GtkTreeIter iter;
 	gchar *urn;
@@ -952,28 +952,28 @@ model_set_up (TrackerResultsWindow *window)
 
 	/* Store */
 	store = gtk_list_store_new (COL_COUNT,
-				    G_TYPE_INT,            /* Category ID */
-				    GDK_TYPE_PIXBUF,       /* Image */
-				    G_TYPE_BOOLEAN,        /* Image requested */
-				    G_TYPE_STRING,         /* URN */
-				    G_TYPE_STRING,         /* Title */
-				    G_TYPE_STRING,         /* Tooltip */
-				    G_TYPE_STRING);        /* Link */
+	                            G_TYPE_INT,            /* Category ID */
+	                            GDK_TYPE_PIXBUF,       /* Image */
+	                            G_TYPE_BOOLEAN,        /* Image requested */
+	                            G_TYPE_STRING,         /* URN */
+	                            G_TYPE_STRING,         /* Title */
+	                            G_TYPE_STRING,         /* Tooltip */
+	                            G_TYPE_STRING);        /* Link */
 
 	gtk_tree_view_set_model (view, GTK_TREE_MODEL (store));
 
 	gtk_tree_view_set_row_separator_func (view,
-					      model_separator_func,
-					      window,
-					      NULL);
+	                                      model_separator_func,
+	                                      window,
+	                                      NULL);
 
 	/* Selection */
 	selection = gtk_tree_view_get_selection (view);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-        gtk_tree_selection_set_select_function (selection,
-						model_selection_func,
-						window,
-						NULL);
+	gtk_tree_selection_set_select_function (selection,
+	                                        model_selection_func,
+	                                        window,
+	                                        NULL);
 
 	/* Column: Category */
 	column = gtk_tree_view_column_new ();
@@ -981,10 +981,10 @@ model_set_up (TrackerResultsWindow *window)
 
 	gtk_tree_view_column_pack_start (column, cell, FALSE);
 	gtk_tree_view_column_set_cell_data_func (column, cell,
-						 (GtkTreeCellDataFunc)
-						 model_category_cell_data_func,
-						 window,
-						 NULL);
+	                                         (GtkTreeCellDataFunc)
+	                                         model_category_cell_data_func,
+	                                         window,
+	                                         NULL);
 
 	gtk_tree_view_column_set_title (column, _("Category"));
 	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
@@ -997,16 +997,16 @@ model_set_up (TrackerResultsWindow *window)
 	cell = gtk_cell_renderer_pixbuf_new ();
 	gtk_tree_view_column_pack_start (column, cell, FALSE);
 	gtk_tree_view_column_set_cell_data_func (column, cell,
-						 (GtkTreeCellDataFunc)
-						 model_pixbuf_cell_data_func,
-						 window,
-						 NULL);
+	                                         (GtkTreeCellDataFunc)
+	                                         model_pixbuf_cell_data_func,
+	                                         window,
+	                                         NULL);
 
 	cell = gtk_cell_renderer_text_new ();
 	g_object_set (cell,
-		      "xpad", 4,
-		      "ypad", 1,
-		      NULL);
+	              "xpad", 4,
+	              "ypad", 1,
+	              NULL);
 	gtk_tree_view_column_pack_start (column, cell, TRUE);
 	gtk_tree_view_column_add_attribute (column, cell, "text", COL_TITLE);
 
@@ -1018,8 +1018,8 @@ model_set_up (TrackerResultsWindow *window)
 
 	/* Sorting */
 	/* gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), */
-	/* 				      COL_CATEGORY_ID, */
-	/* 				      GTK_SORT_ASCENDING); */
+	/*                                    COL_CATEGORY_ID, */
+	/*                                    GTK_SORT_ASCENDING); */
 
 	/* Tooltips */
 	gtk_tree_view_set_tooltip_column (view, COL_TOOLTIP);
@@ -1030,11 +1030,11 @@ model_set_up (TrackerResultsWindow *window)
 
 static void
 model_add (TrackerResultsWindow *window,
-	   TrackerCategory       category,
-	   const gchar          *urn,
-	   const gchar          *title,
-	   const gchar          *tooltip,
-	   const gchar          *link)
+           TrackerCategory       category,
+           const gchar          *urn,
+           const gchar          *title,
+           const gchar          *tooltip,
+           const gchar          *link)
 {
 	TrackerResultsWindowPrivate *priv;
 	GtkTreeIter iter;
@@ -1045,13 +1045,13 @@ model_add (TrackerResultsWindow *window,
 
 	gtk_list_store_append (GTK_LIST_STORE (priv->store), &iter);
 	gtk_list_store_set (GTK_LIST_STORE (priv->store), &iter,
-			    COL_CATEGORY_ID, category,
-			    COL_IMAGE, pixbuf ? pixbuf : NULL,
-			    COL_URN, urn,
-			    COL_TITLE, title,
-			    COL_TOOLTIP, tooltip,
-			    COL_LINK, link,
-			    -1);
+	                    COL_CATEGORY_ID, category,
+	                    COL_IMAGE, pixbuf ? pixbuf : NULL,
+	                    COL_URN, urn,
+	                    COL_TITLE, title,
+	                    COL_TOOLTIP, tooltip,
+	                    COL_LINK, link,
+	                    -1);
 
 	/* path = gtk_tree_model_get_path (GTK_TREE_MODEL (window->store), &iter); */
 	/* gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (window->treeview), tooltip, path); */
@@ -1089,7 +1089,7 @@ search_window_ensure_not_blank (TrackerResultsWindow *window)
 
 inline static void
 search_get_foreach (gpointer value,
-		    gpointer user_data)
+                    gpointer user_data)
 {
 	SearchQuery *sq;
 	ItemData *id;
@@ -1124,8 +1124,8 @@ search_get_foreach (gpointer value,
 
 static void
 search_get_cb (GPtrArray *results,
-	       GError    *error,
-	       gpointer   user_data)
+               GError    *error,
+               gpointer   user_data)
 {
 	TrackerResultsWindow *window;
 	TrackerResultsWindowPrivate *priv;
@@ -1140,8 +1140,8 @@ search_get_cb (GPtrArray *results,
 	/* If request IDs don't match, data is no longer needed */
 	if (priv->request_id != sq->request_id) {
 		g_message ("Received data from request id:%d, now on request id:%d",
-			   sq->request_id,
-			   priv->request_id);
+		           sq->request_id,
+		           priv->request_id);
 		search_query_free (sq);
 		return;
 	}
@@ -1158,18 +1158,18 @@ search_get_cb (GPtrArray *results,
 
 	if (!results) {
 		g_print ("No results were found matching the query in category:'%s'\n",
-			 category_to_string (sq->category));
+		         category_to_string (sq->category));
 	} else {
 		GSList *l;
 
 		g_print ("Results: %d for category:'%s'\n",
-			 results->len,
-			 category_to_string (sq->category));
+		         results->len,
+		         category_to_string (sq->category));
 
 		if (results->len > 0) {
 			g_ptr_array_foreach (results,
-					     search_get_foreach,
-					     sq);
+			                     search_get_foreach,
+			                     sq);
 
 			g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
 			g_ptr_array_free (results, TRUE);
@@ -1183,11 +1183,11 @@ search_get_cb (GPtrArray *results,
 				ItemData *id = l->data;
 
 				model_add (window,
-					   sq->category,
-					   id->urn,
-					   id->title,
-					   id->tooltip,
-					   id->link);
+				           sq->category,
+				           id->urn,
+				           id->title,
+				           id->tooltip,
+				           id->link);
 			}
 
 			priv->first_category_populated = TRUE;
@@ -1204,7 +1204,7 @@ search_get_cb (GPtrArray *results,
 
 static void
 search_get (TrackerResultsWindow *window,
-	    TrackerCategory       category)
+            TrackerCategory       category)
 {
 	TrackerResultsWindowPrivate *priv;
 	SearchQuery *sq;
@@ -1319,10 +1319,10 @@ grab_popup_window (TrackerResultsWindow *window)
 
 	/* Grab pointer */
 	status = gdk_pointer_grab (widget->window,
-				   TRUE,
-				   GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK,
-				   NULL, NULL,
-				   time);
+	                           TRUE,
+	                           GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK,
+	                           NULL, NULL,
+	                           time);
 
 	if (status == GDK_GRAB_SUCCESS) {
 		status = gdk_keyboard_grab (widget->window, TRUE, time);
@@ -1342,12 +1342,12 @@ grab_popup_window (TrackerResultsWindow *window)
 
 GtkWidget *
 tracker_results_window_new (GtkWidget   *parent,
-			    const gchar *query)
+                            const gchar *query)
 {
 	return g_object_new (TRACKER_TYPE_RESULTS_WINDOW,
-			     "align-widget", parent,
-			     "query", query,
-			     NULL);
+	                     "align-widget", parent,
+	                     "query", query,
+	                     NULL);
 }
 
 void
diff --git a/src/tracker-search-bar/tracker-results-window.h b/src/tracker-search-bar/tracker-results-window.h
index d8e0ae1..a39dc33 100644
--- a/src/tracker-search-bar/tracker-results-window.h
+++ b/src/tracker-search-bar/tracker-results-window.h
@@ -48,7 +48,7 @@ struct TrackerResultsWindowClass {
 GType       tracker_results_window_get_type (void) G_GNUC_CONST;
 
 GtkWidget * tracker_results_window_new      (GtkWidget   *parent,
-					     const gchar *query);
+                                             const gchar *query);
 void        tracker_results_window_popup    (TrackerResultsWindow *window);
 
 G_END_DECLS
diff --git a/src/tracker-search-bar/tracker-utils.c b/src/tracker-search-bar/tracker-utils.c
index 129d8d9..78c9f22 100644
--- a/src/tracker-search-bar/tracker-utils.c
+++ b/src/tracker-search-bar/tracker-utils.c
@@ -116,19 +116,19 @@ tracker_regex_match (TrackerRegExType  type,
 			s = matches[0].rm_so + offset;
 			offset = matches[0].rm_eo + offset;
 
-                        if (start) {
-                                g_array_append_val (start, s);
-                        }
+			if (start) {
+				g_array_append_val (start, s);
+			}
 
-                        if (end) {
-                                g_array_append_val (end, offset);
-                        }
+			if (end) {
+				g_array_append_val (end, offset);
+			}
 		}
 	}
 
 	if (type != TRACKER_REGEX_ALL) {
 		/* g_debug ("Found %d matches for regex type:%d", */
-                /*          num_matches, type); */
+		/*          num_matches, type); */
 		return num_matches;
 	}
 
@@ -144,19 +144,19 @@ tracker_regex_match (TrackerRegExType  type,
 				s = matches[0].rm_so + offset;
 				offset = matches[0].rm_eo + offset;
 
-                                if (start) {
-                                        g_array_append_val (start, s);
-                                }
+				if (start) {
+					g_array_append_val (start, s);
+				}
 
-                                if (end) {
-                                        g_array_append_val (end, offset);
-                                }
+				if (end) {
+					g_array_append_val (end, offset);
+				}
 			}
 		}
 	}
 
 	/* g_debug ("Found %d matches for ALL regex types", */
-        /*          num_matches); */
+	/*          num_matches); */
 
 	return num_matches;
 }
diff --git a/src/tracker-status-icon/tomboykeybinder.c b/src/tracker-status-icon/tomboykeybinder.c
index 3827c8d..9f56421 100644
--- a/src/tracker-status-icon/tomboykeybinder.c
+++ b/src/tracker-status-icon/tomboykeybinder.c
@@ -35,22 +35,22 @@ static void
 lookup_ignorable_modifiers (GdkKeymap *keymap)
 {
 	egg_keymap_resolve_virtual_modifiers (keymap,
-					      EGG_VIRTUAL_LOCK_MASK,
-					      &caps_lock_mask);
+	                                      EGG_VIRTUAL_LOCK_MASK,
+	                                      &caps_lock_mask);
 
 	egg_keymap_resolve_virtual_modifiers (keymap,
-					      EGG_VIRTUAL_NUM_LOCK_MASK,
-					      &num_lock_mask);
+	                                      EGG_VIRTUAL_NUM_LOCK_MASK,
+	                                      &num_lock_mask);
 
 	egg_keymap_resolve_virtual_modifiers (keymap,
-					      EGG_VIRTUAL_SCROLL_LOCK_MASK,
-					      &scroll_lock_mask);
+	                                      EGG_VIRTUAL_SCROLL_LOCK_MASK,
+	                                      &scroll_lock_mask);
 }
 
 static void
 grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
-				      Binding   *binding,
-				      gboolean   grab)
+                                      Binding   *binding,
+                                      gboolean   grab)
 {
 	guint mod_masks [] = {
 		0, /* modifier only */
@@ -67,17 +67,17 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
 	for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
 		if (grab) {
 			XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
-				  binding->keycode,
-				  binding->modifiers | mod_masks [i],
-				  GDK_WINDOW_XWINDOW (rootwin),
-				  False,
-				  GrabModeAsync,
-				  GrabModeAsync);
+			          binding->keycode,
+			          binding->modifiers | mod_masks [i],
+			          GDK_WINDOW_XWINDOW (rootwin),
+			          False,
+			          GrabModeAsync,
+			          GrabModeAsync);
 		} else {
 			XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
-				    binding->keycode,
-				    binding->modifiers | mod_masks [i],
-				    GDK_WINDOW_XWINDOW (rootwin));
+			            binding->keycode,
+			            binding->modifiers | mod_masks [i],
+			            GDK_WINDOW_XWINDOW (rootwin));
 		}
 	}
 }
@@ -95,36 +95,36 @@ do_grab_key (Binding *binding)
 		return FALSE;
 
 	if (!egg_accelerator_parse_virtual (binding->keystring,
-					    &keysym,
-					    &virtual_mods))
+	                                    &keysym,
+	                                    &virtual_mods))
 		return FALSE;
 
 	TRACE (g_print ("Got accel %d, %d\n", keysym, virtual_mods));
 
 	binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin),
-					     keysym);
+	                                     keysym);
 	if (binding->keycode == 0)
 		return FALSE;
 
 	TRACE (g_print ("Got keycode %d\n", binding->keycode));
 
 	egg_keymap_resolve_virtual_modifiers (keymap,
-					      virtual_mods,
-					      &binding->modifiers);
+	                                      virtual_mods,
+	                                      &binding->modifiers);
 
 	TRACE (g_print ("Got modmask %d\n", binding->modifiers));
 
 	gdk_error_trap_push ();
 
 	grab_ungrab_with_ignorable_modifiers (rootwin,
-					      binding,
-					      TRUE /* grab */);
+	                                      binding,
+	                                      TRUE /* grab */);
 
 	gdk_flush ();
 
 	if (gdk_error_trap_pop ()) {
-	   g_warning ("Binding '%s' failed!\n", binding->keystring);
-	   return FALSE;
+		g_warning ("Binding '%s' failed!\n", binding->keystring);
+		return FALSE;
 	}
 
 	return TRUE;
@@ -138,8 +138,8 @@ do_ungrab_key (Binding *binding)
 	TRACE (g_print ("Removing grab for '%s'\n", binding->keystring));
 
 	grab_ungrab_with_ignorable_modifiers (rootwin,
-					      binding,
-					      FALSE /* ungrab */);
+	                                      binding,
+	                                      FALSE /* ungrab */);
 
 	return TRUE;
 }
@@ -157,8 +157,8 @@ filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 	switch (xevent->type) {
 	case KeyPress:
 		TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n",
-				xevent->xkey.keycode,
-				xevent->xkey.state));
+		                xevent->xkey.keycode,
+		                xevent->xkey.state));
 
 		/*
 		 * Set the last event time for use when showing
@@ -168,8 +168,8 @@ filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 		last_event_time = xevent->xkey.time;
 
 		event_mods = xevent->xkey.state & ~(num_lock_mask  |
-						    caps_lock_mask |
-						    scroll_lock_mask);
+		                                    caps_lock_mask |
+		                                    scroll_lock_mask);
 
 		for (iter = bindings; iter != NULL; iter = iter->next) {
 			Binding *binding = (Binding *) iter->data;
@@ -178,10 +178,10 @@ filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 			    binding->modifiers == event_mods) {
 
 				TRACE (g_print ("Calling handler for '%s'...\n",
-						binding->keystring));
+				                binding->keystring));
 
 				(binding->handler) (binding->keystring,
-						    binding->user_data);
+				                    binding->user_data);
 			}
 		}
 
@@ -225,19 +225,19 @@ tomboy_keybinder_init (void)
 	lookup_ignorable_modifiers (keymap);
 
 	gdk_window_add_filter (rootwin,
-			       filter_func,
-			       NULL);
+	                       filter_func,
+	                       NULL);
 
 	g_signal_connect (keymap,
-			  "keys_changed",
-			  G_CALLBACK (keymap_changed),
-			  NULL);
+	                  "keys_changed",
+	                  G_CALLBACK (keymap_changed),
+	                  NULL);
 }
 
 void
 tomboy_keybinder_bind (const char           *keystring,
-		       TomboyBindkeyHandler  handler,
-		       gpointer              user_data)
+                       TomboyBindkeyHandler  handler,
+                       gpointer              user_data)
 {
 	Binding *binding;
 	gboolean success;
@@ -260,7 +260,7 @@ tomboy_keybinder_bind (const char           *keystring,
 
 void
 tomboy_keybinder_unbind (const char           *keystring,
-			 TomboyBindkeyHandler  handler)
+                         TomboyBindkeyHandler  handler)
 {
 	GSList *iter;
 
diff --git a/src/tracker-status-icon/tomboykeybinder.h b/src/tracker-status-icon/tomboykeybinder.h
index 6923bd0..1e59291 100644
--- a/src/tracker-status-icon/tomboykeybinder.h
+++ b/src/tracker-status-icon/tomboykeybinder.h
@@ -11,11 +11,11 @@ typedef void (* TomboyBindkeyHandler) (char *keystring, gpointer user_data);
 void tomboy_keybinder_init   (void);
 
 void tomboy_keybinder_bind   (const char           *keystring,
-			      TomboyBindkeyHandler  handler,
-			      gpointer              user_data);
+                              TomboyBindkeyHandler  handler,
+                              gpointer              user_data);
 
 void tomboy_keybinder_unbind (const char           *keystring,
-			      TomboyBindkeyHandler  handler);
+                              TomboyBindkeyHandler  handler);
 
 gboolean tomboy_keybinder_is_modifier (guint keycode);
 
diff --git a/src/tracker-status-icon/tracker-icon-config.c b/src/tracker-status-icon/tracker-icon-config.c
index 7ea0688..d9eab6c 100644
--- a/src/tracker-status-icon/tracker-icon-config.c
+++ b/src/tracker-status-icon/tracker-icon-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -33,13 +33,13 @@
 #define TRACKER_ICON_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_ICON_CONFIG, TrackerIconConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_GENERAL				 "General"
+#define GROUP_GENERAL                            "General"
 
 /* Default values */
 #define DEFAULT_VISIBILITY TRACKER_SHOW_ACTIVE
 
 typedef struct {
-        gint     visibility;
+	gint     visibility;
 } TrackerIconConfigPrivate;
 
 typedef struct {
@@ -50,29 +50,29 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void     config_set_property         (GObject           *object,
-					     guint              param_id,
-					     const GValue      *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             const GValue      *value,
+                                             GParamSpec        *pspec);
 static void     config_get_property         (GObject           *object,
-					     guint              param_id,
-					     GValue            *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             GValue            *value,
+                                             GParamSpec        *pspec);
 static void     config_constructed          (GObject           *object);
 static void     config_changed              (TrackerConfigFile *file);
 static void     config_load                 (TrackerIconConfig *config);
 static gboolean config_save                 (TrackerIconConfig *config);
 static void     config_create_with_defaults (TrackerIconConfig *config,
-					     GKeyFile          *key_file,
-					     gboolean           overwrite);
+                                             GKeyFile          *key_file,
+                                             gboolean           overwrite);
 
 enum {
 	PROP_0,
-        PROP_VISIBILITY
+	PROP_VISIBILITY
 };
 
 static ObjectToKeyFile conversions[] = {
 	/* General */
-        { G_TYPE_INT, "visibility", GROUP_GENERAL,  "Visibility" }
+	{ G_TYPE_INT, "visibility", GROUP_GENERAL,  "Visibility" }
 };
 
 G_DEFINE_TYPE (TrackerIconConfig, tracker_icon_config, TRACKER_TYPE_CONFIG_FILE);
@@ -91,13 +91,13 @@ tracker_icon_config_class_init (TrackerIconConfigClass *klass)
 
 	/* General */
 	g_object_class_install_property (object_class,
-					 PROP_VISIBILITY,
-					 g_param_spec_int ("visibility",
-                                                           "Status icon visibility",
-                                                           "Status icon visibility (0=Never, 1=When active, 2=Always)",
-                                                           TRACKER_SHOW_NEVER, TRACKER_SHOW_ALWAYS,
-                                                           DEFAULT_VISIBILITY,
-                                                           G_PARAM_READWRITE));
+	                                 PROP_VISIBILITY,
+	                                 g_param_spec_int ("visibility",
+	                                                   "Status icon visibility",
+	                                                   "Status icon visibility (0=Never, 1=When active, 2=Always)",
+	                                                   TRACKER_SHOW_NEVER, TRACKER_SHOW_ALWAYS,
+	                                                   DEFAULT_VISIBILITY,
+	                                                   G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerIconConfigPrivate));
 }
@@ -108,17 +108,17 @@ tracker_icon_config_init (TrackerIconConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* General */
-        case PROP_VISIBILITY:
-                tracker_icon_config_set_visibility (TRACKER_ICON_CONFIG (object),
-						    g_value_get_int (value));
-                break;
+	case PROP_VISIBILITY:
+		tracker_icon_config_set_visibility (TRACKER_ICON_CONFIG (object),
+		                                    g_value_get_int (value));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 		break;
@@ -126,10 +126,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerIconConfigPrivate *priv;
 
@@ -163,8 +163,8 @@ config_changed (TrackerConfigFile *file)
 
 static void
 config_create_with_defaults (TrackerIconConfig *config,
-			     GKeyFile          *key_file,
-			     gboolean           overwrite)
+                             GKeyFile          *key_file,
+                             gboolean           overwrite)
 {
 	gint i;
 
@@ -174,9 +174,9 @@ config_create_with_defaults (TrackerIconConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -184,20 +184,20 @@ config_create_with_defaults (TrackerIconConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 		default:
 			g_assert_not_reached ();
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config, conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config, conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -218,17 +218,17 @@ config_load (TrackerIconConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 		}
 	}
@@ -254,10 +254,10 @@ config_save (TrackerIconConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 		default:
 			g_assert_not_reached ();
@@ -302,7 +302,7 @@ tracker_icon_config_get_visibility (TrackerIconConfig *config)
 
 void
 tracker_icon_config_set_visibility (TrackerIconConfig *config,
-				    TrackerVisibility  visibility)
+                                    TrackerVisibility  visibility)
 {
 	TrackerIconConfigPrivate *priv;
 
diff --git a/src/tracker-status-icon/tracker-icon-config.h b/src/tracker-status-icon/tracker-icon-config.h
index 6b02937..9a1977c 100644
--- a/src/tracker-status-icon/tracker-icon-config.h
+++ b/src/tracker-status-icon/tracker-icon-config.h
@@ -34,13 +34,13 @@ G_BEGIN_DECLS
 #define TRACKER_IS_ICON_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_ICON_CONFIG))
 #define TRACKER_ICON_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_ICON_CONFIG, TrackerIconConfigClass))
 
-typedef struct TrackerIconConfig	  TrackerIconConfig;
+typedef struct TrackerIconConfig          TrackerIconConfig;
 typedef struct TrackerIconConfigClass TrackerIconConfigClass;
 
 typedef enum {
-        TRACKER_SHOW_NEVER,
-        TRACKER_SHOW_ACTIVE,
-        TRACKER_SHOW_ALWAYS
+	TRACKER_SHOW_NEVER,
+	TRACKER_SHOW_ACTIVE,
+	TRACKER_SHOW_ALWAYS
 } TrackerVisibility;
 
 struct TrackerIconConfig {
@@ -51,7 +51,7 @@ struct TrackerIconConfigClass {
 	TrackerConfigFileClass parent_class;
 };
 
-GType	           tracker_icon_config_get_type				   (void) G_GNUC_CONST;
+GType              tracker_icon_config_get_type                                    (void) G_GNUC_CONST;
 
 TrackerIconConfig *tracker_icon_config_new                                  (void);
 TrackerIconConfig *tracker_icon_config_new_with_domain                      (const gchar *domain);
@@ -60,7 +60,7 @@ gboolean           tracker_icon_config_save                                 (Tra
 
 TrackerVisibility  tracker_icon_config_get_visibility                       (TrackerIconConfig *config);
 void               tracker_icon_config_set_visibility                       (TrackerIconConfig *config,
-									     TrackerVisibility  value);
+                                                                             TrackerVisibility  value);
 
 G_END_DECLS
 
diff --git a/src/tracker-status-icon/tracker-main.c b/src/tracker-status-icon/tracker-main.c
index d78d457..d16c37b 100644
--- a/src/tracker-status-icon/tracker-main.c
+++ b/src/tracker-status-icon/tracker-main.c
@@ -29,15 +29,15 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static gboolean print_version;
 
@@ -52,7 +52,7 @@ static GOptionEntry entries[] = {
 int
 main (int argc, char *argv[])
 {
-        GtkStatusIcon *icon;
+	GtkStatusIcon *icon;
 	GOptionContext *context;
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
 	g_option_context_free (context);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		return EXIT_SUCCESS;
 	}
 
@@ -79,15 +79,15 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	}
 
-        gtk_init (&argc, &argv);
+	gtk_init (&argc, &argv);
 	tomboy_keybinder_init ();
 
 	gtk_window_set_default_icon_name ("tracker");
 	g_set_application_name ("tracker-status-icon");
 
-        icon = tracker_status_icon_new ();
+	icon = tracker_status_icon_new ();
 
-        gtk_main ();
+	gtk_main ();
 
-        return EXIT_SUCCESS;
+	return EXIT_SUCCESS;
 }
diff --git a/src/tracker-status-icon/tracker-status-icon.c b/src/tracker-status-icon/tracker-status-icon.c
index 7c70d65..59eb717 100644
--- a/src/tracker-status-icon/tracker-status-icon.c
+++ b/src/tracker-status-icon/tracker-status-icon.c
@@ -87,34 +87,34 @@ static void       status_icon_constructed            (GObject             *objec
 static void       status_icon_finalize               (GObject             *object);
 static void       status_icon_activate               (GtkStatusIcon       *icon);
 static void       status_icon_popup_menu             (GtkStatusIcon       *icon,
-						      guint                button,
-						      guint32              activate_time);
+                                                      guint                button,
+                                                      guint32              activate_time);
 static void       status_icon_miner_progress         (TrackerMinerManager *manager,
-						      const gchar         *miner_name,
-						      const gchar         *status,
-						      gdouble              progress,
-						      gpointer             user_data);
+                                                      const gchar         *miner_name,
+                                                      const gchar         *status,
+                                                      gdouble              progress,
+                                                      gpointer             user_data);
 static void       status_icon_miner_paused           (TrackerMinerManager *manager,
-						      const gchar         *miner_name,
-						      gpointer             user_data);
+                                                      const gchar         *miner_name,
+                                                      gpointer             user_data);
 static void       status_icon_miner_resumed          (TrackerMinerManager *manager,
-						      const gchar         *miner_name,
-						      gpointer             user_data);
+                                                      const gchar         *miner_name,
+                                                      gpointer             user_data);
 static void       status_icon_miner_activated        (TrackerMinerManager *manager,
-						      const gchar         *miner_name,
-						      gpointer             user_data);
+                                                      const gchar         *miner_name,
+                                                      gpointer             user_data);
 static void       status_icon_miner_deactivated      (TrackerMinerManager *manager,
-						      const gchar         *miner_name,
-						      gpointer             user_data);
+                                                      const gchar         *miner_name,
+                                                      gpointer             user_data);
 static void       status_icon_visibility_notify      (TrackerIconConfig   *config,
-						      GParamSpec          *pspec,
-						      gpointer             user_data);
+                                                      GParamSpec          *pspec,
+                                                      gpointer             user_data);
 static void       status_icon_initialize_miners_menu (TrackerStatusIcon   *icon);
 static GtkWidget *status_icon_create_context_menu    (TrackerStatusIcon   *icon);
 static void       status_icon_set_status             (TrackerStatusIcon   *icon,
-						      TrackerStatus        status);
+                                                      TrackerStatus        status);
 static void       launch_application_on_screen       (GdkScreen           *screen,
-						      const gchar         *command_line);
+                                                      const gchar         *command_line);
 
 G_DEFINE_TYPE (TrackerStatusIcon, tracker_status_icon, GTK_TYPE_STATUS_ICON)
 
@@ -147,7 +147,7 @@ miner_menu_entry_free (MinerMenuEntry *entry)
 
 static void
 keybinding_activated_cb (gchar    *keybinding,
-			 gpointer  user_data)
+                         gpointer  user_data)
 {
 	TrackerStatusIcon *icon = user_data;
 	GdkScreen *screen;
@@ -158,11 +158,11 @@ keybinding_activated_cb (gchar    *keybinding,
 
 static void
 set_global_keybinding (TrackerStatusIcon *icon,
-		       const gchar       *keybinding)
+                       const gchar       *keybinding)
 {
 	tomboy_keybinder_bind (keybinding,
-			       keybinding_activated_cb,
-			       icon);
+	                       keybinding_activated_cb,
+	                       icon);
 }
 
 static void
@@ -195,8 +195,8 @@ tracker_status_icon_init (TrackerStatusIcon *icon)
 	}
 
 	priv->miners = g_hash_table_new_full (g_str_hash, g_str_equal,
-					      (GDestroyNotify) g_free,
-					      (GDestroyNotify) miner_menu_entry_free);
+	                                      (GDestroyNotify) g_free,
+	                                      (GDestroyNotify) miner_menu_entry_free);
 
 	priv->miner_menu = gtk_menu_new ();
 	priv->context_menu = status_icon_create_context_menu (icon);
@@ -204,20 +204,20 @@ tracker_status_icon_init (TrackerStatusIcon *icon)
 
 	priv->manager = tracker_miner_manager_new ();
 	g_signal_connect (priv->manager, "miner-progress",
-			  G_CALLBACK (status_icon_miner_progress), icon);
+	                  G_CALLBACK (status_icon_miner_progress), icon);
 	g_signal_connect (priv->manager, "miner-paused",
-			  G_CALLBACK (status_icon_miner_paused), icon);
+	                  G_CALLBACK (status_icon_miner_paused), icon);
 	g_signal_connect (priv->manager, "miner-resumed",
-			  G_CALLBACK (status_icon_miner_resumed), icon);
+	                  G_CALLBACK (status_icon_miner_resumed), icon);
 	g_signal_connect (priv->manager, "miner-activated",
-			  G_CALLBACK (status_icon_miner_activated), icon);
+	                  G_CALLBACK (status_icon_miner_activated), icon);
 	g_signal_connect (priv->manager, "miner-deactivated",
-			  G_CALLBACK (status_icon_miner_deactivated), icon);
+	                  G_CALLBACK (status_icon_miner_deactivated), icon);
 	status_icon_initialize_miners_menu (icon);
 
 	priv->config = tracker_icon_config_new ();
 	g_signal_connect (priv->config, "notify::visibility",
-			  G_CALLBACK (status_icon_visibility_notify), icon);
+	                  G_CALLBACK (status_icon_visibility_notify), icon);
 
 	/* FIXME: Make this configurable */
 	set_global_keybinding (icon, "<Ctrl><Alt>S");
@@ -268,25 +268,25 @@ status_icon_activate (GtkStatusIcon *icon)
 	priv = TRACKER_STATUS_ICON_GET_PRIVATE (icon);
 
 	gtk_menu_popup (GTK_MENU (priv->miner_menu),
-			NULL, NULL,
-			gtk_status_icon_position_menu,
-			icon, 0,
-			gtk_get_current_event_time ());
+	                NULL, NULL,
+	                gtk_status_icon_position_menu,
+	                icon, 0,
+	                gtk_get_current_event_time ());
 }
 
 static void
 status_icon_popup_menu (GtkStatusIcon *icon,
-			guint          button,
-			guint32        activate_time)
+                        guint          button,
+                        guint32        activate_time)
 {
 	TrackerStatusIconPrivate *priv;
 
 	priv = TRACKER_STATUS_ICON_GET_PRIVATE (icon);
 
 	gtk_menu_popup (GTK_MENU (priv->context_menu),
-			NULL, NULL,
-			gtk_status_icon_position_menu,
-			icon, button, activate_time);
+	                NULL, NULL,
+	                gtk_status_icon_position_menu,
+	                icon, button, activate_time);
 }
 
 static void
@@ -390,10 +390,10 @@ status_icon_miner_progress_set (MinerMenuEntry *entry)
 
 static void
 status_icon_miner_progress (TrackerMinerManager *manager,
-			    const gchar         *miner_name,
-			    const gchar         *status,
-			    gdouble              progress,
-			    gpointer             user_data)
+                            const gchar         *miner_name,
+                            const gchar         *status,
+                            gdouble              progress,
+                            gpointer             user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerStatusIcon *icon;
@@ -418,8 +418,8 @@ status_icon_miner_progress (TrackerMinerManager *manager,
 
 static void
 status_icon_miner_paused (TrackerMinerManager *manager,
-			  const gchar         *miner_name,
-			  gpointer             user_data)
+                          const gchar         *miner_name,
+                          gpointer             user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerStatusIcon *icon;
@@ -438,16 +438,16 @@ status_icon_miner_paused (TrackerMinerManager *manager,
 	status_icon_miner_progress_set (entry);
 
 	gtk_image_set_from_stock (GTK_IMAGE (entry->state),
-				  GTK_STOCK_MEDIA_PAUSE,
-				  GTK_ICON_SIZE_MENU);
+	                          GTK_STOCK_MEDIA_PAUSE,
+	                          GTK_ICON_SIZE_MENU);
 
 	update_icon_status (icon);
 }
 
 static void
 status_icon_miner_resumed (TrackerMinerManager *manager,
-			   const gchar         *miner_name,
-			   gpointer             user_data)
+                           const gchar         *miner_name,
+                           gpointer             user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerStatusIcon *icon;
@@ -466,16 +466,16 @@ status_icon_miner_resumed (TrackerMinerManager *manager,
 	status_icon_miner_progress_set (entry);
 
 	gtk_image_set_from_stock (GTK_IMAGE (entry->state),
-				  GTK_STOCK_MEDIA_PLAY,
-				  GTK_ICON_SIZE_MENU);
+	                          GTK_STOCK_MEDIA_PLAY,
+	                          GTK_ICON_SIZE_MENU);
 
 	update_icon_status (icon);
 }
 
 static void
 status_icon_miner_activated (TrackerMinerManager *manager,
-			     const gchar         *miner_name,
-			     gpointer             user_data)
+                             const gchar         *miner_name,
+                             gpointer             user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerStatusIcon *icon;
@@ -500,8 +500,8 @@ status_icon_miner_activated (TrackerMinerManager *manager,
 
 static void
 status_icon_miner_deactivated (TrackerMinerManager *manager,
-			       const gchar         *miner_name,
-			       gpointer             user_data)
+                               const gchar         *miner_name,
+                               gpointer             user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerStatusIcon *icon;
@@ -521,7 +521,7 @@ status_icon_miner_deactivated (TrackerMinerManager *manager,
 	gtk_widget_hide (entry->progress_percentage);
 
 	status_icon_miner_progress (priv->manager, miner_name,
-				    _("Miner is not running"), 0.0, icon);
+	                            _("Miner is not running"), 0.0, icon);
 	entry->active = FALSE;
 
 	/* invalidate pause cookie */
@@ -532,8 +532,8 @@ status_icon_miner_deactivated (TrackerMinerManager *manager,
 
 static void
 status_icon_visibility_notify (TrackerIconConfig *config,
-			       GParamSpec        *pspec,
-			       gpointer           user_data)
+                               GParamSpec        *pspec,
+                               gpointer           user_data)
 {
 	TrackerStatusIcon *icon = user_data;
 
@@ -542,7 +542,7 @@ status_icon_visibility_notify (TrackerIconConfig *config,
 
 static void
 miner_menu_entry_activate_cb (GtkMenuItem *item,
-			      gpointer     user_data)
+                              gpointer     user_data)
 {
 	TrackerStatusIconPrivate *priv;
 	MinerMenuEntry *entry;
@@ -562,7 +562,7 @@ miner_menu_entry_activate_cb (GtkMenuItem *item,
 	if (entry->cookie == 0) {
 		/* Miner was not paused from here */
 		if (tracker_miner_manager_pause (priv->manager, miner,
-						 _("Paused by user"), &cookie)) {
+		                                 _("Paused by user"), &cookie)) {
 			entry->cookie = cookie;
 		}
 	} else {
@@ -575,17 +575,17 @@ miner_menu_entry_activate_cb (GtkMenuItem *item,
 
 static void
 miner_menu_entry_add (TrackerStatusIcon *icon,
-		      const gchar       *miner)
+                      const gchar       *miner)
 {
 	TrackerStatusIconPrivate *priv;
 	MinerMenuEntry *entry;
-        PangoFontDescription *fontdesc;
-        PangoFontMetrics *metrics;
-        PangoContext *context;
-        PangoLanguage *lang;
+	PangoFontDescription *fontdesc;
+	PangoFontMetrics *metrics;
+	PangoContext *context;
+	PangoLanguage *lang;
 	const gchar *name;
 	gchar *str;
-        gint ascent;
+	gint ascent;
 
 	priv = TRACKER_STATUS_ICON_GET_PRIVATE (icon);
 	name = tracker_miner_manager_get_display_name (priv->manager, miner);
@@ -595,7 +595,7 @@ miner_menu_entry_add (TrackerStatusIcon *icon,
 
 	entry->box = gtk_hbox_new (FALSE, 6);
 	entry->state = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY,
-						 GTK_ICON_SIZE_MENU);
+	                                         GTK_ICON_SIZE_MENU);
 	entry->name = gtk_label_new (name);
 	gtk_misc_set_alignment (GTK_MISC (entry->name), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (entry->box), entry->name, TRUE, TRUE, 0);
@@ -609,16 +609,16 @@ miner_menu_entry_add (TrackerStatusIcon *icon,
 	gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (entry->progress_bar), PANGO_ELLIPSIZE_END);
 	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (entry->progress_bar), 1.00);
 
-        /* Get the font ascent for the current font and language */
-        context = gtk_widget_get_pango_context (entry->progress_bar);
-        fontdesc = pango_context_get_font_description (context);
-        lang = pango_context_get_language (context);
-        metrics = pango_context_get_metrics (context, fontdesc, lang);
-        ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE;
-        pango_font_metrics_unref (metrics);
+	/* Get the font ascent for the current font and language */
+	context = gtk_widget_get_pango_context (entry->progress_bar);
+	fontdesc = pango_context_get_font_description (context);
+	lang = pango_context_get_language (context);
+	metrics = pango_context_get_metrics (context, fontdesc, lang);
+	ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE;
+	pango_font_metrics_unref (metrics);
 
-        /* Size our progress bar to be five ascents long */
-        gtk_widget_set_size_request (entry->progress_bar, ascent * 5, -1);
+	/* Size our progress bar to be five ascents long */
+	gtk_widget_set_size_request (entry->progress_bar, ascent * 5, -1);
 
 	gtk_box_pack_start (GTK_BOX (entry->box), entry->progress_bar, FALSE, TRUE, 0);
 
@@ -628,7 +628,7 @@ miner_menu_entry_add (TrackerStatusIcon *icon,
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (entry->menu_item), entry->state);
 	g_object_set_data (G_OBJECT (entry->menu_item), "menu-entry-miner-name", str);
 	g_signal_connect (entry->menu_item, "activate",
-			  G_CALLBACK (miner_menu_entry_activate_cb), icon);
+	                  G_CALLBACK (miner_menu_entry_activate_cb), icon);
 
 	gtk_container_add (GTK_CONTAINER (entry->menu_item), entry->box);
 	gtk_widget_show_all (entry->menu_item);
@@ -665,7 +665,7 @@ status_icon_initialize_miners_menu (TrackerStatusIcon *icon)
 
 static void
 launch_application_on_screen (GdkScreen   *screen,
-			      const gchar *command_line)
+                              const gchar *command_line)
 {
 	GError *error = NULL;
 
@@ -677,7 +677,7 @@ launch_application_on_screen (GdkScreen   *screen,
 
 static void
 context_menu_pause_cb (GtkMenuItem *item,
-		       gpointer     user_data)
+                       gpointer     user_data)
 {
 	TrackerStatusIcon *icon;
 	TrackerStatusIconPrivate *priv;
@@ -697,7 +697,7 @@ context_menu_pause_cb (GtkMenuItem *item,
 
 		if (active && entry->cookie == 0) {
 			if (tracker_miner_manager_pause (priv->manager, miner,
-							 _("Paused by user"), &cookie)) {
+			                                 _("Paused by user"), &cookie)) {
 				entry->cookie = cookie;
 			}
 		} else if (!active && entry->cookie != 0) {
@@ -712,23 +712,23 @@ context_menu_pause_cb (GtkMenuItem *item,
 
 static void
 context_menu_search_cb (GtkMenuItem *item,
-			gpointer     user_data)
+                        gpointer     user_data)
 {
 	launch_application_on_screen (gtk_widget_get_screen (GTK_WIDGET (item)),
-				      "tracker-search-tool");
+	                              "tracker-search-tool");
 }
 
 static void
 context_menu_preferences_cb (GtkMenuItem *item,
-			     gpointer     user_data)
+                             gpointer     user_data)
 {
 	launch_application_on_screen (gtk_widget_get_screen (GTK_WIDGET (item)),
-				      "tracker-preferences");
+	                              "tracker-preferences");
 }
 
 static void
 context_menu_about_cb (GtkMenuItem *item,
-		       gpointer     user_data)
+                       gpointer     user_data)
 {
 	const gchar *authors[] = {
 		"Martyn Russell <martyn at lanedo com>",
@@ -794,28 +794,28 @@ context_menu_about_cb (GtkMenuItem *item,
 	gchar *license_trans;
 
 	license_trans = g_strjoin ("\n\n",
-				   _(license[0]),
-				   _(license[1]),
-				   _(license[2]),
-				   NULL);
+	                           _(license[0]),
+	                           _(license[1]),
+	                           _(license[2]),
+	                           NULL);
 
 	gtk_show_about_dialog (NULL,
-			       "version", PACKAGE_VERSION,
-			       "comments", _("A notification icon application to monitor data miners for Tracker"),
-			       "copyright", _("Copyright Tracker Authors 2005-2009"),
-			       "license", license_trans,
-			       "wrap-license", TRUE,
-			       "authors", authors,
-			       "documenters", documenters,
-			       /* Translators should localize the following string
-				* which will be displayed at the bottom of the about
-				* box to give credit to the translator(s).
-				*/
-			       "translator-credits", _("translator-credits"),
-			       "logo-icon-name", "tracker",
-			       "website", "http://www.tracker-project.org/";,
-			       "website-label", "http://www.tracker-project.org/";,
-			       NULL);
+	                       "version", PACKAGE_VERSION,
+	                       "comments", _("A notification icon application to monitor data miners for Tracker"),
+	                       "copyright", _("Copyright Tracker Authors 2005-2009"),
+	                       "license", license_trans,
+	                       "wrap-license", TRUE,
+	                       "authors", authors,
+	                       "documenters", documenters,
+	                       /* Translators should localize the following string
+	                        * which will be displayed at the bottom of the about
+	                        * box to give credit to the translator(s).
+	                        */
+	                       "translator-credits", _("translator-credits"),
+	                       "logo-icon-name", "tracker",
+	                       "website", "http://www.tracker-project.org/";,
+	                       "website-label", "http://www.tracker-project.org/";,
+	                       NULL);
 
 	g_free (license_trans);
 }
@@ -831,67 +831,67 @@ status_icon_create_context_menu (TrackerStatusIcon *icon)
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), FALSE);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	g_signal_connect (G_OBJECT (item), "toggled",
-			  G_CALLBACK (context_menu_pause_cb), icon);
+	                  G_CALLBACK (context_menu_pause_cb), icon);
 
 	item = gtk_separator_menu_item_new ();
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Search"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_FIND,
-					      GTK_ICON_SIZE_MENU);
+	                                      GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (context_menu_search_cb), icon);
+	                  G_CALLBACK (context_menu_search_cb), icon);
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES,
-					      GTK_ICON_SIZE_MENU);
+	                                      GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (context_menu_preferences_cb),
-			  icon);
+	                  G_CALLBACK (context_menu_preferences_cb),
+	                  icon);
 
 	/*
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Indexer Preferences"));
-	image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES,
-					      GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (preferences_menu_activated), icon);
+	  item = gtk_image_menu_item_new_with_mnemonic (_("_Indexer Preferences"));
+	  image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES,
+	  GTK_ICON_SIZE_MENU);
+	  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	  g_signal_connect (G_OBJECT (item), "activate",
+	  G_CALLBACK (preferences_menu_activated), icon);
 	*/
 
 	/*
-	item = gtk_image_menu_item_new_with_mnemonic (_("S_tatistics"));
-	image = gtk_image_new_from_icon_name (GTK_STOCK_INFO,
-					      GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (statistics_menu_activated), icon);
+	  item = gtk_image_menu_item_new_with_mnemonic (_("S_tatistics"));
+	  image = gtk_image_new_from_icon_name (GTK_STOCK_INFO,
+	  GTK_ICON_SIZE_MENU);
+	  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	  g_signal_connect (G_OBJECT (item), "activate",
+	  G_CALLBACK (statistics_menu_activated), icon);
 	*/
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_About"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_ABOUT,
-					      GTK_ICON_SIZE_MENU);
+	                                      GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (context_menu_about_cb), icon);
+	                  G_CALLBACK (context_menu_about_cb), icon);
 
 	/*
-	item = gtk_separator_menu_item_new ();
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Quit"));
-	image = gtk_image_new_from_icon_name (GTK_STOCK_QUIT,
-					      GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (quit_menu_activated), icon);
+	  item = gtk_separator_menu_item_new ();
+	  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	  item = gtk_image_menu_item_new_with_mnemonic (_("_Quit"));
+	  image = gtk_image_new_from_icon_name (GTK_STOCK_QUIT,
+	  GTK_ICON_SIZE_MENU);
+	  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	  g_signal_connect (G_OBJECT (item), "activate",
+	  G_CALLBACK (quit_menu_activated), icon);
 	*/
 
 	gtk_widget_show_all (menu);
@@ -921,7 +921,7 @@ animate_indexing_cb (TrackerStatusIcon *icon)
 
 static void
 animate_indexing (TrackerStatusIcon *icon,
-		  gboolean           animate)
+                  gboolean           animate)
 {
 	TrackerStatusIconPrivate *priv;
 
@@ -944,7 +944,7 @@ animate_indexing (TrackerStatusIcon *icon,
 
 static void
 status_icon_set_status (TrackerStatusIcon *icon,
-			TrackerStatus      status)
+                        TrackerStatus      status)
 {
 	TrackerStatusIconPrivate *priv;
 	TrackerVisibility visibility;
@@ -971,15 +971,15 @@ status_icon_set_status (TrackerStatusIcon *icon,
 		animate_indexing (icon, FALSE);
 
 		gtk_status_icon_set_visible (GTK_STATUS_ICON (icon),
-					     (visibility == TRACKER_SHOW_ALWAYS));
+		                             (visibility == TRACKER_SHOW_ALWAYS));
 
 		gtk_status_icon_set_from_pixbuf (GTK_STATUS_ICON (icon),
-						 priv->icons [ICON_IDLE]);
+		                                 priv->icons [ICON_IDLE]);
 		break;
 	case STATUS_PAUSED:
 		animate_indexing (icon, FALSE);
 		gtk_status_icon_set_from_pixbuf (GTK_STATUS_ICON (icon),
-						 priv->icons [ICON_PAUSED]);
+		                                 priv->icons [ICON_PAUSED]);
 		break;
 	case STATUS_INDEXING:
 		gtk_status_icon_set_visible (GTK_STATUS_ICON (icon), TRUE);
diff --git a/src/tracker-status-icon/tracker-status-icon.h b/src/tracker-status-icon/tracker-status-icon.h
index 31675c6..0c6e405 100644
--- a/src/tracker-status-icon/tracker-status-icon.h
+++ b/src/tracker-status-icon/tracker-status-icon.h
@@ -36,11 +36,11 @@ typedef struct TrackerStatusIcon TrackerStatusIcon;
 typedef struct TrackerStatusIconClass TrackerStatusIconClass;
 
 struct TrackerStatusIcon {
-        GtkStatusIcon parent_object;
+	GtkStatusIcon parent_object;
 };
 
 struct TrackerStatusIconClass {
-        GtkStatusIconClass parent_class;
+	GtkStatusIconClass parent_class;
 };
 
 GType           tracker_status_icon_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-store/mingw-compat.h b/src/tracker-store/mingw-compat.h
index 032da60..a3bfe95 100644
--- a/src/tracker-store/mingw-compat.h
+++ b/src/tracker-store/mingw-compat.h
@@ -3,23 +3,23 @@
 
 #include <Windows.h>
 
-#define _fullpath_internal(res,path,size) \
-  (GetFullPathName ((path), (size), (res), NULL) ? (res) : NULL)
+#define _fullpath_internal(res,path,size)	  \
+	(GetFullPathName ((path), (size), (res), NULL) ? (res) : NULL)
 
 #define realpath(path,resolved_path) _fullpath_internal(resolved_path, path, MAX_PATH)
 
 #define getc_unlocked(s) getc(s)
 
-#define RLIMIT_CPU	0		/* CPU time in seconds */
-#define RLIMIT_AS	6		/* address space (virt. memory) limit */
+#define RLIMIT_CPU      0               /* CPU time in seconds */
+#define RLIMIT_AS       6               /* address space (virt. memory) limit */
 typedef unsigned long rlim_t;
 
 struct rlimit {
-	rlim_t	rlim_cur;
-	rlim_t	rlim_max;
+	rlim_t  rlim_cur;
+	rlim_t  rlim_max;
 };
 
-#define localtime_r( _clock, _result ) \
+#define localtime_r( _clock, _result )	  \
 	( *(_result) = *localtime( (_clock) ), \
 	  (_result) )
 
@@ -28,26 +28,26 @@ struct rlimit {
 #include <sys/timeb.h>
 
 struct timezone {
-       int tz_minuteswest; /* minutes west of Greenwich */
-       int tz_dsttime;	   /* type of dst correction */
-     };
+	int tz_minuteswest; /* minutes west of Greenwich */
+	int tz_dsttime;     /* type of dst correction */
+};
 
 static int gettimeofday (struct timeval *tv, struct timezone *tz)
 {
-   struct _timeb tb;
-
-   if (!tv)
-      return (-1);
-
-  _ftime (&tb);
-  tv->tv_sec  = tb.time;
-  tv->tv_usec = tb.millitm * 1000 + 500;
-  if (tz)
-  {
-    tz->tz_minuteswest = -60 * _timezone;
-    tz->tz_dsttime = _daylight;
-  }
-  return (0);
+	struct _timeb tb;
+
+	if (!tv)
+		return (-1);
+
+	_ftime (&tb);
+	tv->tv_sec  = tb.time;
+	tv->tv_usec = tb.millitm * 1000 + 500;
+	if (tz)
+		{
+			tz->tz_minuteswest = -60 * _timezone;
+			tz->tz_dsttime = _daylight;
+		}
+	return (0);
 }
 
 // Does not exist in a windows filesystem
@@ -63,11 +63,11 @@ static int gettimeofday (struct timeval *tv, struct timezone *tz)
 
 #define link(from, to) 0
 
-#define	_LK_UNLCK	0	/* Unlock */
-#define	_LK_LOCK	1	/* Lock */
-#define	_LK_NBLCK	2	/* Non-blocking lock */
-#define	_LK_RLCK	3	/* Lock for read only */
-#define	_LK_NBRLCK	4	/* Non-blocking lock for read only */
+#define         _LK_UNLCK       0       /* Unlock */
+#define         _LK_LOCK        1       /* Lock */
+#define         _LK_NBLCK       2       /* Non-blocking lock */
+#define         _LK_RLCK        3       /* Lock for read only */
+#define         _LK_NBRLCK      4       /* Non-blocking lock for read only */
 
 #define F_TLOCK _LK_NBLCK /* Test and lock a section for exclusive use */
 
diff --git a/src/tracker-store/tracker-backup.h b/src/tracker-store/tracker-backup.h
index 7459f50..35304ae 100644
--- a/src/tracker-store/tracker-backup.h
+++ b/src/tracker-store/tracker-backup.h
@@ -24,14 +24,14 @@
 
 #include <glib-object.h>
 
-#define TRACKER_BACKUP_SERVICE	       "org.freedesktop.Tracker1"
-#define TRACKER_BACKUP_PATH	       "/org/freedesktop/Tracker1/Backup"
+#define TRACKER_BACKUP_SERVICE         "org.freedesktop.Tracker1"
+#define TRACKER_BACKUP_PATH            "/org/freedesktop/Tracker1/Backup"
 #define TRACKER_BACKUP_INTERFACE       "org.freedesktop.Tracker1.Backup"
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_BACKUP	       (tracker_backup_get_type ())
-#define TRACKER_BACKUP(object)	       (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_BACKUP, TrackerBackup))
+#define TRACKER_TYPE_BACKUP            (tracker_backup_get_type ())
+#define TRACKER_BACKUP(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_BACKUP, TrackerBackup))
 #define TRACKER_BACKUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_BACKUP, TrackerBackupClass))
 #define TRACKER_IS_BACKUP(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_BACKUP))
 #define TRACKER_IS_BACKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_BACKUP))
@@ -48,19 +48,19 @@ struct TrackerBackupClass {
 	GObjectClass parent;
 };
 
-GType	       tracker_backup_get_type (void) G_GNUC_CONST;
+GType          tracker_backup_get_type (void) G_GNUC_CONST;
 
 TrackerBackup *tracker_backup_new      (void);
 void           tracker_backup_save     (TrackerBackup          *object,
-					const gchar            *destination_uri,
-					const gchar            *journal_uri,
-					DBusGMethodInvocation  *context,
-					GError                **error);
+                                        const gchar            *destination_uri,
+                                        const gchar            *journal_uri,
+                                        DBusGMethodInvocation  *context,
+                                        GError                **error);
 void           tracker_backup_restore  (TrackerBackup          *object,
-					const gchar            *backup_uri,
-					const gchar            *journal_uri,
-					DBusGMethodInvocation  *context,
-					GError                **error);
+                                        const gchar            *backup_uri,
+                                        const gchar            *journal_uri,
+                                        DBusGMethodInvocation  *context,
+                                        GError                **error);
 
 G_END_DECLS
 
diff --git a/src/tracker-store/tracker-config.c b/src/tracker-store/tracker-config.c
index 62ea7dc..263410c 100644
--- a/src/tracker-store/tracker-config.c
+++ b/src/tracker-store/tracker-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -33,12 +33,12 @@
 #define TRACKER_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG, TrackerConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_GENERAL		    "General"
-#define GROUP_INDEXING		    "Indexing"
+#define GROUP_GENERAL               "General"
+#define GROUP_INDEXING              "Indexing"
 
 /* Default values */
-#define DEFAULT_VERBOSITY	    2
-#define DEFAULT_LOW_MEMORY_MODE	    FALSE
+#define DEFAULT_VERBOSITY           2
+#define DEFAULT_LOW_MEMORY_MODE             FALSE
 
 /* typedef struct TrackerConfigPrivate TrackerConfigPrivate; */
 
@@ -56,18 +56,18 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void config_set_property         (GObject       *object,
-					 guint          param_id,
-					 const GValue  *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         const GValue  *value,
+                                         GParamSpec    *pspec);
 static void config_get_property         (GObject       *object,
-					 guint          param_id,
-					 GValue        *value,
-					 GParamSpec    *pspec);
+                                         guint          param_id,
+                                         GValue        *value,
+                                         GParamSpec    *pspec);
 static void config_finalize             (GObject       *object);
 static void config_constructed          (GObject       *object);
 static void config_create_with_defaults (TrackerConfig *config,
-					 GKeyFile      *key_file,
-					 gboolean       overwrite);
+                                         GKeyFile      *key_file,
+                                         gboolean       overwrite);
 static void config_load                 (TrackerConfig *config);
 
 enum {
@@ -92,26 +92,26 @@ tracker_config_class_init (TrackerConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	/* General */
 	g_object_class_install_property (object_class,
-					 PROP_VERBOSITY,
-					 g_param_spec_int ("verbosity",
-							   "Log verbosity",
-							   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
-							   0,
-							   3,
-							   DEFAULT_VERBOSITY,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_VERBOSITY,
+	                                 g_param_spec_int ("verbosity",
+	                                                   "Log verbosity",
+	                                                   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
+	                                                   0,
+	                                                   3,
+	                                                   DEFAULT_VERBOSITY,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
-					 PROP_LOW_MEMORY_MODE,
-					 g_param_spec_boolean ("low-memory-mode",
-							       "Use extra memory",
-							       " Minimizes memory use at the expense of indexing speed",
-							       DEFAULT_LOW_MEMORY_MODE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_LOW_MEMORY_MODE,
+	                                 g_param_spec_boolean ("low-memory-mode",
+	                                                       "Use extra memory",
+	                                                       " Minimizes memory use at the expense of indexing speed",
+	                                                       DEFAULT_LOW_MEMORY_MODE,
+	                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigPrivate));
 }
@@ -122,20 +122,20 @@ tracker_config_init (TrackerConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* General */
 	case PROP_VERBOSITY:
 		tracker_config_set_verbosity (TRACKER_CONFIG (object),
-					      g_value_get_int (value));
+		                              g_value_get_int (value));
 		break;
 	case PROP_LOW_MEMORY_MODE:
 		tracker_config_set_low_memory_mode (TRACKER_CONFIG (object),
-						    g_value_get_boolean (value));
+		                                    g_value_get_boolean (value));
 		break;
 
 	default:
@@ -145,10 +145,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerConfigPrivate *priv;
 
@@ -189,8 +189,8 @@ config_constructed (GObject *object)
 
 static void
 config_create_with_defaults (TrackerConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gint i;
 
@@ -200,9 +200,9 @@ config_create_with_defaults (TrackerConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -210,18 +210,18 @@ config_create_with_defaults (TrackerConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		case G_TYPE_BOOLEAN:
 			g_key_file_set_boolean (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_boolean (config,
-											conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_boolean (config,
+			                                                                conversions[i].property));
 			break;
 
 		default:
@@ -230,11 +230,11 @@ config_create_with_defaults (TrackerConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-							      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -255,25 +255,25 @@ config_load (TrackerConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-						 conversions[i].property,
-						 file->key_file,
-						 conversions[i].group,
-						 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_load_boolean (G_OBJECT (file),
-						     conversions[i].property,
-						     file->key_file,
-						     conversions[i].group,
-						     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 
 		default:
@@ -303,18 +303,18 @@ config_save (TrackerConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-						 conversions[i].property,
-						 file->key_file,
-						 conversions[i].group,
-						 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_save_boolean (file,
-						     conversions[i].property,
-						     file->key_file,
-						     conversions[i].group,
-						     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 
 		default:
@@ -366,7 +366,7 @@ tracker_config_get_low_memory_mode (TrackerConfig *config)
 
 void
 tracker_config_set_verbosity (TrackerConfig *config,
-			      gint	     value)
+                              gint           value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -384,7 +384,7 @@ tracker_config_set_verbosity (TrackerConfig *config,
 
 void
 tracker_config_set_low_memory_mode (TrackerConfig *config,
-				    gboolean	   value)
+                                    gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
diff --git a/src/tracker-store/tracker-config.h b/src/tracker-store/tracker-config.h
index 2e3f8a4..89eeda4 100644
--- a/src/tracker-store/tracker-config.h
+++ b/src/tracker-store/tracker-config.h
@@ -27,10 +27,10 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_CONFIG	    (tracker_config_get_type ())
-#define TRACKER_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
+#define TRACKER_TYPE_CONFIG         (tracker_config_get_type ())
+#define TRACKER_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
 #define TRACKER_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-#define TRACKER_IS_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
+#define TRACKER_IS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
 #define TRACKER_IS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
 #define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
 
@@ -45,7 +45,7 @@ struct TrackerConfigClass {
 	TrackerConfigFileClass parent_class;
 };
 
-GType	       tracker_config_get_type               (void) G_GNUC_CONST;
+GType          tracker_config_get_type               (void) G_GNUC_CONST;
 
 TrackerConfig *tracker_config_new                    (void);
 gboolean       tracker_config_save                   (TrackerConfig *config);
@@ -53,9 +53,9 @@ gint           tracker_config_get_verbosity          (TrackerConfig *config);
 gboolean       tracker_config_get_low_memory_mode    (TrackerConfig *config);
 
 void           tracker_config_set_verbosity          (TrackerConfig *config,
-						      gint           value);
+                                                      gint           value);
 void           tracker_config_set_low_memory_mode    (TrackerConfig *config,
-						      gboolean       value);
+                                                      gboolean       value);
 
 G_END_DECLS
 
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index f95c2b2..91c87e4 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -45,26 +45,26 @@
 
 static DBusGConnection *connection;
 static DBusGProxy      *gproxy;
-static GSList	       *objects;
+static GSList          *objects;
 
 static gboolean
 dbus_register_service (DBusGProxy  *proxy,
-		       const gchar *name)
+                       const gchar *name)
 {
 	GError *error = NULL;
-	guint	result;
+	guint   result;
 
 	g_message ("Registering D-Bus service...\n"
-		   "  Name:'%s'",
-		   name);
+	           "  Name:'%s'",
+	           name);
 
 	if (!org_freedesktop_DBus_request_name (proxy,
-						name,
-						DBUS_NAME_FLAG_DO_NOT_QUEUE,
-						&result, &error)) {
+	                                        name,
+	                                        DBUS_NAME_FLAG_DO_NOT_QUEUE,
+	                                        &result, &error)) {
 		g_critical ("Could not aquire name:'%s', %s",
-			    name,
-			    error ? error->message : "no error given");
+		            name,
+		            error ? error->message : "no error given");
 		g_error_free (error);
 
 		return FALSE;
@@ -72,8 +72,8 @@ dbus_register_service (DBusGProxy  *proxy,
 
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_critical ("D-Bus service name:'%s' is already taken, "
-			    "perhaps the daemon is already running?",
-			    name);
+		            "perhaps the daemon is already running?",
+		            name);
 		return FALSE;
 	}
 
@@ -81,11 +81,11 @@ dbus_register_service (DBusGProxy  *proxy,
 }
 
 static void
-dbus_register_object (DBusGConnection	    *lconnection,
-		      DBusGProxy	    *proxy,
-		      GObject		    *object,
-		      const DBusGObjectInfo *info,
-		      const gchar	    *path)
+dbus_register_object (DBusGConnection       *lconnection,
+                      DBusGProxy            *proxy,
+                      GObject               *object,
+                      const DBusGObjectInfo *info,
+                      const gchar           *path)
 {
 	g_message ("Registering D-Bus object...");
 	g_message ("  Path:'%s'", path);
@@ -114,7 +114,7 @@ dbus_register_names (void)
 
 	if (!connection) {
 		g_critical ("Could not connect to the D-Bus session bus, %s",
-			    error ? error->message : "no error given.");
+		            error ? error->message : "no error given.");
 		g_clear_error (&error);
 		return FALSE;
 	}
@@ -123,9 +123,9 @@ dbus_register_names (void)
 	 * predefined for us to just use (dbus_g_proxy_...)
 	 */
 	gproxy = dbus_g_proxy_new_for_name (connection,
-					    DBUS_SERVICE_DBUS,
-					    DBUS_PATH_DBUS,
-					    DBUS_INTERFACE_DBUS);
+	                                    DBUS_SERVICE_DBUS,
+	                                    DBUS_PATH_DBUS,
+	                                    DBUS_INTERFACE_DBUS);
 
 	/* Register the service name for org.freedesktop.Tracker */
 	if (!dbus_register_service (gproxy, TRACKER_STATISTICS_SERVICE)) {
@@ -208,10 +208,10 @@ tracker_dbus_register_objects (void)
 	}
 
 	dbus_register_object (connection,
-			      gproxy,
-			      G_OBJECT (object),
-			      &dbus_glib_tracker_statistics_object_info,
-			      TRACKER_STATISTICS_PATH);
+	                      gproxy,
+	                      G_OBJECT (object),
+	                      &dbus_glib_tracker_statistics_object_info,
+	                      TRACKER_STATISTICS_PATH);
 	objects = g_slist_prepend (objects, object);
 
 	/* Add org.freedesktop.Tracker1.Resources */
@@ -233,10 +233,10 @@ tracker_dbus_register_objects (void)
 	                             name_owner_changed_closure);
 
 	dbus_register_object (connection,
-			      gproxy,
-			      G_OBJECT (object),
-			      &dbus_glib_tracker_resources_object_info,
-			      TRACKER_RESOURCES_PATH);
+	                      gproxy,
+	                      G_OBJECT (object),
+	                      &dbus_glib_tracker_resources_object_info,
+	                      TRACKER_RESOURCES_PATH);
 	objects = g_slist_prepend (objects, object);
 
 	/* Add org.freedesktop.Tracker1.Backup */
@@ -247,10 +247,10 @@ tracker_dbus_register_objects (void)
 	}
 
 	dbus_register_object (connection,
-			      gproxy,
-			      G_OBJECT (object),
-			      &dbus_glib_tracker_backup_object_info,
-			      TRACKER_BACKUP_PATH);
+	                      gproxy,
+	                      G_OBJECT (object),
+	                      &dbus_glib_tracker_backup_object_info,
+	                      TRACKER_BACKUP_PATH);
 	objects = g_slist_prepend (objects, object);
 
 	/* Reverse list since we added objects at the top each time */
@@ -290,7 +290,7 @@ tracker_dbus_register_objects (void)
 
 		if (!hash) {
 			g_critical ("Unknown namespace for class:'%s'",
-				    rdf_class);
+			            rdf_class);
 			continue;
 		}
 
@@ -300,32 +300,32 @@ tracker_dbus_register_objects (void)
 
 		if (!namespace) {
 			g_critical ("Unknown namespace:'%s' for class:'%s'",
-				    namespace_uri,
-				    rdf_class);
+			            namespace_uri,
+			            rdf_class);
 			continue;
 		}
 
 		replaced = g_strdup_printf ("%s/%s",
-					    tracker_namespace_get_prefix (namespace),
-					    hash + 1);
+		                            tracker_namespace_get_prefix (namespace),
+		                            hash + 1);
 		path = g_strdup_printf (TRACKER_RESOURCES_CLASS_PATH,
-					replaced);
+		                        replaced);
 		g_free (replaced);
 
 		/* Add a org.freedesktop.Tracker1.Resources.Class */
 		object = tracker_resource_class_new (rdf_class);
 		if (!object) {
 			g_critical ("Could not create TrackerResourcesClass object to register:'%s' class",
-				rdf_class);
+			            rdf_class);
 			g_free (path);
 			return FALSE;
 		}
 
 		dbus_register_object (connection,
-				      gproxy,
-				      G_OBJECT (object),
-				      &dbus_glib_tracker_resources_class_object_info,
-				      path);
+		                      gproxy,
+		                      G_OBJECT (object),
+		                      &dbus_glib_tracker_resources_class_object_info,
+		                      path);
 		g_free (path);
 
 		/* TrackerResources takes over ownership and unrefs
diff --git a/src/tracker-store/tracker-events.c b/src/tracker-store/tracker-events.c
index d07f889..f7504ba 100644
--- a/src/tracker-store/tracker-events.c
+++ b/src/tracker-store/tracker-events.c
@@ -97,10 +97,10 @@ prepare_event_for_rdf_type (EventsPrivate *private,
 
 void
 tracker_events_insert (const gchar *uri,
-		       const gchar *predicate,
-		       const gchar *object,
-		       GPtrArray *rdf_types,
-		       TrackerDBusEventsType type)
+                       const gchar *predicate,
+                       const gchar *object,
+                       GPtrArray *rdf_types,
+                       TrackerDBusEventsType type)
 {
 	EventsPrivate *private;
 
@@ -187,8 +187,8 @@ tracker_events_init (TrackerNotifyClassGetter callback)
 	private = g_new0 (EventsPrivate, 1);
 
 	g_static_private_set (&private_key,
-			      private,
-			      (GDestroyNotify) free_private);
+	                      private,
+	                      (GDestroyNotify) free_private);
 
 	private->allowances = g_hash_table_new_full (g_str_hash, g_str_equal,
 	                                             (GDestroyNotify) g_free,
diff --git a/src/tracker-store/tracker-events.h b/src/tracker-store/tracker-events.h
index 459cf8d..1c5dd2c 100644
--- a/src/tracker-store/tracker-events.h
+++ b/src/tracker-store/tracker-events.h
@@ -33,10 +33,10 @@ typedef GStrv (*TrackerNotifyClassGetter) (void);
 void       tracker_events_init        (TrackerNotifyClassGetter  callback);
 void       tracker_events_shutdown    (void);
 void       tracker_events_insert      (const gchar              *uri,
-				       const gchar              *predicate,
-				       const gchar              *object,
-				       GPtrArray                *rdf_types,
-				       TrackerDBusEventsType     type);
+                                       const gchar              *predicate,
+                                       const gchar              *object,
+                                       GPtrArray                *rdf_types,
+                                       TrackerDBusEventsType     type);
 GPtrArray *tracker_events_get_pending (void);
 void       tracker_events_reset       (void);
 
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 63a2d2f..44db706 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -65,14 +65,14 @@
 #include "mingw-compat.h"
 #endif
 
-#define ABOUT								  \
+#define ABOUT	  \
 	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE								  \
+#define LICENSE	  \
 	"This program is free software and comes without any warranty.\n" \
-	"It is licensed under version 2 or later of the General Public "  \
-	"License which can be viewed at:\n"				  \
-	"\n"								  \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
 	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 typedef struct {
@@ -143,13 +143,13 @@ sanity_check_option_values (TrackerConfig *config)
 {
 	g_message ("General options:");
 	g_message ("  Verbosity  ............................  %d",
-		   tracker_config_get_verbosity (config));
+	           tracker_config_get_verbosity (config));
 	g_message ("  Low memory mode  ......................  %s",
-		   tracker_config_get_low_memory_mode (config) ? "yes" : "no");
+	           tracker_config_get_low_memory_mode (config) ? "yes" : "no");
 
 	g_message ("Store options:");
 	g_message ("  Readonly mode  ........................  %s",
-		   readonly_mode ? "yes" : "no");
+	           readonly_mode ? "yes" : "no");
 }
 
 static void
@@ -197,8 +197,8 @@ signal_handler (int signo)
 		if (g_strsignal (signo)) {
 			g_print ("\n");
 			g_print ("Received signal:%d->'%s'",
-				 signo,
-				 g_strsignal (signo));
+			         signo,
+			         g_strsignal (signo));
 		}
 		break;
 	}
@@ -209,7 +209,7 @@ initialize_signal_handler (void)
 {
 #ifndef G_OS_WIN32
 	struct sigaction act;
-	sigset_t	 empty_mask;
+	sigset_t         empty_mask;
 
 	sigemptyset (&empty_mask);
 	act.sa_handler = signal_handler;
@@ -337,8 +337,8 @@ main (gint argc, gchar *argv[])
 
 	private = g_new0 (TrackerMainPrivate, 1);
 	g_static_private_set (&private_key,
-			      private,
-			      private_free);
+	                      private,
+	                      private_free);
 
 	dbus_g_thread_init ();
 
@@ -386,10 +386,10 @@ main (gint argc, gchar *argv[])
 	/* Public locations */
 	private->ttl_backup_file =
 		g_build_filename (g_get_user_data_dir (),
-				  "tracker",
-				  "data",
-				  "tracker-userdata-backup.ttl",
-				  NULL);
+		                  "tracker",
+		                  "data",
+		                  "tracker-userdata-backup.ttl",
+		                  NULL);
 
 	/* Initialize major subsystems */
 	config = tracker_config_new ();
@@ -411,7 +411,7 @@ main (gint argc, gchar *argv[])
 
 	/* Initialize other subsystems */
 	tracker_log_init (tracker_config_get_verbosity (config),
-			  &private->log_filename);
+	                  &private->log_filename);
 	g_print ("Starting log:\n  File:'%s'\n", private->log_filename);
 
 	sanity_check_option_values (config);
@@ -420,7 +420,7 @@ main (gint argc, gchar *argv[])
 
 	if (force_reindex) {
 		/* TODO port backup support
-		backup_user_metadata (config, language); */
+		   backup_user_metadata (config, language); */
 
 		flags |= TRACKER_DB_MANAGER_FORCE_REINDEX;
 	}
@@ -430,8 +430,8 @@ main (gint argc, gchar *argv[])
 	}
 
 	if (!tracker_data_manager_init (flags,
-					NULL,
-					&is_first_time_index,
+	                                NULL,
+	                                &is_first_time_index,
 	                                &need_journal)) {
 		return EXIT_FAILURE;
 	}
@@ -462,7 +462,7 @@ main (gint argc, gchar *argv[])
 		g_main_loop_run (private->main_loop);
 	}
 
-shutdown:
+ shutdown:
 	/*
 	 * Shutdown the daemon
 	 */
diff --git a/src/tracker-store/tracker-push-registrar.c b/src/tracker-store/tracker-push-registrar.c
index f087980..b067724 100644
--- a/src/tracker-store/tracker-push-registrar.c
+++ b/src/tracker-store/tracker-push-registrar.c
@@ -43,13 +43,13 @@ enum {
 static void   tracker_push_registrar_finalize     (GObject      *object);
 static void   tracker_push_registrar_constructed  (GObject      *object);
 static void   tracker_push_registrar_set_property (GObject      *object,
-						   guint         prop_id,
-						   const GValue *value,
-						   GParamSpec   *pspec);
+                                                   guint         prop_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
 static void   tracker_push_registrar_get_property (GObject      *object,
-						   guint         prop_id,
-						   GValue       *value,
-						   GParamSpec   *pspec);
+                                                   guint         prop_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
 
 G_DEFINE_TYPE (TrackerPushRegistrar, tracker_push_registrar, G_TYPE_OBJECT)
 
@@ -65,28 +65,28 @@ tracker_push_registrar_class_init (TrackerPushRegistrarClass *klass)
 	object_class->get_property = tracker_push_registrar_get_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_MANAGER,
-					 g_param_spec_object ("manager",
-							      "Manager",
-							      "Manager ",
-							      G_TYPE_OBJECT,
-							      G_PARAM_READWRITE));
+	                                 PROP_MANAGER,
+	                                 g_param_spec_object ("manager",
+	                                                      "Manager",
+	                                                      "Manager ",
+	                                                      G_TYPE_OBJECT,
+	                                                      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class,
-					 PROP_OBJECT,
-					 g_param_spec_object ("object",
-							      "Object",
-							      "Object ",
-							      G_TYPE_OBJECT,
-							      G_PARAM_READWRITE));
+	                                 PROP_OBJECT,
+	                                 g_param_spec_object ("object",
+	                                                      "Object",
+	                                                      "Object ",
+	                                                      G_TYPE_OBJECT,
+	                                                      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class,
-					 PROP_MANAGER,
-					 g_param_spec_string ("service",
-							      "Service",
-							      "Service ",
-							      NULL,
-							      G_PARAM_READWRITE));
+	                                 PROP_MANAGER,
+	                                 g_param_spec_string ("service",
+	                                                      "Service",
+	                                                      "Service ",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (TrackerPushRegistrarPrivate));
 }
@@ -122,22 +122,22 @@ tracker_push_registrar_constructed (GObject *object)
 
 static void
 tracker_push_registrar_set_property (GObject      *object,
-				     guint         prop_id,
-				     const GValue *value,
-				     GParamSpec   *pspec)
+                                     guint         prop_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
 {
 	switch (prop_id) {
 	case PROP_MANAGER:
 		tracker_push_registrar_set_manager (TRACKER_PUSH_REGISTRAR (object),
-						    g_value_get_object (value));
+		                                    g_value_get_object (value));
 		break;
 	case PROP_OBJECT:
 		tracker_push_registrar_set_object (TRACKER_PUSH_REGISTRAR (object),
-						   g_value_get_object (value));
+		                                   g_value_get_object (value));
 		break;
 	case PROP_SERVICE:
 		tracker_push_registrar_set_service (TRACKER_PUSH_REGISTRAR (object),
-						    g_value_get_string (value));
+		                                    g_value_get_string (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -146,9 +146,9 @@ tracker_push_registrar_set_property (GObject      *object,
 
 static void
 tracker_push_registrar_get_property (GObject    *object,
-				     guint       prop_id,
-				     GValue     *value,
-				     GParamSpec *pspec)
+                                     guint       prop_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
 {
 	TrackerPushRegistrarPrivate *priv;
 
@@ -233,7 +233,7 @@ tracker_push_registrar_get_manager (TrackerPushRegistrar *registrar)
  **/
 void
 tracker_push_registrar_set_service (TrackerPushRegistrar *registrar,
-				    const gchar *service)
+                                    const gchar *service)
 {
 	TrackerPushRegistrarPrivate *priv;
 
@@ -253,7 +253,7 @@ tracker_push_registrar_set_service (TrackerPushRegistrar *registrar,
  **/
 void
 tracker_push_registrar_set_object (TrackerPushRegistrar *registrar,
-				   GObject              *object)
+                                   GObject              *object)
 {
 	TrackerPushRegistrarPrivate *priv;
 
@@ -281,7 +281,7 @@ tracker_push_registrar_set_object (TrackerPushRegistrar *registrar,
  **/
 void
 tracker_push_registrar_set_manager (TrackerPushRegistrar *registrar,
-				    DBusGProxy           *manager)
+                                    DBusGProxy           *manager)
 {
 	TrackerPushRegistrarPrivate *priv;
 
@@ -310,15 +310,15 @@ tracker_push_registrar_set_manager (TrackerPushRegistrar *registrar,
  **/
 void
 tracker_push_registrar_enable (TrackerPushRegistrar *registrar,
-			      DBusGConnection *connection,
-			      DBusGProxy *dbus_proxy,
-			      GError **error)
+                               DBusGConnection *connection,
+                               DBusGProxy *dbus_proxy,
+                               GError **error)
 {
 	if (TRACKER_PUSH_REGISTRAR_GET_CLASS (registrar)->enable) {
 		TRACKER_PUSH_REGISTRAR_GET_CLASS (registrar)->enable (registrar,
-								      connection,
-								      dbus_proxy,
-								      error);
+		                                                      connection,
+		                                                      dbus_proxy,
+		                                                      error);
 	}
 }
 
diff --git a/src/tracker-store/tracker-push-registrar.h b/src/tracker-store/tracker-push-registrar.h
index df2defa..3aadeb1 100644
--- a/src/tracker-store/tracker-push-registrar.h
+++ b/src/tracker-store/tracker-push-registrar.h
@@ -47,9 +47,9 @@ struct TrackerPushRegistrarClass {
 	GObjectClass parent_class;
 
 	void (*enable) (TrackerPushRegistrar *registrar,
-			DBusGConnection      *connection,
-			DBusGProxy           *dbus_proxy,
-			GError              **error);
+	                DBusGConnection      *connection,
+	                DBusGProxy           *dbus_proxy,
+	                GError              **error);
 
 	void (*disable) (TrackerPushRegistrar *registrar);
 };
@@ -61,17 +61,17 @@ GObject *               tracker_push_registrar_get_object    (TrackerPushRegistr
 DBusGProxy *            tracker_push_registrar_get_manager   (TrackerPushRegistrar *registrar);
 
 void                    tracker_push_registrar_set_service   (TrackerPushRegistrar *registrar,
-							      const gchar *service);
+                                                              const gchar *service);
 void                    tracker_push_registrar_set_object    (TrackerPushRegistrar *registrar,
-							      GObject              *object);
+                                                              GObject              *object);
 void                    tracker_push_registrar_set_manager   (TrackerPushRegistrar *registrar,
-							      DBusGProxy           *manager);
+                                                              DBusGProxy           *manager);
 
 
 void                    tracker_push_registrar_enable        (TrackerPushRegistrar *registrar,
-							      DBusGConnection      *connection,
-							      DBusGProxy           *dbus_proxy,
-							      GError              **error);
+                                                              DBusGConnection      *connection,
+                                                              DBusGProxy           *dbus_proxy,
+                                                              GError              **error);
 void                    tracker_push_registrar_disable       (TrackerPushRegistrar *registrar);
 
 TrackerPushRegistrar *  tracker_push_module_init             (void);
diff --git a/src/tracker-store/tracker-push.c b/src/tracker-store/tracker-push.c
index 8f89311..44fd2c1 100644
--- a/src/tracker-store/tracker-push.c
+++ b/src/tracker-store/tracker-push.c
@@ -69,12 +69,12 @@ load_modules (PushSupportPrivate *private)
 			p_module->module = g_module_open (path, G_MODULE_BIND_LOCAL);
 
 			if (!g_module_symbol (p_module->module, "tracker_push_module_shutdown",
-					      (gpointer *) &p_module->shutdown) ||
+			                      (gpointer *) &p_module->shutdown) ||
 			    !g_module_symbol (p_module->module, "tracker_push_module_init",
-					      (gpointer *) &p_module->init)) {
+			                      (gpointer *) &p_module->init)) {
 
 				g_warning ("Could not load module symbols for '%s': %s",
-					   path, g_module_error ());
+				           path, g_module_error ());
 
 				g_module_close (p_module->module);
 				g_slice_free (PushModule, p_module);
@@ -85,7 +85,7 @@ load_modules (PushSupportPrivate *private)
 				p_module->registrar = p_module->init ();
 
 				private->modules = g_list_prepend (private->modules,
-								   p_module);
+				                                   p_module);
 			}
 
 			g_free (path);
@@ -128,9 +128,9 @@ name_owner_changed_cb (DBusGProxy *proxy,
 				GError *error  = NULL;
 
 				tracker_push_registrar_enable (registrar,
-							       private->connection,
-							       private->dbus_proxy,
-							       &error);
+				                               private->connection,
+				                               private->dbus_proxy,
+				                               &error);
 
 				if (error) {
 					g_debug ("%s\n", error->message);
@@ -156,9 +156,9 @@ name_owner_changed_cb (DBusGProxy *proxy,
 				GError *error  = NULL;
 
 				tracker_push_registrar_enable (registrar,
-							       private->connection,
-							       private->dbus_proxy,
-							       &error);
+				                               private->connection,
+				                               private->dbus_proxy,
+				                               &error);
 
 				if (error) {
 					g_debug ("%s\n", error->message);
@@ -173,8 +173,8 @@ name_owner_changed_cb (DBusGProxy *proxy,
 
 static void
 list_names_reply_cb (DBusGProxy     *proxy,
-		     DBusGProxyCall *call,
-		     gpointer        user_data)
+                     DBusGProxyCall *call,
+                     gpointer        user_data)
 {
 	PushSupportPrivate *private;
 	GError *error = NULL;
@@ -186,8 +186,8 @@ list_names_reply_cb (DBusGProxy     *proxy,
 	g_return_if_fail (private != NULL);
 
 	dbus_g_proxy_end_call (proxy, call, &error,
-			       G_TYPE_STRV, &names,
-			       G_TYPE_INVALID);
+	                       G_TYPE_STRV, &names,
+	                       G_TYPE_INVALID);
 
 	if (error) {
 		g_warning ("%s", error->message);
@@ -211,9 +211,9 @@ list_names_reply_cb (DBusGProxy     *proxy,
 				GError *lerror  = NULL;
 
 				tracker_push_registrar_enable (registrar,
-							       private->connection,
-							       private->dbus_proxy,
-							       &lerror);
+				                               private->connection,
+				                               private->dbus_proxy,
+				                               &lerror);
 
 				if (lerror) {
 					g_debug ("%s\n", lerror->message);
@@ -248,8 +248,8 @@ tracker_push_init (void)
 	private = g_new0 (PushSupportPrivate, 1);
 
 	g_static_private_set (&private_key,
-			      private,
-			      (GDestroyNotify) free_private);
+	                      private,
+	                      (GDestroyNotify) free_private);
 
 	load_modules (private);
 
@@ -262,20 +262,20 @@ tracker_push_init (void)
 		private->connection = dbus_g_connection_ref (connection);
 
 		private->dbus_proxy = dbus_g_proxy_new_for_name (private->connection,
-								 DBUS_SERVICE_DBUS,
-								 DBUS_PATH_DBUS,
-								 DBUS_INTERFACE_DBUS);
+		                                                 DBUS_SERVICE_DBUS,
+		                                                 DBUS_PATH_DBUS,
+		                                                 DBUS_INTERFACE_DBUS);
 
 		/* We listen for NameOwnerChanged to know when the manager's service
 		 * comes up and to know when it goes down */
 
 		dbus_g_proxy_add_signal (private->dbus_proxy, "NameOwnerChanged",
-					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-					 G_TYPE_INVALID);
+		                         G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+		                         G_TYPE_INVALID);
 
 		dbus_g_proxy_connect_signal (private->dbus_proxy, "NameOwnerChanged",
-					     G_CALLBACK (name_owner_changed_cb),
-					     NULL, NULL);
+		                             G_CALLBACK (name_owner_changed_cb),
+		                             NULL, NULL);
 
 		dbus_error_init (&dbus_error);
 
@@ -288,14 +288,14 @@ tracker_push_init (void)
 			const gchar *service = tracker_push_registrar_get_service (registrar);
 
 			gchar *dbus_string = g_strdup_printf ("type='signal',"
-					    "sender='" DBUS_SERVICE_DBUS
-					    "',interface='" DBUS_INTERFACE_DBUS
-					    "',path='" DBUS_PATH_DBUS
-					    "',member='NameOwnerChanged',"
-					     "arg0='%s'", service);
+			                                      "sender='" DBUS_SERVICE_DBUS
+			                                      "',interface='" DBUS_INTERFACE_DBUS
+			                                      "',path='" DBUS_PATH_DBUS
+			                                      "',member='NameOwnerChanged',"
+			                                      "arg0='%s'", service);
 
 			dbus_bus_add_match ((DBusConnection *) dbus_g_connection_get_connection (private->connection),
-					    dbus_string, &dbus_error);
+			                    dbus_string, &dbus_error);
 
 			if (dbus_error_is_set (&dbus_error)) {
 				g_warning ("%s for rule=%s\n", dbus_error.message, dbus_string);
@@ -313,9 +313,9 @@ tracker_push_init (void)
 		 * NameOwnerChanged to emit that the manager's service has came up. */
 
 		dbus_g_proxy_begin_call (private->dbus_proxy, "ListNames",
-					 list_names_reply_cb, NULL, NULL,
-					 G_TYPE_INVALID,
-					 G_TYPE_INVALID);
+		                         list_names_reply_cb, NULL, NULL,
+		                         G_TYPE_INVALID,
+		                         G_TYPE_INVALID);
 
 	} else {
 		g_critical ("Could not setup D-Bus, %s\n", error->message);
diff --git a/src/tracker-store/tracker-resource-class.c b/src/tracker-store/tracker-resource-class.c
index c7368e4..9c9d5e8 100644
--- a/src/tracker-store/tracker-resource-class.c
+++ b/src/tracker-store/tracker-resource-class.c
@@ -73,37 +73,37 @@ tracker_resource_class_class_init (TrackerResourceClassClass *klass)
 
 	signals[SUBJECTS_ADDED] =
 		g_signal_new ("subjects-added",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__BOXED,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_STRV);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__BOXED,
+		              G_TYPE_NONE,
+		              1,
+		              G_TYPE_STRV);
 
 	signals[SUBJECTS_REMOVED] =
 		g_signal_new ("subjects-removed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__BOXED,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_STRV);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__BOXED,
+		              G_TYPE_NONE,
+		              1,
+		              G_TYPE_STRV);
 
 	signals[SUBJECTS_CHANGED] =
 		g_signal_new ("subjects-changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__BOXED_BOXED,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRV,
-			      G_TYPE_STRV);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              tracker_marshal_VOID__BOXED_BOXED,
+		              G_TYPE_NONE,
+		              2,
+		              G_TYPE_STRV,
+		              G_TYPE_STRV);
 
 	g_type_class_add_private (object_class, sizeof (TrackerResourceClassPrivate));
 }
@@ -225,7 +225,7 @@ tracker_resource_class_finalize (GObject *object)
 TrackerResourceClass *
 tracker_resource_class_new (const gchar *rdf_class)
 {
-	TrackerResourceClass	     *object;
+	TrackerResourceClass         *object;
 	TrackerResourceClassPrivate *priv;
 
 	object = g_object_new (TRACKER_TYPE_RESOURCE_CLASS, NULL);
@@ -267,31 +267,31 @@ has_already (GPtrArray *array, const gchar *uri)
 }
 
 /*
-static gboolean
-changed_has_already (GPtrArray *array, const gchar *uri, const gchar *predicate)
-{
-	guint i;
-
-	if (!array) {
-		return FALSE;
-	}
-
-	for (i = 0; i < array->len; i++) {
-		ChangedItem *item = g_ptr_array_index (array, i);
-		if (g_strcmp0 (item->uri, uri) == 0 && g_strcmp0 (item->predicate, predicate) == 0) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
+  static gboolean
+  changed_has_already (GPtrArray *array, const gchar *uri, const gchar *predicate)
+  {
+  guint i;
+
+  if (!array) {
+  return FALSE;
+  }
+
+  for (i = 0; i < array->len; i++) {
+  ChangedItem *item = g_ptr_array_index (array, i);
+  if (g_strcmp0 (item->uri, uri) == 0 && g_strcmp0 (item->predicate, predicate) == 0) {
+  return TRUE;
+  }
+  }
+
+  return FALSE;
+  }
 */
 
 void
 tracker_resource_class_add_event (TrackerResourceClass  *object,
-				  const gchar           *uri,
-				  const gchar           *predicate,
-				  TrackerDBusEventsType type)
+                                  const gchar           *uri,
+                                  const gchar           *predicate,
+                                  TrackerDBusEventsType type)
 {
 	TrackerResourceClassPrivate *priv;
 
@@ -303,36 +303,36 @@ tracker_resource_class_add_event (TrackerResourceClass  *object,
 	}
 
 	switch (type) {
-		case TRACKER_DBUS_EVENTS_TYPE_ADD:
+	case TRACKER_DBUS_EVENTS_TYPE_ADD:
 		if (!has_already (priv->adds, uri)) {
 			if (!priv->adds)
 				priv->adds = g_ptr_array_new ();
 			g_ptr_array_add (priv->adds, g_string_chunk_insert_const (priv->changed_strings, uri));
 		}
 		break;
-		case TRACKER_DBUS_EVENTS_TYPE_UPDATE: {
+	case TRACKER_DBUS_EVENTS_TYPE_UPDATE: {
 		/* Duplicate checking slows down too much
-		 if (!changed_has_already (priv->ups, uri, predicate)) { */
-			ChangedItem *item;
+		   if (!changed_has_already (priv->ups, uri, predicate)) { */
+		ChangedItem *item;
 
-			item = g_slice_new (ChangedItem);
+		item = g_slice_new (ChangedItem);
 
-			item->uri = g_string_chunk_insert_const (priv->changed_strings, uri);
-			item->predicate = g_string_chunk_insert_const (priv->changed_strings, predicate);
+		item->uri = g_string_chunk_insert_const (priv->changed_strings, uri);
+		item->predicate = g_string_chunk_insert_const (priv->changed_strings, predicate);
 
-			if (!priv->ups)
-				priv->ups = g_ptr_array_new ();
-			g_ptr_array_add (priv->ups, item);
-		}
+		if (!priv->ups)
+			priv->ups = g_ptr_array_new ();
+		g_ptr_array_add (priv->ups, item);
+	}
 		break;
-		case TRACKER_DBUS_EVENTS_TYPE_DELETE:
+	case TRACKER_DBUS_EVENTS_TYPE_DELETE:
 		if (!has_already (priv->dels, uri)) {
 			if (!priv->dels)
 				priv->dels = g_ptr_array_new ();
 			g_ptr_array_add (priv->dels, g_string_chunk_insert_const (priv->changed_strings, uri));
 		}
 		break;
-		default:
+	default:
 		break;
 	}
 }
diff --git a/src/tracker-store/tracker-resource-class.h b/src/tracker-store/tracker-resource-class.h
index 248a16f..f28808a 100644
--- a/src/tracker-store/tracker-resource-class.h
+++ b/src/tracker-store/tracker-resource-class.h
@@ -27,20 +27,20 @@
 #include <glib-object.h>
 #include <libtracker-common/tracker-dbus.h>
 
-#define TRACKER_RESOURCES_CLASS_SERVICE	       "org.freedesktop.Tracker1"
-#define TRACKER_RESOURCES_CLASS_PATH	       "/org/freedesktop/Tracker1/Resources/Classes/%s"
+#define TRACKER_RESOURCES_CLASS_SERVICE                "org.freedesktop.Tracker1"
+#define TRACKER_RESOURCES_CLASS_PATH           "/org/freedesktop/Tracker1/Resources/Classes/%s"
 #define TRACKER_RESOURCES_CLASS_INTERFACE       "org.freedesktop.Tracker1.Resources.Class"
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_RESOURCE_CLASS	       (tracker_resource_class_get_type ())
-#define TRACKER_RESOURCE_CLASS(object)	       (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_RESOURCE_CLASS, TrackerResourceClass))
+#define TRACKER_TYPE_RESOURCE_CLASS            (tracker_resource_class_get_type ())
+#define TRACKER_RESOURCE_CLASS(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_RESOURCE_CLASS, TrackerResourceClass))
 #define TRACKER_RESOURCE_CLASS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_RESOURCE_CLASS, TrackerResourceClassClass))
 #define TRACKER_IS_RESOURCE_CLASS(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_RESOURCE_CLASS))
 #define TRACKER_IS_RESOURCE_CLASS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_RESOURCE_CLASS))
 #define TRACKER_RESOURCE_CLASS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_RESOURCE_CLASS, TrackerResourceClassClass))
 
-typedef struct TrackerResourceClass	  TrackerResourceClass;
+typedef struct TrackerResourceClass       TrackerResourceClass;
 typedef struct TrackerResourceClassClass TrackerResourceClassClass;
 
 struct TrackerResourceClass {
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index d43f18a..33dc783 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -74,7 +74,7 @@ free_event_sources (TrackerResourcesPrivate *priv)
 {
 	if (priv->event_sources) {
 		g_slist_foreach (priv->event_sources,
-				 (GFunc) g_object_unref, NULL);
+		                 (GFunc) g_object_unref, NULL);
 		g_slist_free (priv->event_sources);
 
 		priv->event_sources = NULL;
@@ -82,7 +82,7 @@ free_event_sources (TrackerResourcesPrivate *priv)
 }
 
 static void
-tracker_resources_finalize (GObject	 *object)
+tracker_resources_finalize (GObject      *object)
 {
 	TrackerResourcesPrivate *priv;
 
@@ -104,13 +104,13 @@ tracker_resources_class_init (TrackerResourcesClass *klass)
 
 	signals[WRITEBACK] =
 		g_signal_new ("writeback",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerResourcesClass, writeback),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
-			      G_TYPE_NONE, 1,
-			      TRACKER_TYPE_STR_STRV_MAP);
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (TrackerResourcesClass, writeback),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__BOXED,
+		              G_TYPE_NONE, 1,
+		              TRACKER_TYPE_STR_STRV_MAP);
 
 	g_type_class_add_private (object_class, sizeof (TrackerResourcesPrivate));
 }
@@ -144,8 +144,8 @@ turtle_import_callback (GError *error, gpointer user_data)
 
 	if (error) {
 		tracker_dbus_request_failed (info->request_id,
-					     &error,
-					     NULL);
+		                             &error,
+		                             NULL);
 		dbus_g_method_return_error (info->context, error);
 		return;
 	}
@@ -156,13 +156,13 @@ turtle_import_callback (GError *error, gpointer user_data)
 }
 
 void
-tracker_resources_load (TrackerResources	 *object,
-			const gchar		 *uri,
-			DBusGMethodInvocation	 *context,
-			GError			**error)
+tracker_resources_load (TrackerResources         *object,
+                        const gchar              *uri,
+                        DBusGMethodInvocation    *context,
+                        GError                  **error)
 {
 	TrackerDBusMethodInfo   *info;
-	guint		    request_id;
+	guint               request_id;
 	GFile  *file;
 
 	request_id = tracker_dbus_get_next_request_id ();
@@ -170,9 +170,9 @@ tracker_resources_load (TrackerResources	 *object,
 	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request to load turtle file "
-				  "'%s'",
-				  uri);
+	                          "D-Bus request to load turtle file "
+	                          "'%s'",
+	                          uri);
 
 	file = g_file_new_for_uri (uri);
 
@@ -188,14 +188,14 @@ tracker_resources_load (TrackerResources	 *object,
 }
 
 void
-tracker_resources_sparql_query (TrackerResources	 *self,
-				const gchar	         *query,
-				DBusGMethodInvocation	 *context,
-				GError			**error)
+tracker_resources_sparql_query (TrackerResources         *self,
+                                const gchar              *query,
+                                DBusGMethodInvocation    *context,
+                                GError                  **error)
 {
 	TrackerDBResultSet   *result_set;
-	GError 		     *actual_error = NULL;
-	guint		      request_id;
+	GError                       *actual_error = NULL;
+	guint                 request_id;
 	GPtrArray            *values;
 
 	request_id = tracker_dbus_get_next_request_id ();
@@ -203,16 +203,16 @@ tracker_resources_sparql_query (TrackerResources	 *self,
 	tracker_dbus_async_return_if_fail (query != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request for SPARQL Query, "
-				  "query:'%s'",
-				  query);
+	                          "D-Bus request for SPARQL Query, "
+	                          "query:'%s'",
+	                          query);
 
 	result_set = tracker_store_sparql_query (query, &actual_error);
 
 	if (actual_error) {
 		tracker_dbus_request_failed (request_id,
-					     &actual_error,
-					     NULL);
+		                             &actual_error,
+		                             NULL);
 		dbus_g_method_return_error (context, actual_error);
 		g_error_free (actual_error);
 		return;
@@ -232,14 +232,14 @@ tracker_resources_sparql_query (TrackerResources	 *self,
 }
 
 void
-tracker_resources_sparql_update (TrackerResources	 *self,
-				 const gchar	         *update,
-				 DBusGMethodInvocation	 *context,
-				 GError			**error)
+tracker_resources_sparql_update (TrackerResources        *self,
+                                 const gchar             *update,
+                                 DBusGMethodInvocation   *context,
+                                 GError                         **error)
 {
 	TrackerResourcesPrivate *priv;
-	GError 		     *actual_error = NULL;
-	guint		      request_id;
+	GError                       *actual_error = NULL;
+	guint                 request_id;
 
 	priv = TRACKER_RESOURCES_GET_PRIVATE (self);
 
@@ -248,16 +248,16 @@ tracker_resources_sparql_update (TrackerResources	 *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request for SPARQL Update, "
-				  "update:'%s'",
-				  update);
+	                          "D-Bus request for SPARQL Update, "
+	                          "update:'%s'",
+	                          update);
 
 	tracker_store_sparql_update (update, &actual_error);
 
 	if (actual_error) {
 		tracker_dbus_request_failed (request_id,
-					     &actual_error,
-					     NULL);
+		                             &actual_error,
+		                             NULL);
 		dbus_g_method_return_error (context, actual_error);
 		g_error_free (actual_error);
 		return;
@@ -269,14 +269,14 @@ tracker_resources_sparql_update (TrackerResources	 *self,
 }
 
 void
-tracker_resources_sparql_update_blank (TrackerResources	      *self,
-				       const gchar	      *update,
-				       DBusGMethodInvocation  *context,
-				       GError		     **error)
+tracker_resources_sparql_update_blank (TrackerResources               *self,
+                                       const gchar            *update,
+                                       DBusGMethodInvocation  *context,
+                                       GError                **error)
 {
 	TrackerResourcesPrivate *priv;
-	GError 		     *actual_error = NULL;
-	guint		      request_id;
+	GError                       *actual_error = NULL;
+	guint                 request_id;
 	GPtrArray            *blank_nodes;
 
 	priv = TRACKER_RESOURCES_GET_PRIVATE (self);
@@ -286,16 +286,16 @@ tracker_resources_sparql_update_blank (TrackerResources	      *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request for SPARQL Update, "
-				  "update:'%s'",
-				  update);
+	                          "D-Bus request for SPARQL Update, "
+	                          "update:'%s'",
+	                          update);
 
 	blank_nodes = tracker_store_sparql_update_blank (update, &actual_error);
 
 	if (actual_error) {
 		tracker_dbus_request_failed (request_id,
-					     &actual_error,
-					     NULL);
+		                             &actual_error,
+		                             NULL);
 		dbus_g_method_return_error (context, actual_error);
 		g_error_free (actual_error);
 		return;
@@ -313,8 +313,8 @@ batch_update_callback (GError *error, gpointer user_data)
 
 	if (error) {
 		tracker_dbus_request_failed (info->request_id,
-					     &error,
-					     NULL);
+		                             &error,
+		                             NULL);
 		dbus_g_method_return_error (info->context, error);
 		return;
 	}
@@ -326,14 +326,14 @@ batch_update_callback (GError *error, gpointer user_data)
 
 void
 tracker_resources_batch_sparql_update (TrackerResources          *self,
-				       const gchar	         *update,
-				       DBusGMethodInvocation	 *context,
-				       GError			**error)
+                                       const gchar               *update,
+                                       DBusGMethodInvocation     *context,
+                                       GError                   **error)
 {
 	TrackerDBusMethodInfo   *info;
 	TrackerResourcesPrivate *priv;
-	guint		      request_id;
-	gchar		      *sender;
+	guint                 request_id;
+	gchar                 *sender;
 
 	priv = TRACKER_RESOURCES_GET_PRIVATE (self);
 
@@ -342,9 +342,9 @@ tracker_resources_batch_sparql_update (TrackerResources          *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request for batch SPARQL Update, "
-				  "update:'%s'",
-				  update);
+	                          "D-Bus request for batch SPARQL Update, "
+	                          "update:'%s'",
+	                          update);
 
 	info = g_slice_new (TrackerDBusMethodInfo);
 
@@ -369,21 +369,21 @@ batch_commit_callback (gpointer user_data)
 }
 
 void
-tracker_resources_batch_commit (TrackerResources	 *self,
-				DBusGMethodInvocation	 *context,
-				GError			**error)
+tracker_resources_batch_commit (TrackerResources         *self,
+                                DBusGMethodInvocation    *context,
+                                GError                  **error)
 {
 	TrackerDBusMethodInfo *info;
 	TrackerResourcesPrivate *priv;
-	guint		      request_id;
-	gchar		      *sender;
+	guint                 request_id;
+	gchar                 *sender;
 
 	priv = TRACKER_RESOURCES_GET_PRIVATE (self);
 
 	request_id = tracker_dbus_get_next_request_id ();
 
 	tracker_dbus_request_new (request_id,
-				  "D-Bus request for batch commit");
+	                          "D-Bus request for batch commit");
 
 	info = g_slice_new (TrackerDBusMethodInfo);
 
@@ -516,7 +516,7 @@ on_statement_deleted (const gchar *graph,
 
 void
 tracker_resources_prepare (TrackerResources *object,
-			   GSList           *event_sources)
+                           GSList           *event_sources)
 {
 	TrackerResourcesPrivate *priv;
 
diff --git a/src/tracker-store/tracker-resources.h b/src/tracker-store/tracker-resources.h
index d1c0d00..7c5b07c 100644
--- a/src/tracker-store/tracker-resources.h
+++ b/src/tracker-store/tracker-resources.h
@@ -24,20 +24,20 @@
 
 #include <glib-object.h>
 
-#define TRACKER_RESOURCES_SERVICE	 "org.freedesktop.Tracker1"
-#define TRACKER_RESOURCES_PATH		 "/org/freedesktop/Tracker1/Resources"
-#define TRACKER_RESOURCES_INTERFACE	 "org.freedesktop.Tracker1.Resources"
+#define TRACKER_RESOURCES_SERVICE        "org.freedesktop.Tracker1"
+#define TRACKER_RESOURCES_PATH           "/org/freedesktop/Tracker1/Resources"
+#define TRACKER_RESOURCES_INTERFACE      "org.freedesktop.Tracker1.Resources"
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_RESOURCES		 (tracker_resources_get_type ())
-#define TRACKER_RESOURCES(object)	 (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_RESOURCES, TrackerResources))
-#define TRACKER_RESOURCES_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_RESOURCES, TrackerResourcesClass))
-#define TRACKER_IS_RESOURCES(object)	 (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_RESOURCES))
+#define TRACKER_TYPE_RESOURCES           (tracker_resources_get_type ())
+#define TRACKER_RESOURCES(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_RESOURCES, TrackerResources))
+#define TRACKER_RESOURCES_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_RESOURCES, TrackerResourcesClass))
+#define TRACKER_IS_RESOURCES(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_RESOURCES))
 #define TRACKER_IS_RESOURCES_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_RESOURCES))
 #define TRACKER_RESOURCES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_RESOURCES, TrackerResourcesClass))
 
-typedef struct TrackerResources	TrackerResources;
+typedef struct TrackerResources         TrackerResources;
 typedef struct TrackerResourcesClass TrackerResourcesClass;
 
 struct TrackerResources {
@@ -54,34 +54,34 @@ struct TrackerResourcesClass {
 GType             tracker_resources_get_type            (void);
 TrackerResources *tracker_resources_new                 (void);
 void              tracker_resources_prepare             (TrackerResources       *object,
-							 GSList                 *event_sources);
+                                                         GSList                 *event_sources);
 void              tracker_resources_unreg_batches       (TrackerResources       *object,
-							 const gchar            *old_owner);
+                                                         const gchar            *old_owner);
 
 /* DBus methods */
 void              tracker_resources_load                (TrackerResources       *object,
-							 const gchar            *uri,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *uri,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void              tracker_resources_sparql_query        (TrackerResources       *object,
-							 const gchar            *query,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *query,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void              tracker_resources_sparql_update       (TrackerResources       *object,
-							 const gchar            *update,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *update,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void              tracker_resources_sparql_update_blank (TrackerResources       *object,
-							 const gchar            *update,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *update,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void              tracker_resources_batch_sparql_update (TrackerResources       *object,
-							 const gchar            *update,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         const gchar            *update,
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 void              tracker_resources_batch_commit        (TrackerResources       *object,
-							 DBusGMethodInvocation  *context,
-							 GError                **error);
+                                                         DBusGMethodInvocation  *context,
+                                                         GError                **error);
 
 G_END_DECLS
 
diff --git a/src/tracker-store/tracker-statistics.c b/src/tracker-store/tracker-statistics.c
index 6421a94..042894b 100644
--- a/src/tracker-store/tracker-statistics.c
+++ b/src/tracker-store/tracker-statistics.c
@@ -72,14 +72,14 @@ tracker_statistics_class_init (TrackerStatisticsClass *klass)
 
 	signals[UPDATED] =
 		g_signal_new ("updated",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE,
-			      1,
-			      TRACKER_TYPE_G_STRV_ARRAY);
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              0,
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__POINTER,
+		              G_TYPE_NONE,
+		              1,
+		              TRACKER_TYPE_G_STRV_ARRAY);
 
 	g_type_class_add_private (object_class, sizeof (TrackerStatisticsPrivate));
 }
@@ -96,14 +96,14 @@ tracker_statistics_init (TrackerStatistics *object)
 
 	priv->cache_timeout_id =
 		g_timeout_add_seconds (CACHE_LIFETIME,
-				       cache_timeout,
-				       object);
+		                       cache_timeout,
+		                       object);
 }
 
 static void
 tracker_statistics_finalize (GObject *object)
 {
-	TrackerStatistics	     *statistics;
+	TrackerStatistics            *statistics;
 	TrackerStatisticsPrivate *priv;
 
 	statistics = TRACKER_STATISTICS (object);
@@ -140,9 +140,9 @@ cache_get_latest (void)
 	g_message ("Requesting statistics from database for an accurate signal");
 
 	values = g_hash_table_new_full (g_str_hash,
-					g_str_equal,
-					g_free,
-					NULL);
+	                                g_str_equal,
+	                                g_free,
+	                                NULL);
 
 	classes = tracker_ontology_get_classes (&n_classes);
 
@@ -166,8 +166,8 @@ cache_get_latest (void)
 		tracker_db_result_set_get (result_set, 0, &count, -1);
 
 		g_hash_table_insert (values,
-				     g_strdup (tracker_class_get_name (cl)),
-				     GINT_TO_POINTER (count));
+		                     g_strdup (tracker_class_get_name (cl)),
+		                     GINT_TO_POINTER (count));
 
 		g_object_unref (result_set);
 		g_object_unref (stmt);
@@ -188,7 +188,7 @@ cache_timeout (gpointer user_data)
 
 static gint
 cache_sort_func (gconstpointer a,
-		 gconstpointer b)
+                 gconstpointer b)
 {
 	const GStrv *strv_a = (GStrv *) a;
 	const GStrv *strv_b = (GStrv *) b;
@@ -201,12 +201,12 @@ cache_sort_func (gconstpointer a,
 
 void
 tracker_statistics_get (TrackerStatistics      *object,
-			DBusGMethodInvocation  *context,
-			GError		      **error)
+                        DBusGMethodInvocation  *context,
+                        GError                **error)
 {
 	TrackerClass **classes, *cl;
 	TrackerStatisticsPrivate *priv;
-	guint		          request_id;
+	guint                     request_id;
 	GPtrArray                *values;
 	guint                     i, n_classes;
 
@@ -254,7 +254,7 @@ tracker_statistics_get (TrackerStatistics      *object,
 void
 tracker_statistics_signal (void)
 {
-	GObject		     *statistics;
+	GObject                      *statistics;
 	TrackerStatisticsPrivate *priv;
 	GHashTable           *stats;
 	GHashTableIter        iter;
@@ -302,10 +302,10 @@ tracker_statistics_signal (void)
 			GStrv strv;
 
 			g_message ("  Updating '%s' with new count:%d, old count:%d, diff:%d",
-				   service_type,
-				   new_count,
-				   old_count,
-				   new_count - old_count);
+			           service_type,
+			           new_count,
+			           old_count,
+			           new_count - old_count);
 
 			strv = g_new (gchar*, 3);
 			strv[0] = g_strdup (service_type);
diff --git a/src/tracker-store/tracker-statistics.h b/src/tracker-store/tracker-statistics.h
index 17c2210..d3fefcc 100644
--- a/src/tracker-store/tracker-statistics.h
+++ b/src/tracker-store/tracker-statistics.h
@@ -25,12 +25,12 @@
 #include <glib-object.h>
 
 #define TRACKER_STATISTICS_SERVICE         "org.freedesktop.Tracker1"
-#define TRACKER_STATISTICS_PATH	           "/org/freedesktop/Tracker1/Statistics"
+#define TRACKER_STATISTICS_PATH                    "/org/freedesktop/Tracker1/Statistics"
 #define TRACKER_STATISTICS_INTERFACE       "org.freedesktop.Tracker1.Statistics"
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_STATISTICS	           (tracker_statistics_get_type ())
+#define TRACKER_TYPE_STATISTICS                    (tracker_statistics_get_type ())
 #define TRACKER_STATISTICS(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_STATISTICS, TrackerStatistics))
 #define TRACKER_STATISTICS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_STATISTICS, TrackerStatisticsClass))
 #define TRACKER_IS_STATISTICS(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_STATISTICS))
@@ -51,8 +51,8 @@ struct TrackerStatisticsClass {
 GType              tracker_statistics_get_type (void);
 TrackerStatistics *tracker_statistics_new      (void);
 void               tracker_statistics_get      (TrackerStatistics      *object,
-						DBusGMethodInvocation  *context,
-						GError                **error);
+                                                DBusGMethodInvocation  *context,
+                                                GError                **error);
 void               tracker_statistics_signal   (void);
 
 G_END_DECLS
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 087c050..f9d9cb8 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -38,8 +38,8 @@
 
 #include "tracker-store.h"
 
-#define TRACKER_STORE_TRANSACTION_MAX			4000		/* At commit is journal fsynced too */
-#define TRACKER_STORE_JOURNAL_TIMEOUT_BEFORE_BACKUP	(60 * 60 * 2)	/* Two hours before backup */
+#define TRACKER_STORE_TRANSACTION_MAX                   4000            /* At commit is journal fsynced too */
+#define TRACKER_STORE_JOURNAL_TIMEOUT_BEFORE_BACKUP     (60 * 60 * 2)   /* Two hours before backup */
 
 typedef struct {
 	gboolean  have_handler, have_sync_handler;
@@ -58,14 +58,14 @@ typedef enum {
 typedef struct {
 	TrackerStoreTaskType  type;
 	union {
-	  struct {
-		gchar                   *query;
-		gchar                   *client_id;
-	  } update;
-	  struct {
-		gboolean           in_progress;
-		gchar             *path;
-	  } turtle;
+		struct {
+			gchar                   *query;
+			gchar                   *client_id;
+		} update;
+		struct {
+			gboolean           in_progress;
+			gchar             *path;
+		} turtle;
 	} data;
 	gpointer                   user_data;
 	GDestroyNotify             destroy;
@@ -113,18 +113,18 @@ process_turtle_file_part (TrackerTurtleReader *reader, GError **error)
 		/* insert statement */
 		if (tracker_turtle_reader_get_object_is_uri (reader)) {
 			tracker_data_insert_statement_with_uri (
-				tracker_turtle_reader_get_graph (reader),
-				tracker_turtle_reader_get_subject (reader),
-				tracker_turtle_reader_get_predicate (reader),
-				tracker_turtle_reader_get_object (reader),
-				&new_error);
+			                                        tracker_turtle_reader_get_graph (reader),
+			                                        tracker_turtle_reader_get_subject (reader),
+			                                        tracker_turtle_reader_get_predicate (reader),
+			                                        tracker_turtle_reader_get_object (reader),
+			                                        &new_error);
 		} else {
 			tracker_data_insert_statement_with_string (
-				tracker_turtle_reader_get_graph (reader),
-				tracker_turtle_reader_get_subject (reader),
-				tracker_turtle_reader_get_predicate (reader),
-				tracker_turtle_reader_get_object (reader),
-				&new_error);
+			                                           tracker_turtle_reader_get_graph (reader),
+			                                           tracker_turtle_reader_get_subject (reader),
+			                                           tracker_turtle_reader_get_predicate (reader),
+			                                           tracker_turtle_reader_get_object (reader),
+			                                           &new_error);
 		}
 
 		i++;
@@ -277,7 +277,7 @@ queue_idle_handler (gpointer user_data)
 		}
 	}
 
-out:
+ out:
 	g_queue_pop_head (private->queue);
 
 	if (task->destroy) {
@@ -482,9 +482,9 @@ tracker_store_queue_sparql_update (const gchar *sparql,
 
 void
 tracker_store_queue_turtle_import (GFile                      *file,
-				   TrackerStoreTurtleCallback  callback,
-				   gpointer                    user_data,
-				   GDestroyNotify              destroy)
+                                   TrackerStoreTurtleCallback  callback,
+                                   gpointer                    user_data,
+                                   GDestroyNotify              destroy)
 {
 	TrackerStorePrivate *private;
 	TrackerStoreTask    *task;
diff --git a/src/tracker-store/tracker-store.h b/src/tracker-store/tracker-store.h
index da2b0c0..baa6522 100644
--- a/src/tracker-store/tracker-store.h
+++ b/src/tracker-store/tracker-store.h
@@ -31,10 +31,10 @@
 G_BEGIN_DECLS
 
 typedef void (* TrackerStoreSparqlUpdateCallback) (GError          *error,
-						   gpointer         user_data);
+                                                   gpointer         user_data);
 typedef void (* TrackerStoreCommitCallback)       (gpointer         user_data);
 typedef void (* TrackerStoreTurtleCallback)       (GError          *error,
-						   gpointer         user_data);
+                                                   gpointer         user_data);
 
 void         tracker_store_init                   (gboolean load_journal);
 void         tracker_store_shutdown               (void);
@@ -56,8 +56,8 @@ void         tracker_store_sparql_update          (const gchar   *sparql,
 GPtrArray *  tracker_store_sparql_update_blank    (const gchar   *sparql,
                                                    GError       **error);
 TrackerDBResultSet*
-             tracker_store_sparql_query           (const gchar   *sparql,
-                                                   GError       **error);
+tracker_store_sparql_query           (const gchar   *sparql,
+                                      GError       **error);
 
 guint        tracker_store_get_queue_size         (void);
 
diff --git a/src/tracker-store/tracker-writeback.h b/src/tracker-store/tracker-writeback.h
index 3c12ff5..0201206 100644
--- a/src/tracker-store/tracker-writeback.h
+++ b/src/tracker-store/tracker-writeback.h
@@ -33,10 +33,10 @@ typedef GStrv (*TrackerWritebackGetPredicatesFunc) (void);
 void        tracker_writeback_init        (TrackerWritebackGetPredicatesFunc  callback);
 void        tracker_writeback_shutdown    (void);
 void        tracker_writeback_check       (const gchar                       *graph,
-					   const gchar                       *subject,
-					   const gchar                       *predicate,
-					   const gchar                       *object,
-					   GPtrArray                         *rdf_types);
+                                           const gchar                       *subject,
+                                           const gchar                       *predicate,
+                                           const gchar                       *object,
+                                           GPtrArray                         *rdf_types);
 GHashTable* tracker_writeback_get_pending (void);
 void        tracker_writeback_reset       (void);
 
diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c
index 6054251..ba94b4d 100644
--- a/src/tracker-utils/tracker-import.c
+++ b/src/tracker-utils/tracker-import.c
@@ -33,15 +33,15 @@
 #include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 
 static gchar        **filenames = NULL;
@@ -61,8 +61,8 @@ static GOptionEntry   entries[] = {
 int
 main (int argc, char **argv)
 {
-	TrackerClient	*client;
-	GOptionContext	*context;
+	TrackerClient   *client;
+	GOptionContext  *context;
 	gchar          **p;
 
 	setlocale (LC_ALL, "");
@@ -71,17 +71,17 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new (_("- Import data using Turtle files"));
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -91,7 +91,7 @@ main (int argc, char **argv)
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("One or more files have not been specified"));
+		            _("One or more files have not been specified"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -107,7 +107,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
@@ -117,22 +117,22 @@ main (int argc, char **argv)
 		gchar  *uri;
 
 		g_print ("%s:'%s'\n",
-			 _("Importing Turtle file"),
-			 *p);
+		         _("Importing Turtle file"),
+		         *p);
 
 		file = g_file_new_for_commandline_arg (*p);
 		uri = g_file_get_uri (file);
-		
+                
 		tracker_resources_load (client, uri, &error);
-		
+                
 		g_object_unref (file);
 		g_free (uri);
-		
+                
 		if (error) {
 			g_printerr ("%s, %s\n",
-				    _("Unable to import Turtle file"),
-				    error->message);
-			
+			            _("Unable to import Turtle file"),
+			            error->message);
+                        
 			g_error_free (error);
 			continue;
 		}
@@ -142,6 +142,6 @@ main (int argc, char **argv)
 	}
 
 	tracker_disconnect (client);
-	
+        
 	return EXIT_SUCCESS;
 }
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index 679cac4..f8c1696 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -32,15 +32,15 @@
 #include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static gchar        **filenames = NULL;
 static gboolean       print_version;
@@ -87,8 +87,8 @@ has_valid_uri_scheme (const gchar *uri)
 int
 main (int argc, char **argv)
 {
-	TrackerClient	*client;
-	GOptionContext	*context;
+	TrackerClient   *client;
+	GOptionContext  *context;
 	gchar          **p;
 
 	setlocale (LC_ALL, "");
@@ -97,17 +97,17 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new (_("- Get all information about one or more files"));
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-     	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+	if (print_version) {
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -117,7 +117,7 @@ main (int argc, char **argv)
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("One or more files have not been specified"));
+		            _("One or more files have not been specified"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -133,19 +133,19 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
-        for (p = filenames; *p; p++) {
+	for (p = filenames; *p; p++) {
 		GPtrArray *results;
 		GError    *error = NULL;
 		gchar     *uri;
 		gchar     *query;
 
 		g_print ("%s:'%s'\n",
-			 _("Querying information for file"),
-			 *p);
+		         _("Querying information for file"),
+		         *p);
 
 		/* support both, URIs and local file paths */
 		if (has_valid_uri_scheme (*p)) {
@@ -167,8 +167,8 @@ main (int argc, char **argv)
 
 		if (error) {
 			g_printerr ("  %s, %s\n",
-				    _("Unable to retrieve data for URI"),
-				    error->message);
+			            _("Unable to retrieve data for URI"),
+			            error->message);
 
 			g_error_free (error);
 			continue;
@@ -176,17 +176,17 @@ main (int argc, char **argv)
 
 		if (!results) {
 			g_print ("  %s\n",
-				 _("No metadata available for that URI"));
+			         _("No metadata available for that URI"));
 		} else {
 			gint length;
 
 			length = results->len;
 
 			g_print (tracker_dngettext (NULL,
-						    "Result: %d",
-						    "Results: %d",
-						    length),
-				 length);
+			                            "Result: %d",
+			                            "Results: %d",
+			                            length),
+			         length);
 			g_print ("\n");
 
 			g_ptr_array_foreach (results, (GFunc) print_property_value, NULL);
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index 2e475cb..5728fa4 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -31,19 +31,19 @@
 #include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
-
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
-
-static gint	      limit = 512;
-static gint	      offset;
-static gchar	    **terms;
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
+
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
+
+static gint           limit = 512;
+static gint           offset;
+static gchar        **terms;
 static gboolean       or_operator;
 static gboolean       detailed;
 static gboolean       files;
@@ -129,12 +129,12 @@ show_limit_warning (void)
 	 * not the WHOLE data set.
 	 */
 	g_printerr ("\n%s\n",
-		    _("NOTE: Limit was reached, there are more items in the database not listed here"));
+	            _("NOTE: Limit was reached, there are more items in the database not listed here"));
 }
 
 static gchar *
 get_fts_string (GStrv    search_words,
-		gboolean use_or_operator)
+                gboolean use_or_operator)
 {
 	GString *fts;
 	gint i, len;
@@ -164,7 +164,7 @@ get_fts_string (GStrv    search_words,
 
 static void
 get_files_foreach (gpointer value,
-		   gpointer user_data)
+                   gpointer user_data)
 {
 	gchar **data = value;
 
@@ -173,8 +173,8 @@ get_files_foreach (gpointer value,
 
 static gboolean
 get_files_results (TrackerClient *client,
-		   const gchar   *query,
-		   gint           search_limit)
+                   const gchar   *query,
+                   gint           search_limit)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -183,8 +183,8 @@ get_files_results (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get search results"),
-			    error->message);
+		            _("Could not get search results"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -192,18 +192,18 @@ get_files_results (TrackerClient *client,
 
 	if (!results) {
 		g_print ("%s\n",
-			 _("No files were found"));
+		         _("No files were found"));
 	} else {
 		g_print (tracker_dngettext (NULL,
-					    "File: %d",
-					    "Files: %d",
-					    results->len),
-			 results->len);
+		                            "File: %d",
+		                            "Files: %d",
+		                            results->len),
+		         results->len);
 		g_print ("\n");
 
 		g_ptr_array_foreach (results,
-				     get_files_foreach,
-				     NULL);
+		                     get_files_foreach,
+		                     NULL);
 
 		if (results->len >= search_limit) {
 			show_limit_warning ();
@@ -218,10 +218,10 @@ get_files_results (TrackerClient *client,
 
 static gboolean
 get_document_files (TrackerClient *client,
-		    GStrv          search_terms,
-		    gint           search_offset,
-		    gint           search_limit,
-		    gboolean       use_or_operator)
+                    GStrv          search_terms,
+                    gint           search_offset,
+                    gint           search_limit,
+                    gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -231,26 +231,26 @@ get_document_files (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?document "
-					 "WHERE { "
-					 "  ?document a nfo:Document ."
-					 "  ?document fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?document) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?document a nfo:Document ."
+		                         "  ?document fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?document) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?document "
-					 "WHERE { "
-					 "  ?document a nfo:Document "
-					 "} "
-					 "ORDER BY ASC(?document) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?document a nfo:Document "
+		                         "} "
+		                         "ORDER BY ASC(?document) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -262,10 +262,10 @@ get_document_files (TrackerClient *client,
 
 static gboolean
 get_video_files (TrackerClient *client,
-		 GStrv          search_terms,
-		 gint           search_offset,
-		 gint           search_limit,
-		 gboolean       use_or_operator)
+                 GStrv          search_terms,
+                 gint           search_offset,
+                 gint           search_limit,
+                 gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -275,26 +275,26 @@ get_video_files (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?video "
-					 "WHERE { "
-					 "  ?video a nfo:Video ."
-					 "  ?video fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?video) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?video a nfo:Video ."
+		                         "  ?video fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?video) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?video "
-					 "WHERE { "
-					 "  ?video a nfo:Video "
-					 "} "
-					 "ORDER BY ASC(?video) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?video a nfo:Video "
+		                         "} "
+		                         "ORDER BY ASC(?video) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -306,10 +306,10 @@ get_video_files (TrackerClient *client,
 
 static gboolean
 get_image_files (TrackerClient *client,
-		 GStrv          search_terms,
-		 gint           search_offset,
-		 gint           search_limit,
-		 gboolean       use_or_operator)
+                 GStrv          search_terms,
+                 gint           search_offset,
+                 gint           search_limit,
+                 gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -319,26 +319,26 @@ get_image_files (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?image "
-					 "WHERE { "
-					 "  ?image a nfo:Image ."
-					 "  ?image fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?image) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?image a nfo:Image ."
+		                         "  ?image fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?image) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?image "
-					 "WHERE { "
-					 "  ?image a nfo:Image "
-					 "} "
-					 "ORDER BY ASC(?image) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?image a nfo:Image "
+		                         "} "
+		                         "ORDER BY ASC(?image) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -350,10 +350,10 @@ get_image_files (TrackerClient *client,
 
 static gboolean
 get_music_files (TrackerClient *client,
-		 GStrv          search_terms,
-		 gint           search_offset,
-		 gint           search_limit,
-		 gboolean       use_or_operator)
+                 GStrv          search_terms,
+                 gint           search_offset,
+                 gint           search_limit,
+                 gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -363,26 +363,26 @@ get_music_files (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?song "
-					 "WHERE { "
-					 "  ?song a nmm:MusicPiece ."
-					 "  ?song fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?song) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?song a nmm:MusicPiece ."
+		                         "  ?song fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?song) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?song "
-					 "WHERE { "
-					 "  ?song a nmm:MusicPiece "
-					 "} "
-					 "ORDER BY ASC(?song) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?song a nmm:MusicPiece "
+		                         "} "
+		                         "ORDER BY ASC(?song) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -394,7 +394,7 @@ get_music_files (TrackerClient *client,
 
 static void
 get_music_artists_foreach (gpointer value,
-			   gpointer user_data)
+                           gpointer user_data)
 {
 	gchar **data = value;
 
@@ -403,10 +403,10 @@ get_music_artists_foreach (gpointer value,
 
 static gboolean
 get_music_artists (TrackerClient *client,
-		   GStrv          search_terms,
-		   gint           search_offset,
-		   gint           search_limit,
-		   gboolean       use_or_operator)
+                   GStrv          search_terms,
+                   gint           search_offset,
+                   gint           search_limit,
+                   gboolean       use_or_operator)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -417,28 +417,28 @@ get_music_artists (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?artist ?title "
-					 "WHERE {"
-					 "  ?artist a nmm:Artist ;"
-					 "  nmm:artistName ?title ."
-					 "  ?artist fts:match \"%s\" "
-					 "} "
-					 "GROUP BY ?artist "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE {"
+		                         "  ?artist a nmm:Artist ;"
+		                         "  nmm:artistName ?title ."
+		                         "  ?artist fts:match \"%s\" "
+		                         "} "
+		                         "GROUP BY ?artist "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?artist ?title "
-					 "WHERE {"
-					 "  ?artist a nmm:Artist ;"
-					 "  nmm:artistName ?title "
-					 "} "
-					 "GROUP BY ?artist "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE {"
+		                         "  ?artist a nmm:Artist ;"
+		                         "  nmm:artistName ?title "
+		                         "} "
+		                         "GROUP BY ?artist "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	g_free (fts);
@@ -448,8 +448,8 @@ get_music_artists (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get search results"),
-			    error->message);
+		            _("Could not get search results"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -457,18 +457,18 @@ get_music_artists (TrackerClient *client,
 
 	if (!results) {
 		g_print ("%s\n",
-			 _("No artists were found"));
+		         _("No artists were found"));
 	} else {
 		g_print (tracker_dngettext (NULL,
-					    "Artist: %d",
-					    "Artists: %d",
-					    results->len),
-			 results->len);
+		                            "Artist: %d",
+		                            "Artists: %d",
+		                            results->len),
+		         results->len);
 		g_print ("\n");
 
 		g_ptr_array_foreach (results,
-				     get_music_artists_foreach,
-				     NULL);
+		                     get_music_artists_foreach,
+		                     NULL);
 
 		if (results->len >= search_limit) {
 			show_limit_warning ();
@@ -483,23 +483,23 @@ get_music_artists (TrackerClient *client,
 
 static void
 get_music_albums_foreach (gpointer value,
-			  gpointer user_data)
+                          gpointer user_data)
 {
 	gchar **data = value;
 
 	g_print ("  "); /*'%s', ", data[1]);*/
 	g_print (tracker_dngettext (NULL,
-				    "%d Song",
-				    "%d Songs",
-				    atoi (data[2])),
-		 atoi (data[2]));
+	                            "%d Song",
+	                            "%d Songs",
+	                            atoi (data[2])),
+	         atoi (data[2]));
 
 	g_print (", ");
 	g_print (tracker_dngettext (NULL,
-				    "%d Second",
-				    "%d Seconds",
-				    atoi (data[3])),
-		 atoi (data[3]));
+	                            "%d Second",
+	                            "%d Seconds",
+	                            atoi (data[3])),
+	         atoi (data[3]));
 	g_print (", ");
 	g_print (_("Album '%s'"), data[1]);
 	g_print ("\n");
@@ -507,10 +507,10 @@ get_music_albums_foreach (gpointer value,
 
 static gboolean
 get_music_albums (TrackerClient *client,
-		  GStrv          search_words,
-		  gint           search_offset,
-		  gint           search_limit,
-		  gboolean       use_or_operator)
+                  GStrv          search_words,
+                  gint           search_offset,
+                  gint           search_limit,
+                  gboolean       use_or_operator)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -521,36 +521,36 @@ get_music_albums (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?album ?title COUNT(?song) "
-					 "AS songs "
-					 "SUM(?length) AS totallength "
-					 "WHERE {"
-					 "  ?album a nmm:MusicAlbum ;"
-					 "  nie:title ?title ."
-					 "  ?song nmm:musicAlbum ?album ;"
-					 "  nmm:length ?length ."
-					 "  ?album fts:match \"%s\" "
-					 "} "
-					 "GROUP BY ?album "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "AS songs "
+		                         "SUM(?length) AS totallength "
+		                         "WHERE {"
+		                         "  ?album a nmm:MusicAlbum ;"
+		                         "  nie:title ?title ."
+		                         "  ?song nmm:musicAlbum ?album ;"
+		                         "  nmm:length ?length ."
+		                         "  ?album fts:match \"%s\" "
+		                         "} "
+		                         "GROUP BY ?album "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?album ?title COUNT(?song) "
-					 "AS songs "
-					 "SUM(?length) AS totallength "
-					 "WHERE {"
-					 "  ?album a nmm:MusicAlbum ;"
-					 "  nie:title ?title ."
-					 "  ?song nmm:musicAlbum ?album ;"
-					 "  nmm:length ?length ."
-					 "} "
-					 "GROUP BY ?album "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "AS songs "
+		                         "SUM(?length) AS totallength "
+		                         "WHERE {"
+		                         "  ?album a nmm:MusicAlbum ;"
+		                         "  nie:title ?title ."
+		                         "  ?song nmm:musicAlbum ?album ;"
+		                         "  nmm:length ?length ."
+		                         "} "
+		                         "GROUP BY ?album "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	g_free (fts);
@@ -560,8 +560,8 @@ get_music_albums (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get search results"),
-			    error->message);
+		            _("Could not get search results"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -569,18 +569,18 @@ get_music_albums (TrackerClient *client,
 
 	if (!results) {
 		g_print ("%s\n",
-			 _("No music was found"));
+		         _("No music was found"));
 	} else {
 		g_print (tracker_dngettext (NULL,
-					    "Album: %d",
-					    "Albums: %d",
-					    results->len),
-			 results->len);
+		                            "Album: %d",
+		                            "Albums: %d",
+		                            results->len),
+		         results->len);
 		g_print ("\n");
 
 		g_ptr_array_foreach (results,
-				     get_music_albums_foreach,
-				     NULL);
+		                     get_music_albums_foreach,
+		                     NULL);
 
 		if (results->len >= search_limit) {
 			show_limit_warning ();
@@ -595,10 +595,10 @@ get_music_albums (TrackerClient *client,
 
 static gboolean
 get_files (TrackerClient *client,
-	   GStrv          search_terms,
-	   gint           search_offset,
-	   gint           search_limit,
-	   gboolean       use_or_operator)
+           GStrv          search_terms,
+           gint           search_offset,
+           gint           search_limit,
+           gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -608,26 +608,26 @@ get_files (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?u "
-					 "WHERE { "
-					 "  ?u a nie:InformationElement ."
-					 "  ?u fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?u) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?u a nie:InformationElement ."
+		                         "  ?u fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?u) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?u "
-					 "WHERE { "
-					 "  ?u a nie:InformationElement "
-					 "} "
-					 "ORDER BY ASC(?u) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?u a nie:InformationElement "
+		                         "} "
+		                         "ORDER BY ASC(?u) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -639,10 +639,10 @@ get_files (TrackerClient *client,
 
 static gboolean
 get_folders (TrackerClient *client,
-	     GStrv          search_terms,
-	     gint           search_offset,
-	     gint           search_limit,
-	     gboolean       use_or_operator)
+             GStrv          search_terms,
+             gint           search_offset,
+             gint           search_limit,
+             gboolean       use_or_operator)
 {
 	gchar *fts;
 	gchar *query;
@@ -652,26 +652,26 @@ get_folders (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?u "
-					 "WHERE { "
-					 "  ?u a nfo:Folder ."
-					 "  ?u fts:match \"%s\" "
-					 "} "
-					 "ORDER BY ASC(?u) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?u a nfo:Folder ."
+		                         "  ?u fts:match \"%s\" "
+		                         "} "
+		                         "ORDER BY ASC(?u) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?u "
-					 "WHERE { "
-					 "  ?u a nfo:Folder "
-					 "} "
-					 "ORDER BY ASC(?u) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE { "
+		                         "  ?u a nfo:Folder "
+		                         "} "
+		                         "ORDER BY ASC(?u) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	success = get_files_results (client, query, search_limit);
@@ -683,7 +683,7 @@ get_folders (TrackerClient *client,
 
 static void
 get_all_by_search_foreach (gpointer value,
-			   gpointer user_data)
+                           gpointer user_data)
 {
 	gchar **metadata;
 	gchar **p;
@@ -706,11 +706,11 @@ get_all_by_search_foreach (gpointer value,
 
 static gboolean
 get_all_by_search (TrackerClient *client,
-		   GStrv          search_words,
-		   gint           search_offset,
-		   gint           search_limit,
-		   gboolean       use_or_operator,
-		   gboolean       detailed_results)
+                   GStrv          search_words,
+                   gint           search_offset,
+                   gint           search_limit,
+                   gboolean       use_or_operator,
+                   gboolean       detailed_results)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -724,15 +724,15 @@ get_all_by_search (TrackerClient *client,
 
 	if (detailed_results) {
 		query = g_strdup_printf ("SELECT ?s ?type ?mimeType WHERE { ?s fts:match \"%s\" ; rdf:type ?type . "
-					 "OPTIONAL { ?s nie:mimeType ?mimeType } } OFFSET %d LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "OPTIONAL { ?s nie:mimeType ?mimeType } } OFFSET %d LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?s WHERE { ?s fts:match \"%s\" } OFFSET %d LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	}
 
 	g_free (fts);
@@ -742,8 +742,8 @@ get_all_by_search (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get search results"),
-			    error->message);
+		            _("Could not get search results"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -751,18 +751,18 @@ get_all_by_search (TrackerClient *client,
 
 	if (!results) {
 		g_print ("%s\n",
-			 _("No results were found matching your query"));
+		         _("No results were found matching your query"));
 	} else {
 		g_print (tracker_dngettext (NULL,
-					    "Result: %d",
-					    "Results: %d",
-					    results->len),
-			 results->len);
+		                            "Result: %d",
+		                            "Results: %d",
+		                            results->len),
+		         results->len);
 		g_print ("\n");
 
 		g_ptr_array_foreach (results,
-				     get_all_by_search_foreach,
-				     GINT_TO_POINTER (detailed_results));
+		                     get_all_by_search_foreach,
+		                     GINT_TO_POINTER (detailed_results));
 
 		if (results->len >= search_limit) {
 			show_limit_warning ();
@@ -797,12 +797,12 @@ main (int argc, char **argv)
 	 * and before the list of options.
 	 */
 	summary = g_strconcat (_("Applies an AND operator to all terms separated "
-				 "by a space (see --or-operator)"),
-			       "\n",
-			       "\n",
-			       _("This means if you search for 'foo' and 'bar', "
-				 "they must BOTH exist (unless you use --or-operator)"),
-			       NULL);
+	                         "by a space (see --or-operator)"),
+	                       "\n",
+	                       "\n",
+	                       _("This means if you search for 'foo' and 'bar', "
+	                         "they must BOTH exist (unless you use --or-operator)"),
+	                       NULL);
 	g_option_context_set_summary (context, summary);
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
@@ -825,7 +825,7 @@ main (int argc, char **argv)
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("Search terms are missing"));
+		            _("Search terms are missing"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -841,7 +841,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a DBus connection to Tracker"));
+		            _("Could not establish a DBus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index 158373f..1e33659 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -32,19 +32,19 @@
 #include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
-
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
-
-static gchar	*file;
-static gchar	*query;
-static gboolean	 update;
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
+
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
+
+static gchar    *file;
+static gchar    *query;
+static gboolean          update;
 static gboolean  list_classes;
 static gboolean  list_class_prefixes;
 static gchar    *list_properties;
@@ -84,7 +84,7 @@ static GOptionEntry   entries[] = {
 
 static gchar *
 get_class_from_prefix (TrackerClient *client,
-		       const gchar   *prefix)
+                       const gchar   *prefix)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -103,8 +103,8 @@ get_class_from_prefix (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get namespace prefixes"),
-			    error->message);
+		            _("Could not get namespace prefixes"),
+		            error->message);
 		g_error_free (error);
 
 		return NULL;
@@ -112,7 +112,7 @@ get_class_from_prefix (TrackerClient *client,
 
 	if (!results) {
 		g_printerr ("%s\n",
-			    _("No namespace prefixes were found"));
+		            _("No namespace prefixes were found"));
 
 		return NULL;
 	}
@@ -138,7 +138,7 @@ get_class_from_prefix (TrackerClient *client,
 
 static void
 results_foreach (gpointer value,
-		 gpointer user_data)
+                 gpointer user_data)
 {
 	gchar **data;
 	gchar **p;
@@ -177,7 +177,7 @@ main (int argc, char **argv)
 	g_option_context_parse (context, &argc, &argv, NULL);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -188,7 +188,7 @@ main (int argc, char **argv)
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("Either a file or query needs to be specified"));
+		            _("Either a file or query needs to be specified"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -204,7 +204,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
@@ -217,8 +217,8 @@ main (int argc, char **argv)
 
 		if (error) {
 			g_printerr ("%s, %s\n",
-				    _("Could not list classes"),
-				    error->message);
+			            _("Could not list classes"),
+			            error->message);
 			g_error_free (error);
 			tracker_disconnect (client);
 
@@ -227,13 +227,13 @@ main (int argc, char **argv)
 
 		if (!results) {
 			g_print ("%s\n",
-				 _("No classes were found"));
+			         _("No classes were found"));
 		} else {
 			g_print (tracker_dngettext (NULL,
-						    "Class: %d",
-						    "Classes: %d",
-						    results->len),
-				 results->len);
+			                            "Class: %d",
+			                            "Classes: %d",
+			                            results->len),
+			         results->len);
 			g_print ("\n");
 
 			g_ptr_array_foreach (results, results_foreach, NULL);
@@ -255,8 +255,8 @@ main (int argc, char **argv)
 
 		if (error) {
 			g_printerr ("%s, %s\n",
-				    _("Could not list class prefixes"),
-				    error->message);
+			            _("Could not list class prefixes"),
+			            error->message);
 			g_error_free (error);
 			tracker_disconnect (client);
 
@@ -265,13 +265,13 @@ main (int argc, char **argv)
 
 		if (!results) {
 			g_print ("%s\n",
-				 _("No class prefixes were found"));
+			         _("No class prefixes were found"));
 		} else {
 			g_print (tracker_dngettext (NULL,
-						    "Prefix: %d",
-						    "Prefixes: %d",
-						    results->len),
-				 results->len);
+			                            "Prefix: %d",
+			                            "Prefixes: %d",
+			                            results->len),
+			         results->len);
 			g_print ("\n");
 
 			g_ptr_array_foreach (results, results_foreach, NULL);
@@ -297,8 +297,8 @@ main (int argc, char **argv)
 
 			if (!p) {
 				g_printerr ("%s\n",
-					    _("Could not find property for class prefix, "
-					      "e.g. :Resource in 'rdfs:Resource'"));
+				            _("Could not find property for class prefix, "
+				              "e.g. :Resource in 'rdfs:Resource'"));
 				g_free (prefix);
 				tracker_disconnect (client);
 				return EXIT_FAILURE;
@@ -322,11 +322,11 @@ main (int argc, char **argv)
 		}
 
 		query = g_strdup_printf ("SELECT ?prop "
-					 "WHERE {"
-					 "  ?prop a rdf:Property ;"
-					 "  rdfs:domain <%s>"
-					 "}",
-					 class_name);
+		                         "WHERE {"
+		                         "  ?prop a rdf:Property ;"
+		                         "  rdfs:domain <%s>"
+		                         "}",
+		                         class_name);
 
 		results = tracker_resources_sparql_query (client, query, &error);
 		g_free (query);
@@ -334,8 +334,8 @@ main (int argc, char **argv)
 
 		if (error) {
 			g_printerr ("%s, %s\n",
-				    _("Could not list properties"),
-				    error->message);
+			            _("Could not list properties"),
+			            error->message);
 			g_error_free (error);
 			tracker_disconnect (client);
 
@@ -344,13 +344,13 @@ main (int argc, char **argv)
 
 		if (!results) {
 			g_print ("%s\n",
-				 _("No properties were found"));
+			         _("No properties were found"));
 		} else {
 			g_print (tracker_dngettext (NULL,
-						    "Property: %d",
-						    "Properties: %d",
-						    results->len),
-				 results->len);
+			                            "Property: %d",
+			                            "Properties: %d",
+			                            results->len),
+			         results->len);
 			g_print ("\n");
 
 			g_ptr_array_foreach (results, results_foreach, NULL);
@@ -366,9 +366,9 @@ main (int argc, char **argv)
 		path_in_utf8 = g_filename_to_utf8 (file, -1, NULL, NULL, &error);
 		if (error) {
 			g_printerr ("%s:'%s', %s\n",
-				    _("Could not get UTF-8 path from path"),
-				    file,
-				    error->message);
+			            _("Could not get UTF-8 path from path"),
+			            file,
+			            error->message);
 			g_error_free (error);
 			tracker_disconnect (client);
 
@@ -378,9 +378,9 @@ main (int argc, char **argv)
 		g_file_get_contents (path_in_utf8, &query, &size, &error);
 		if (error) {
 			g_printerr ("%s:'%s', %s\n",
-				    _("Could not read file"),
-				    path_in_utf8,
-				    error->message);
+			            _("Could not read file"),
+			            path_in_utf8,
+			            error->message);
 			g_error_free (error);
 			g_free (path_in_utf8);
 			tracker_disconnect (client);
@@ -397,8 +397,8 @@ main (int argc, char **argv)
 
 			if (error) {
 				g_printerr ("%s, %s\n",
-					    _("Could not run update"),
-					    error->message);
+				            _("Could not run update"),
+				            error->message);
 				g_error_free (error);
 
 				return FALSE;
@@ -432,8 +432,8 @@ main (int argc, char **argv)
 
 			if (error) {
 				g_printerr ("%s, %s\n",
-					    _("Could not run query"),
-					    error->message);
+				            _("Could not run query"),
+				            error->message);
 				g_error_free (error);
 
 				return FALSE;
@@ -441,13 +441,13 @@ main (int argc, char **argv)
 
 			if (!results) {
 				g_print ("%s\n",
-					 _("No results found matching your query"));
+				         _("No results found matching your query"));
 			} else {
 				g_print (tracker_dngettext (NULL,
-							    "Result: %d",
-							    "Results: %d",
-							    results->len),
-					 results->len);
+				                            "Result: %d",
+				                            "Results: %d",
+				                            results->len),
+				         results->len);
 				g_print ("\n");
 
 				g_ptr_array_foreach (results, results_foreach, NULL);
diff --git a/src/tracker-utils/tracker-stats.c b/src/tracker-utils/tracker-stats.c
index 2c95be7..c066597 100644
--- a/src/tracker-utils/tracker-stats.c
+++ b/src/tracker-utils/tracker-stats.c
@@ -31,15 +31,15 @@
 
 #include <libtracker-client/tracker.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static gboolean print_version;
 
@@ -56,7 +56,7 @@ get_meta_table_data (gpointer value)
 {
 	gchar **meta;
 	gchar **p;
-	gint	i;
+	gint    i;
 
 	meta = value;
 
@@ -77,7 +77,7 @@ main (int argc, char **argv)
 	TrackerClient  *client;
 	GOptionContext *context;
 	GPtrArray      *array;
-	GError	       *error = NULL;
+	GError         *error = NULL;
 
 	setlocale (LC_ALL, "");
 
@@ -85,14 +85,14 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new (_(" - Show statistics for all Nepomuk defined ontology classes"));
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -104,7 +104,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
@@ -112,8 +112,8 @@ main (int argc, char **argv)
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get Tracker statistics"),
-			    error->message);
+		            _("Could not get Tracker statistics"),
+		            error->message);
 		g_error_free (error);
 
 		return EXIT_FAILURE;
@@ -121,10 +121,10 @@ main (int argc, char **argv)
 
 	if (!array) {
 		g_print ("%s\n",
-			 _("No statistics available"));
+		         _("No statistics available"));
 	} else {
 		g_print ("%s\n",
-			 _("Statistics:"));
+		         _("Statistics:"));
 
 		g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
 		g_ptr_array_free (array, TRUE);
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index f10416b..a0b61a9 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -38,15 +38,15 @@
 
 #include "tracker-miner-client.h"
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static GMainLoop *main_loop;
 static GHashTable *miners_progress;
@@ -127,8 +127,8 @@ signal_handler (int signo)
 		if (g_strsignal (signo)) {
 			g_print ("\n");
 			g_print ("Received signal:%d->'%s'\n",
-				 signo,
-				 g_strsignal (signo));
+			         signo,
+			         g_strsignal (signo));
 		}
 		break;
 	}
@@ -152,15 +152,15 @@ initialize_signal_handler (void)
 
 static int
 miner_pause (TrackerMinerManager *manager,
-	     const gchar         *miner,
-	     const gchar         *reason)
+             const gchar         *miner,
+             const gchar         *reason)
 {
 	gchar *str;
 	gint cookie;
 
 	str = g_strdup_printf (_("Attempting to pause miner '%s' with reason '%s'"),
-			       miner,
-			       reason);
+	                       miner,
+	                       reason);
 	g_print ("%s\n", str);
 	g_free (str);
 
@@ -178,14 +178,14 @@ miner_pause (TrackerMinerManager *manager,
 
 static int
 miner_resume (TrackerMinerManager *manager,
-	      const gchar         *miner,
-	      gint                 cookie)
+              const gchar         *miner,
+              gint                 cookie)
 {
 	gchar *str;
 
 	str = g_strdup_printf (_("Attempting to resume miner %s with cookie %d"),
-			       miner,
-			       cookie);
+	                       miner,
+	                       cookie);
 	g_print ("%s\n", str);
 	g_free (str);
 
@@ -201,33 +201,33 @@ miner_resume (TrackerMinerManager *manager,
 
 static gboolean
 miner_get_details (TrackerMinerManager  *manager,
-		   const gchar          *miner,
-		   gchar               **status,
-		   gdouble              *progress,
-		   GStrv                *pause_applications,
-		   GStrv                *pause_reasons)
+                   const gchar          *miner,
+                   gchar               **status,
+                   gdouble              *progress,
+                   GStrv                *pause_applications,
+                   GStrv                *pause_reasons)
 {
 	if ((status || progress) &&
 	    !tracker_miner_manager_get_status (manager, miner,
-					       status, progress)) {
+	                                       status, progress)) {
 		g_printerr (_("Could not get status from miner: %s"), miner);
 		return FALSE;
 	}
 
 	tracker_miner_manager_is_paused (manager, miner,
-					 pause_applications,
-					 pause_reasons);
+	                                 pause_applications,
+	                                 pause_reasons);
 
 	return TRUE;
 }
 
 static void
 miner_print_state (TrackerMinerManager *manager,
-		   const gchar         *miner_name,
-		   const gchar         *status,
-		   gdouble              progress,
-		   gboolean             is_running,
-		   gboolean             is_paused)
+                   const gchar         *miner_name,
+                   const gchar         *status,
+                   gdouble              progress,
+                   gboolean             is_running,
+                   gboolean             is_paused)
 {
 	const gchar *name;
 	time_t now;
@@ -239,9 +239,9 @@ miner_print_state (TrackerMinerManager *manager,
 		now = time ((time_t *) NULL);
 		local_time = localtime (&now);
 		len = strftime (time_str,
-				sizeof (time_str) - 1,
-				"%d %b %Y, %H:%M:%S:",
-				local_time);
+		                sizeof (time_str) - 1,
+		                "%d %b %Y, %H:%M:%S:",
+		                local_time);
 		time_str[len] = '\0';
 	} else {
 		time_str[0] = '\0';
@@ -251,27 +251,27 @@ miner_print_state (TrackerMinerManager *manager,
 
 	if (is_running) {
 		g_print ("%s  [%s] %s: %3.0f%%, %s, %s: '%s'\n",
-			 time_str,
-			 is_paused ? "P" : "R",
-			 _("Progress"),
-			 progress * 100,
-			 name,
-			 _("Status"),
-			 status ? status : _("Unknown"));
+		         time_str,
+		         is_paused ? "P" : "R",
+		         _("Progress"),
+		         progress * 100,
+		         name,
+		         _("Status"),
+		         status ? status : _("Unknown"));
 	} else {
 		g_print ("%s  [ ] %s: %3.0f%%, %s\n",
-			 time_str,
-			 _("Progress"),
-			 0.0,
-			 name);
+		         time_str,
+		         _("Progress"),
+		         0.0,
+		         name);
 	}
 }
 
 static void
 manager_miner_progress_cb (TrackerMinerManager *manager,
-			   const gchar         *miner_name,
-			   const gchar         *status,
-			   gdouble              progress)
+                           const gchar         *miner_name,
+                           const gchar         *status,
+                           gdouble              progress)
 {
 	GValue *gvalue;
 
@@ -283,41 +283,41 @@ manager_miner_progress_cb (TrackerMinerManager *manager,
 	miner_print_state (manager, miner_name, status, progress, TRUE, FALSE);
 
 	g_hash_table_replace (miners_status,
-			      g_strdup (miner_name),
-			      g_strdup (status));
+	                      g_strdup (miner_name),
+	                      g_strdup (status));
 	g_hash_table_replace (miners_progress,
-			      g_strdup (miner_name),
-			      gvalue);
+	                      g_strdup (miner_name),
+	                      gvalue);
 }
 
 static void
 manager_miner_paused_cb (TrackerMinerManager *manager,
-			 const gchar         *miner_name)
+                         const gchar         *miner_name)
 {
 	GValue *gvalue;
 
 	gvalue = g_hash_table_lookup (miners_progress, miner_name);
 
 	miner_print_state (manager, miner_name,
-			   g_hash_table_lookup (miners_status, miner_name),
-			   gvalue ? g_value_get_double (gvalue) : 0.0,
-			   TRUE,
-			   TRUE);
+	                   g_hash_table_lookup (miners_status, miner_name),
+	                   gvalue ? g_value_get_double (gvalue) : 0.0,
+	                   TRUE,
+	                   TRUE);
 }
 
 static void
 manager_miner_resumed_cb (TrackerMinerManager *manager,
-			  const gchar         *miner_name)
+                          const gchar         *miner_name)
 {
 	GValue *gvalue;
 
 	gvalue = g_hash_table_lookup (miners_progress, miner_name);
 
 	miner_print_state (manager, miner_name,
-			   g_hash_table_lookup (miners_status, miner_name),
-			   gvalue ? g_value_get_double (gvalue) : 0.0,
-			   TRUE,
-			   FALSE);
+	                   g_hash_table_lookup (miners_status, miner_name),
+	                   gvalue ? g_value_get_double (gvalue) : 0.0,
+	                   TRUE,
+	                   FALSE);
 }
 
 static void
@@ -326,8 +326,8 @@ miners_progress_destroy_notify (gpointer data)
 	GValue *value;
 
 	value = data;
-        g_value_unset (value);
-        g_slice_free (GValue, value);
+	g_value_unset (value);
+	g_slice_free (GValue, value);
 }
 
 gint
@@ -351,7 +351,7 @@ main (gint argc, gchar *argv[])
 	g_option_context_parse (context, &argc, &argv, NULL);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -361,7 +361,7 @@ main (gint argc, gchar *argv[])
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("You can not use miner pause and resume switches together"));
+		            _("You can not use miner pause and resume switches together"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -375,7 +375,7 @@ main (gint argc, gchar *argv[])
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    _("You must provide the miner for pause or resume commands"));
+		            _("You must provide the miner for pause or resume commands"));
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -397,7 +397,7 @@ main (gint argc, gchar *argv[])
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 
 		return EXIT_FAILURE;
 	}
@@ -492,11 +492,11 @@ main (gint argc, gchar *argv[])
 			}
 
 			if (!miner_get_details (manager,
-						l->data,
-						NULL,
-						NULL,
-						&pause_applications,
-						&pause_reasons)) {
+			                        l->data,
+			                        NULL,
+			                        NULL,
+			                        &pause_applications,
+			                        &pause_reasons)) {
 				continue;
 			}
 
@@ -515,10 +515,10 @@ main (gint argc, gchar *argv[])
 
 			for (i = 0; pause_applications[i] != NULL; i++) {
 				g_print ("    %s: '%s', %s: '%s'\n",
-					 _("Application"),
-					 pause_applications[i],
-					 _("Reason"),
-					 pause_reasons[i]);
+				         _("Application"),
+				         pause_applications[i],
+				         _("Reason"),
+				         pause_reasons[i]);
 			}
 
 			g_strfreev (pause_applications);
@@ -560,11 +560,11 @@ main (gint argc, gchar *argv[])
 			gboolean is_paused;
 
 			if (!miner_get_details (manager,
-						l->data,
-						&status,
-						&progress,
-						&pause_applications,
-						&pause_reasons)) {
+			                        l->data,
+			                        &status,
+			                        &progress,
+			                        &pause_applications,
+			                        &pause_reasons)) {
 				continue;
 			}
 
@@ -595,22 +595,22 @@ main (gint argc, gchar *argv[])
 	g_print ("Press Ctrl+C to end follow of Tracker state\n");
 
 	g_signal_connect (manager, "miner-progress",
-			  G_CALLBACK (manager_miner_progress_cb), NULL);
+	                  G_CALLBACK (manager_miner_progress_cb), NULL);
 	g_signal_connect (manager, "miner-paused",
-			  G_CALLBACK (manager_miner_paused_cb), NULL);
+	                  G_CALLBACK (manager_miner_paused_cb), NULL);
 	g_signal_connect (manager, "miner-resumed",
-			  G_CALLBACK (manager_miner_resumed_cb), NULL);
+	                  G_CALLBACK (manager_miner_resumed_cb), NULL);
 
 	initialize_signal_handler ();
 
 	miners_progress = g_hash_table_new_full (g_str_hash,
-						 g_str_equal,
-						 (GDestroyNotify) g_free,
-						 (GDestroyNotify) miners_progress_destroy_notify);
+	                                         g_str_equal,
+	                                         (GDestroyNotify) g_free,
+	                                         (GDestroyNotify) miners_progress_destroy_notify);
 	miners_status = g_hash_table_new_full (g_str_hash,
-					       g_str_equal,
-					       (GDestroyNotify) g_free,
-					       (GDestroyNotify) g_free);
+	                                       g_str_equal,
+	                                       (GDestroyNotify) g_free,
+	                                       (GDestroyNotify) g_free);
 
 	main_loop = g_main_loop_new (NULL, FALSE);
 	g_main_loop_run (main_loop);
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 90fb7e4..6900e40 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -31,22 +31,22 @@
 #include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
-#define ABOUT                                                             \
-        "Tracker " PACKAGE_VERSION "\n"
-
-#define LICENSE                                                           \
-        "This program is free software and comes without any warranty.\n" \
-        "It is licensed under version 2 or later of the General Public "  \
-        "License which can be viewed at:\n"                               \
-        "\n"                                                              \
-        "  http://www.gnu.org/licenses/gpl.txt\n";
-
-static gint	     limit = 512;
-static gint	     offset;
-static gchar	   **files;
+#define ABOUT	  \
+	"Tracker " PACKAGE_VERSION "\n"
+
+#define LICENSE	  \
+	"This program is free software and comes without any warranty.\n" \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
+	"  http://www.gnu.org/licenses/gpl.txt\n";
+
+static gint          limit = 512;
+static gint          offset;
+static gchar       **files;
 static gboolean      or_operator;
-static gchar	    *add_tag;
-static gchar	    *remove_tag;
+static gchar        *add_tag;
+static gchar        *remove_tag;
 static gboolean     *list;
 static gboolean      show_files;
 static gboolean      print_version;
@@ -104,7 +104,7 @@ show_limit_warning (void)
 	 * not the WHOLE data set.
 	 */
 	g_printerr ("\n%s\n",
-		    _("NOTE: Limit was reached, there are more items in the database not listed here"));
+	            _("NOTE: Limit was reached, there are more items in the database not listed here"));
 }
 
 static gchar *
@@ -113,43 +113,43 @@ get_escaped_sparql_string (const gchar *str)
 	GString *sparql;
 
 	sparql = g_string_new ("");
-        g_string_append_c (sparql, '"');
-
-        while (*str != '\0') {
-                gsize len = strcspn (str, "\t\n\r\"\\");
-                g_string_append_len (sparql, str, len);
-                str += len;
-                switch (*str) {
-                case '\t':
-                        g_string_append (sparql, "\\t");
-                        break;
-                case '\n':
-                        g_string_append (sparql, "\\n");
-                        break;
-                case '\r':
-                        g_string_append (sparql, "\\r");
-                        break;
-                case '"':
-                        g_string_append (sparql, "\\\"");
-                        break;
-                case '\\':
-                        g_string_append (sparql, "\\\\");
-                        break;
-                default:
-                        continue;
-                }
-                str++;
-        }
-
-        g_string_append_c (sparql, '"');
+	g_string_append_c (sparql, '"');
+
+	while (*str != '\0') {
+		gsize len = strcspn (str, "\t\n\r\"\\");
+		g_string_append_len (sparql, str, len);
+		str += len;
+		switch (*str) {
+		case '\t':
+			g_string_append (sparql, "\\t");
+			break;
+		case '\n':
+			g_string_append (sparql, "\\n");
+			break;
+		case '\r':
+			g_string_append (sparql, "\\r");
+			break;
+		case '"':
+			g_string_append (sparql, "\\\"");
+			break;
+		case '\\':
+			g_string_append (sparql, "\\\\");
+			break;
+		default:
+			continue;
+		}
+		str++;
+	}
+
+	g_string_append_c (sparql, '"');
 
 	return g_string_free (sparql, FALSE);
 }
 
 static gchar *
 get_fts_string (GStrv    search_words,
-		gboolean use_or_operator,
-		gboolean for_regex)
+                gboolean use_or_operator,
+                gboolean for_regex)
 {
 	GString *fts;
 	gint i, len;
@@ -187,7 +187,7 @@ get_fts_string (GStrv    search_words,
 
 static gchar *
 get_filter_string (GStrv        files,
-		   const gchar *tag)
+                   const gchar *tag)
 {
 	GString *filter;
 	gint i, len;
@@ -237,7 +237,7 @@ get_filter_string (GStrv        files,
 
 static void
 get_all_tags_foreach (gpointer value,
-		      gpointer user_data)
+                      gpointer user_data)
 {
 	TrackerClient *client;
 	GError *error = NULL;
@@ -261,10 +261,10 @@ get_all_tags_foreach (gpointer value,
 
 	g_print ("    ");
 	g_print (tracker_dngettext (NULL,
-				    "%d file",
-				    "%d files",
-				    files),
-		 files);
+	                            "%d file",
+	                            "%d files",
+	                            files),
+	         files);
 	g_print ("\n");
 
 	if (!client || files < 1) {
@@ -273,18 +273,18 @@ get_all_tags_foreach (gpointer value,
 
 	/* Get files associated */
 	query = g_strdup_printf ("SELECT ?urn WHERE {"
-				 "  ?urn a rdfs:Resource; "
-				 "  nao:hasTag \"%s\" "
-				 "}",
-				 id);
+	                         "  ?urn a rdfs:Resource; "
+	                         "  nao:hasTag \"%s\" "
+	                         "}",
+	                         id);
 
 	results = tracker_resources_sparql_query (client, query, &error);
 	g_free (query);
 
 	if (error) {
 		g_print ("    %s, %s\n",
-			 _("Could not get files related to tag"),
-			 error->message);
+		         _("Could not get files related to tag"),
+		         error->message);
 		g_error_free (error);
 		return;
 	}
@@ -302,11 +302,11 @@ get_all_tags_foreach (gpointer value,
 
 static gboolean
 get_all_tags (TrackerClient *client,
-	      GStrv          files,
-	      gint           search_offset,
-	      gint           search_limit,
-	      gboolean       use_or_operator,
-	      gboolean       show_files)
+              GStrv          files,
+              gint           search_offset,
+              gint           search_limit,
+              gboolean       use_or_operator,
+              gboolean       show_files)
 {
 	GError *error = NULL;
 	GPtrArray *results;
@@ -317,36 +317,36 @@ get_all_tags (TrackerClient *client,
 
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?tag ?label COUNT(?urns) AS urns "
-					 "WHERE {"
-					 "  ?tag a nao:Tag ;"
-					 "  nao:prefLabel ?label ."
-					 "  OPTIONAL {"
-					 "     ?urns nao:hasTag ?tag"
-					 "  } ."
-					 "  FILTER regex (?label, \"%s\")"
-					 "} "
-					 "GROUP BY ?tag "
-					 "ORDER BY ASC(?label) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 fts,
-					 search_offset,
-					 search_limit);
+		                         "WHERE {"
+		                         "  ?tag a nao:Tag ;"
+		                         "  nao:prefLabel ?label ."
+		                         "  OPTIONAL {"
+		                         "     ?urns nao:hasTag ?tag"
+		                         "  } ."
+		                         "  FILTER regex (?label, \"%s\")"
+		                         "} "
+		                         "GROUP BY ?tag "
+		                         "ORDER BY ASC(?label) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         fts,
+		                         search_offset,
+		                         search_limit);
 	} else {
 		query = g_strdup_printf ("SELECT ?tag ?label COUNT(?urns) AS urns "
-					 "WHERE {"
-					 "  ?tag a nao:Tag ;"
-					 "  nao:prefLabel ?label ."
-					 "  OPTIONAL {"
-					 "     ?urns nao:hasTag ?tag"
-					 "  }"
-					 "} "
-					 "GROUP BY ?tag "
-					 "ORDER BY ASC(?label) "
-					 "OFFSET %d "
-					 "LIMIT %d",
-					 search_offset,
-					 search_limit);
+		                         "WHERE {"
+		                         "  ?tag a nao:Tag ;"
+		                         "  nao:prefLabel ?label ."
+		                         "  OPTIONAL {"
+		                         "     ?urns nao:hasTag ?tag"
+		                         "  }"
+		                         "} "
+		                         "GROUP BY ?tag "
+		                         "ORDER BY ASC(?label) "
+		                         "OFFSET %d "
+		                         "LIMIT %d",
+		                         search_offset,
+		                         search_limit);
 	}
 
 	g_free (fts);
@@ -356,8 +356,8 @@ get_all_tags (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get all tags"),
-			    error->message);
+		            _("Could not get all tags"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -365,18 +365,18 @@ get_all_tags (TrackerClient *client,
 
 	if (!results) {
 		g_print ("%s\n",
-			 _("No tags were found"));
+		         _("No tags were found"));
 	} else {
 		g_print (tracker_dngettext (NULL,
-					    "Tag: %d (shown by name)",
-					    "Tags: %d (shown by name)",
-					    results->len),
-			 results->len);
+		                            "Tag: %d (shown by name)",
+		                            "Tags: %d (shown by name)",
+		                            results->len),
+		         results->len);
 		g_print ("\n");
 
 		g_ptr_array_foreach (results,
-				     get_all_tags_foreach,
-				     show_files ? client : NULL);
+		                     get_all_tags_foreach,
+		                     show_files ? client : NULL);
 
 		if (results->len >= search_limit) {
 			show_limit_warning ();
@@ -391,8 +391,8 @@ get_all_tags (TrackerClient *client,
 
 static gboolean
 add_tag_for_urns (TrackerClient *client,
-		  GStrv          files,
-		  const gchar   *tag)
+                  GStrv          files,
+                  const gchar   *tag)
 {
 	GError *error = NULL;
 	gchar *filter;
@@ -408,43 +408,43 @@ add_tag_for_urns (TrackerClient *client,
 	if (filter) {
 		/* Add tag to specific urns */
 		query = g_strdup_printf ("INSERT { "
-					 "  _:tag a nao:Tag;"
-					 "  nao:prefLabel %s ."
-					 "} "
-					 "WHERE {"
-					 "  OPTIONAL {"
-					 "     ?tag a nao:Tag ;"
-					 "     nao:prefLabel %s"
-					 "  } ."
-					 "  FILTER (!bound(?tag)) "
-					 "} "
-					 "INSERT { "
-					 "  ?urn nao:hasTag ?id "
-					 "} "
-					 "WHERE {"
-					 "  ?urn nie:isStoredAs ?f ."
-					 "  ?id nao:prefLabel %s "
-					 "  %s "
-					 "}",
-					 tag_escaped,
-					 tag_escaped,
-					 tag_escaped,
-					 filter);
+		                         "  _:tag a nao:Tag;"
+		                         "  nao:prefLabel %s ."
+		                         "} "
+		                         "WHERE {"
+		                         "  OPTIONAL {"
+		                         "     ?tag a nao:Tag ;"
+		                         "     nao:prefLabel %s"
+		                         "  } ."
+		                         "  FILTER (!bound(?tag)) "
+		                         "} "
+		                         "INSERT { "
+		                         "  ?urn nao:hasTag ?id "
+		                         "} "
+		                         "WHERE {"
+		                         "  ?urn nie:isStoredAs ?f ."
+		                         "  ?id nao:prefLabel %s "
+		                         "  %s "
+		                         "}",
+		                         tag_escaped,
+		                         tag_escaped,
+		                         tag_escaped,
+		                         filter);
 	} else {
 		/* Add tag and do not link it to urns */
 		query = g_strdup_printf ("INSERT { "
-					 "  _:tag a nao:Tag;"
-					 "  nao:prefLabel %s ."
-					 "} "
-					 "WHERE {"
-					 "  OPTIONAL {"
-					 "     ?tag a nao:Tag ;"
-					 "     nao:prefLabel %s"
-					 "  } ."
-					 "  FILTER (!bound(?tag)) "
-					 "}",
-					 tag_escaped,
-					 tag_escaped);
+		                         "  _:tag a nao:Tag;"
+		                         "  nao:prefLabel %s ."
+		                         "} "
+		                         "WHERE {"
+		                         "  OPTIONAL {"
+		                         "     ?tag a nao:Tag ;"
+		                         "     nao:prefLabel %s"
+		                         "  } ."
+		                         "  FILTER (!bound(?tag)) "
+		                         "}",
+		                         tag_escaped,
+		                         tag_escaped);
 	}
 
 	g_free (tag_escaped);
@@ -455,23 +455,23 @@ add_tag_for_urns (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not add tag"),
-			    error->message);
+		            _("Could not add tag"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
 	}
 
 	g_print ("%s\n",
-		 _("Tag was added successfully"));
+	         _("Tag was added successfully"));
 
 	return TRUE;
 }
 
 static gboolean
 remove_tag_for_urns (TrackerClient *client,
-		     GStrv          files,
-		     const gchar   *tag)
+                     GStrv          files,
+                     const gchar   *tag)
 {
 	GError *error = NULL;
 	gchar *tag_escaped;
@@ -486,19 +486,19 @@ remove_tag_for_urns (TrackerClient *client,
 
 		/* Get all tags urns */
 		query = g_strdup_printf ("SELECT ?tag "
-					 "WHERE {"
-					 "  ?tag a nao:Tag ."
-					 "  ?tag nao:prefLabel %s "
-					 "}",
-					 tag_escaped);
+		                         "WHERE {"
+		                         "  ?tag a nao:Tag ."
+		                         "  ?tag nao:prefLabel %s "
+		                         "}",
+		                         tag_escaped);
 
 		results = tracker_resources_sparql_query (client, query, &error);
 		g_free (query);
 
 		if (error) {
 			g_printerr ("%s, %s\n",
-				    _("Could not get tag by label"),
-				    error->message);
+			            _("Could not get tag by label"),
+			            error->message);
 			g_error_free (error);
 			g_free (tag_escaped);
 
@@ -507,7 +507,7 @@ remove_tag_for_urns (TrackerClient *client,
 
 		if (!results || !results->pdata || !results->pdata[0]) {
 			g_print ("%s\n",
-				 _("No tags were found by that name"));
+			         _("No tags were found by that name"));
 
 			g_free (tag_escaped);
 
@@ -518,27 +518,27 @@ remove_tag_for_urns (TrackerClient *client,
 		filter = get_filter_string (files, urn);
 
 		query = g_strdup_printf ("DELETE { "
-					 "  ?f nao:hasTag ?t "
-					 "} "
-					 "WHERE { "
-					 "  ?f nao:hasTag ?t ."
-					 "  %s "
-					 "}",
-					 filter);
+		                         "  ?f nao:hasTag ?t "
+		                         "} "
+		                         "WHERE { "
+		                         "  ?f nao:hasTag ?t ."
+		                         "  %s "
+		                         "}",
+		                         filter);
 		g_free (filter);
 #if 0
 		filter = get_filter_string (files);
 
 		query = g_strdup_printf ("DELETE {"
-					 "  <%s> nao:hasTag ?tag "
-					 "} "
-					 "WHERE {"
-					 "  <%s> nao:hasTag ?tag"
-					 "  FILTER (?tag = <%s>)"
-					 "}",
-					 files[0],
-					 files[0],
-					 urn);
+		                         "  <%s> nao:hasTag ?tag "
+		                         "} "
+		                         "WHERE {"
+		                         "  <%s> nao:hasTag ?tag"
+		                         "  FILTER (?tag = <%s>)"
+		                         "}",
+		                         files[0],
+		                         files[0],
+		                         urn);
 
 		g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
 		g_ptr_array_free (results, TRUE);
@@ -546,12 +546,12 @@ remove_tag_for_urns (TrackerClient *client,
 	} else {
 		/* Remove tag completely */
 		query = g_strdup_printf ("DELETE { "
-					 "  ?tag a nao:Tag "
-					 "} "
-					 "WHERE {"
-					 "  ?tag nao:prefLabel %s "
-					 "}",
-					 tag_escaped);
+		                         "  ?tag a nao:Tag "
+		                         "} "
+		                         "WHERE {"
+		                         "  ?tag nao:prefLabel %s "
+		                         "}",
+		                         tag_escaped);
 	}
 
 	g_free (tag_escaped);
@@ -561,22 +561,22 @@ remove_tag_for_urns (TrackerClient *client,
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not remove tag"),
-			    error->message);
+		            _("Could not remove tag"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
 	}
 
 	g_print ("%s\n",
-		 _("Tag was removed successfully"));
+	         _("Tag was removed successfully"));
 
 	return TRUE;
 }
 
 static void
 get_tags_by_file_foreach (gpointer value,
-			  gpointer user_data)
+                          gpointer user_data)
 {
 	GStrv data = value;
 
@@ -585,29 +585,29 @@ get_tags_by_file_foreach (gpointer value,
 
 static gboolean
 get_tags_by_file (TrackerClient *client,
-		  const gchar   *file)
+                  const gchar   *file)
 {
 	GError *error = NULL;
 	GPtrArray *results;
 	gchar *query;
 
 	query = g_strdup_printf ("SELECT ?tags ?labels "
-				 "WHERE {"
-				 "  <%s>"
-				 "  nao:hasTag ?tags ."
-				 "  ?tags a nao:Tag ;"
-				 "  nao:prefLabel ?labels "
-				 "} "
-				 "ORDER BY ASC(?labels)",
-				 file);
+	                         "WHERE {"
+	                         "  <%s>"
+	                         "  nao:hasTag ?tags ."
+	                         "  ?tags a nao:Tag ;"
+	                         "  nao:prefLabel ?labels "
+	                         "} "
+	                         "ORDER BY ASC(?labels)",
+	                         file);
 
 	results = tracker_resources_sparql_query (client, query, &error);
 	g_free (query);
 
 	if (error) {
 		g_printerr ("%s, %s\n",
-			    _("Could not get all tags"),
-			    error->message);
+		            _("Could not get all tags"),
+		            error->message);
 		g_error_free (error);
 
 		return FALSE;
@@ -615,11 +615,11 @@ get_tags_by_file (TrackerClient *client,
 
 	if (!results || results->len < 1) {
 		g_print ("  %s\n",
-			 _("No tags were found"));
+		         _("No tags were found"));
 	} else {
 		g_ptr_array_foreach (results,
-				     get_tags_by_file_foreach,
-				     NULL);
+		                     get_tags_by_file_foreach,
+		                     NULL);
 
 		g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
 		g_ptr_array_free (results, TRUE);
@@ -631,9 +631,9 @@ get_tags_by_file (TrackerClient *client,
 int
 main (int argc, char **argv)
 {
-	TrackerClient	*client;
-	GOptionContext	*context;
-	const gchar	*failed = NULL;
+	TrackerClient   *client;
+	GOptionContext  *context;
+	const gchar     *failed = NULL;
 
 	setlocale (LC_ALL, "");
 
@@ -653,7 +653,7 @@ main (int argc, char **argv)
 	g_option_context_parse (context, &argc, &argv, NULL);
 
 	if (print_version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
 		g_option_context_free (context);
 
 		return EXIT_SUCCESS;
@@ -686,7 +686,7 @@ main (int argc, char **argv)
 
 	if (!client) {
 		g_printerr ("%s\n",
-			    _("Could not establish a D-Bus connection to Tracker"));
+		            _("Could not establish a D-Bus connection to Tracker"));
 		return EXIT_FAILURE;
 	}
 
diff --git a/src/tracker-writeback/tracker-config.c b/src/tracker-writeback/tracker-config.c
index 0c31855..6c2a111 100644
--- a/src/tracker-writeback/tracker-config.c
+++ b/src/tracker-writeback/tracker-config.c
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
@@ -35,14 +35,14 @@
 #define TRACKER_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG, TrackerConfigPrivate))
 
 /* GKeyFile defines */
-#define GROUP_GENERAL				 "General"
+#define GROUP_GENERAL                            "General"
 
 /* Default values */
-#define DEFAULT_VERBOSITY			 0
+#define DEFAULT_VERBOSITY                        0
 
 typedef struct {
 	/* General */
-	gint	  verbosity;
+	gint      verbosity;
 } TrackerConfigPrivate;
 
 typedef struct {
@@ -53,21 +53,21 @@ typedef struct {
 } ObjectToKeyFile;
 
 static void     config_set_property         (GObject           *object,
-					     guint              param_id,
-					     const GValue      *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             const GValue      *value,
+                                             GParamSpec        *pspec);
 static void     config_get_property         (GObject           *object,
-					     guint              param_id,
-					     GValue            *value,
-					     GParamSpec        *pspec);
+                                             guint              param_id,
+                                             GValue            *value,
+                                             GParamSpec        *pspec);
 static void     config_finalize             (GObject           *object);
 static void     config_constructed          (GObject           *object);
 static void     config_changed              (TrackerConfigFile *file);
 static void     config_load                 (TrackerConfig     *config);
 static gboolean config_save                 (TrackerConfig     *config);
 static void     config_create_with_defaults (TrackerConfig     *config,
-					     GKeyFile          *key_file,
-					     gboolean           overwrite);
+                                             GKeyFile          *key_file,
+                                             gboolean           overwrite);
 
 enum {
 	PROP_0,
@@ -91,21 +91,21 @@ tracker_config_class_init (TrackerConfigClass *klass)
 
 	object_class->set_property = config_set_property;
 	object_class->get_property = config_get_property;
-	object_class->finalize	   = config_finalize;
+	object_class->finalize     = config_finalize;
 	object_class->constructed  = config_constructed;
 
 	config_file_class->changed = config_changed;
 
 	/* General */
 	g_object_class_install_property (object_class,
-					 PROP_VERBOSITY,
-					 g_param_spec_int ("verbosity",
-							   "Log verbosity",
-							   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
-							   0,
-							   3,
-							   DEFAULT_VERBOSITY,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	                                 PROP_VERBOSITY,
+	                                 g_param_spec_int ("verbosity",
+	                                                   "Log verbosity",
+	                                                   " Log verbosity (0=errors, 1=minimal, 2=detailed, 3=debug)",
+	                                                   0,
+	                                                   3,
+	                                                   DEFAULT_VERBOSITY,
+	                                                   G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigPrivate));
 }
@@ -116,16 +116,16 @@ tracker_config_init (TrackerConfig *object)
 }
 
 static void
-config_set_property (GObject	  *object,
-		     guint	   param_id,
-		     const GValue *value,
-		     GParamSpec	  *pspec)
+config_set_property (GObject      *object,
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec           *pspec)
 {
 	switch (param_id) {
 		/* General */
 	case PROP_VERBOSITY:
 		tracker_config_set_verbosity (TRACKER_CONFIG (object),
-					      g_value_get_int (value));
+		                              g_value_get_int (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -134,10 +134,10 @@ config_set_property (GObject	  *object,
 }
 
 static void
-config_get_property (GObject	*object,
-		     guint	 param_id,
-		     GValue	*value,
-		     GParamSpec *pspec)
+config_get_property (GObject    *object,
+                     guint       param_id,
+                     GValue     *value,
+                     GParamSpec *pspec)
 {
 	TrackerConfigPrivate *priv;
 
@@ -181,8 +181,8 @@ config_changed (TrackerConfigFile *file)
 
 static void
 config_create_with_defaults (TrackerConfig *config,
-			     GKeyFile      *key_file,
-			     gboolean       overwrite)
+                             GKeyFile      *key_file,
+                             gboolean       overwrite)
 {
 	gint i;
 
@@ -192,9 +192,9 @@ config_create_with_defaults (TrackerConfig *config,
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 		if (!overwrite && has_key) {
 			continue;
 		}
@@ -202,18 +202,18 @@ config_create_with_defaults (TrackerConfig *config,
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			g_key_file_set_integer (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_int (config,
-										    conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_int (config,
+			                                                            conversions[i].property));
 			break;
 
 		case G_TYPE_BOOLEAN:
 			g_key_file_set_boolean (key_file,
-						conversions[i].group,
-						conversions[i].key,
-						tracker_keyfile_object_default_boolean (config,
-											conversions[i].property));
+			                        conversions[i].group,
+			                        conversions[i].key,
+			                        tracker_keyfile_object_default_boolean (config,
+			                                                                conversions[i].property));
 			break;
 
 		default:
@@ -221,11 +221,11 @@ config_create_with_defaults (TrackerConfig *config,
 		}
 
 		g_key_file_set_comment (key_file,
-					conversions[i].group,
-					conversions[i].key,
-					tracker_keyfile_object_blurb (config,
-								      conversions[i].property),
-					NULL);
+		                        conversions[i].group,
+		                        conversions[i].key,
+		                        tracker_keyfile_object_blurb (config,
+		                                                      conversions[i].property),
+		                        NULL);
 	}
 }
 
@@ -246,25 +246,25 @@ config_load (TrackerConfig *config)
 		gboolean has_key;
 
 		has_key = g_key_file_has_key (file->key_file,
-					      conversions[i].group,
-					      conversions[i].key,
-					      NULL);
+		                              conversions[i].group,
+		                              conversions[i].key,
+		                              NULL);
 
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_load_int (G_OBJECT (file),
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_load_boolean (G_OBJECT (file),
-							     conversions[i].property,
-							     file->key_file,
-							     conversions[i].group,
-							     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 		}
 	}
@@ -290,18 +290,18 @@ config_save (TrackerConfig *config)
 		switch (conversions[i].type) {
 		case G_TYPE_INT:
 			tracker_keyfile_object_save_int (file,
-							 conversions[i].property,
-							 file->key_file,
-							 conversions[i].group,
-							 conversions[i].key);
+			                                 conversions[i].property,
+			                                 file->key_file,
+			                                 conversions[i].group,
+			                                 conversions[i].key);
 			break;
 
 		case G_TYPE_BOOLEAN:
 			tracker_keyfile_object_save_boolean (file,
-							     conversions[i].property,
-							     file->key_file,
-							     conversions[i].group,
-							     conversions[i].key);
+			                                     conversions[i].property,
+			                                     file->key_file,
+			                                     conversions[i].group,
+			                                     conversions[i].key);
 			break;
 
 		default:
@@ -348,7 +348,7 @@ tracker_config_get_verbosity (TrackerConfig *config)
 
 void
 tracker_config_set_verbosity (TrackerConfig *config,
-			      gint	     value)
+                              gint           value)
 {
 	TrackerConfigPrivate *priv;
 
diff --git a/src/tracker-writeback/tracker-config.h b/src/tracker-writeback/tracker-config.h
index 89a53e8..3a1c0b5 100644
--- a/src/tracker-writeback/tracker-config.h
+++ b/src/tracker-writeback/tracker-config.h
@@ -27,14 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define TRACKER_TYPE_CONFIG	    (tracker_config_get_type ())
-#define TRACKER_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
+#define TRACKER_TYPE_CONFIG         (tracker_config_get_type ())
+#define TRACKER_CONFIG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
 #define TRACKER_CONFIG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-#define TRACKER_IS_CONFIG(o)	    (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
+#define TRACKER_IS_CONFIG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
 #define TRACKER_IS_CONFIG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
 #define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
 
-typedef struct TrackerConfig	  TrackerConfig;
+typedef struct TrackerConfig      TrackerConfig;
 typedef struct TrackerConfigClass TrackerConfigClass;
 
 struct TrackerConfig {
@@ -45,7 +45,7 @@ struct TrackerConfigClass {
 	TrackerConfigFileClass parent_class;
 };
 
-GType	       tracker_config_get_type				   (void) G_GNUC_CONST;
+GType          tracker_config_get_type                             (void) G_GNUC_CONST;
 
 TrackerConfig *tracker_config_new                                  (void);
 TrackerConfig *tracker_config_new_with_domain                      (const gchar *domain);
@@ -54,7 +54,7 @@ gboolean       tracker_config_save                                 (TrackerConfi
 
 gint           tracker_config_get_verbosity                        (TrackerConfig *config);
 void           tracker_config_set_verbosity                        (TrackerConfig *config,
-								    gint           value);
+                                                                    gint           value);
 
 G_END_DECLS
 
diff --git a/src/tracker-writeback/tracker-main.c b/src/tracker-writeback/tracker-main.c
index f4661fb..d8f6c5b 100644
--- a/src/tracker-writeback/tracker-main.c
+++ b/src/tracker-writeback/tracker-main.c
@@ -29,18 +29,18 @@
 #include "tracker-writeback-consumer.h"
 #include "tracker-config.h"
 
-#define ABOUT								  \
+#define ABOUT	  \
 	"Tracker " PACKAGE_VERSION "\n"
 
-#define LICENSE								  \
+#define LICENSE	  \
 	"This program is free software and comes without any warranty.\n" \
-	"It is licensed under version 2 or later of the General Public "  \
-	"License which can be viewed at:\n"				  \
-	"\n"								  \
+	"It is licensed under version 2 or later of the General Public " \
+	"License which can be viewed at:\n" \
+	"\n" \
 	"  http://www.gnu.org/licenses/gpl.txt\n";
 
 static gboolean      version;
-static gint	     verbosity = -1;
+static gint          verbosity = -1;
 
 static GOptionEntry  entries[] = {
 	{ "version", 'V', 0,
@@ -66,7 +66,7 @@ static GMainContext *dispatcher_context = NULL;
 
 static WritebackData *
 writeback_data_new (const gchar *subject,
-		    const GStrv  rdf_types)
+                    const GStrv  rdf_types)
 {
 	WritebackData *data;
 
@@ -109,12 +109,12 @@ on_writeback_cb (TrackerWritebackDispatcher *dispatcher,
 	WritebackData *data;
 
 	g_message ("Got writeback petition on thread '%p' for subject '%s'",
-		   g_thread_self (), subject);
+	           g_thread_self (), subject);
 
 	data = writeback_data_new (subject, rdf_types);
 	g_idle_add_full (G_PRIORITY_HIGH_IDLE,
-			 on_writeback_idle_cb,
-			 data, NULL);
+	                 on_writeback_idle_cb,
+	                 data, NULL);
 }
 
 static gpointer
@@ -142,7 +142,7 @@ sanity_check_option_values (TrackerConfig *config)
 {
 	g_message ("General options:");
 	g_message ("  Verbosity  ............................  %d",
-		   tracker_config_get_verbosity (config));
+	           tracker_config_get_verbosity (config));
 }
 
 int
@@ -176,10 +176,10 @@ main (int   argc,
 	g_option_context_parse (context, &argc, &argv, &error);
 	g_option_context_free (context);
 
-        if (version) {
-                g_print ("\n" ABOUT "\n" LICENSE "\n");
-                return EXIT_SUCCESS;
-        }
+	if (version) {
+		g_print ("\n" ABOUT "\n" LICENSE "\n");
+		return EXIT_SUCCESS;
+	}
 
 	/* Initialize logging */
 	config = tracker_config_new ();
@@ -189,7 +189,7 @@ main (int   argc,
 	}
 
 	tracker_log_init (tracker_config_get_verbosity (config),
-                          &log_filename);
+	                  &log_filename);
 	g_print ("Starting log:\n  File:'%s'\n", log_filename);
 	g_free (log_filename);
 
diff --git a/src/tracker-writeback/tracker-writeback-consumer.c b/src/tracker-writeback/tracker-writeback-consumer.c
index a611ef9..2adf10a 100644
--- a/src/tracker-writeback/tracker-writeback-consumer.c
+++ b/src/tracker-writeback/tracker-writeback-consumer.c
@@ -137,7 +137,7 @@ tracker_writeback_consumer_new (void)
 
 static gboolean
 sparql_rdf_types_match (const gchar * const *module_types,
-			const gchar * const *rdf_types)
+                        const gchar * const *rdf_types)
 {
 	guint n;
 
@@ -156,8 +156,8 @@ sparql_rdf_types_match (const gchar * const *module_types,
 
 static void
 sparql_query_cb (GPtrArray *result,
-		 GError	   *error,
-		 gpointer   user_data)
+                 GError            *error,
+                 gpointer   user_data)
 {
 	TrackerWritebackConsumerPrivate *priv;
 	TrackerWritebackConsumer *consumer;
diff --git a/src/tracker-writeback/tracker-writeback-dispatcher.c b/src/tracker-writeback/tracker-writeback-dispatcher.c
index 399da47..85b75c4 100644
--- a/src/tracker-writeback/tracker-writeback-dispatcher.c
+++ b/src/tracker-writeback/tracker-writeback-dispatcher.c
@@ -31,7 +31,7 @@
 #define TRACKER_RESOURCES_OBJECT        "/org/freedesktop/Tracker1/Resources"
 #define TRACKER_INTERFACE_RESOURCES     "org.freedesktop.Tracker1.Resources"
 
-#define DBUS_MATCH_STR \
+#define DBUS_MATCH_STR	  \
 	"type='signal', " \
 	"sender='" TRACKER_SERVICE "', " \
 	"path='" TRACKER_RESOURCES_OBJECT "', " \
@@ -158,8 +158,8 @@ handle_writeback_signal (TrackerWritebackDispatcher *dispatcher,
 
 static DBusHandlerResult
 message_filter (DBusConnection *connection,
-		DBusMessage    *message,
-		gpointer        user_data)
+                DBusMessage    *message,
+                gpointer        user_data)
 {
 	if (dbus_message_is_signal (message,
 	                            TRACKER_INTERFACE_RESOURCES,
diff --git a/src/tracker-writeback/tracker-writeback-mp3.c b/src/tracker-writeback/tracker-writeback-mp3.c
index b168099..3e8d03d 100644
--- a/src/tracker-writeback/tracker-writeback-mp3.c
+++ b/src/tracker-writeback/tracker-writeback-mp3.c
@@ -73,9 +73,9 @@ static const gchar * const *
 writeback_mp3_content_types (TrackerWritebackFile *wbf)
 {
 	static const gchar *content_types[] = {
-	        "audio/mpeg",
-	        "audio/x-mp3",
-	        NULL
+		"audio/mpeg",
+		"audio/x-mp3",
+		NULL
 	};
 
 	return content_types;
@@ -102,7 +102,7 @@ writeback_mp3_update_file_metadata (TrackerWritebackFile *writeback_file,
 			tag = ID3Tag_New ();
 			ID3Tag_Link (tag, path);
 
- 			frame = ID3Tag_FindFrameWithID (tag, ID3FID_TITLE);
+			frame = ID3Tag_FindFrameWithID (tag, ID3FID_TITLE);
 			if (frame) {
 				ID3Field *field;
 
@@ -144,8 +144,8 @@ const gchar * const *
 writeback_module_get_rdf_types (void)
 {
 	static const gchar *rdftypes[] = {
-	        TRACKER_NFO_PREFIX "Audio",
-	        NULL
+		TRACKER_NFO_PREFIX "Audio",
+		NULL
 	};
 
 	return rdftypes;
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index e92ec2f..fb598fb 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -83,11 +83,11 @@ static const gchar * const *
 writeback_xmp_content_types (TrackerWritebackFile *wbf)
 {
 	static const gchar *content_types[] = {
-	        "image/png",   /* .png files */
-	        "sketch/png",  /* .sketch.png files on Maemo*/
-	        "image/jpeg",  /* .jpg & .jpeg files */
-	        "image/tiff",  /* .tiff & .tif files */
-	        NULL
+		"image/png",   /* .png files */
+		"sketch/png",  /* .sketch.png files on Maemo*/
+		"image/jpeg",  /* .jpg & .jpeg files */
+		"image/tiff",  /* .tiff & .tif files */
+		NULL
 	};
 
 	/* "image/gif"                        .gif files
@@ -223,31 +223,31 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile *wbf,
 			for (i=0; i < 8; i++) {
 				if (g_strcmp0 (row[2], ostr[i]) == 0) {
 					switch (i) {
-						case 0:
+					case 0:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "top - left", 0);
 						break;
-						case 1:
+					case 1:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "top - right", 0);
 						break;
-						case 2:
+					case 2:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "bottom - right", 0);
 						break;
-						case 3:
+					case 3:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "bottom - left", 0);
 						break;
-						case 4:
+					case 4:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "left - top", 0);
 						break;
-						case 5:
+					case 5:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "right - top", 0);
 						break;
-						case 6:
+					case 6:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "right - bottom", 0);
 						break;
-						case 7:
+					case 7:
 						xmp_set_property (xmp, NS_EXIF, "Orientation", "left - bottom", 0);
 						break;
-						default:
+					default:
 						break;
 					}
 				}
@@ -256,22 +256,22 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile *wbf,
 
 
 		/*
-		if (g_strcmp0 (row[1], PHOTO_HAS "contact") == 0) {
-			Face recognition on the photos
-			xmp_delete_property (xmp, FACE, "contact");
-			Fetch full name of the contact?
-			xmp_set_array_item (xmp, FACE, "contact", 1, fetched, 0);
-		}
-
-		if (g_strcmp0 (row[1], LOCATION_PREFIX "country") == 0) {
-			xmp_delete_property (xmp, NS_PHOTOSHOP, "Country");
-			xmp_set_array_item (xmp, NS_PHOTOSHOP, "Country", 1, row[2], 0);
-		}
-
-		if (g_strcmp0 (row[1], LOCATION_PREFIX "city") == 0) {
-			xmp_delete_property (xmp, NS_PHOTOSHOP, "City");
-			xmp_set_array_item (xmp, NS_PHOTOSHOP, "City", 1, row[2], 0);
-		} */
+		  if (g_strcmp0 (row[1], PHOTO_HAS "contact") == 0) {
+		  Face recognition on the photos
+		  xmp_delete_property (xmp, FACE, "contact");
+		  Fetch full name of the contact?
+		  xmp_set_array_item (xmp, FACE, "contact", 1, fetched, 0);
+		  }
+
+		  if (g_strcmp0 (row[1], LOCATION_PREFIX "country") == 0) {
+		  xmp_delete_property (xmp, NS_PHOTOSHOP, "Country");
+		  xmp_set_array_item (xmp, NS_PHOTOSHOP, "Country", 1, row[2], 0);
+		  }
+
+		  if (g_strcmp0 (row[1], LOCATION_PREFIX "city") == 0) {
+		  xmp_delete_property (xmp, NS_PHOTOSHOP, "City");
+		  xmp_set_array_item (xmp, NS_PHOTOSHOP, "City", 1, row[2], 0);
+		  } */
 
 	}
 
@@ -315,10 +315,10 @@ const gchar * const *
 writeback_module_get_rdf_types (void)
 {
 	static const gchar *rdf_types[] = {
-	        TRACKER_NFO_PREFIX "Image",
-	        TRACKER_NFO_PREFIX "Audio",
-	        TRACKER_NFO_PREFIX "Video",
-	        NULL
+		TRACKER_NFO_PREFIX "Image",
+		TRACKER_NFO_PREFIX "Audio",
+		TRACKER_NFO_PREFIX "Video",
+		NULL
 	};
 
 	return rdf_types;
diff --git a/tests/common/tracker-test-helpers.c b/tests/common/tracker-test-helpers.c
index cb1774a..9adeaa7 100644
--- a/tests/common/tracker-test-helpers.c
+++ b/tests/common/tracker-test-helpers.c
@@ -23,7 +23,7 @@ static gchar *nonutf8_str = NULL;
 
 gboolean
 tracker_test_helpers_cmpstr_equal (const gchar *obtained,
-				   const gchar *expected)
+                                   const gchar *expected)
 {
 	gboolean result;
 
diff --git a/tests/common/tracker-test-helpers.h b/tests/common/tracker-test-helpers.h
index 5953ad2..c1410c4 100644
--- a/tests/common/tracker-test-helpers.h
+++ b/tests/common/tracker-test-helpers.h
@@ -25,9 +25,9 @@
 G_BEGIN_DECLS
 
 gboolean     tracker_test_helpers_cmpstr_equal (const gchar *obtained,
-						const gchar *expected);
+                                                const gchar *expected);
 const gchar *tracker_test_helpers_get_nonutf8  (void);
-void	     tracker_test_helpers_free_nonutf8 (void);
+void         tracker_test_helpers_free_nonutf8 (void);
 
 G_END_DECLS
 
diff --git a/tests/libtracker-common/mock-thumbnailer-dbus.c b/tests/libtracker-common/mock-thumbnailer-dbus.c
index 608fe9a..dd1f674 100644
--- a/tests/libtracker-common/mock-thumbnailer-dbus.c
+++ b/tests/libtracker-common/mock-thumbnailer-dbus.c
@@ -30,7 +30,7 @@
 DBusGConnection*
 dbus_g_bus_get (DBusBusType type, GError **error)
 {
-        return (DBusGConnection *)g_strdup ("mock connection");
+	return (DBusGConnection *)g_strdup ("mock connection");
 }
 
 DBusGProxy*
@@ -39,7 +39,7 @@ dbus_g_proxy_new_for_name (DBusGConnection *connection,
                            const char *path,
                            const char *interface)
 {
-        return (DBusGProxy *)mock_dbus_gproxy_new ();
+	return (DBusGProxy *)mock_dbus_gproxy_new ();
 }
 
 gboolean
@@ -49,25 +49,25 @@ dbus_g_proxy_call (DBusGProxy *proxy,
                    GType first_arg_type,
                    ...)
 {
-        va_list args;
+	va_list args;
 
-        g_message ("DBUS-CALL: %s", method);
+	g_message ("DBUS-CALL: %s", method);
 
-        va_start (args, first_arg_type);
+	va_start (args, first_arg_type);
 
-        if (g_strcmp0 (method, "GetSupported") == 0) {
-                GType *t;
-                GStrv *mime_types;
-                gchar *mimetypes[] = {"image/jpeg", "image/png", NULL};
+	if (g_strcmp0 (method, "GetSupported") == 0) {
+		GType *t;
+		GStrv *mime_types;
+		gchar *mimetypes[] = {"image/jpeg", "image/png", NULL};
 
-                t = va_arg (args, GType*);
-                mime_types = va_arg (args, GStrv*);
+		t = va_arg (args, GType*);
+		mime_types = va_arg (args, GStrv*);
 
-                *mime_types = g_strdupv (mimetypes);
-        }
+		*mime_types = g_strdupv (mimetypes);
+	}
 
-        va_end (args);
-        return TRUE;
+	va_end (args);
+	return TRUE;
 }
 
 void
@@ -75,6 +75,6 @@ dbus_g_proxy_call_no_reply (DBusGProxy *proxy,
                             const char *method,
                             GType first_arg_type,...)
 {
-        g_message ("DBUS-CALL: %s", method);
+	g_message ("DBUS-CALL: %s", method);
 }
 
diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c
index 4b5730c..de254cb 100644
--- a/tests/libtracker-common/tracker-dbus-test.c
+++ b/tests/libtracker-common/tracker-dbus-test.c
@@ -27,9 +27,9 @@ static void
 slist_to_strv (gboolean utf8)
 {
 	GSList *input = NULL;
-	gint	i;
+	gint    i;
 	gchar **input_as_strv;
-	gint	strings = 5;
+	gint    strings = 5;
 
 	for (i = 0; i < strings; i++) {
 		if (utf8) {
diff --git a/tests/libtracker-common/tracker-field-test.c b/tests/libtracker-common/tracker-field-test.c
index cfc37d4..2fb9f25 100644
--- a/tests/libtracker-common/tracker-field-test.c
+++ b/tests/libtracker-common/tracker-field-test.c
@@ -36,15 +36,15 @@ test_type_to_string ()
 	result = tracker_property_type_to_string (type);
 	g_assert (tracker_test_helpers_cmpstr_equal (result, "date"));
 
-	type =	TRACKER_PROPERTY_TYPE_BLOB;
+	type =  TRACKER_PROPERTY_TYPE_BLOB;
 	result = tracker_property_type_to_string (type);
 	g_assert (tracker_test_helpers_cmpstr_equal (result, "blob"));
 
-	type =	TRACKER_PROPERTY_TYPE_STRUCT;
+	type =  TRACKER_PROPERTY_TYPE_STRUCT;
 	result = tracker_property_type_to_string (type);
 	g_assert (tracker_test_helpers_cmpstr_equal (result, "struct"));
 
-	type =	TRACKER_PROPERTY_TYPE_RESOURCE;
+	type =  TRACKER_PROPERTY_TYPE_RESOURCE;
 	result = tracker_property_type_to_string (type);
 	g_assert (tracker_test_helpers_cmpstr_equal (result, "link"));
 
@@ -65,7 +65,7 @@ main (int argc, char **argv) {
 	/* Init */
 
 	g_test_add_func ("/libtracker-common/tracker-field/type_to_string",
-			 test_type_to_string);
+	                 test_type_to_string);
 
 	result = g_test_run ();
 
diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
index d211d03..91a2b6e 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@ -154,7 +154,7 @@ test_path_evaluate_name (void)
 
 	result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
 	tracker_test_helpers_cmpstr_equal (result,
-					   tracker_test_helpers_get_nonutf8 ());
+	                                   tracker_test_helpers_get_nonutf8 ());
 
 	g_unsetenv ("TEST_TRACKER_DIR");
 }
@@ -191,13 +191,13 @@ main (int argc, char **argv)
 
 
 	g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_evaluate_name",
-			 test_path_evaluate_name);
+	                 test_path_evaluate_name);
 
 	g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_list_filter_duplicates",
-			 test_path_list_filter_duplicates);
+	                 test_path_list_filter_duplicates);
 
 	g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/file_get_mime_type",
-			 test_file_get_mime_type);
+	                 test_file_get_mime_type);
 
 	result = g_test_run ();
 
diff --git a/tests/libtracker-common/tracker-type-utils-test.c b/tests/libtracker-common/tracker-type-utils-test.c
index 96a4486..d1afa74 100644
--- a/tests/libtracker-common/tracker-type-utils-test.c
+++ b/tests/libtracker-common/tracker-type-utils-test.c
@@ -36,8 +36,8 @@ test_date_format (void)
 	g_assert (result == NULL);
 
 	/* Fails
-	result = tracker_date_format ("1978"); //Audio.ReleaseDate
-	g_assert (tracker_test_helpers_cmpstr_equal (result, "1978-01-01T00:00:00"));
+	   result = tracker_date_format ("1978"); //Audio.ReleaseDate
+	   g_assert (tracker_test_helpers_cmpstr_equal (result, "1978-01-01T00:00:00"));
 	*/
 
 	result = tracker_date_format ("2008-06-14");
@@ -70,9 +70,9 @@ test_date_format (void)
 static void
 test_string_to_date (void)
 {
-	GDate	  *expected;
-	GDate	  *result;
-	time_t	   result_time_t;
+	GDate     *expected;
+	GDate     *result;
+	time_t     result_time_t;
 	const gchar  *input = "2008-06-16T11:10:10+0600";
 	gchar  *timezone = g_strdup (g_getenv ("TZ"));
 
@@ -112,8 +112,8 @@ test_string_to_date (void)
 	g_assert_cmpint (result_time_t, ==, -1);
 
 	/* Fails! Check the code
-	result_time_t = tracker_string_to_date ("2008-06-32T04:23:10+0000");
-	g_assert_cmpint (result_time_t, ==, -1);
+	   result_time_t = tracker_string_to_date ("2008-06-32T04:23:10+0000");
+	   g_assert_cmpint (result_time_t, ==, -1);
 	*/
 }
 
@@ -121,8 +121,8 @@ static void
 test_date_to_string (void)
 {
 	struct tm *original;
-	time_t	   input;
-	gchar	  *result;
+	time_t     input;
+	gchar     *result;
 
 	original = g_new0 (struct tm, 1);
 	original->tm_sec = 10;
@@ -288,9 +288,9 @@ test_gslist_to_string_list (void)
 	result = tracker_gslist_to_string_list (input);
 
 	g_assert (tracker_test_helpers_cmpstr_equal (result[0], "one") &&
-		  tracker_test_helpers_cmpstr_equal (result[1], "two") &&
-		  tracker_test_helpers_cmpstr_equal (result[2], "three") &&
-		  tracker_test_helpers_cmpstr_equal (result[3], "four"));
+	          tracker_test_helpers_cmpstr_equal (result[1], "two") &&
+	          tracker_test_helpers_cmpstr_equal (result[2], "three") &&
+	          tracker_test_helpers_cmpstr_equal (result[3], "four"));
 
 	g_strfreev (result);
 
@@ -396,31 +396,31 @@ main (int argc, char **argv)
 	g_test_init (&argc, &argv, NULL);
 
 	g_test_add_func ("/libtracker-common/tracker-type-utils/boolean_as_text_to_number",
-			 test_boolean_as_text_to_number);
+	                 test_boolean_as_text_to_number);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/string_list_as_list",
-			 test_string_list_to_string);
+	                 test_string_list_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/gslist_to_string_list",
-			 test_gslist_to_string_list);
+	                 test_gslist_to_string_list);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/string_in_string_list",
-			 test_string_in_string_list);
+	                 test_string_in_string_list);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_uint",
-			 test_string_to_uint);
+	                 test_string_to_uint);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/guint32_to_string",
-			 test_guint32_to_string);
+	                 test_guint32_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/gint32_to_string",
-			 test_gint32_to_string);
+	                 test_gint32_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/uint_to_string",
-			 test_uint_to_string);
+	                 test_uint_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/int_to_string",
-			 test_int_to_string);
+	                 test_int_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/long_to_string",
-			 test_long_to_string);
+	                 test_long_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/date_format",
-			 test_date_format);
+	                 test_date_format);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/date_to_string",
-			 test_date_to_string);
+	                 test_date_to_string);
 	g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_date",
-			 test_string_to_date);
+	                 test_string_to_date);
 	result = g_test_run ();
 
 	return result;
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index ce4f9a2..ecdcff1 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -95,8 +95,8 @@ test_query (gconstpointer test_data)
 
 	/* initialization */
 	tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-		                   NULL,
-				   NULL, NULL);
+	                           NULL,
+	                           NULL, NULL);
 
 	/* load data set */
 	data_filename = g_strconcat (data_prefix, ".ttl", NULL);
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c
index 9a485ae..8a779fd 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -43,16 +43,16 @@ test_blank (void)
 
 	/* initialization */
 	tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-		                   NULL,
-				   NULL, NULL);
+	                           NULL,
+	                           NULL, NULL);
 
 	/* perform update in transaction */
 
 	tracker_data_begin_transaction ();
 	updates = tracker_data_update_sparql_blank (
-		"INSERT { _:foo a rdfs:Resource } "
-		"INSERT { _:foo a rdfs:Resource . _:bar a rdfs:Resource } ",
-		&error);
+	                                            "INSERT { _:foo a rdfs:Resource } "
+	                                            "INSERT { _:foo a rdfs:Resource . _:bar a rdfs:Resource } ",
+	                                            &error);
 	tracker_data_commit_transaction ();
 	g_assert (error == NULL);
 
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 32b644d..45f4c19 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -112,8 +112,8 @@ test_sparql_query (gconstpointer test_data)
 	g_free (prefix);
 
 	tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-		                   data_prefix,
-				   NULL, NULL);
+	                           data_prefix,
+	                           NULL, NULL);
 
 	/* data_path = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL); */
 
diff --git a/tests/libtracker-db/tracker-db-dbus-test.c b/tests/libtracker-db/tracker-db-dbus-test.c
index 867d1e3..1e75934 100644
--- a/tests/libtracker-db/tracker-db-dbus-test.c
+++ b/tests/libtracker-db/tracker-db-dbus-test.c
@@ -149,7 +149,7 @@ test_dbus_query_result_to_strv ()
 
 	TrackerDBResultSet *result_set = NULL;
 	gchar **result;
-	gint	count;
+	gint    count;
 
 	/* NULL */
 	result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
@@ -301,9 +301,9 @@ test_dbus_query_result_columns_to_strv ()
 
 	/* NULL */
 	result = tracker_dbus_query_result_columns_to_strv (result_set,
-							    -1,
-							    -1,
-							    TRUE);
+	                                                    -1,
+	                                                    -1,
+	                                                    TRUE);
 	g_assert_cmpint (g_strv_length (result), ==, 0);
 	g_strfreev (result);
 
@@ -355,7 +355,7 @@ test_dbus_query_result_columns_to_strv ()
 	result = tracker_dbus_query_result_columns_to_strv (result_set, -1, -1, TRUE);
 
 	g_assert_cmpint (g_strv_length (result), ==, 2);
- 	tracker_test_helpers_cmpstr_equal (result[0], "value 0|value 0");
+	tracker_test_helpers_cmpstr_equal (result[0], "value 0|value 0");
 	tracker_test_helpers_cmpstr_equal (result[1], "value 1");
 	g_strfreev (result);
 
@@ -373,15 +373,15 @@ main (gint argc, gchar **argv)
 	g_test_init (&argc, &argv, NULL);
 
 	g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_strv",
-			 test_dbus_query_result_to_strv);
+	                 test_dbus_query_result_to_strv);
 	g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_hash_table",
-			 test_dbus_query_result_to_hash_table);
+	                 test_dbus_query_result_to_hash_table);
 	g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_ptr_array",
-			 test_dbus_query_result_to_ptr_array);
+	                 test_dbus_query_result_to_ptr_array);
 	g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_multi_to_ptr_array",
-			 test_dbus_query_result_multi_to_ptr_array);
+	                 test_dbus_query_result_multi_to_ptr_array);
 	g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_columns_to_strv",
-			 test_dbus_query_result_columns_to_strv);
+	                 test_dbus_query_result_columns_to_strv);
 	result = g_test_run ();
 
 	/* End */
diff --git a/tests/libtracker-db/tracker-db-manager-common.c b/tests/libtracker-db/tracker-db-manager-common.c
index c65d3c8..6c267ca 100644
--- a/tests/libtracker-db/tracker-db-manager-common.c
+++ b/tests/libtracker-db/tracker-db-manager-common.c
@@ -37,8 +37,8 @@ test_assert_query_run_on_iface (TrackerDBInterface *iface, const gchar *query)
 	GError *error = NULL;
 
 	result_set = tracker_db_interface_execute_query (iface,
-							 &error,
-							 query);
+	                                                 &error,
+	                                                 query);
 
 	if (error && error->message) {
 		g_warning ("Error loading query:'%s' - %s", query, error->message);
diff --git a/tests/libtracker-db/tracker-db-manager-test-attach.c b/tests/libtracker-db/tracker-db-manager-test-attach.c
index 843885b..cb37440 100644
--- a/tests/libtracker-db/tracker-db-manager-test-attach.c
+++ b/tests/libtracker-db/tracker-db-manager-test-attach.c
@@ -42,7 +42,7 @@ ensure_db_manager_is_reindex (gboolean must_reindex)
 	if (db_manager_status == NO_INIT) {
 		if (must_reindex) {
 			tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-						 &first);
+			                         &first);
 			db_manager_status = INIT_REINDEX;
 		} else {
 			tracker_db_manager_init (0, &first);
@@ -64,7 +64,7 @@ ensure_db_manager_is_reindex (gboolean must_reindex)
 	tracker_db_manager_shutdown ();
 	if (must_reindex) {
 		tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-					 &first);
+		                         &first);
 		db_manager_status = INIT_REINDEX;
 	} else {
 		tracker_db_manager_init (0, &first);
@@ -117,13 +117,13 @@ main (int argc, char **argv) {
 
 	// Tests with attach and no-reindex
 	g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/common_db_tables",
-			test_creation_common_db_no_reindex);
+	                 test_creation_common_db_no_reindex);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_meta_db_tables",
-			 test_creation_file_meta_db_no_reindex);
+	                 test_creation_file_meta_db_no_reindex);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_contents_db_tables",
-			 test_creation_file_contents_db_no_reindex);
+	                 test_creation_file_contents_db_no_reindex);
 
 
 	result = g_test_run ();
diff --git a/tests/libtracker-db/tracker-db-manager-test-custom.c b/tests/libtracker-db/tracker-db-manager-test-custom.c
index a74626d..4931901 100644
--- a/tests/libtracker-db/tracker-db-manager-test-custom.c
+++ b/tests/libtracker-db/tracker-db-manager-test-custom.c
@@ -38,9 +38,9 @@ test_custom_common_filemeta_filecontents ()
 	TrackerDBInterface *iface;
 
 	iface = tracker_db_manager_get_db_interfaces (3,
-						      TRACKER_DB_COMMON,
-						      TRACKER_DB_FILE_METADATA,
-						      TRACKER_DB_FILE_CONTENTS);
+	                                              TRACKER_DB_COMMON,
+	                                              TRACKER_DB_FILE_METADATA,
+	                                              TRACKER_DB_FILE_CONTENTS);
 
 	test_assert_tables_in_db (iface, "SELECT * FROM MetadataTypes");
 	test_assert_tables_in_db (iface, "SELECT * FROM ServiceMetadata");
@@ -60,10 +60,10 @@ main (int argc, char **argv) {
 
 	/* Init */
 	tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-				 &first_time);
+	                         &first_time);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/custom/common_filemeta_filecontents",
-			test_custom_common_filemeta_filecontents);
+	                 test_custom_common_filemeta_filecontents);
 
 	result = g_test_run ();
 
diff --git a/tests/libtracker-db/tracker-db-manager-test-unattach.c b/tests/libtracker-db/tracker-db-manager-test-unattach.c
index 08ff5dc..35d5845 100644
--- a/tests/libtracker-db/tracker-db-manager-test-unattach.c
+++ b/tests/libtracker-db/tracker-db-manager-test-unattach.c
@@ -81,25 +81,25 @@ main (int argc, char **argv) {
 
 	/* Init */
 	tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-				 &first_time);
+	                         &first_time);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/common_db_tables",
-			test_creation_common_db);
+	                 test_creation_common_db);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/cache_db_tables",
-			test_creation_cache_db);
+	                 test_creation_cache_db);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_meta_db_tables",
-			 test_creation_file_meta_db);
+	                 test_creation_file_meta_db);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_contents_db_tables",
-			 test_creation_file_contents_db);
+	                 test_creation_file_contents_db);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_meta_db_tables",
-			 test_creation_email_meta_db);
+	                 test_creation_email_meta_db);
 
 	g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_contents_db_tables",
-			 test_creation_email_contents_db);
+	                 test_creation_email_contents_db);
 
 	result = g_test_run ();
 
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index 6e07a07..f002d2f 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -70,8 +70,8 @@ test_sparql_query (gconstpointer test_data)
 	g_free (prefix);
 
 	tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
-		                   data_prefix,
-				   NULL, NULL);
+	                           data_prefix,
+	                           NULL, NULL);
 
 	/* load data / perform updates */
 
diff --git a/tests/tracker-extract/tracker-extract-gstreamer-test.c b/tests/tracker-extract/tracker-extract-gstreamer-test.c
index 2de7f9c..1f07b10 100644
--- a/tests/tracker-extract/tracker-extract-gstreamer-test.c
+++ b/tests/tracker-extract/tracker-extract-gstreamer-test.c
@@ -48,23 +48,23 @@ main (int argc, char **argv) {
 	g_free (path);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/check-extract-data",
-			      data, test_tracker_extract_check_extract_data);
+	                      data, test_tracker_extract_check_extract_data);
 
 #if 0
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/id3v1_basic",
-			      data, test_tracker_extract_mp3_id3v1_basic);
+	                      data, test_tracker_extract_mp3_id3v1_basic);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/id3v23_basic",
-			      data, test_tracker_extract_mp3_id3v23_basic);
+	                      data, test_tracker_extract_mp3_id3v23_basic);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/id3v23_tags",
-			      data, test_tracker_extract_mp3_id3v23_tags);
-/* 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/header_bitrate", */
-/* 			      data, test_tracker_extract_mp3_header_bitrate); */
+	                      data, test_tracker_extract_mp3_id3v23_tags);
+	/*      g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/header_bitrate", */
+	/*                            data, test_tracker_extract_mp3_header_bitrate); */
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/header_sampling",
-			      data, test_tracker_extract_mp3_header_sampling);
+	                      data, test_tracker_extract_mp3_header_sampling);
 
 	if (g_test_perf()) {
 		g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/performance_cbr",
-				      data, test_tracker_extract_mp3_performance);
+		                      data, test_tracker_extract_mp3_performance);
 	}
 
 	path = g_build_filename (MODULESDIR, "libextract-gstreamer", NULL);
@@ -72,7 +72,7 @@ main (int argc, char **argv) {
 	g_free (path);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/avi/basic_tags",
-			      data, test_tracker_extract_avi_basic_tags);
+	                      data, test_tracker_extract_avi_basic_tags);
 
 #endif
 
diff --git a/tests/tracker-extract/tracker-extract-jpeg-test.c b/tests/tracker-extract/tracker-extract-jpeg-test.c
index d9a076e..3248ba1 100644
--- a/tests/tracker-extract/tracker-extract-jpeg-test.c
+++ b/tests/tracker-extract/tracker-extract-jpeg-test.c
@@ -47,29 +47,29 @@ main (int argc, char **argv) {
 	g_free (path);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/check-extract-data",
-			      data, test_tracker_extract_check_extract_data);
-	
+	                      data, test_tracker_extract_check_extract_data);
+        
 #if 0
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/basic_size",
-			      data, test_tracker_extract_jpeg_basic_size);
+	                      data, test_tracker_extract_jpeg_basic_size);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/exif_size",
-			      data, test_tracker_extract_jpeg_exif_size);
+	                      data, test_tracker_extract_jpeg_exif_size);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/exif_orientation",
-			      data, test_tracker_extract_jpeg_exif_orientation);
+	                      data, test_tracker_extract_jpeg_exif_orientation);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/exif_flash",
-			      data, test_tracker_extract_jpeg_exif_flash);
+	                      data, test_tracker_extract_jpeg_exif_flash);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/exif_tags",
-			      data, test_tracker_extract_jpeg_exif_tags);
+	                      data, test_tracker_extract_jpeg_exif_tags);
 
 	/*
-	if (g_test_perf()) {
-		g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/performance",
-				      data, test_tracker_extract_jpeg_performance);
-	}*/
+	  if (g_test_perf()) {
+	  g_test_add_data_func ("/tracker-extract/tracker-extract-jpeg/performance",
+	  data, test_tracker_extract_jpeg_performance);
+	  }*/
 
 #endif
 
diff --git a/tests/tracker-extract/tracker-extract-mp3-test.c b/tests/tracker-extract/tracker-extract-mp3-test.c
index 682e2b6..87f3f78 100644
--- a/tests/tracker-extract/tracker-extract-mp3-test.c
+++ b/tests/tracker-extract/tracker-extract-mp3-test.c
@@ -48,30 +48,30 @@ main (int argc, char **argv) {
 	g_free (path);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/check-extract-data",
-			      data, test_tracker_extract_check_extract_data);
+	                      data, test_tracker_extract_check_extract_data);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/access",
-			      data, test_tracker_extract_mp3_access);
+	                      data, test_tracker_extract_mp3_access);
 
 #if 0
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v1_basic",
-			      data, test_tracker_extract_mp3_id3v1_basic);
+	                      data, test_tracker_extract_mp3_id3v1_basic);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_basic",
-			      data, test_tracker_extract_mp3_id3v23_basic);
+	                      data, test_tracker_extract_mp3_id3v23_basic);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_tcon",
-			      data, test_tracker_extract_mp3_id3v23_tcon);
+	                      data, test_tracker_extract_mp3_id3v23_tcon);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_tags",
-			      data, test_tracker_extract_mp3_id3v23_tags);
+	                      data, test_tracker_extract_mp3_id3v23_tags);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/header_bitrate",
-			      data, test_tracker_extract_mp3_header_bitrate);
+	                      data, test_tracker_extract_mp3_header_bitrate);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/header_sampling",
-			      data, test_tracker_extract_mp3_header_sampling);
+	                      data, test_tracker_extract_mp3_header_sampling);
 
 
 	if (g_test_perf()) {
 		g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/performance_cbr",
-				      data, test_tracker_extract_mp3_performance);
+		                      data, test_tracker_extract_mp3_performance);
 	}
 
 #endif
diff --git a/tests/tracker-extract/tracker-extract-png-test.c b/tests/tracker-extract/tracker-extract-png-test.c
index 9095792..ee96fc7 100644
--- a/tests/tracker-extract/tracker-extract-png-test.c
+++ b/tests/tracker-extract/tracker-extract-png-test.c
@@ -47,18 +47,18 @@ main (int argc, char **argv) {
 	g_free (path);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-png/check-extract-data",
-			      data, test_tracker_extract_check_extract_data);
+	                      data, test_tracker_extract_check_extract_data);
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-png/basic_size",
-			      data, test_tracker_extract_png_basic_size);
+	                      data, test_tracker_extract_png_basic_size);
 
-/* 	g_test_add_data_func ("/tracker-extract/tracker-extract-png/xmp_exif_orientation", */
-/* 			      data, test_tracker_extract_png_xmp_exif_orientation); */
+	/*      g_test_add_data_func ("/tracker-extract/tracker-extract-png/xmp_exif_orientation", */
+	/*                            data, test_tracker_extract_png_xmp_exif_orientation); */
 
-/*	if (g_test_perf()) {
-		g_test_add_data_func ("/tracker-extract/tracker-extract-png/performance",
-				      data, performance_tracker_extract_png);
-	}*/
+	/*      if (g_test_perf()) {
+	        g_test_add_data_func ("/tracker-extract/tracker-extract-png/performance",
+	        data, performance_tracker_extract_png);
+	        }*/
 
 	result = g_test_run ();
 
diff --git a/tests/tracker-extract/tracker-extract-test-utils.c b/tests/tracker-extract/tracker-extract-test-utils.c
index cadb0ca..23b48cc 100644
--- a/tests/tracker-extract/tracker-extract-test-utils.c
+++ b/tests/tracker-extract/tracker-extract-test-utils.c
@@ -64,9 +64,9 @@ parse_file (const gchar *filename)
 	gint fd;
 
 	testdata = g_hash_table_new_full (g_str_hash,
-					  g_str_equal,
-					  g_free,
-					  g_free);
+	                                  g_str_equal,
+	                                  g_free,
+	                                  g_free);
 
 	fd = g_open (filename, O_RDONLY);
 
@@ -92,8 +92,8 @@ parse_file (const gchar *filename)
 			switch (ttype) {
 			case G_TOKEN_STRING:
 				g_hash_table_insert (testdata,
-						     g_strdup(key),
-						     g_strdup(scanner->value.v_string));
+				                     g_strdup(key),
+				                     g_strdup(scanner->value.v_string));
 				break;
 
 			default:
@@ -111,7 +111,7 @@ parse_file (const gchar *filename)
 
 static void
 dump_metadata_item (const gchar *key,
-		    const gchar *value)
+                    const gchar *value)
 {
 	gchar *value_utf8;
 
@@ -150,8 +150,8 @@ dump_metadata (GPtrArray *metadata)
 
 static void
 check_metadata (GPtrArray   *metadata,
-		const gchar *key,
-		const gchar *value)
+                const gchar *key,
+                const gchar *value)
 {
 	GValueArray *statement;
 	const gchar *subject, *predicate, *object;
@@ -247,8 +247,8 @@ free_statements (GPtrArray *metadata)
 
 void
 tracker_test_extract_file (const TrackerExtractData *data,
-			   const gchar              *file,
-			   const gchar              *test_data_file)
+                           const gchar              *file,
+                           const gchar              *test_data_file)
 {
 	GPtrArray  *metadata;
 	GHashTable *test_data;
@@ -290,8 +290,8 @@ tracker_test_extract_file (const TrackerExtractData *data,
 
 void
 tracker_test_extract_file_performance (const TrackerExtractData *data,
-				       const gchar              *file_match,
-				       guint                     file_count)
+                                       const gchar              *file_match,
+                                       guint                     file_count)
 {
 	double perftime;
 	guint i;
@@ -336,8 +336,8 @@ tracker_test_extract_file_performance (const TrackerExtractData *data,
 
 void
 tracker_test_extract_file_access (const TrackerExtractData *data,
-				  const gchar              *file_match,
-				  guint                     file_count)
+                                  const gchar              *file_match,
+                                  guint                     file_count)
 {
 	guint i;
 
diff --git a/tests/tracker-extract/tracker-extract-test-utils.h b/tests/tracker-extract/tracker-extract-test-utils.h
index bc484e6..d18416e 100644
--- a/tests/tracker-extract/tracker-extract-test-utils.h
+++ b/tests/tracker-extract/tracker-extract-test-utils.h
@@ -30,15 +30,15 @@
 #include <tracker-extract/tracker-main.h>
 
 TrackerExtractData *tracker_test_extract_get_extract      (const gchar              *path,
-							   const gchar              *mime);
+                                                           const gchar              *mime);
 void                tracker_test_extract_file             (const TrackerExtractData *data,
-							   const gchar              *file,
-							   const gchar              *testdatafile);
+                                                           const gchar              *file,
+                                                           const gchar              *testdatafile);
 void                tracker_test_extract_file_performance (const TrackerExtractData *data,
-							   const gchar              *file_match,
-							   guint                     file_count);
+                                                           const gchar              *file_match,
+                                                           guint                     file_count);
 void                tracker_test_extract_file_access      (const TrackerExtractData *data,
-							   const gchar              *file_match,
-							   guint                     file_count);
+                                                           const gchar              *file_match,
+                                                           guint                     file_count);
 
 #endif
diff --git a/tests/tracker-extract/tracker-extract-testsuite-avi.c b/tests/tracker-extract/tracker-extract-testsuite-avi.c
index a1190e8..213ca58 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-avi.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-avi.c
@@ -40,8 +40,8 @@ test_tracker_extract_avi_basic_tags (gconstpointer data)
 
 	for (i = 0; data_basic_tags[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_basic_tags[i].filename,
-					   data_basic_tags[i].testdata);
+		                           data_basic_tags[i].filename,
+		                           data_basic_tags[i].testdata);
 	}
 }
 
diff --git a/tests/tracker-extract/tracker-extract-testsuite-jpeg.c b/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
index 248cfeb..3833501 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
@@ -112,8 +112,8 @@ test_tracker_extract_jpeg_basic_size (gconstpointer data)
 
 	for (i = 0; data_basic_size[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_basic_size[i].filename,
-					   data_basic_size[i].testdata);
+		                           data_basic_size[i].filename,
+		                           data_basic_size[i].testdata);
 	}
 }
 
@@ -124,8 +124,8 @@ test_tracker_extract_jpeg_exif_size (gconstpointer data)
 
 	for (i = 0; data_exif_size[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_exif_size[i].filename,
-					   data_exif_size[i].testdata);
+		                           data_exif_size[i].filename,
+		                           data_exif_size[i].testdata);
 	}
 }
 
@@ -136,8 +136,8 @@ test_tracker_extract_jpeg_exif_orientation (gconstpointer data)
 
 	for (i = 0; data_exif_orientation[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_exif_orientation[i].filename,
-					   data_exif_orientation[i].testdata);
+		                           data_exif_orientation[i].filename,
+		                           data_exif_orientation[i].testdata);
 	}
 }
 
@@ -148,8 +148,8 @@ test_tracker_extract_jpeg_exif_flash (gconstpointer data)
 
 	for (i = 0; data_exif_flash[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_exif_flash[i].filename,
-					   data_exif_flash[i].testdata);
+		                           data_exif_flash[i].filename,
+		                           data_exif_flash[i].testdata);
 	}
 }
 
@@ -160,8 +160,8 @@ test_tracker_extract_jpeg_exif_tags (gconstpointer data)
 
 	for (i = 0; data_exif_tags[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_exif_tags[i].filename,
-					   data_exif_tags[i].testdata);
+		                           data_exif_tags[i].filename,
+		                           data_exif_tags[i].testdata);
 	}
 }
 
diff --git a/tests/tracker-extract/tracker-extract-testsuite-mp3.c b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
index ffbd991..e4bfcae 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-mp3.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
@@ -113,8 +113,8 @@ test_tracker_extract_mp3_id3v1_basic (gconstpointer data)
 
 	for (i = 0; data_id3v1_basic[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_id3v1_basic[i].filename,
-					   data_id3v1_basic[i].testdata);
+		                           data_id3v1_basic[i].filename,
+		                           data_id3v1_basic[i].testdata);
 	}
 }
 
@@ -125,8 +125,8 @@ test_tracker_extract_mp3_id3v23_basic (gconstpointer data)
 
 	for (i = 0; data_id3v23_basic[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_id3v23_basic[i].filename,
-					   data_id3v23_basic[i].testdata);
+		                           data_id3v23_basic[i].filename,
+		                           data_id3v23_basic[i].testdata);
 	}
 }
 
@@ -137,8 +137,8 @@ test_tracker_extract_mp3_id3v23_tags (gconstpointer data)
 
 	for (i = 0; data_id3v23_tags[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_id3v23_tags[i].filename,
-					   data_id3v23_tags[i].testdata);
+		                           data_id3v23_tags[i].filename,
+		                           data_id3v23_tags[i].testdata);
 	}
 }
 
@@ -149,8 +149,8 @@ test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
 
 	for (i = 0; data_id3v23_tcon[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_id3v23_tcon[i].filename,
-					   data_id3v23_tcon[i].testdata);
+		                           data_id3v23_tcon[i].filename,
+		                           data_id3v23_tcon[i].testdata);
 	}
 }
 
@@ -161,8 +161,8 @@ test_tracker_extract_mp3_header_bitrate (gconstpointer data)
 
 	for (i = 0; data_header_bitrate[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_header_bitrate[i].filename,
-					   data_header_bitrate[i].testdata);
+		                           data_header_bitrate[i].filename,
+		                           data_header_bitrate[i].testdata);
 	}
 }
 
@@ -173,8 +173,8 @@ test_tracker_extract_mp3_header_bitrate_vbr (gconstpointer data)
 
 	for (i = 0; data_header_bitrate_vbr[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_header_bitrate_vbr[i].filename,
-					   data_header_bitrate_vbr[i].testdata);
+		                           data_header_bitrate_vbr[i].filename,
+		                           data_header_bitrate_vbr[i].testdata);
 	}
 }
 
@@ -185,8 +185,8 @@ test_tracker_extract_mp3_header_sampling (gconstpointer data)
 
 	for (i = 0; data_header_sampling[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_header_sampling[i].filename,
-					   data_header_sampling[i].testdata);
+		                           data_header_sampling[i].filename,
+		                           data_header_sampling[i].testdata);
 	}
 }
 
diff --git a/tests/tracker-extract/tracker-extract-testsuite-png.c b/tests/tracker-extract/tracker-extract-testsuite-png.c
index 7e1093c..9e7a90a 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-png.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-png.c
@@ -56,8 +56,8 @@ test_tracker_extract_png_basic_size (gconstpointer data)
 
 	for (i = 0; data_basic_size[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_basic_size[i].filename,
-					   data_basic_size[i].testdata);
+		                           data_basic_size[i].filename,
+		                           data_basic_size[i].testdata);
 	}
 }
 
@@ -68,8 +68,8 @@ test_tracker_extract_png_xmp_exif_orientation (gconstpointer data)
 
 	for (i = 0; data_xmp_exif_orientation[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_xmp_exif_orientation[i].filename,
-					   data_xmp_exif_orientation[i].testdata);
+		                           data_xmp_exif_orientation[i].filename,
+		                           data_xmp_exif_orientation[i].testdata);
 	}
 }
 
diff --git a/tests/tracker-extract/tracker-extract-testsuite-tiff.c b/tests/tracker-extract/tracker-extract-testsuite-tiff.c
index 0ad8629..276bf0f 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-tiff.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-tiff.c
@@ -61,8 +61,8 @@ test_tracker_extract_tiff_basic_size (gconstpointer data)
 
 	for (i = 0; data_basic_size[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_basic_size[i].filename,
-					   data_basic_size[i].testdata);
+		                           data_basic_size[i].filename,
+		                           data_basic_size[i].testdata);
 	}
 }
 
@@ -75,8 +75,8 @@ test_tracker_extract_tiff_exif_size (gconstpointer data)
 		g_debug ("Filename: %s", data_basic_size[i].filename);
 
 		tracker_test_extract_file (data,
-					   data_exif_size[i].filename,
-					   data_exif_size[i].testdata);
+		                           data_exif_size[i].filename,
+		                           data_exif_size[i].testdata);
 	}
 }
 
@@ -87,8 +87,8 @@ test_tracker_extract_tiff_exif_orientation (gconstpointer data)
 
 	for (i = 0; data_exif_orientation[i].filename; i++) {
 		tracker_test_extract_file (data,
-					   data_exif_orientation[i].filename,
-					   data_exif_orientation[i].testdata);
+		                           data_exif_orientation[i].filename,
+		                           data_exif_orientation[i].testdata);
 	}
 }
 
diff --git a/tests/tracker-extract/tracker-extract-tiff-test.c b/tests/tracker-extract/tracker-extract-tiff-test.c
index 213bae7..6e3cda7 100644
--- a/tests/tracker-extract/tracker-extract-tiff-test.c
+++ b/tests/tracker-extract/tracker-extract-tiff-test.c
@@ -45,23 +45,23 @@ main (int argc, char **argv) {
 	path = g_build_filename (MODULESDIR, "libextract-tiff", NULL);
 	data = tracker_test_extract_get_extract (path, "image/tiff");
 	g_free (path);
-	
+        
 	g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/check-extract-data",
-			      data, test_tracker_extract_check_extract_data);
-	
+	                      data, test_tracker_extract_check_extract_data);
+        
 #if 0
 	g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/basic_size",
-			      data, test_tracker_extract_tiff_basic_size);
+	                      data, test_tracker_extract_tiff_basic_size);
 
-/* 	g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/exif_size", */
-/* 			      data, test_tracker_extract_tiff_exif_size); */
+	/*      g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/exif_size", */
+	/*                            data, test_tracker_extract_tiff_exif_size); */
 
 	g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/exif_orientation",
-			      data, test_tracker_extract_tiff_exif_orientation);
+	                      data, test_tracker_extract_tiff_exif_orientation);
 
 	if (g_test_perf()) {
 		g_test_add_data_func ("/tracker-extract/tracker-extract-tiff/performance",
-				      data, test_tracker_extract_tiff_performance);
+		                      data, test_tracker_extract_tiff_performance);
 	}
 
 #endif
diff --git a/tests/tracker-miner-fs/tracker-metadata-utils-test.c b/tests/tracker-miner-fs/tracker-metadata-utils-test.c
index f667bfc..4fb58cc 100644
--- a/tests/tracker-miner-fs/tracker-metadata-utils-test.c
+++ b/tests/tracker-miner-fs/tracker-metadata-utils-test.c
@@ -24,19 +24,19 @@
 
 static void
 test_something (void) {
-        g_assert_cmpint (1, ==, 1);
-        return;
+	g_assert_cmpint (1, ==, 1);
+	return;
 }
 
 int
 main (int    argc,
       char **argv)
 {
-        g_type_init ();
-        g_thread_init (NULL);
-        g_test_init (&argc, &argv, NULL);
+	g_type_init ();
+	g_thread_init (NULL);
+	g_test_init (&argc, &argv, NULL);
 
-        g_test_add_func ("/tracker-indexer/tracker-metadata-utils/something",
-                         test_something);
+	g_test_add_func ("/tracker-indexer/tracker-metadata-utils/something",
+	                 test_something);
 	return g_test_run ();
 }
diff --git a/tests/tracker-store/tracker-events-test.c b/tests/tracker-store/tracker-events-test.c
index a5c8490..1384714 100644
--- a/tests/tracker-store/tracker-events-test.c
+++ b/tests/tracker-store/tracker-events-test.c
@@ -33,122 +33,122 @@ static GPtrArray *types;
 static GStrv
 initialization_callback (void)
 {
-        gchar *klasses[] = {
-                EMAIL_CLASS,
-                FEED_CLASS,
-                CONTACT_CLASS,
-                NULL};
+	gchar *klasses[] = {
+		EMAIL_CLASS,
+		FEED_CLASS,
+		CONTACT_CLASS,
+		NULL};
 
-        return g_strdupv (klasses);
+	return g_strdupv (klasses);
 }
 
 static void
 test_events_empty (void)
 {
-        GPtrArray *events = NULL;
+	GPtrArray *events = NULL;
 
-        tracker_events_init (initialization_callback);
+	tracker_events_init (initialization_callback);
 
-        events = tracker_events_get_pending ();
-        g_assert (events == NULL);
+	events = tracker_events_get_pending ();
+	g_assert (events == NULL);
 
-        tracker_events_reset ();
+	tracker_events_reset ();
 
-        tracker_events_shutdown ();
+	tracker_events_shutdown ();
 }
 
 static void
 test_events_reset (void)
 {
-        GPtrArray *events;
+	GPtrArray *events;
 
-        tracker_events_init (initialization_callback);
+	tracker_events_init (initialization_callback);
 
-        tracker_events_insert ("uri://1", EMAIL_CLASS, types,
-                               TRACKER_DBUS_EVENTS_TYPE_ADD);
+	tracker_events_insert ("uri://1", EMAIL_CLASS, types,
+	                       TRACKER_DBUS_EVENTS_TYPE_ADD);
 
-        events = tracker_events_get_pending ();
-        g_assert_cmpint (events->len, ==, 1);
+	events = tracker_events_get_pending ();
+	g_assert_cmpint (events->len, ==, 1);
 
-        /* Try again without reset to ensure the data is
-         * still there
-         */
-        events = tracker_events_get_pending ();
-        g_assert_cmpint (events->len, ==, 1);
+	/* Try again without reset to ensure the data is
+	 * still there
+	 */
+	events = tracker_events_get_pending ();
+	g_assert_cmpint (events->len, ==, 1);
 
-        tracker_events_reset ();
-        tracker_events_shutdown ();
+	tracker_events_reset ();
+	tracker_events_shutdown ();
 }
 
 static void
 test_events_insertions (void)
 {
-        GPtrArray *events;
+	GPtrArray *events;
 
-        tracker_events_init (initialization_callback);
+	tracker_events_init (initialization_callback);
 
-        tracker_events_insert ("uri://1", EMAIL_CLASS, types,
-                               TRACKER_DBUS_EVENTS_TYPE_ADD);
+	tracker_events_insert ("uri://1", EMAIL_CLASS, types,
+	                       TRACKER_DBUS_EVENTS_TYPE_ADD);
 
-        tracker_events_insert ("uri://2", EMAIL_CLASS, types,
-                               TRACKER_DBUS_EVENTS_TYPE_UPDATE);
+	tracker_events_insert ("uri://2", EMAIL_CLASS, types,
+	                       TRACKER_DBUS_EVENTS_TYPE_UPDATE);
 
-        tracker_events_insert ("uri://3", EMAIL_CLASS, types,
-                               TRACKER_DBUS_EVENTS_TYPE_DELETE);
+	tracker_events_insert ("uri://3", EMAIL_CLASS, types,
+	                       TRACKER_DBUS_EVENTS_TYPE_DELETE);
 
-        events = tracker_events_get_pending ();
-        g_assert_cmpint (events->len, ==, 2);
+	events = tracker_events_get_pending ();
+	g_assert_cmpint (events->len, ==, 2);
 
-        /* Insert class we dont want to signal */
-        tracker_events_insert ("uri://x", NON_SIGNAL_CLASS, types,
-                               TRACKER_DBUS_EVENTS_TYPE_DELETE);
+	/* Insert class we dont want to signal */
+	tracker_events_insert ("uri://x", NON_SIGNAL_CLASS, types,
+	                       TRACKER_DBUS_EVENTS_TYPE_DELETE);
 
-        events = tracker_events_get_pending ();
-        g_assert_cmpint (events->len, ==, 2);
+	events = tracker_events_get_pending ();
+	g_assert_cmpint (events->len, ==, 2);
 
-        tracker_events_reset ();
-        tracker_events_shutdown ();
+	tracker_events_reset ();
+	tracker_events_shutdown ();
 }
 
 static void
 test_events_no_allows (void)
 {
-        gint i;
+	gint i;
 
-        tracker_events_init (NULL);
-        g_assert (tracker_events_get_pending () == NULL);
-        tracker_events_reset ();
-        g_assert (tracker_events_get_pending () == NULL);
+	tracker_events_init (NULL);
+	g_assert (tracker_events_get_pending () == NULL);
+	tracker_events_reset ();
+	g_assert (tracker_events_get_pending () == NULL);
 
-        for (i = 0; i < 10; i++) {
-                tracker_events_insert (g_strdup_printf ("uri://%d", i),
-                                       EMAIL_CLASS, types,
-                                       TRACKER_DBUS_EVENTS_TYPE_ADD);
-        }
+	for (i = 0; i < 10; i++) {
+		tracker_events_insert (g_strdup_printf ("uri://%d", i),
+		                       EMAIL_CLASS, types,
+		                       TRACKER_DBUS_EVENTS_TYPE_ADD);
+	}
 
-        g_assert (tracker_events_get_pending () == NULL);
+	g_assert (tracker_events_get_pending () == NULL);
 
-        tracker_events_shutdown ();
+	tracker_events_shutdown ();
 }
 
 static void
 test_events_lifecycle (void)
 {
-        /* Shutdown - no init */
- 	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                tracker_events_shutdown ();
+	/* Shutdown - no init */
+	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+		tracker_events_shutdown ();
 	}
 	g_test_trap_assert_stderr ("*tracker_events already shutdown*");
 
-  	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                tracker_events_get_pending ();
-        }
-        g_test_trap_assert_stderr ("*assertion `private != NULL' failed*");
+	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+		tracker_events_get_pending ();
+	}
+	g_test_trap_assert_stderr ("*assertion `private != NULL' failed*");
 
-  	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                tracker_events_reset ();
-        }
-        g_test_trap_assert_stderr ("*assertion `private != NULL' failed*");
+	if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+		tracker_events_reset ();
+	}
+	g_test_trap_assert_stderr ("*assertion `private != NULL' failed*");
 }
 
 int
@@ -158,9 +158,9 @@ main (int    argc,
 	GStrv types_s;
 	guint i;
 
-        g_type_init ();
-        g_thread_init (NULL);
-        g_test_init (&argc, &argv, NULL);
+	g_type_init ();
+	g_thread_init (NULL);
+	g_test_init (&argc, &argv, NULL);
 
 	types = g_ptr_array_new ();
 
@@ -170,16 +170,16 @@ main (int    argc,
 		g_ptr_array_add (types, types_s[i]);
 	}
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-events/empty",
-                         test_events_empty);
-        g_test_add_func ("/tracker/tracker-indexer/tracker-events/reset",
-                         test_events_reset);
-        g_test_add_func ("/tracker/tracker-indexer/tracker-events/insertions",
-                         test_events_insertions);
-        g_test_add_func ("/tracker/tracker-indexer/tracker-events/no-allows",
-                         test_events_no_allows);
-        g_test_add_func ("/tracker/tracker-indexer/tracker-events/lifecycle",
-                         test_events_lifecycle);
+	g_test_add_func ("/tracker/tracker-indexer/tracker-events/empty",
+	                 test_events_empty);
+	g_test_add_func ("/tracker/tracker-indexer/tracker-events/reset",
+	                 test_events_reset);
+	g_test_add_func ("/tracker/tracker-indexer/tracker-events/insertions",
+	                 test_events_insertions);
+	g_test_add_func ("/tracker/tracker-indexer/tracker-events/no-allows",
+	                 test_events_no_allows);
+	g_test_add_func ("/tracker/tracker-indexer/tracker-events/lifecycle",
+	                 test_events_lifecycle);
 
 	g_ptr_array_free (types, TRUE);
 
diff --git a/utils/playlists/playlist2ttl.c b/utils/playlists/playlist2ttl.c
index 65c7d1d..8aaf725 100644
--- a/utils/playlists/playlist2ttl.c
+++ b/utils/playlists/playlist2ttl.c
@@ -5,15 +5,15 @@
 static gchar    **filenames = NULL;
 
 typedef struct {
-        gint   tracks ;
-        gchar *playlist;
+	gint   tracks ;
+	gchar *playlist;
 } PlaylistData;
 
 static GOptionEntry entries[] = {
 	{ G_OPTION_REMAINING, 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
 	  "FILE",
 	  NULL
-        },
+	},
 	{ NULL }
 };
 
@@ -23,52 +23,52 @@ print_header ()
 	g_print ("@prefix nmo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#>.\n");
 	g_print ("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n");
 	g_print ("@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.\n");
-        g_print ("\n");
+	g_print ("\n");
 }
 
 static void
 print_playlist_entry (const gchar *uri) {
-        g_print ("<%s> a nfo:MediaList .\n\n", uri);
+	g_print ("<%s> a nfo:MediaList .\n\n", uri);
 }
 
 static void
 entry_parsed (TotemPlParser *parser, const gchar *uri, GHashTable *metadata, gpointer user_data)
 {
-        PlaylistData *playlist_data = (PlaylistData *)user_data;
+	PlaylistData *playlist_data = (PlaylistData *)user_data;
 
-        playlist_data->tracks += 1;
+	playlist_data->tracks += 1;
 
 	//uri = g_hash_table_lookup (metadata, TOTEM_PL_PARSER_FIELD_URI);
-        g_print ("<%s> nfo:hasMediaFileListEntry [ \n",
-                 playlist_data->playlist);
-        g_print ("\t a nfo:MediaFileListEntry ; \n");
-        g_print ("\t nfo:listPosition %d ; \n", playlist_data->tracks);
-        g_print ("\t nfo:entryContent <%s> ] .\n\n", uri);
+	g_print ("<%s> nfo:hasMediaFileListEntry [ \n",
+	         playlist_data->playlist);
+	g_print ("\t a nfo:MediaFileListEntry ; \n");
+	g_print ("\t nfo:listPosition %d ; \n", playlist_data->tracks);
+	g_print ("\t nfo:entryContent <%s> ] .\n\n", uri);
 }
 
 gint
 main (gint argc, gchar **argv)
 {
-        GFile *file;
-        GOptionContext *context = NULL;
-        gchar *uri;
-        PlaylistData   playlist_data = { 0, NULL};
-        TotemPlParser *pl;
-        TotemPlParserResult result;
-        GError *error = NULL;
+	GFile *file;
+	GOptionContext *context = NULL;
+	gchar *uri;
+	PlaylistData   playlist_data = { 0, NULL};
+	TotemPlParser *pl;
+	TotemPlParserResult result;
+	GError *error = NULL;
 
-        g_type_init ();
+	g_type_init ();
 
 	context = g_option_context_new ("- Parse a playlist and show info");
 
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-        if (!g_option_context_parse (context, &argc, &argv, &error) || !filenames) {
+	if (!g_option_context_parse (context, &argc, &argv, &error) || !filenames) {
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    "Playlist filename is mandatory");
+		            "Playlist filename is mandatory");
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -76,42 +76,42 @@ main (gint argc, gchar **argv)
 		g_free (help);
 
 		return -1;
-        }
+	}
 
-        file = g_file_new_for_commandline_arg (filenames[0]);
+	file = g_file_new_for_commandline_arg (filenames[0]);
 	uri = g_file_get_uri (file);
 
-        print_header ();
-        print_playlist_entry (uri);
-        playlist_data.playlist = uri;
+	print_header ();
+	print_playlist_entry (uri);
+	playlist_data.playlist = uri;
 
-        pl = totem_pl_parser_new ();
+	pl = totem_pl_parser_new ();
 
-        g_object_set (pl, "recurse", FALSE, "disable-unsafe", TRUE, NULL);
-        g_signal_connect (G_OBJECT (pl), "entry-parsed", G_CALLBACK (entry_parsed), &playlist_data);
+	g_object_set (pl, "recurse", FALSE, "disable-unsafe", TRUE, NULL);
+	g_signal_connect (G_OBJECT (pl), "entry-parsed", G_CALLBACK (entry_parsed), &playlist_data);
 
 
 
-        result = totem_pl_parser_parse (pl, uri, FALSE);
+	result = totem_pl_parser_parse (pl, uri, FALSE);
 
-        switch (result) {
-        case TOTEM_PL_PARSER_RESULT_SUCCESS:
-                break;
-        case TOTEM_PL_PARSER_RESULT_IGNORED:
-                g_print ("Error: Ignored (%s)\n", uri);
-                break;
-        case TOTEM_PL_PARSER_RESULT_ERROR:
-                g_print ("Error: Failed parsing (%s)\n", uri);
-                break;
-        case TOTEM_PL_PARSER_RESULT_UNHANDLED:
-                g_print ("Error: Unhandled type (%s)\n", uri);
-                break;
-        default:
-                g_print ("Undefined result!?!?!");
-        }
+	switch (result) {
+	case TOTEM_PL_PARSER_RESULT_SUCCESS:
+		break;
+	case TOTEM_PL_PARSER_RESULT_IGNORED:
+		g_print ("Error: Ignored (%s)\n", uri);
+		break;
+	case TOTEM_PL_PARSER_RESULT_ERROR:
+		g_print ("Error: Failed parsing (%s)\n", uri);
+		break;
+	case TOTEM_PL_PARSER_RESULT_UNHANDLED:
+		g_print ("Error: Unhandled type (%s)\n", uri);
+		break;
+	default:
+		g_print ("Undefined result!?!?!");
+	}
 
-        g_object_unref (pl);
+	g_object_unref (pl);
 
-        return 0;
+	return 0;
 }
 
diff --git a/utils/services/data-validator.c b/utils/services/data-validator.c
index 99ef2bf..c77e45e 100644
--- a/utils/services/data-validator.c
+++ b/utils/services/data-validator.c
@@ -5,7 +5,7 @@
 
 #include <libtracker-data/tracker-sparql-query.h>
 
-static gchar	     *ontology_dir = NULL;
+static gchar         *ontology_dir = NULL;
 static gchar         *ttl_file = NULL;
 
 static GOptionEntry   entries[] = {
@@ -32,16 +32,16 @@ static GList *known_items = NULL;
 static gboolean
 exists_or_already_reported (const gchar *item)
 {
-        if (!g_list_find_custom (known_items,
-                                 item,
-                                 (GCompareFunc) g_strcmp0)){
-                if (!g_list_find_custom (unknown_items,
-                                         item,
-                                         (GCompareFunc) g_strcmp0)) {
-                        return FALSE;
-                }
-        }
-        return TRUE;
+	if (!g_list_find_custom (known_items,
+	                         item,
+	                         (GCompareFunc) g_strcmp0)){
+		if (!g_list_find_custom (unknown_items,
+		                         item,
+		                         (GCompareFunc) g_strcmp0)) {
+			return FALSE;
+		}
+	}
+	return TRUE;
 }
 
 static void
@@ -50,9 +50,9 @@ turtle_load_ontology (const gchar *turtle_subject,
                       const gchar *turtle_object)
 {
 
-        if (!g_strcmp0 (turtle_predicate, IS)) {
-                known_items = g_list_prepend (known_items, g_strdup (turtle_subject));
-        }
+	if (!g_strcmp0 (turtle_predicate, IS)) {
+		known_items = g_list_prepend (known_items, g_strdup (turtle_subject));
+	}
 
 }
 
@@ -62,61 +62,61 @@ turtle_statement_handler (const gchar *turtle_subject,
                           const gchar *turtle_object)
 {
 
-        /* Check that predicate exists in the ontology
-        */
-        if (!exists_or_already_reported (turtle_predicate)){
-                g_print ("Unknown property %s\n", turtle_predicate);
-                unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_predicate));
-                error_flag = TRUE;
-        }
-
-        /* And if it is a type... check the object is also there
-         */
-        if (!g_strcmp0 (turtle_predicate, IS)) {
-
-                if (!exists_or_already_reported (turtle_object)){
-                        g_print ("Unknown class %s\n", turtle_object);
-                        error_flag = TRUE;
-                        unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_object));
-                }
-        }
+	/* Check that predicate exists in the ontology
+	 */
+	if (!exists_or_already_reported (turtle_predicate)){
+		g_print ("Unknown property %s\n", turtle_predicate);
+		unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_predicate));
+		error_flag = TRUE;
+	}
+
+	/* And if it is a type... check the object is also there
+	 */
+	if (!g_strcmp0 (turtle_predicate, IS)) {
+
+		if (!exists_or_already_reported (turtle_object)){
+			g_print ("Unknown class %s\n", turtle_object);
+			error_flag = TRUE;
+			unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_object));
+		}
+	}
 }
 
 
 static void
 load_ontology_files (const gchar *services_dir)
 {
-        GList       *files = NULL;
-        GDir        *services;
-        const gchar *conf_file;
-        GFile       *f;
-        gchar       *dir_uri, *fullpath;
-        gint         counter = 0;
+	GList       *files = NULL;
+	GDir        *services;
+	const gchar *conf_file;
+	GFile       *f;
+	gchar       *dir_uri, *fullpath;
+	gint         counter = 0;
 
-        f = g_file_new_for_path (services_dir);
-        dir_uri = g_file_get_path (f);
+	f = g_file_new_for_path (services_dir);
+	dir_uri = g_file_get_path (f);
 
-        services = g_dir_open (dir_uri, 0, NULL);
+	services = g_dir_open (dir_uri, 0, NULL);
 
-        conf_file = g_dir_read_name (services);
+	conf_file = g_dir_read_name (services);
 
-        while (conf_file) {
+	while (conf_file) {
 		TrackerTurtleReader *reader;
 		GError *error = NULL;
 
-                if (!g_str_has_suffix (conf_file, "ontology")) {
-                        conf_file = g_dir_read_name (services);
-                        continue;
-                }
+		if (!g_str_has_suffix (conf_file, "ontology")) {
+			conf_file = g_dir_read_name (services);
+			continue;
+		}
 
-                fullpath = g_build_filename (dir_uri, conf_file, NULL);
+		fullpath = g_build_filename (dir_uri, conf_file, NULL);
 
 		reader = tracker_turtle_reader_new (fullpath, NULL);
 
 		while (error == NULL && tracker_turtle_reader_next (reader, &error)) {
 			turtle_load_ontology (tracker_turtle_reader_get_subject (reader),
-				              tracker_turtle_reader_get_predicate (reader),
-				              tracker_turtle_reader_get_object (reader));
+			                      tracker_turtle_reader_get_predicate (reader),
+			                      tracker_turtle_reader_get_object (reader));
 		}
 
 		g_object_unref (reader);
@@ -127,17 +127,17 @@ load_ontology_files (const gchar *services_dir)
 		}
 
 
-                g_free (fullpath);
-                counter += 1;
-                conf_file = g_dir_read_name (services);
-        }
+		g_free (fullpath);
+		counter += 1;
+		conf_file = g_dir_read_name (services);
+	}
 
-        g_dir_close (services);
+	g_dir_close (services);
 
-        g_list_foreach (files, (GFunc) g_free, NULL);
-        g_object_unref (f);
-        g_free (dir_uri);
-        g_debug ("Loaded %d ontologies\n", counter);
+	g_list_foreach (files, (GFunc) g_free, NULL);
+	g_object_unref (f);
+	g_free (dir_uri);
+	g_debug ("Loaded %d ontologies\n", counter);
 }
 
 
@@ -145,27 +145,27 @@ load_ontology_files (const gchar *services_dir)
 gint
 main (gint argc, gchar **argv)
 {
-        GOptionContext *context;
+	GOptionContext *context;
 	TrackerTurtleReader *reader;
 	GError *error = NULL;
 
-        g_type_init ();
+	g_type_init ();
 
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new ("- Validate a turtle file against the ontology");
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-        if (!ontology_dir || !ttl_file) {
+	if (!ontology_dir || !ttl_file) {
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    "Ontology directory and turtle file are mandatory");
+		            "Ontology directory and turtle file are mandatory");
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -173,10 +173,10 @@ main (gint argc, gchar **argv)
 		g_free (help);
 
 		return -1;
-        }
+	}
 
-        //"/home/ivan/devel/codethink/tracker-ssh/data/services"
-        load_ontology_files (ontology_dir);
+	//"/home/ivan/devel/codethink/tracker-ssh/data/services"
+	load_ontology_files (ontology_dir);
 
 	reader = tracker_turtle_reader_new (ttl_file, NULL);
 
@@ -193,9 +193,9 @@ main (gint argc, gchar **argv)
 		g_error_free (error);
 	}
 
-        if (!error_flag) {
-                g_debug ("%s seems OK.", ttl_file);
-        }
+	if (!error_flag) {
+		g_debug ("%s seems OK.", ttl_file);
+	}
 
-        return 0;
+	return 0;
 }
diff --git a/utils/services/ontology-validator.c b/utils/services/ontology-validator.c
index 24bca56..024570c 100644
--- a/utils/services/ontology-validator.c
+++ b/utils/services/ontology-validator.c
@@ -5,7 +5,7 @@
 
 #include <libtracker-data/tracker-sparql-query.h>
 
-static gchar	     *ontology_dir = NULL;
+static gchar         *ontology_dir = NULL;
 
 static GOptionEntry   entries[] = {
 	{ "ontology-dir", 'o', 0, G_OPTION_ARG_FILENAME, &ontology_dir,
@@ -33,16 +33,16 @@ static GList *unknown_predicates = NULL;
 static gboolean
 exists_or_already_reported (const gchar *item)
 {
-        if (!g_list_find_custom (known_items,
-                                 item,
-                                 (GCompareFunc) g_strcmp0)){
-                if (!g_list_find_custom (unknown_items,
-                                         item,
-                                         (GCompareFunc) g_strcmp0)) {
-                        return FALSE;
-                }
-        }
-        return TRUE;
+	if (!g_list_find_custom (known_items,
+	                         item,
+	                         (GCompareFunc) g_strcmp0)){
+		if (!g_list_find_custom (unknown_items,
+		                         item,
+		                         (GCompareFunc) g_strcmp0)) {
+			return FALSE;
+		}
+	}
+	return TRUE;
 }
 
 static void
@@ -51,81 +51,81 @@ turtle_load_ontology (const gchar *turtle_subject,
                       const gchar *turtle_object)
 {
 
-        /* nmo:Email a rdfs:Class
-         *  If rdfs:Class exists, add nmo:Email to the known_items
-         **/
-        if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
-
-                if (!g_strcmp0 (turtle_object, TRACKER_NS)) {
-                        /* Ignore the internal tracker namespace definitions */
-                        return;
-                }
-
-                if (!g_strcmp0 (turtle_object, NRL_IFP)) {
-                        /* Ignore the InverseFunctionalProperty subclassing */
-                        return;
-                }
-
-                /* Check the nmo:Email hasn't already be defined
-                 *  (ignoring rdfs:Class and rdf:Property for bootstraping reasons)
-                 */
-                if (exists_or_already_reported (turtle_subject)
-                    && g_strcmp0 (turtle_subject, RDFS_CLASS)
-                    && g_strcmp0 (turtle_subject, RDF_PROPERTY)) {
-                        g_error ("%s is already defined", turtle_subject);
-                        return;
-                }
-
-                /* Check the object class is already defined */
-                if (!exists_or_already_reported (turtle_object)) {
-                        g_error ("%s is a %s but %s is not defined",
-                                 turtle_subject, turtle_object, turtle_object);
-                } else {
-                        /* A new type defined... if it is a predicate,
-                         *  remove it from the maybe list!
-                         */
-                        if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
-                                GList *link;
-                                link = g_list_find_custom (unknown_predicates,
-                                                           turtle_subject,
-                                                           (GCompareFunc)g_strcmp0);
-                                if (link) {
-                                        unknown_predicates = g_list_remove_link (unknown_predicates,
-                                                                                 link);
-                                }
-                        }
-                        known_items = g_list_prepend (known_items, g_strdup (turtle_subject));
-                }
-                return;
-        }
-
-        /*
-         * nmo:Message rdfs:subClassOf nie:InformationElement
-         *  Check nie:InformationElement is defined
-         */
-        if (!g_strcmp0 (turtle_predicate, RDFS_SUBCLASSOF)
-            || !g_strcmp0 (turtle_predicate, RDFS_SUBPROPERTYOF)
-            || !g_strcmp0 (turtle_predicate, RDFS_RANGE)
-            || !g_strcmp0 (turtle_predicate, RDFS_DOMAIN)) {
-                /* Check the class is already defined */
-                if (!exists_or_already_reported (turtle_object)) {
-                        g_error ("Class %s refers to %s but it is not defined",
-                                 turtle_subject, turtle_object);
-                }
-                return;
-        }
-
-        /*
-         * The predicate is not type, subclass, range, domain...
-         *   Put it in maybe
-         */
-        if (!exists_or_already_reported (turtle_predicate)
-            && !g_list_find_custom (unknown_predicates,
-                                    turtle_predicate,
-                                    (GCompareFunc) g_strcmp0)) {
-                unknown_predicates = g_list_prepend (unknown_predicates,
-                                                     g_strdup (turtle_predicate));
-        }
+	/* nmo:Email a rdfs:Class
+	 *  If rdfs:Class exists, add nmo:Email to the known_items
+	 **/
+	if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
+
+		if (!g_strcmp0 (turtle_object, TRACKER_NS)) {
+			/* Ignore the internal tracker namespace definitions */
+			return;
+		}
+
+		if (!g_strcmp0 (turtle_object, NRL_IFP)) {
+			/* Ignore the InverseFunctionalProperty subclassing */
+			return;
+		}
+
+		/* Check the nmo:Email hasn't already be defined
+		 *  (ignoring rdfs:Class and rdf:Property for bootstraping reasons)
+		 */
+		if (exists_or_already_reported (turtle_subject)
+		    && g_strcmp0 (turtle_subject, RDFS_CLASS)
+		    && g_strcmp0 (turtle_subject, RDF_PROPERTY)) {
+			g_error ("%s is already defined", turtle_subject);
+			return;
+		}
+
+		/* Check the object class is already defined */
+		if (!exists_or_already_reported (turtle_object)) {
+			g_error ("%s is a %s but %s is not defined",
+			         turtle_subject, turtle_object, turtle_object);
+		} else {
+			/* A new type defined... if it is a predicate,
+			 *  remove it from the maybe list!
+			 */
+			if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
+				GList *link;
+				link = g_list_find_custom (unknown_predicates,
+				                           turtle_subject,
+				                           (GCompareFunc)g_strcmp0);
+				if (link) {
+					unknown_predicates = g_list_remove_link (unknown_predicates,
+					                                         link);
+				}
+			}
+			known_items = g_list_prepend (known_items, g_strdup (turtle_subject));
+		}
+		return;
+	}
+
+	/*
+	 * nmo:Message rdfs:subClassOf nie:InformationElement
+	 *  Check nie:InformationElement is defined
+	 */
+	if (!g_strcmp0 (turtle_predicate, RDFS_SUBCLASSOF)
+	    || !g_strcmp0 (turtle_predicate, RDFS_SUBPROPERTYOF)
+	    || !g_strcmp0 (turtle_predicate, RDFS_RANGE)
+	    || !g_strcmp0 (turtle_predicate, RDFS_DOMAIN)) {
+		/* Check the class is already defined */
+		if (!exists_or_already_reported (turtle_object)) {
+			g_error ("Class %s refers to %s but it is not defined",
+			         turtle_subject, turtle_object);
+		}
+		return;
+	}
+
+	/*
+	 * The predicate is not type, subclass, range, domain...
+	 *   Put it in maybe
+	 */
+	if (!exists_or_already_reported (turtle_predicate)
+	    && !g_list_find_custom (unknown_predicates,
+	                            turtle_predicate,
+	                            (GCompareFunc) g_strcmp0)) {
+		unknown_predicates = g_list_prepend (unknown_predicates,
+		                                     g_strdup (turtle_predicate));
+	}
 }
 
 static void
@@ -155,72 +155,72 @@ process_file (const gchar *ttl_file)
 static void
 load_ontology_files (const gchar *services_dir)
 {
-        GList       *files = NULL;
-        GDir        *services;
-        const gchar *conf_file;
-        GFile       *f;
-        gchar       *dir_uri, *fullpath;
+	GList       *files = NULL;
+	GDir        *services;
+	const gchar *conf_file;
+	GFile       *f;
+	gchar       *dir_uri, *fullpath;
 
-        f = g_file_new_for_path (services_dir);
-        dir_uri = g_file_get_path (f);
+	f = g_file_new_for_path (services_dir);
+	dir_uri = g_file_get_path (f);
 
-        g_print ("dir_uri %s\n", dir_uri);
-        services = g_dir_open (dir_uri, 0, NULL);
+	g_print ("dir_uri %s\n", dir_uri);
+	services = g_dir_open (dir_uri, 0, NULL);
 
-        conf_file = g_dir_read_name (services);
+	conf_file = g_dir_read_name (services);
 
-        while (conf_file) {
+	while (conf_file) {
 
-                if (!g_str_has_suffix (conf_file, "ontology")) {
-                        conf_file = g_dir_read_name (services);
-                        continue;
-                }
+		if (!g_str_has_suffix (conf_file, "ontology")) {
+			conf_file = g_dir_read_name (services);
+			continue;
+		}
 
-                fullpath = g_build_filename (dir_uri, conf_file, NULL);
-                files = g_list_insert_sorted (files, fullpath, (GCompareFunc) g_strcmp0);
-                conf_file = g_dir_read_name (services);
-        }
+		fullpath = g_build_filename (dir_uri, conf_file, NULL);
+		files = g_list_insert_sorted (files, fullpath, (GCompareFunc) g_strcmp0);
+		conf_file = g_dir_read_name (services);
+	}
 
-        g_dir_close (services);
+	g_dir_close (services);
 
-        //process_file (fullpath, turtle_load_ontology, NULL);
-        g_list_foreach (files, (GFunc) process_file, turtle_load_ontology);
+	//process_file (fullpath, turtle_load_ontology, NULL);
+	g_list_foreach (files, (GFunc) process_file, turtle_load_ontology);
 
-        g_list_foreach (files, (GFunc) g_free, NULL);
-        g_object_unref (f);
-        g_free (dir_uri);
+	g_list_foreach (files, (GFunc) g_free, NULL);
+	g_object_unref (f);
+	g_free (dir_uri);
 }
 
 static void
 load_basic_classes ()
 {
-        known_items = g_list_prepend (known_items, (gpointer) RDFS_CLASS);
-        known_items = g_list_prepend (known_items, (gpointer) RDF_PROPERTY);
+	known_items = g_list_prepend (known_items, (gpointer) RDFS_CLASS);
+	known_items = g_list_prepend (known_items, (gpointer) RDF_PROPERTY);
 }
 
 gint
 main (gint argc, gchar **argv)
 {
-        GOptionContext *context;
-        GList *it;
+	GOptionContext *context;
+	GList *it;
 
-        g_type_init ();
+	g_type_init ();
 
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new ("- Validate the ontology consistency");
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-        if (!ontology_dir) {
+	if (!ontology_dir) {
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    "Ontology directory is mandatory");
+		            "Ontology directory is mandatory");
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -228,17 +228,17 @@ main (gint argc, gchar **argv)
 		g_free (help);
 
 		return -1;
-        }
+	}
 
-        load_basic_classes ();
-        //"/home/ivan/devel/codethink/tracker-ssh/data/services"
-        load_ontology_files (ontology_dir);
+	load_basic_classes ();
+	//"/home/ivan/devel/codethink/tracker-ssh/data/services"
+	load_ontology_files (ontology_dir);
 
 
-        for (it = unknown_predicates; it != NULL; it = it->next) {
-                g_error ("Predicate '%s' is used in the ontology, but it is not defined\n",
-                         (gchar *)it->data);
-        }
+	for (it = unknown_predicates; it != NULL; it = it->next) {
+		g_error ("Predicate '%s' is used in the ontology, but it is not defined\n",
+		         (gchar *)it->data);
+	}
 
-        return 0;
+	return 0;
 }
diff --git a/utils/services/qname-test.c b/utils/services/qname-test.c
index 658fbf6..948dc3c 100644
--- a/utils/services/qname-test.c
+++ b/utils/services/qname-test.c
@@ -5,122 +5,122 @@
 static void
 srcdir_qname_init (const gchar *luri, const gchar *lprefix)
 {
-        gchar *class_location;
+	gchar *class_location;
 
-        class_location = g_build_filename (TOP_SRCDIR, "utils", "services", "file-class.cache.test", NULL);
+	class_location = g_build_filename (TOP_SRCDIR, "utils", "services", "file-class.cache.test", NULL);
 
-        qname_init (luri, lprefix, class_location);
+	qname_init (luri, lprefix, class_location);
 
-         g_free (class_location);
+	g_free (class_location);
 }
 
 static void
 test_qname_to_shortname (void)
 {
-        gchar *result = NULL;
+	gchar *result = NULL;
 
-        srcdir_qname_init ("test://local_uri#", "local");
+	srcdir_qname_init ("test://local_uri#", "local");
 
-        result = qname_to_shortname ("http://purl.org/dc/elements/1.1/source";);
-        g_assert_cmpstr (result, ==, "dc:source");
-        g_free (result);
+	result = qname_to_shortname ("http://purl.org/dc/elements/1.1/source";);
+	g_assert_cmpstr (result, ==, "dc:source");
+	g_free (result);
 
-        result = qname_to_shortname ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
-        g_assert_cmpstr (result, ==, "nie:InformationElement");
-        g_free (result);
+	result = qname_to_shortname ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
+	g_assert_cmpstr (result, ==, "nie:InformationElement");
+	g_free (result);
 
-        result = qname_to_shortname ("test://local_uri#Class");
-        g_assert_cmpstr (result, ==, "local:Class");
-        g_free (result);
+	result = qname_to_shortname ("test://local_uri#Class");
+	g_assert_cmpstr (result, ==, "local:Class");
+	g_free (result);
 
-        result = qname_to_shortname ("test://doesnt_exists#Class");
-        g_assert_cmpstr (result, ==, "test://doesnt_exists#Class");
-        g_free (result);
+	result = qname_to_shortname ("test://doesnt_exists#Class");
+	g_assert_cmpstr (result, ==, "test://doesnt_exists#Class");
+	g_free (result);
 
-        qname_shutdown ();
+	qname_shutdown ();
 }
 
 static void
 test_qname_to_classname (void)
 {
-        gchar *result = NULL;
+	gchar *result = NULL;
 
-        srcdir_qname_init ("test://local_uri#", "local");
+	srcdir_qname_init ("test://local_uri#", "local");
 
-        result = qname_to_classname ("http://purl.org/dc/elements/1.1/source";);
-        g_assert_cmpstr (result, ==, "source");
-        g_free (result);
+	result = qname_to_classname ("http://purl.org/dc/elements/1.1/source";);
+	g_assert_cmpstr (result, ==, "source");
+	g_free (result);
 
-        result = qname_to_classname ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
-        g_assert_cmpstr (result, ==, "InformationElement");
-        g_free (result);
+	result = qname_to_classname ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
+	g_assert_cmpstr (result, ==, "InformationElement");
+	g_free (result);
 
-        result = qname_to_classname ("test://local_uri#Class");
-        g_assert_cmpstr (result, ==, "Class");
-        g_free (result);
+	result = qname_to_classname ("test://local_uri#Class");
+	g_assert_cmpstr (result, ==, "Class");
+	g_free (result);
 
-        result = qname_to_classname ("test://doesnt_exists#Class");
-        g_assert_cmpstr (result, ==, "test://doesnt_exists#Class");
-        g_free (result);
+	result = qname_to_classname ("test://doesnt_exists#Class");
+	g_assert_cmpstr (result, ==, "test://doesnt_exists#Class");
+	g_free (result);
 
-        qname_shutdown ();
+	qname_shutdown ();
 }
 
 static void
 test_qname_to_link (void)
 {
-        gchar *result = NULL;
+	gchar *result = NULL;
 
-        srcdir_qname_init ("test://local_uri#", "local");
+	srcdir_qname_init ("test://local_uri#", "local");
 
-        result = qname_to_link ("test://local_uri#Class");
-        g_assert_cmpstr (result, ==, "#Class");
-        g_free (result);
+	result = qname_to_link ("test://local_uri#Class");
+	g_assert_cmpstr (result, ==, "#Class");
+	g_free (result);
 
-        result = qname_to_link ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
-        g_assert_cmpstr (result, ==, "../nie/index.html#InformationElement");
-        g_free (result);
+	result = qname_to_link ("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#InformationElement";);
+	g_assert_cmpstr (result, ==, "../nie/index.html#InformationElement");
+	g_free (result);
 
-        /* This is one of the special cases, where the prefix of the class
-         * doesn't match with the prefix of the file where it is defined
-         */
-        result = qname_to_link ("http://www.tracker-project.org/ontologies/tracker#Namespace";);
-        g_assert_cmpstr (result, ==, "../rdf/index.html#Namespace");
-        g_free (result);
+	/* This is one of the special cases, where the prefix of the class
+	 * doesn't match with the prefix of the file where it is defined
+	 */
+	result = qname_to_link ("http://www.tracker-project.org/ontologies/tracker#Namespace";);
+	g_assert_cmpstr (result, ==, "../rdf/index.html#Namespace");
+	g_free (result);
 
-        qname_shutdown ();
+	qname_shutdown ();
 }
 
 static void
 test_process_dc (void)
 {
-        /* DC is the only ontology namespaces without '#' at the end
-           This force us to handle it as special case in a lot of places
-         */
+	/* DC is the only ontology namespaces without '#' at the end
+	   This force us to handle it as special case in a lot of places
+	*/
 
-        gchar *result = NULL;
+	gchar *result = NULL;
 
-        srcdir_qname_init ("test://dc_style/", "local");
+	srcdir_qname_init ("test://dc_style/", "local");
 
-        /* local */
-        result = qname_to_link ("test://dc_style/Class");
-        g_assert_cmpstr (result, ==, "#Class");
-        g_free (result);
+	/* local */
+	result = qname_to_link ("test://dc_style/Class");
+	g_assert_cmpstr (result, ==, "#Class");
+	g_free (result);
 
-        /* out of this file */
-        result = qname_to_link ("http://purl.org/dc/elements/1.1/creator";);
-        g_assert_cmpstr (result, ==, "../dc/index.html#creator");
-        g_free (result);
+	/* out of this file */
+	result = qname_to_link ("http://purl.org/dc/elements/1.1/creator";);
+	g_assert_cmpstr (result, ==, "../dc/index.html#creator");
+	g_free (result);
 
-        result = qname_to_shortname ("http://purl.org/dc/elements/1.1/creator";);
-        g_assert_cmpstr (result, ==, "dc:creator");
-        g_free (result);
+	result = qname_to_shortname ("http://purl.org/dc/elements/1.1/creator";);
+	g_assert_cmpstr (result, ==, "dc:creator");
+	g_free (result);
 
-        result = qname_to_classname ("http://purl.org/dc/elements/1.1/creator";);
-        g_assert_cmpstr (result, ==, "creator");
-        g_free (result);
+	result = qname_to_classname ("http://purl.org/dc/elements/1.1/creator";);
+	g_assert_cmpstr (result, ==, "creator");
+	g_free (result);
 
-        qname_shutdown ();
+	qname_shutdown ();
 }
 
 int
@@ -132,16 +132,16 @@ main (int argc, char **argv)
 	g_test_init (&argc, &argv, NULL);
 
 	g_test_add_func ("/html_generator/qname/qname_to_shortname",
-			 test_qname_to_shortname);
+	                 test_qname_to_shortname);
 
 	g_test_add_func ("/html_generator/qname/qname_to_classname",
-			 test_qname_to_classname);
+	                 test_qname_to_classname);
 
 	g_test_add_func ("/html_generator/qname/qname_to_link",
-			 test_qname_to_link);
+	                 test_qname_to_link);
 
 	g_test_add_func ("/html_generator/qname/dc_alike_namespaces",
-			 test_process_dc);
+	                 test_process_dc);
 
 	result = g_test_run ();
 
diff --git a/utils/services/qname.c b/utils/services/qname.c
index a5ffe9b..c3857aa 100644
--- a/utils/services/qname.c
+++ b/utils/services/qname.c
@@ -6,224 +6,224 @@
 //static gchar *local_prefix = NULL;
 
 typedef struct {
-        gchar *namespace;
-        gchar *uri;
+	gchar *namespace;
+	gchar *uri;
 } Namespace;
 
 static GHashTable *class_deffile = NULL;
 
 Namespace NAMESPACES [] = {
-        {NULL, NULL}, /* Save this for the local_uri and prefix */
-        {"dc", "http://purl.org/dc/elements/1.1/"},
-        {"xsd", "http://www.w3.org/2001/XMLSchema#"},
-        {"fts", "http://www.tracker-project.org/ontologies/fts#"},
-        {"mto", "http://www.tracker-project.org/temp/mto#"},
-        {"mlo", "http://www.tracker-project.org/temp/mlo#"},
-        {"nao", "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#"},
-        {"ncal", "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#"},
-        {"nco", "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#"},
-        {"nfo", "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"},
-        {"nid3", "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#"},
-        {"nie", "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"},
-        {"nmm", "http://www.tracker-project.org/temp/nmm#"},
-        {"nmo", "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#"},
-        {"nrl", "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#"},
-        {"rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"},
-        {"rdfs", "http://www.w3.org/2000/01/rdf-schema#"},
-        {"tracker", "http://www.tracker-project.org/ontologies/tracker#"},
-        {NULL, NULL}
+	{NULL, NULL}, /* Save this for the local_uri and prefix */
+	{"dc", "http://purl.org/dc/elements/1.1/"},
+	{"xsd", "http://www.w3.org/2001/XMLSchema#"},
+	{"fts", "http://www.tracker-project.org/ontologies/fts#"},
+	{"mto", "http://www.tracker-project.org/temp/mto#"},
+	{"mlo", "http://www.tracker-project.org/temp/mlo#"},
+	{"nao", "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#"},
+	{"ncal", "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#"},
+	{"nco", "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#"},
+	{"nfo", "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"},
+	{"nid3", "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#"},
+	{"nie", "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"},
+	{"nmm", "http://www.tracker-project.org/temp/nmm#"},
+	{"nmo", "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#"},
+	{"nrl", "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#"},
+	{"rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"},
+	{"rdfs", "http://www.w3.org/2000/01/rdf-schema#"},
+	{"tracker", "http://www.tracker-project.org/ontologies/tracker#"},
+	{NULL, NULL}
 };
 
 
 void
 qname_init (const gchar *luri, const gchar *lprefix, const gchar *class_location)
 {
-        g_return_if_fail (luri != NULL);
-
-        if (NAMESPACES[0].namespace || NAMESPACES[0].uri) {
-                g_warning ("Reinitializing qname_module");
-                g_free (NAMESPACES[0].namespace);
-                g_free (NAMESPACES[0].uri);
-                if (class_deffile) {
-                        g_hash_table_destroy (class_deffile);
-                }
-        }
-
-        NAMESPACES[0].uri = g_strdup (luri);
-        NAMESPACES[0].namespace = (lprefix != NULL ? g_strdup (lprefix) : g_strdup (""));
-
-        if (class_location) {
-                /* Process a file that contains: dir class pairs by line
-                 */
-                gint   i;
-                gchar  *raw_content = NULL;
-                gchar **lines;
-                gsize   length;
-
-                if (!g_file_get_contents (class_location, &raw_content, &length, NULL)) {
-                        g_error ("Unable to load '%s'", class_location);
-                }
-
-                class_deffile = g_hash_table_new_full (g_str_hash,
-                                                       g_str_equal,
-                                                       g_free,
-                                                       g_free);
-
-                lines = g_strsplit (raw_content, "\n", -1);
-                for (i = 0; lines[i] != NULL; i++) {
-                        if (strlen (lines[i]) < 1) {
-                                continue;
-                        }
-
-                        gchar **pieces = NULL;
-
-                        pieces = g_strsplit (lines[i], " ", -1);
-                        g_assert (g_strv_length (pieces) == 2);
-                        g_hash_table_insert (class_deffile,
-                                             g_strdup(pieces[1]),
-                                             g_strdup(pieces[0]));
-                        g_strfreev (pieces);
-
-                }
-                g_strfreev (lines);
-                g_free (raw_content);
-        }
+	g_return_if_fail (luri != NULL);
+
+	if (NAMESPACES[0].namespace || NAMESPACES[0].uri) {
+		g_warning ("Reinitializing qname_module");
+		g_free (NAMESPACES[0].namespace);
+		g_free (NAMESPACES[0].uri);
+		if (class_deffile) {
+			g_hash_table_destroy (class_deffile);
+		}
+	}
+
+	NAMESPACES[0].uri = g_strdup (luri);
+	NAMESPACES[0].namespace = (lprefix != NULL ? g_strdup (lprefix) : g_strdup (""));
+
+	if (class_location) {
+		/* Process a file that contains: dir class pairs by line
+		 */
+		gint   i;
+		gchar  *raw_content = NULL;
+		gchar **lines;
+		gsize   length;
+
+		if (!g_file_get_contents (class_location, &raw_content, &length, NULL)) {
+			g_error ("Unable to load '%s'", class_location);
+		}
+
+		class_deffile = g_hash_table_new_full (g_str_hash,
+		                                       g_str_equal,
+		                                       g_free,
+		                                       g_free);
+
+		lines = g_strsplit (raw_content, "\n", -1);
+		for (i = 0; lines[i] != NULL; i++) {
+			if (strlen (lines[i]) < 1) {
+				continue;
+			}
+
+			gchar **pieces = NULL;
+
+			pieces = g_strsplit (lines[i], " ", -1);
+			g_assert (g_strv_length (pieces) == 2);
+			g_hash_table_insert (class_deffile,
+			                     g_strdup(pieces[1]),
+			                     g_strdup(pieces[0]));
+			g_strfreev (pieces);
+
+		}
+		g_strfreev (lines);
+		g_free (raw_content);
+	}
 
 }
 
 void
 qname_shutdown (void)
 {
-        g_free (NAMESPACES[0].namespace);
-        NAMESPACES[0].namespace = NULL;
+	g_free (NAMESPACES[0].namespace);
+	NAMESPACES[0].namespace = NULL;
 
-        g_free (NAMESPACES[0].uri);
-        NAMESPACES[0].uri = NULL;
+	g_free (NAMESPACES[0].uri);
+	NAMESPACES[0].uri = NULL;
 
-        if (class_deffile) {
-                g_hash_table_destroy (class_deffile);
-                class_deffile = NULL;
-        }
+	if (class_deffile) {
+		g_hash_table_destroy (class_deffile);
+		class_deffile = NULL;
+	}
 }
 
 static gchar **
 split_qname (const gchar *qname, GError **error)
 {
-        gchar **pieces;
-        gint    i;
-
-        /* Try by '#' */
-        pieces = g_strsplit (qname, "#", 2);
-        if (g_strv_length (pieces) == 2) {
-                return pieces;
-        }
-        g_strfreev (pieces);
-        pieces = NULL;
-
-        /* Try by last '/' */
-        for (i = strlen (qname); i >= 0; i--) {
-                if (qname[i] == '/') {
-                        pieces = g_new0 (gchar*, 3);
-                        pieces[0] = g_strndup (qname, i);
-                        pieces[1] = g_strdup (&qname[i+1]);
-                        pieces[2] = NULL;
-                        break;
-                }
-        }
-
-        if (pieces == NULL) {
-                g_warning ("Unable to split '%s' in prefix and class", qname);
-        }
-        return pieces;
+	gchar **pieces;
+	gint    i;
+
+	/* Try by '#' */
+	pieces = g_strsplit (qname, "#", 2);
+	if (g_strv_length (pieces) == 2) {
+		return pieces;
+	}
+	g_strfreev (pieces);
+	pieces = NULL;
+
+	/* Try by last '/' */
+	for (i = strlen (qname); i >= 0; i--) {
+		if (qname[i] == '/') {
+			pieces = g_new0 (gchar*, 3);
+			pieces[0] = g_strndup (qname, i);
+			pieces[1] = g_strdup (&qname[i+1]);
+			pieces[2] = NULL;
+			break;
+		}
+	}
+
+	if (pieces == NULL) {
+		g_warning ("Unable to split '%s' in prefix and class", qname);
+	}
+	return pieces;
 }
 
 gchar *
 qname_to_link (const gchar *qname)
 {
-        gchar **pieces;
-        gchar *name;
-
-        if (NAMESPACES[0].uri) {
-
-                /* There is a local URI! */
-                if (g_str_has_prefix (qname, NAMESPACES[0].uri)) {
-                        pieces = split_qname (qname, NULL);
-                        name = g_strdup_printf ("#%s", pieces[1]);
-                        g_strfreev (pieces);
-                        return name;
-                }
-        }
-
-        if (class_deffile) {
-                gchar *dir, *shortname;
-                shortname = qname_to_shortname (qname);
-                dir = g_hash_table_lookup (class_deffile, shortname);
-                g_free (shortname);
-                if (dir) {
-                        return g_strdup_printf ("../%s/index.html#%s",
-                                                dir, qname_to_classname (qname));
-                }
-        }
-
-        return g_strdup (qname);
+	gchar **pieces;
+	gchar *name;
+
+	if (NAMESPACES[0].uri) {
+
+		/* There is a local URI! */
+		if (g_str_has_prefix (qname, NAMESPACES[0].uri)) {
+			pieces = split_qname (qname, NULL);
+			name = g_strdup_printf ("#%s", pieces[1]);
+			g_strfreev (pieces);
+			return name;
+		}
+	}
+
+	if (class_deffile) {
+		gchar *dir, *shortname;
+		shortname = qname_to_shortname (qname);
+		dir = g_hash_table_lookup (class_deffile, shortname);
+		g_free (shortname);
+		if (dir) {
+			return g_strdup_printf ("../%s/index.html#%s",
+			                        dir, qname_to_classname (qname));
+		}
+	}
+
+	return g_strdup (qname);
 }
 
 
 gchar *
 qname_to_shortname (const gchar *qname)
 {
-        gchar **pieces;
-        gchar  *name = NULL;
-        gint    i;
-
-        for (i = 0; NAMESPACES[i].namespace != NULL; i++) {
-                if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
-
-                        pieces = split_qname (qname, NULL);
-                        name = g_strdup_printf ("%s:%s",
-                                                NAMESPACES[i].namespace,
-                                                pieces[1]);
-                        g_strfreev (pieces);
-                        break;
-                }
-        }
-
-        if (!name) {
-                return g_strdup (qname);
-        } else {
-                return name;
-        }
+	gchar **pieces;
+	gchar  *name = NULL;
+	gint    i;
+
+	for (i = 0; NAMESPACES[i].namespace != NULL; i++) {
+		if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
+
+			pieces = split_qname (qname, NULL);
+			name = g_strdup_printf ("%s:%s",
+			                        NAMESPACES[i].namespace,
+			                        pieces[1]);
+			g_strfreev (pieces);
+			break;
+		}
+	}
+
+	if (!name) {
+		return g_strdup (qname);
+	} else {
+		return name;
+	}
 }
 
 gchar *
 qname_to_classname (const gchar *qname) {
 
-        gchar  *shortname;
-        gchar **pieces;
-        gchar  *classname = NULL;
-
-        shortname = qname_to_shortname (qname);
-        if (g_strcmp0 (qname, shortname) == 0) {
-                return shortname;
-        }
-        pieces = g_strsplit (shortname, ":", -1);
-        g_assert (g_strv_length (pieces) == 2);
-
-        classname = g_strdup (pieces[1]);
-        g_strfreev (pieces);
-        g_free (shortname);
-        return classname;
+	gchar  *shortname;
+	gchar **pieces;
+	gchar  *classname = NULL;
+
+	shortname = qname_to_shortname (qname);
+	if (g_strcmp0 (qname, shortname) == 0) {
+		return shortname;
+	}
+	pieces = g_strsplit (shortname, ":", -1);
+	g_assert (g_strv_length (pieces) == 2);
+
+	classname = g_strdup (pieces[1]);
+	g_strfreev (pieces);
+	g_free (shortname);
+	return classname;
 }
 
 gboolean
 qname_is_basic_type (const gchar *qname)
 {
-        gint i;
-        /* dc: or xsd: are basic types */
-        for (i = 1; NAMESPACES[i].namespace != NULL && i < 3; i++) {
-                if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
-                        return TRUE;
-                }
-        }
-        return FALSE;
+	gint i;
+	/* dc: or xsd: are basic types */
+	for (i = 1; NAMESPACES[i].namespace != NULL && i < 3; i++) {
+		if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
+			return TRUE;
+		}
+	}
+	return FALSE;
 }
diff --git a/utils/services/ttl2graphviz.c b/utils/services/ttl2graphviz.c
index bbed0d0..93b55e0 100644
--- a/utils/services/ttl2graphviz.c
+++ b/utils/services/ttl2graphviz.c
@@ -24,29 +24,29 @@ static GOptionEntry   entries[] = {
 gint
 main (gint argc, gchar **argv)
 {
-        GOptionContext *context;
-        Ontology *ontology = NULL;
-        OntologyDescription *description = NULL;
-        gchar *ttl_file = NULL;
-        gchar *dirname = NULL;
-        FILE *f = NULL;
+	GOptionContext *context;
+	Ontology *ontology = NULL;
+	OntologyDescription *description = NULL;
+	gchar *ttl_file = NULL;
+	gchar *dirname = NULL;
+	FILE *f = NULL;
 
-        g_type_init ();
+	g_type_init ();
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new ("- Generates graphviz for a TTL file");
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-        if (!desc_file) {
+	if (!desc_file) {
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    "Description file is mandatory");
+		            "Description file is mandatory");
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -54,34 +54,34 @@ main (gint argc, gchar **argv)
 		g_free (help);
 
 		return -1;
-        }
+	}
 
-        if (output_file) {
-                f = fopen (output_file, "w");
-        } else {
-                f = stdout;
-        }
-        g_assert (f != NULL);
+	if (output_file) {
+		f = fopen (output_file, "w");
+	} else {
+		f = stdout;
+	}
+	g_assert (f != NULL);
 
-        description = ttl_loader_load_description (desc_file);
+	description = ttl_loader_load_description (desc_file);
 
-        dirname = g_path_get_dirname (desc_file);
-        ttl_file = g_build_filename (dirname,
-                                     description->relativePath,
-                                     NULL);
+	dirname = g_path_get_dirname (desc_file);
+	ttl_file = g_build_filename (dirname,
+	                             description->relativePath,
+	                             NULL);
 
-        ontology = ttl_loader_load_ontology (ttl_file);
-        g_free (ttl_file);
-        g_free (dirname);
+	ontology = ttl_loader_load_ontology (ttl_file);
+	g_free (ttl_file);
+	g_free (dirname);
 
-        ttl_graphviz_print (description, ontology, f);
+	ttl_graphviz_print (description, ontology, f);
 
-        ttl_loader_free_ontology (ontology);
-        ttl_loader_free_description (description);
+	ttl_loader_free_ontology (ontology);
+	ttl_loader_free_description (description);
 
-        g_option_context_free (context);
+	g_option_context_free (context);
 
-        fclose (f);
+	fclose (f);
 
-        return 0;
+	return 0;
 }
diff --git a/utils/services/ttl2html.c b/utils/services/ttl2html.c
index 0c4a588..6af1293 100644
--- a/utils/services/ttl2html.c
+++ b/utils/services/ttl2html.c
@@ -20,43 +20,43 @@ static GOptionEntry   entries[] = {
 	  "File to write the output (default stdout)",
 	  NULL
 	},
-        { "links", 'l', 0, G_OPTION_ARG_FILENAME, &class_location_file,
-          "File with pairs: (prefix where the class is defined, class)",
-          NULL
-        },
-        { "explanation", 'e', 0, G_OPTION_ARG_FILENAME, &explanation_file,
-          "Verbosy explanation file in HTML format to include in the webpage",
-          NULL
-        },
+	{ "links", 'l', 0, G_OPTION_ARG_FILENAME, &class_location_file,
+	  "File with pairs: (prefix where the class is defined, class)",
+	  NULL
+	},
+	{ "explanation", 'e', 0, G_OPTION_ARG_FILENAME, &explanation_file,
+	  "Verbosy explanation file in HTML format to include in the webpage",
+	  NULL
+	},
 	{ NULL }
 };
 
 gint
 main (gint argc, gchar **argv)
 {
-        GOptionContext *context;
-        Ontology *ontology = NULL;
-        OntologyDescription *description = NULL;
-        gchar *ttl_file = NULL;
-        gchar *dirname = NULL;
-        FILE *f = NULL;
+	GOptionContext *context;
+	Ontology *ontology = NULL;
+	OntologyDescription *description = NULL;
+	gchar *ttl_file = NULL;
+	gchar *dirname = NULL;
+	FILE *f = NULL;
 
-        g_type_init ();
+	g_type_init ();
 
-	/* Translators: this messagge will apper immediately after the	*/
-	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>	*/
+	/* Translators: this messagge will apper immediately after the  */
+	/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>     */
 	context = g_option_context_new ("- Generates HTML doc for a TTL file");
 
 	/* Translators: this message will appear after the usage string */
-	/* and before the list of options.				*/
+	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 
-        if (!desc_file) {
+	if (!desc_file) {
 		gchar *help;
 
 		g_printerr ("%s\n\n",
-			    "Description file is mandatory");
+		            "Description file is mandatory");
 
 		help = g_option_context_get_help (context, TRUE, NULL);
 		g_option_context_free (context);
@@ -64,34 +64,34 @@ main (gint argc, gchar **argv)
 		g_free (help);
 
 		return -1;
-        }
+	}
 
-        if (output_file) {
-                f = fopen (output_file, "w");
-        } else {
-                f = stdout;
-        }
-        g_assert (f != NULL);
+	if (output_file) {
+		f = fopen (output_file, "w");
+	} else {
+		f = stdout;
+	}
+	g_assert (f != NULL);
 
-        description = ttl_loader_load_description (desc_file);
+	description = ttl_loader_load_description (desc_file);
 
-        dirname = g_path_get_dirname (desc_file);
-        ttl_file = g_build_filename (dirname,
-                                     description->relativePath,
-                                     NULL);
+	dirname = g_path_get_dirname (desc_file);
+	ttl_file = g_build_filename (dirname,
+	                             description->relativePath,
+	                             NULL);
 
-        ontology = ttl_loader_load_ontology (ttl_file);
-        g_free (ttl_file);
-        g_free (dirname);
+	ontology = ttl_loader_load_ontology (ttl_file);
+	g_free (ttl_file);
+	g_free (dirname);
 
-        ttl_html_print (description, ontology, f, class_location_file, explanation_file);
+	ttl_html_print (description, ontology, f, class_location_file, explanation_file);
 
-        ttl_loader_free_ontology (ontology);
-        ttl_loader_free_description (description);
+	ttl_loader_free_ontology (ontology);
+	ttl_loader_free_description (description);
 
-        g_option_context_free (context);
+	g_option_context_free (context);
 
-        fclose (f);
+	fclose (f);
 
-        return 0;
+	return 0;
 }
diff --git a/utils/services/ttl_graphviz.c b/utils/services/ttl_graphviz.c
index 10658f6..7515131 100644
--- a/utils/services/ttl_graphviz.c
+++ b/utils/services/ttl_graphviz.c
@@ -6,55 +6,55 @@
 static void
 generate_class_nodes (gpointer key, gpointer value, gpointer user_data)
 {
-        FILE *output = (FILE *)user_data;
-        OntologyClass *klass = (OntologyClass *)value;
-        GList *it = NULL;
+	FILE *output = (FILE *)user_data;
+	OntologyClass *klass = (OntologyClass *)value;
+	GList *it = NULL;
 
-        g_fprintf (output, "\t \"%s\" [fillcolor=\"greenyellow\"];\n",
-                   qname_to_shortname (klass->classname));
+	g_fprintf (output, "\t \"%s\" [fillcolor=\"greenyellow\"];\n",
+	           qname_to_shortname (klass->classname));
 
-        for (it = klass->superclasses; it != NULL; it = it->next) {
-                g_fprintf (output, 
-                           "\t \"%s\" -> \"%s\" [arrowhead=\"empty\"];\n",
-                           qname_to_shortname (klass->classname),
-                           qname_to_shortname (it->data));
+	for (it = klass->superclasses; it != NULL; it = it->next) {
+		g_fprintf (output, 
+		           "\t \"%s\" -> \"%s\" [arrowhead=\"empty\"];\n",
+		           qname_to_shortname (klass->classname),
+		           qname_to_shortname (it->data));
                 
-        }
+	}
 }
 
 static void
 generate_property_edges (gpointer key, gpointer value, gpointer user_data)
 {
-        FILE *output = (FILE *)user_data;
-        OntologyProperty *prop = (OntologyProperty *)value;
-        static gint counter = 0;
+	FILE *output = (FILE *)user_data;
+	OntologyProperty *prop = (OntologyProperty *)value;
+	static gint counter = 0;
 
-        g_assert (g_list_length (prop->domain) == 1);
-        g_assert (g_list_length (prop->range) == 1);
+	g_assert (g_list_length (prop->domain) == 1);
+	g_assert (g_list_length (prop->range) == 1);
 
-        if (qname_is_basic_type (prop->range->data)) {
-/*
- "_str_1" [label="_str_", shape="box"];
- "nfo:Video" ->  "_str_1" [label="name"];
-*/
-                g_fprintf (output, 
-                           "\t \"_str_%d\" [label=\"%s\", shape=\"box\", fontsize=\"8\", height=\"0.2\"];\n",
-                           counter,
-                           qname_to_shortname (prop->range->data));
-                g_fprintf (output, 
-                           "\t \"%s\" -> \"_str_%d\" [label=\"%s\"];\n",
-                           qname_to_shortname (prop->domain->data),
-                           counter,
-                           qname_to_shortname (prop->propertyname));
-                counter += 1;
+	if (qname_is_basic_type (prop->range->data)) {
+		/*
+		  "_str_1" [label="_str_", shape="box"];
+		  "nfo:Video" ->  "_str_1" [label="name"];
+		*/
+		g_fprintf (output, 
+		           "\t \"_str_%d\" [label=\"%s\", shape=\"box\", fontsize=\"8\", height=\"0.2\"];\n",
+		           counter,
+		           qname_to_shortname (prop->range->data));
+		g_fprintf (output, 
+		           "\t \"%s\" -> \"_str_%d\" [label=\"%s\"];\n",
+		           qname_to_shortname (prop->domain->data),
+		           counter,
+		           qname_to_shortname (prop->propertyname));
+		counter += 1;
                 
-        } else {
-                g_fprintf (output, 
-                           "\t \"%s\" -> \"%s\" [label=\"%s\"];\n",
-                           qname_to_shortname (prop->domain->data),
-                           qname_to_shortname (prop->range->data),
-                           qname_to_shortname (prop->propertyname));
-        }
+	} else {
+		g_fprintf (output, 
+		           "\t \"%s\" -> \"%s\" [label=\"%s\"];\n",
+		           qname_to_shortname (prop->domain->data),
+		           qname_to_shortname (prop->range->data),
+		           qname_to_shortname (prop->propertyname));
+	}
 }
 
 
@@ -63,20 +63,20 @@ ttl_graphviz_print (OntologyDescription *description,
                     Ontology *ontology,
                     FILE *output)
 {
-        qname_init (description->baseUrl, description->localPrefix, NULL);
-        g_fprintf (output, "digraph \"%s\" {\n",  description->title);
-        g_fprintf (output, "    label=\"%s\";\n", description->title);
-        g_fprintf (output, "    rankdir=BT;\n");
-        g_fprintf (output, "    node [style=filled];\n");
+	qname_init (description->baseUrl, description->localPrefix, NULL);
+	g_fprintf (output, "digraph \"%s\" {\n",  description->title);
+	g_fprintf (output, "    label=\"%s\";\n", description->title);
+	g_fprintf (output, "    rankdir=BT;\n");
+	g_fprintf (output, "    node [style=filled];\n");
 
-        g_hash_table_foreach (ontology->classes,
-                              generate_class_nodes,
-                              output);
+	g_hash_table_foreach (ontology->classes,
+	                      generate_class_nodes,
+	                      output);
 
-        g_hash_table_foreach (ontology->properties,
-                              generate_property_edges,
-                              output);
+	g_hash_table_foreach (ontology->properties,
+	                      generate_property_edges,
+	                      output);
 
-        g_fprintf (output, "}\n");
+	g_fprintf (output, "}\n");
 
 }
diff --git a/utils/services/ttl_html.c b/utils/services/ttl_html.c
index 3355495..8dc0b6a 100644
--- a/utils/services/ttl_html.c
+++ b/utils/services/ttl_html.c
@@ -6,32 +6,32 @@
 #define SIGNALS_DOC "http://live.gnome.org/Tracker/Documentation/SignalsOnChanges";
 
 typedef struct {
-        Ontology *ontology;
-        OntologyDescription *description;
-        FILE *output;
+	Ontology *ontology;
+	OntologyDescription *description;
+	FILE *output;
 } CallbackInfo;
 
 
 static void
 print_author (gpointer item, gpointer user_data) {
-        FILE *f = (FILE *)user_data;
-        g_fprintf (f,"<dd>%s</dd>", (gchar *)item);
+	FILE *f = (FILE *)user_data;
+	g_fprintf (f,"<dd>%s</dd>", (gchar *)item);
 }
 
 static void
 print_reference (gpointer item, gpointer user_data)
 {
-        gchar *shortname;
-        gchar *link;
-        FILE *f = (FILE *)user_data;
+	gchar *shortname;
+	gchar *link;
+	FILE *f = (FILE *)user_data;
 
-        shortname = qname_to_shortname ((gchar *)item);
-        link = qname_to_link ((gchar *)item);
+	shortname = qname_to_shortname ((gchar *)item);
+	link = qname_to_link ((gchar *)item);
 
-        g_fprintf (f,"<a href=\"%s\">%s</a>, ", link , shortname);
+	g_fprintf (f,"<a href=\"%s\">%s</a>, ", link , shortname);
 
-        g_free (shortname);
-        g_free (link);
+	g_free (shortname);
+	g_free (link);
 }
 
 
@@ -39,255 +39,255 @@ print_reference (gpointer item, gpointer user_data)
 static void
 print_references_list (FILE *f, GList *list)
 {
-        g_fprintf (f,"<td>");
-        if (list == NULL) {
-                g_fprintf (f,"--");
-        } else {
-                g_list_foreach (list, print_reference, f);
-        }
-        g_fprintf (f,"</td>");
+	g_fprintf (f,"<td>");
+	if (list == NULL) {
+		g_fprintf (f,"--");
+	} else {
+		g_list_foreach (list, print_reference, f);
+	}
+	g_fprintf (f,"</td>");
 }
 
 static void
 print_list (FILE *f, GList *list)
 {
-        GList *it;
-        gchar *shortname;
+	GList *it;
+	gchar *shortname;
 
 
-        g_fprintf (f, "<td>");
-        for (it = list; it != NULL; it = it->next) {
-                shortname = qname_to_shortname ((gchar *)it->data);
-                g_fprintf (f, "%s%s", shortname, (it->next ? ", " : ""));
-                g_free (shortname);
-        }
-        g_fprintf (f, "</td>");
+	g_fprintf (f, "<td>");
+	for (it = list; it != NULL; it = it->next) {
+		shortname = qname_to_shortname ((gchar *)it->data);
+		g_fprintf (f, "%s%s", shortname, (it->next ? ", " : ""));
+		g_free (shortname);
+	}
+	g_fprintf (f, "</td>");
 }
 
 static void
 print_deprecated_message (FILE *f)
 {
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"deprecated\" colspan=\"2\">This item is deprecated.</td>\n");
-        g_fprintf (f,"</tr>\n");
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"deprecated\" colspan=\"2\">This item is deprecated.</td>\n");
+	g_fprintf (f,"</tr>\n");
 }
 
 static void
 print_html_header (FILE *f, OntologyDescription *desc)
 {
-        g_fprintf (f,"<html>\n");
-        g_fprintf (f,"<head>\n");
-        g_fprintf (f,"\t<link rel=\"stylesheet\" type=\"text/css\"");
-        g_fprintf (f," href=\"../resources/nie-maemo.css\" />\n");
-        g_fprintf (f,"<title>%s</title>\n", desc->title);
-        g_fprintf (f,"</head>\n");
-        g_fprintf (f,"<body>\n");
-        g_fprintf (f,"<div class=\"head\">\n");
-        g_fprintf (f," <div class=\"nav\">\n");
-
-        /* Three logos at the top. Tracker, maemo, nepomuk */
-        g_fprintf (f, " <a href=\"http://www.tracker-project.org\";>");
-        g_fprintf (f, "<img alt=\"Tracker logo\" src=\"../resources/tracker-logo.png\" /></a> \n");
-        g_fprintf (f, " <a href=\"http://www.maemo.org\";> <img alt=\"MAEMO logo\" ");
-        g_fprintf (f, " src=\"../resources/maemo-logo.gif\" /></a>\n");
-        g_fprintf (f, " <a href=\"http://nepomuk.semanticdesktop.org\";> ");
-        g_fprintf (f, "<img alt=\"Nepomuk logo\"  src=\"../resources/nepomuk-logo.png\"/></a>\n");
-
-        g_fprintf (f,"</div>\n");
-        g_fprintf (f,"</div>\n");
-
-        g_fprintf (f,"<h1>%s</h1>\n", desc->title);
-        g_fprintf (f," <dl>\n");
-        if (desc->upstream) {
-                g_fprintf (f,"  <dt>Upstream:</dt><dd><a href=\"%s\">Upstream version</a></dd>\n",
-                           desc->upstream);
-        } else {
-                g_fprintf (f,"  <dt>Upstream:</dt><dd>Not available</dd>\n");
-        }
-        g_fprintf (f,"  <dt></dt>\n");
-        g_fprintf (f,"  <dt></dt>\n");
-        g_fprintf (f, "</dl>\n <dl>\n");
-        g_fprintf (f,"  <dt>Authors:</dt>\n");
-        g_list_foreach (desc->authors, print_author, f);
-        g_fprintf (f, "</dl>\n <dl>\n");
-        g_fprintf (f,"  <dt>Editors:</dt>\n");
-        g_list_foreach (desc->editors, print_author, f);
-        if (desc->contributors) {
-                g_fprintf (f, "</dl>\n <dl>\n");
-                g_fprintf (f,"  <dt>Contributors:</dt>\n");
-                g_list_foreach (desc->contributors, print_author, f);
-        }
-        g_fprintf (f, "</dl>\n <dl>\n");
-        g_fprintf (f,"  <dt>Changelog:</dt>\n");
-        g_fprintf (f,"  <dd><a href=\"%s\">Tracker changes</a>",
-                   (desc->gitlog ? desc->gitlog : "#"));
-        g_fprintf (f," </dl>\n");
-        g_fprintf (f,"</div>\n");
-        g_fprintf (f,"<p class=\"copyright\">%s</p>\n",
-                   (desc->copyright ? desc->copyright : DEFAULT_COPYRIGHT));
-
-        g_fprintf (f,"<hr />\n");
+	g_fprintf (f,"<html>\n");
+	g_fprintf (f,"<head>\n");
+	g_fprintf (f,"\t<link rel=\"stylesheet\" type=\"text/css\"");
+	g_fprintf (f," href=\"../resources/nie-maemo.css\" />\n");
+	g_fprintf (f,"<title>%s</title>\n", desc->title);
+	g_fprintf (f,"</head>\n");
+	g_fprintf (f,"<body>\n");
+	g_fprintf (f,"<div class=\"head\">\n");
+	g_fprintf (f," <div class=\"nav\">\n");
+
+	/* Three logos at the top. Tracker, maemo, nepomuk */
+	g_fprintf (f, " <a href=\"http://www.tracker-project.org\";>");
+	g_fprintf (f, "<img alt=\"Tracker logo\" src=\"../resources/tracker-logo.png\" /></a> \n");
+	g_fprintf (f, " <a href=\"http://www.maemo.org\";> <img alt=\"MAEMO logo\" ");
+	g_fprintf (f, " src=\"../resources/maemo-logo.gif\" /></a>\n");
+	g_fprintf (f, " <a href=\"http://nepomuk.semanticdesktop.org\";> ");
+	g_fprintf (f, "<img alt=\"Nepomuk logo\"  src=\"../resources/nepomuk-logo.png\"/></a>\n");
+
+	g_fprintf (f,"</div>\n");
+	g_fprintf (f,"</div>\n");
+
+	g_fprintf (f,"<h1>%s</h1>\n", desc->title);
+	g_fprintf (f," <dl>\n");
+	if (desc->upstream) {
+		g_fprintf (f,"  <dt>Upstream:</dt><dd><a href=\"%s\">Upstream version</a></dd>\n",
+		           desc->upstream);
+	} else {
+		g_fprintf (f,"  <dt>Upstream:</dt><dd>Not available</dd>\n");
+	}
+	g_fprintf (f,"  <dt></dt>\n");
+	g_fprintf (f,"  <dt></dt>\n");
+	g_fprintf (f, "</dl>\n <dl>\n");
+	g_fprintf (f,"  <dt>Authors:</dt>\n");
+	g_list_foreach (desc->authors, print_author, f);
+	g_fprintf (f, "</dl>\n <dl>\n");
+	g_fprintf (f,"  <dt>Editors:</dt>\n");
+	g_list_foreach (desc->editors, print_author, f);
+	if (desc->contributors) {
+		g_fprintf (f, "</dl>\n <dl>\n");
+		g_fprintf (f,"  <dt>Contributors:</dt>\n");
+		g_list_foreach (desc->contributors, print_author, f);
+	}
+	g_fprintf (f, "</dl>\n <dl>\n");
+	g_fprintf (f,"  <dt>Changelog:</dt>\n");
+	g_fprintf (f,"  <dd><a href=\"%s\">Tracker changes</a>",
+	           (desc->gitlog ? desc->gitlog : "#"));
+	g_fprintf (f," </dl>\n");
+	g_fprintf (f,"</div>\n");
+	g_fprintf (f,"<p class=\"copyright\">%s</p>\n",
+	           (desc->copyright ? desc->copyright : DEFAULT_COPYRIGHT));
+
+	g_fprintf (f,"<hr />\n");
 
 }
 
 static void
 print_html_explanation (FILE *f, const gchar *explanation_file)
 {
-        gchar *raw_content;
-        gint   length;
+	gchar *raw_content;
+	gint   length;
 
-        if (explanation_file && g_file_test (explanation_file, G_FILE_TEST_EXISTS)) {
-                if (!g_file_get_contents (explanation_file, &raw_content, &length, NULL)) {
-                        g_error ("Unable to load '%s'", explanation_file );
-                }
-                g_fprintf (f, "%s", raw_content);
-        }
-        g_fprintf (f,"<hr />\n");
+	if (explanation_file && g_file_test (explanation_file, G_FILE_TEST_EXISTS)) {
+		if (!g_file_get_contents (explanation_file, &raw_content, &length, NULL)) {
+			g_error ("Unable to load '%s'", explanation_file );
+		}
+		g_fprintf (f, "%s", raw_content);
+	}
+	g_fprintf (f,"<hr />\n");
 
 }
 
 static void
 print_html_footer (FILE *f)
 {
-        g_fprintf (f,"</body>\n");
-        g_fprintf (f,"</html>\n");
+	g_fprintf (f,"</body>\n");
+	g_fprintf (f,"</html>\n");
 }
 
 
 static void
 print_ontology_class (gpointer key, gpointer value, gpointer user_data)
 {
-        OntologyClass *def = (OntologyClass *)value;
-        gchar *name, *anchor;
-        FILE *f = (FILE *)user_data;
-
-        g_return_if_fail (f != NULL);
-
-        name = qname_to_shortname (def->classname);
-        anchor = qname_to_link (def->classname);
-
-        /* Anchor without initial '#' */
-        g_fprintf (f,"<a name=\"%s\">\n", &anchor[1]);
-        g_free (anchor);
-
-        if (def->deprecated) {
-                g_fprintf (f,"<h3 class=\"deprecated\">%s</h3>\n", name);
-                g_fprintf (f,"<table class=\"deprecated\">\n");
-                print_deprecated_message (f);
-        } else {
-                g_fprintf (f,"<h3>%s</h3>\n", name);
-                g_fprintf (f,"<table class=\"doctable\">\n");
-        }
-        g_free (name);
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Superclasses</td>");
-        print_references_list (f, def->superclasses);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Subclasses</td>");
-        print_references_list (f, def->subclasses);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">In domain of</td>");
-        print_references_list (f, def->in_domain_of);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">In range of</td>");
-        print_references_list (f, def->in_range_of);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Description</td>");
-        g_fprintf (f,"<td>%s</td>\n", (def->description ? def->description : "--"));
-        g_fprintf (f,"</tr>\n");
-
-        if (def->notify) {
-                g_fprintf (f,"<tr>");
-                g_fprintf (f,"<td colspan=\"2\">This class <a href=\"%s\">notifies changes</a></td>\n", SIGNALS_DOC);
-                g_fprintf (f,"</tr>\n");
-        }
-
-        if (def->instances) {
-                g_fprintf (f,"<tr>");
-                g_fprintf (f,"<td class=\"rowheader\">Predefined instances</td>");
-                print_list (f, def->instances);
-                g_fprintf (f,"</tr>\n");
-        }
-
-
-        g_fprintf (f,"</table>\n\n");
+	OntologyClass *def = (OntologyClass *)value;
+	gchar *name, *anchor;
+	FILE *f = (FILE *)user_data;
+
+	g_return_if_fail (f != NULL);
+
+	name = qname_to_shortname (def->classname);
+	anchor = qname_to_link (def->classname);
+
+	/* Anchor without initial '#' */
+	g_fprintf (f,"<a name=\"%s\">\n", &anchor[1]);
+	g_free (anchor);
+
+	if (def->deprecated) {
+		g_fprintf (f,"<h3 class=\"deprecated\">%s</h3>\n", name);
+		g_fprintf (f,"<table class=\"deprecated\">\n");
+		print_deprecated_message (f);
+	} else {
+		g_fprintf (f,"<h3>%s</h3>\n", name);
+		g_fprintf (f,"<table class=\"doctable\">\n");
+	}
+	g_free (name);
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Superclasses</td>");
+	print_references_list (f, def->superclasses);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Subclasses</td>");
+	print_references_list (f, def->subclasses);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">In domain of</td>");
+	print_references_list (f, def->in_domain_of);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">In range of</td>");
+	print_references_list (f, def->in_range_of);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Description</td>");
+	g_fprintf (f,"<td>%s</td>\n", (def->description ? def->description : "--"));
+	g_fprintf (f,"</tr>\n");
+
+	if (def->notify) {
+		g_fprintf (f,"<tr>");
+		g_fprintf (f,"<td colspan=\"2\">This class <a href=\"%s\">notifies changes</a></td>\n", SIGNALS_DOC);
+		g_fprintf (f,"</tr>\n");
+	}
+
+	if (def->instances) {
+		g_fprintf (f,"<tr>");
+		g_fprintf (f,"<td class=\"rowheader\">Predefined instances</td>");
+		print_list (f, def->instances);
+		g_fprintf (f,"</tr>\n");
+	}
+
+
+	g_fprintf (f,"</table>\n\n");
 
 }
 
 static void
 print_ontology_property (gpointer key, gpointer value, gpointer user_data)
 {
-        OntologyProperty *def = (OntologyProperty *)value;
-        gchar *name, *anchor;
-        FILE *f = (FILE *)user_data;
-
-        g_return_if_fail (f != NULL);
-
-        name = qname_to_shortname (def->propertyname);
-        anchor = qname_to_link (def->propertyname);
-
-        /* Anchor without initial '#' */
-        g_fprintf (f,"<a name=\"%s\">", &anchor[1]);
-        g_free (anchor);
-
-        if (def->deprecated) {
-                g_fprintf (f,"<h3 class=\"deprecated\">%s</h3>\n", name);
-                g_fprintf (f,"<table class=\"deprecated\">\n");
-                print_deprecated_message (f);
-        } else {
-                g_fprintf (f,"<h3>%s</h3>\n", name);
-                g_fprintf (f,"<table class=\"doctable\">\n");
-        }
-        g_free (name);
-
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Type</td>");
-        print_references_list (f, def->type);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Domain</td>");
-        print_references_list (f, def->domain);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Range</td>");
-        print_references_list (f, def->range);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Superproperties</td>");
-        print_references_list (f, def->superproperties);
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Subproperties</td>");
-        print_references_list (f, def->subproperties);
-        g_fprintf (f,"</tr>\n");
-
-        if (def->max_cardinality) {
-                g_fprintf (f,"<tr>");
-                g_fprintf (f,"<td class=\"rowheader\">Maximal cardinality</td>");
-                g_fprintf (f,"<td>%s</td", def->max_cardinality);
-                g_fprintf (f,"</tr>\n");
-        }
-
-        g_fprintf (f,"<tr>");
-        g_fprintf (f,"<td class=\"rowheader\">Description</td>");
-        g_fprintf (f,"<td>%s</td>\n", (def->description ? def->description : "--"));
-        g_fprintf (f,"</tr>\n");
-
-        g_fprintf (f,"</table>\n\n");
+	OntologyProperty *def = (OntologyProperty *)value;
+	gchar *name, *anchor;
+	FILE *f = (FILE *)user_data;
+
+	g_return_if_fail (f != NULL);
+
+	name = qname_to_shortname (def->propertyname);
+	anchor = qname_to_link (def->propertyname);
+
+	/* Anchor without initial '#' */
+	g_fprintf (f,"<a name=\"%s\">", &anchor[1]);
+	g_free (anchor);
+
+	if (def->deprecated) {
+		g_fprintf (f,"<h3 class=\"deprecated\">%s</h3>\n", name);
+		g_fprintf (f,"<table class=\"deprecated\">\n");
+		print_deprecated_message (f);
+	} else {
+		g_fprintf (f,"<h3>%s</h3>\n", name);
+		g_fprintf (f,"<table class=\"doctable\">\n");
+	}
+	g_free (name);
+
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Type</td>");
+	print_references_list (f, def->type);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Domain</td>");
+	print_references_list (f, def->domain);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Range</td>");
+	print_references_list (f, def->range);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Superproperties</td>");
+	print_references_list (f, def->superproperties);
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Subproperties</td>");
+	print_references_list (f, def->subproperties);
+	g_fprintf (f,"</tr>\n");
+
+	if (def->max_cardinality) {
+		g_fprintf (f,"<tr>");
+		g_fprintf (f,"<td class=\"rowheader\">Maximal cardinality</td>");
+		g_fprintf (f,"<td>%s</td", def->max_cardinality);
+		g_fprintf (f,"</tr>\n");
+	}
+
+	g_fprintf (f,"<tr>");
+	g_fprintf (f,"<td class=\"rowheader\">Description</td>");
+	g_fprintf (f,"<td>%s</td>\n", (def->description ? def->description : "--"));
+	g_fprintf (f,"</tr>\n");
+
+	g_fprintf (f,"</table>\n\n");
 }
 
 
@@ -300,13 +300,13 @@ ttl_html_print (OntologyDescription *description,
                 const gchar *explanation_file)
 {
 
-        qname_init (description->baseUrl, description->localPrefix, class_location_file);
-        print_html_header (f, description);
-        print_html_explanation (f, explanation_file);
-        g_fprintf (f,"<h2>Ontology Classes Descriptions</h2>");
-        g_hash_table_foreach (ontology->classes, print_ontology_class, f);
-        g_fprintf (f,"<h2>Ontology Properties Descriptions</h2>");
-        g_hash_table_foreach (ontology->properties, print_ontology_property, f);
+	qname_init (description->baseUrl, description->localPrefix, class_location_file);
+	print_html_header (f, description);
+	print_html_explanation (f, explanation_file);
+	g_fprintf (f,"<h2>Ontology Classes Descriptions</h2>");
+	g_hash_table_foreach (ontology->classes, print_ontology_class, f);
+	g_fprintf (f,"<h2>Ontology Properties Descriptions</h2>");
+	g_hash_table_foreach (ontology->properties, print_ontology_property, f);
 
-        print_html_footer (f);
+	print_html_footer (f);
 }
diff --git a/utils/services/ttl_loader.c b/utils/services/ttl_loader.c
index 3c8310d..d490925 100644
--- a/utils/services/ttl_loader.c
+++ b/utils/services/ttl_loader.c
@@ -39,13 +39,13 @@
 
 static gboolean
 string_to_boolean (const gchar *str) {
-        if (!g_strcmp0 (str, "true")) {
-                return TRUE;
-        } else if (!g_strcmp0 (str, "false")) {
-                return FALSE;
-        } else {
-                g_error ("Unable to map '%s' into boolean", str);
-        }
+	if (!g_strcmp0 (str, "true")) {
+		return TRUE;
+	} else if (!g_strcmp0 (str, "false")) {
+		return FALSE;
+	} else {
+		g_error ("Unable to map '%s' into boolean", str);
+	}
 }
 
 
@@ -55,189 +55,189 @@ load_in_memory (Ontology    *ontology,
                 const gchar *turtle_predicate,
                 const gchar *turtle_object)
 {
-        g_return_if_fail (ontology != NULL);
-
-        if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
-                /* It is a definition of class or property */
-                if (!g_strcmp0 (turtle_object, RDFS_CLASS)) {
-                        g_hash_table_insert (ontology->classes,
-                                             g_strdup (turtle_subject),
-                                             ttl_model_class_new (turtle_subject));
-
-                } else if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
-                        g_hash_table_insert (ontology->properties,
-                                             g_strdup (turtle_subject),
-                                             ttl_model_property_new (turtle_subject));
-
-                } else {
-                        /* xxx:a-default-instance a xxx:Class */
-                        OntologyClass *def;
-
-                        def = g_hash_table_lookup (ontology->classes, turtle_object);
-                        if (def) {
-                                def->instances = g_list_prepend (def->instances,
-                                                                 g_strdup (turtle_subject));
-                        }
-                        /* g_print ("FIXME Ignoring %s %s %s\n",
-                                 turtle_subject, turtle_predicate, turtle_object);
-                        */
-                }
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_SUBCLASSOF)) {
-                /*
-                 * A subclass of B:
-                 *  - Add B in A->superclasses list
-                 *  - Add A in B->subclasses list (if B is in this ontology!)
-                 */
-                OntologyClass *def;
-
-                def = g_hash_table_lookup (ontology->classes, turtle_subject);
-                if (!def) {
-                        g_error ("Something wrong");
-                }
-
-                def->superclasses = g_list_prepend (def->superclasses,
-                                                    g_strdup (turtle_object));
-
-                def = g_hash_table_lookup (ontology->classes, turtle_object);
-                if (def) {
-                        def->subclasses = g_list_prepend (def->subclasses,
-                                                          g_strdup (turtle_subject));
-                }
-        } else if (!g_strcmp0 (turtle_predicate, TRACKER_NOTIFY)) {
-                /*
-                 * A tracker:notify TRUE
-                 */
-                OntologyClass *def;
-
-                def = g_hash_table_lookup (ontology->classes, turtle_subject);
-                if (!def) {
-                        g_error ("Something wrong");
-                }
-
-                def->notify = string_to_boolean (turtle_object);
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_COMMENT)) {
-                OntologyClass *klass;
-                OntologyProperty *prop;
-
-                klass = g_hash_table_lookup (ontology->classes, turtle_subject);
-                if (klass) {
-                        klass->description = g_strdup (turtle_object);
-                } else {
-                        prop = g_hash_table_lookup (ontology->properties, turtle_subject);
-                        if (prop) {
-                                prop->description = g_strdup (turtle_object);
-                        } else {
-                                g_error ("UHUMMM %s", turtle_subject);
-                        }
-                }
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_DOMAIN)) {
-                /*
-                 * (prop A) has domain (class B)
-                 *  -> add B in A->domain
-                 *  -> add A in B->in_domain_of (if B is defined in this ontology!)
-                 */
-                OntologyProperty *prop;
-                OntologyClass *klass;
-
-                prop = g_hash_table_lookup (ontology->properties, turtle_subject);
-                if (!prop) {
-                        g_error ("Strange error in domain (%s doesnt exist!)",
-                                 turtle_subject);
-                }
-                prop->domain = g_list_prepend (prop->domain, g_strdup (turtle_object));
-
-                klass = g_hash_table_lookup (ontology->classes, turtle_object);
-                if (klass) {
-                        klass->in_domain_of = g_list_prepend (klass->in_domain_of,
-                                                              g_strdup (turtle_subject));
-                }
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_RANGE)) {
-                /*
-                 * (prop A) has range (class B)
-                 *  -> add B in A->range
-                 *  -> add A in B->in_range_of (if B is defined in this ontology!)
-                 */
-                OntologyProperty *prop;
-                OntologyClass *klass;
-
-                prop = g_hash_table_lookup (ontology->properties, turtle_subject);
-                if (!prop) {
-                        g_error ("Strange error in domain (%s doesnt exist!)",
-                                 turtle_subject);
-                }
-                prop->range = g_list_prepend (prop->range, g_strdup (turtle_object));
-
-                klass = g_hash_table_lookup (ontology->classes, turtle_object);
-                if (klass) {
-                        klass->in_range_of = g_list_prepend (klass->in_range_of,
-                                                              g_strdup (turtle_subject));
-                }
-        } else if (!g_strcmp0 (turtle_predicate, NRL_MAX_CARDINALITY)) {
-                OntologyProperty *prop;
-
-                prop = g_hash_table_lookup (ontology->properties, turtle_subject);
-                if (!prop) {
-                        g_error ("Strange error in max cardinality (%s doesnt exist!)",
-                                 turtle_subject);
-                }
-                prop->max_cardinality = g_strdup (turtle_object);
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_SUBPROPERTYOF)) {
-                /*
-                 * (prop A) is subproperty of (prop B)
-                 *  -> add B in A->superproperties
-                 *  -> add A in B->subproperties (if B is in this ontology)
-                 */
-                OntologyProperty *propA, *propB;
-
-                propA = g_hash_table_lookup (ontology->properties, turtle_subject);
-                if (!propA) {
-                        g_error ("Strange error in subpropertyof (%s doesnt exist!)",
-                                 turtle_subject);
-                }
-                propA->superproperties = g_list_prepend (propA->superproperties,
-                                                         g_strdup (turtle_object));
-
-                propB = g_hash_table_lookup (ontology->properties, turtle_object);
-                if (propB) {
-                        propB->subproperties = g_list_prepend (propB->subproperties,
-                                                               g_strdup (turtle_subject));
-                }
-
-        } else if (!g_strcmp0 (turtle_predicate, NAO_DEPRECATED)) {
-                /*
-                 * X nao:deprecated true
-                 *
-                 * This can apply to classes OR properties!
-                 */
-                OntologyProperty *prop;
-                OntologyClass *klass;
-
-                prop = g_hash_table_lookup (ontology->properties, turtle_subject);
-                if (prop) {
-                        prop->deprecated = string_to_boolean (turtle_object);
-                } else {
-                        /* Try with a class */
-                        klass = g_hash_table_lookup (ontology->classes, turtle_subject);
-                        if (klass) {
-                                klass->deprecated = string_to_boolean (turtle_object);
-                        } else {
-                                g_error ("'%s' is not a class nor a property!?", turtle_subject);
-                        }
-                }
-
-        } else if (!g_strcmp0 (turtle_predicate, RDFS_LABEL)) {
-                /* Intentionaly ignored */
-        } else {
-                /* DEBUG
-                g_print ("UNHANDLED %s %s %s\n",
-                         turtle_subject, turtle_predicate, turtle_object);
-                */
-        }
+	g_return_if_fail (ontology != NULL);
+
+	if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
+		/* It is a definition of class or property */
+		if (!g_strcmp0 (turtle_object, RDFS_CLASS)) {
+			g_hash_table_insert (ontology->classes,
+			                     g_strdup (turtle_subject),
+			                     ttl_model_class_new (turtle_subject));
+
+		} else if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
+			g_hash_table_insert (ontology->properties,
+			                     g_strdup (turtle_subject),
+			                     ttl_model_property_new (turtle_subject));
+
+		} else {
+			/* xxx:a-default-instance a xxx:Class */
+			OntologyClass *def;
+
+			def = g_hash_table_lookup (ontology->classes, turtle_object);
+			if (def) {
+				def->instances = g_list_prepend (def->instances,
+				                                 g_strdup (turtle_subject));
+			}
+			/* g_print ("FIXME Ignoring %s %s %s\n",
+			   turtle_subject, turtle_predicate, turtle_object);
+			*/
+		}
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_SUBCLASSOF)) {
+		/*
+		 * A subclass of B:
+		 *  - Add B in A->superclasses list
+		 *  - Add A in B->subclasses list (if B is in this ontology!)
+		 */
+		OntologyClass *def;
+
+		def = g_hash_table_lookup (ontology->classes, turtle_subject);
+		if (!def) {
+			g_error ("Something wrong");
+		}
+
+		def->superclasses = g_list_prepend (def->superclasses,
+		                                    g_strdup (turtle_object));
+
+		def = g_hash_table_lookup (ontology->classes, turtle_object);
+		if (def) {
+			def->subclasses = g_list_prepend (def->subclasses,
+			                                  g_strdup (turtle_subject));
+		}
+	} else if (!g_strcmp0 (turtle_predicate, TRACKER_NOTIFY)) {
+		/*
+		 * A tracker:notify TRUE
+		 */
+		OntologyClass *def;
+
+		def = g_hash_table_lookup (ontology->classes, turtle_subject);
+		if (!def) {
+			g_error ("Something wrong");
+		}
+
+		def->notify = string_to_boolean (turtle_object);
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_COMMENT)) {
+		OntologyClass *klass;
+		OntologyProperty *prop;
+
+		klass = g_hash_table_lookup (ontology->classes, turtle_subject);
+		if (klass) {
+			klass->description = g_strdup (turtle_object);
+		} else {
+			prop = g_hash_table_lookup (ontology->properties, turtle_subject);
+			if (prop) {
+				prop->description = g_strdup (turtle_object);
+			} else {
+				g_error ("UHUMMM %s", turtle_subject);
+			}
+		}
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_DOMAIN)) {
+		/*
+		 * (prop A) has domain (class B)
+		 *  -> add B in A->domain
+		 *  -> add A in B->in_domain_of (if B is defined in this ontology!)
+		 */
+		OntologyProperty *prop;
+		OntologyClass *klass;
+
+		prop = g_hash_table_lookup (ontology->properties, turtle_subject);
+		if (!prop) {
+			g_error ("Strange error in domain (%s doesnt exist!)",
+			         turtle_subject);
+		}
+		prop->domain = g_list_prepend (prop->domain, g_strdup (turtle_object));
+
+		klass = g_hash_table_lookup (ontology->classes, turtle_object);
+		if (klass) {
+			klass->in_domain_of = g_list_prepend (klass->in_domain_of,
+			                                      g_strdup (turtle_subject));
+		}
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_RANGE)) {
+		/*
+		 * (prop A) has range (class B)
+		 *  -> add B in A->range
+		 *  -> add A in B->in_range_of (if B is defined in this ontology!)
+		 */
+		OntologyProperty *prop;
+		OntologyClass *klass;
+
+		prop = g_hash_table_lookup (ontology->properties, turtle_subject);
+		if (!prop) {
+			g_error ("Strange error in domain (%s doesnt exist!)",
+			         turtle_subject);
+		}
+		prop->range = g_list_prepend (prop->range, g_strdup (turtle_object));
+
+		klass = g_hash_table_lookup (ontology->classes, turtle_object);
+		if (klass) {
+			klass->in_range_of = g_list_prepend (klass->in_range_of,
+			                                     g_strdup (turtle_subject));
+		}
+	} else if (!g_strcmp0 (turtle_predicate, NRL_MAX_CARDINALITY)) {
+		OntologyProperty *prop;
+
+		prop = g_hash_table_lookup (ontology->properties, turtle_subject);
+		if (!prop) {
+			g_error ("Strange error in max cardinality (%s doesnt exist!)",
+			         turtle_subject);
+		}
+		prop->max_cardinality = g_strdup (turtle_object);
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_SUBPROPERTYOF)) {
+		/*
+		 * (prop A) is subproperty of (prop B)
+		 *  -> add B in A->superproperties
+		 *  -> add A in B->subproperties (if B is in this ontology)
+		 */
+		OntologyProperty *propA, *propB;
+
+		propA = g_hash_table_lookup (ontology->properties, turtle_subject);
+		if (!propA) {
+			g_error ("Strange error in subpropertyof (%s doesnt exist!)",
+			         turtle_subject);
+		}
+		propA->superproperties = g_list_prepend (propA->superproperties,
+		                                         g_strdup (turtle_object));
+
+		propB = g_hash_table_lookup (ontology->properties, turtle_object);
+		if (propB) {
+			propB->subproperties = g_list_prepend (propB->subproperties,
+			                                       g_strdup (turtle_subject));
+		}
+
+	} else if (!g_strcmp0 (turtle_predicate, NAO_DEPRECATED)) {
+		/*
+		 * X nao:deprecated true
+		 *
+		 * This can apply to classes OR properties!
+		 */
+		OntologyProperty *prop;
+		OntologyClass *klass;
+
+		prop = g_hash_table_lookup (ontology->properties, turtle_subject);
+		if (prop) {
+			prop->deprecated = string_to_boolean (turtle_object);
+		} else {
+			/* Try with a class */
+			klass = g_hash_table_lookup (ontology->classes, turtle_subject);
+			if (klass) {
+				klass->deprecated = string_to_boolean (turtle_object);
+			} else {
+				g_error ("'%s' is not a class nor a property!?", turtle_subject);
+			}
+		}
+
+	} else if (!g_strcmp0 (turtle_predicate, RDFS_LABEL)) {
+		/* Intentionaly ignored */
+	} else {
+		/* DEBUG
+		   g_print ("UNHANDLED %s %s %s\n",
+		   turtle_subject, turtle_predicate, turtle_object);
+		*/
+	}
 
 }
 
@@ -247,52 +247,52 @@ load_description (OntologyDescription *desc,
                   const gchar         *turtle_predicate,
                   const gchar         *turtle_object)
 {
-        if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
-                g_assert (!g_strcmp0 (turtle_object, DSC_ONTOLOGY));
-        } else if (!g_strcmp0 (turtle_predicate, DSC_TITLE)) {
-                desc->title = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_UPSTREAM)) {
-                desc->upstream = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_AUTHOR)) {
-                desc->authors = g_list_prepend (desc->authors, g_strdup (turtle_object));
-        } else if (!g_strcmp0 (turtle_predicate, DSC_EDITOR)) {
-                desc->editors = g_list_prepend (desc->editors, g_strdup (turtle_object));
-        } else if (!g_strcmp0 (turtle_predicate, DSC_CONTRIBUTOR)) {
-                desc->contributors = g_list_prepend (desc->contributors,
-                                                     g_strdup (turtle_object));
-        } else if (!g_strcmp0 (turtle_predicate, DSC_GITLOG)) {
-                desc->gitlog = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_BASEURI)) {
-                desc->baseUrl = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_RELPATH)) {
-                desc->relativePath = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_LOCALPREFIX)) {
-                desc->localPrefix = g_strdup (turtle_object);
-        } else if (!g_strcmp0 (turtle_predicate, DSC_COPYRIGHT)) {
-                desc->copyright = g_strdup (turtle_object);
-        } else {
-                g_critical ("Unhandled element %s", turtle_predicate);
-        }
+	if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
+		g_assert (!g_strcmp0 (turtle_object, DSC_ONTOLOGY));
+	} else if (!g_strcmp0 (turtle_predicate, DSC_TITLE)) {
+		desc->title = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_UPSTREAM)) {
+		desc->upstream = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_AUTHOR)) {
+		desc->authors = g_list_prepend (desc->authors, g_strdup (turtle_object));
+	} else if (!g_strcmp0 (turtle_predicate, DSC_EDITOR)) {
+		desc->editors = g_list_prepend (desc->editors, g_strdup (turtle_object));
+	} else if (!g_strcmp0 (turtle_predicate, DSC_CONTRIBUTOR)) {
+		desc->contributors = g_list_prepend (desc->contributors,
+		                                     g_strdup (turtle_object));
+	} else if (!g_strcmp0 (turtle_predicate, DSC_GITLOG)) {
+		desc->gitlog = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_BASEURI)) {
+		desc->baseUrl = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_RELPATH)) {
+		desc->relativePath = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_LOCALPREFIX)) {
+		desc->localPrefix = g_strdup (turtle_object);
+	} else if (!g_strcmp0 (turtle_predicate, DSC_COPYRIGHT)) {
+		desc->copyright = g_strdup (turtle_object);
+	} else {
+		g_critical ("Unhandled element %s", turtle_predicate);
+	}
 }
 
 
 Ontology *
 ttl_loader_load_ontology (const gchar *ttl_file)
 {
-        Ontology *ontology;
+	Ontology *ontology;
 
-        ontology = g_new0 (Ontology, 1);
-        ontology->classes = g_hash_table_new_full (g_str_hash,
-                                                   g_str_equal,
-                                                   g_free,
-                                                   (GDestroyNotify)ttl_model_class_free);
+	ontology = g_new0 (Ontology, 1);
+	ontology->classes = g_hash_table_new_full (g_str_hash,
+	                                           g_str_equal,
+	                                           g_free,
+	                                           (GDestroyNotify)ttl_model_class_free);
 
-        ontology->properties = g_hash_table_new_full (g_str_hash,
-                                                      g_str_equal,
-                                                      g_free,
-                                                      (GDestroyNotify)ttl_model_property_free);
+	ontology->properties = g_hash_table_new_full (g_str_hash,
+	                                              g_str_equal,
+	                                              g_free,
+	                                              (GDestroyNotify)ttl_model_property_free);
 
-        if (ttl_file) {
+	if (ttl_file) {
 		TrackerTurtleReader *reader;
 		GError *error = NULL;
 
@@ -301,8 +301,8 @@ ttl_loader_load_ontology (const gchar *ttl_file)
 		while (error == NULL && tracker_turtle_reader_next (reader, &error)) {
 			load_in_memory (ontology,
 			                tracker_turtle_reader_get_subject (reader),
-				        tracker_turtle_reader_get_predicate (reader),
-				        tracker_turtle_reader_get_object (reader));
+			                tracker_turtle_reader_get_predicate (reader),
+			                tracker_turtle_reader_get_object (reader));
 		}
 
 		g_object_unref (reader);
@@ -311,11 +311,11 @@ ttl_loader_load_ontology (const gchar *ttl_file)
 			g_message ("Turtle parse error: %s", error->message);
 			g_error_free (error);
 		}
-        } else {
-                g_warning ("Unable to open '%s'", ttl_file);
-        }
+	} else {
+		g_warning ("Unable to open '%s'", ttl_file);
+	}
 
-        return ontology;
+	return ontology;
 }
 
 OntologyDescription *
@@ -333,8 +333,8 @@ ttl_loader_load_description (const gchar *filename)
 	while (error == NULL && tracker_turtle_reader_next (reader, &error)) {
 		load_description (desc,
 		                  tracker_turtle_reader_get_subject (reader),
-			          tracker_turtle_reader_get_predicate (reader),
-			          tracker_turtle_reader_get_object (reader));
+		                  tracker_turtle_reader_get_predicate (reader),
+		                  tracker_turtle_reader_get_object (reader));
 	}
 
 	g_object_unref (reader);
@@ -344,20 +344,20 @@ ttl_loader_load_description (const gchar *filename)
 		g_error_free (error);
 	}
 
-        return desc;
+	return desc;
 }
 
 
 void
 ttl_loader_free_ontology (Ontology *ontology)
 {
-        g_hash_table_destroy (ontology->classes);
-        g_hash_table_destroy (ontology->properties);
-        g_free (ontology);
+	g_hash_table_destroy (ontology->classes);
+	g_hash_table_destroy (ontology->properties);
+	g_free (ontology);
 }
 
 void
 ttl_loader_free_description (OntologyDescription *desc)
 {
-        ttl_model_description_free (desc);
+	ttl_model_description_free (desc);
 }
diff --git a/utils/services/ttl_model.c b/utils/services/ttl_model.c
index bc72e04..3510e2e 100644
--- a/utils/services/ttl_model.c
+++ b/utils/services/ttl_model.c
@@ -3,121 +3,121 @@
 OntologyClass *
 ttl_model_class_new (const gchar *classname)
 {
-        OntologyClass *def = NULL;
-
-        def = g_new0 (OntologyClass, 1);
-
-        def->classname = g_strdup (classname);
-        def->superclasses = NULL;
-        def->subclasses = NULL;
-        def->in_domain_of = NULL;
-        def->in_range_of = NULL;
-        def->description = NULL;
-        def->instances = NULL;
-        def->notify = FALSE;
-        def->deprecated = FALSE;
-        return def;
+	OntologyClass *def = NULL;
+
+	def = g_new0 (OntologyClass, 1);
+
+	def->classname = g_strdup (classname);
+	def->superclasses = NULL;
+	def->subclasses = NULL;
+	def->in_domain_of = NULL;
+	def->in_range_of = NULL;
+	def->description = NULL;
+	def->instances = NULL;
+	def->notify = FALSE;
+	def->deprecated = FALSE;
+	return def;
 }
 
 void
 ttl_model_class_free (OntologyClass *def)
 {
-        if (def->classname) {
-                g_free (def->classname);
-        }
+	if (def->classname) {
+		g_free (def->classname);
+	}
 
-        g_list_foreach (def->superclasses, (GFunc) g_free, NULL);
-        g_list_foreach (def->subclasses, (GFunc) g_free, NULL);
-        g_list_foreach (def->in_domain_of, (GFunc) g_free, NULL);
-        g_list_foreach (def->in_range_of, (GFunc) g_free, NULL);
+	g_list_foreach (def->superclasses, (GFunc) g_free, NULL);
+	g_list_foreach (def->subclasses, (GFunc) g_free, NULL);
+	g_list_foreach (def->in_domain_of, (GFunc) g_free, NULL);
+	g_list_foreach (def->in_range_of, (GFunc) g_free, NULL);
 
-        if (def->description) {
-                g_free (def->description);
-        }
-        g_list_foreach (def->instances, (GFunc) g_free, NULL);
+	if (def->description) {
+		g_free (def->description);
+	}
+	g_list_foreach (def->instances, (GFunc) g_free, NULL);
 
-        g_free (def);
+	g_free (def);
 }
 
 OntologyProperty *
 ttl_model_property_new (const gchar *propname)
 {
-        OntologyProperty *prop;
+	OntologyProperty *prop;
 
-        prop = g_new0 (OntologyProperty, 1);
+	prop = g_new0 (OntologyProperty, 1);
 
-        prop->propertyname = g_strdup (propname);
-        prop->type = NULL;
-        prop->domain = NULL;
-        prop->range = NULL;
-        prop->superproperties = NULL;
-        prop->subproperties = NULL;
-        prop->max_cardinality = NULL;
-        prop->description = NULL;
-        prop->deprecated = FALSE;
+	prop->propertyname = g_strdup (propname);
+	prop->type = NULL;
+	prop->domain = NULL;
+	prop->range = NULL;
+	prop->superproperties = NULL;
+	prop->subproperties = NULL;
+	prop->max_cardinality = NULL;
+	prop->description = NULL;
+	prop->deprecated = FALSE;
 
-        return prop;
+	return prop;
 }
 
 void
 ttl_model_property_free (OntologyProperty *def)
 {
-        if (def->propertyname) {
-                g_free (def->propertyname);
-        }
+	if (def->propertyname) {
+		g_free (def->propertyname);
+	}
 
-        g_list_foreach (def->type, (GFunc) g_free, NULL);
-        g_list_foreach (def->domain, (GFunc) g_free, NULL);
-        g_list_foreach (def->range, (GFunc) g_free, NULL);
-        g_list_foreach (def->superproperties, (GFunc) g_free, NULL);
-        g_list_foreach (def->subproperties, (GFunc) g_free, NULL);
+	g_list_foreach (def->type, (GFunc) g_free, NULL);
+	g_list_foreach (def->domain, (GFunc) g_free, NULL);
+	g_list_foreach (def->range, (GFunc) g_free, NULL);
+	g_list_foreach (def->superproperties, (GFunc) g_free, NULL);
+	g_list_foreach (def->subproperties, (GFunc) g_free, NULL);
 
-        if (def->max_cardinality) {
-                g_free (def->max_cardinality);
-        }
+	if (def->max_cardinality) {
+		g_free (def->max_cardinality);
+	}
 
-        if (def->description) {
-                g_free (def->description);
-        }
+	if (def->description) {
+		g_free (def->description);
+	}
 
-        g_free (def);
+	g_free (def);
 }
 
 OntologyDescription *
 ttl_model_description_new (void)
 {
-        OntologyDescription *desc;
-
-        desc = g_new0 (OntologyDescription, 1);
-        desc->title = NULL;
-        desc->authors = NULL;
-        desc->editors = NULL;
-        desc->contributors = NULL;
-        desc->gitlog = NULL;
-        desc->upstream = NULL;
-        desc->copyright = NULL;
-        desc->baseUrl = NULL;
-        desc->localPrefix = NULL;
-        desc->relativePath = NULL;
-        return desc;
+	OntologyDescription *desc;
+
+	desc = g_new0 (OntologyDescription, 1);
+	desc->title = NULL;
+	desc->authors = NULL;
+	desc->editors = NULL;
+	desc->contributors = NULL;
+	desc->gitlog = NULL;
+	desc->upstream = NULL;
+	desc->copyright = NULL;
+	desc->baseUrl = NULL;
+	desc->localPrefix = NULL;
+	desc->relativePath = NULL;
+	return desc;
 }
 
 void
 ttl_model_description_free (OntologyDescription *desc)
 {
-        g_free (desc->title);
+	g_free (desc->title);
 
-        g_list_foreach (desc->authors, (GFunc)g_free, NULL);
-        g_list_foreach (desc->editors, (GFunc)g_free, NULL);
-        g_list_foreach (desc->contributors, (GFunc)g_free, NULL);
+	g_list_foreach (desc->authors, (GFunc)g_free, NULL);
+	g_list_foreach (desc->editors, (GFunc)g_free, NULL);
+	g_list_foreach (desc->contributors, (GFunc)g_free, NULL);
 
-        g_free (desc->gitlog);
-        g_free (desc->upstream);
-        g_free (desc->copyright);
+	g_free (desc->gitlog);
+	g_free (desc->upstream);
+	g_free (desc->copyright);
 
-        g_free (desc->baseUrl);
-        g_free (desc->relativePath);
-        g_free (desc->localPrefix);
+	g_free (desc->baseUrl);
+	g_free (desc->relativePath);
+	g_free (desc->localPrefix);
 
-        g_free (desc);
+	g_free (desc);
 }
diff --git a/utils/services/ttl_model.h b/utils/services/ttl_model.h
index 47af64d..927af44 100644
--- a/utils/services/ttl_model.h
+++ b/utils/services/ttl_model.h
@@ -6,45 +6,45 @@
 G_BEGIN_DECLS
 
 typedef struct {
-        gchar *classname;
-        GList *superclasses;
-        GList *subclasses;
-        GList *in_domain_of;
-        GList *in_range_of;
-        gchar *description;
-        GList *instances;
-        gboolean notify;
-        gboolean deprecated;
+	gchar *classname;
+	GList *superclasses;
+	GList *subclasses;
+	GList *in_domain_of;
+	GList *in_range_of;
+	gchar *description;
+	GList *instances;
+	gboolean notify;
+	gboolean deprecated;
 } OntologyClass;
 
 typedef struct {
-        gchar *propertyname;
-        GList *type;
-        GList *domain;
-        GList *range;
-        GList *superproperties;
-        GList *subproperties;
-        gchar *max_cardinality;
-        gchar *description;
-        gboolean deprecated;
+	gchar *propertyname;
+	GList *type;
+	GList *domain;
+	GList *range;
+	GList *superproperties;
+	GList *subproperties;
+	gchar *max_cardinality;
+	gchar *description;
+	gboolean deprecated;
 } OntologyProperty;
 
 typedef struct {
-        gchar *title;
-        GList *authors;
-        GList *editors;
-        GList *contributors;
-        gchar *gitlog;
-        gchar *upstream;
-        gchar *copyright;
-        gchar *baseUrl;
-        gchar *localPrefix;
-        gchar *relativePath;
+	gchar *title;
+	GList *authors;
+	GList *editors;
+	GList *contributors;
+	gchar *gitlog;
+	gchar *upstream;
+	gchar *copyright;
+	gchar *baseUrl;
+	gchar *localPrefix;
+	gchar *relativePath;
 } OntologyDescription;
 
 typedef struct {
-        GHashTable *classes;
-        GHashTable *properties;
+	GHashTable *classes;
+	GHashTable *properties;
 } Ontology;
 
 
diff --git a/utils/tracker-fts/tracker-fts-test.c b/utils/tracker-fts/tracker-fts-test.c
index 08383a8..88d472c 100644
--- a/utils/tracker-fts/tracker-fts-test.c
+++ b/utils/tracker-fts/tracker-fts-test.c
@@ -38,13 +38,13 @@ callback (void   *NotUsed,
 {
 	gint i;
 
-  	for (i = 0; i < argc; i++) {
-    		printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
-  	}
+	for (i = 0; i < argc; i++) {
+		printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
+	}
 
-  	printf("\n");
+	printf("\n");
 
-  	return 0;
+	return 0;
 }
 
 static void
@@ -54,12 +54,12 @@ exec_sql (sqlite3     *db,
 	gchar *zErrMsg;
 	gint   rc;
 
-        rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
+	rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
 
-  	if (rc != SQLITE_OK) {
-    		g_printerr ("SQL error: %s\n", zErrMsg);
-    		sqlite3_free (zErrMsg);
-  	}
+	if (rc != SQLITE_OK) {
+		g_printerr ("SQL error: %s\n", zErrMsg);
+		sqlite3_free (zErrMsg);
+	}
 }
 
 int
@@ -68,10 +68,10 @@ main (int argc, char **argv)
 	sqlite3  *db;
 	gint      rc;
 	gboolean  db_exists = FALSE;
-        gchar    *sql;
+	gchar    *sql;
 
 	g_type_init ();
-        g_thread_init (NULL);
+	g_thread_init (NULL);
 
 	if (argc != 2) {
 		g_printerr ("Usage: %s MATCH_TERM\n", argv[0]);
@@ -101,9 +101,9 @@ main (int argc, char **argv)
 		exec_sql (db, "insert into recipe (cat, col_default, col_1, col_2) values (7, 'stew pumpkin pie stew', 'pumpkin,sugar,flour and butter.', 'spread them all thinly')");
 		exec_sql (db, "insert into recipe (cat, col_default, col_1, col_2) values (6, 'stew pumpkin pie stew', 'pumpkin,sugar,flour and butter.', 'mash and spread')");
 	}
-//	sql = g_strdup_printf ("select cat, count (*) from recipe where recipe match '%s' group by Cat", argv[1]);
-//	exec_sql (db, sql);
-//	g_free (sql);
+	//      sql = g_strdup_printf ("select cat, count (*) from recipe where recipe match '%s' group by Cat", argv[1]);
+	//      exec_sql (db, sql);
+	//      g_free (sql);
 	sql = g_strdup_printf ("select rowid, cat, col_default, col_1, col_2, offsets(recipe), rank(recipe) from recipe where recipe match '%s' and Cat<8 order by rank(recipe) desc", argv[1]);
 	exec_sql (db, sql);
 	g_free (sql);



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