[tracker/sam/uncrustify: 7/8] style: Align code automatically using Uncrustify



commit 1dbdeb1f9b7445b2ce8040fc50f43c15584495c6
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Apr 19 12:58:20 2019 +0200

    style: Align code automatically using Uncrustify
    
    This commit re-aligns all of the Tracker code using the style defined in
    utils/uncrustify.cfg.
    
    It ensures that we indent code with tabs and align with spaces. In some
    places we were aligning code with tabs.
    
    It also aligns variable declarations, struct members and function
    parameters in a more consistent way. See utils/uncrustify.cfg for
    details. My goal here was to minimize the size of the diff, but as
    Tracker code was quite inconsistent about aligning there is necessarily
    still quite a large changeset. Note that the uncrustify option
    'align_keep_extra_space' is enabled which means that some manual
    alignment has been preserved. This may be removed if you rerun
    uncrustify with a different config, which will result in more changes.

 src/libtracker-common/tracker-date-time.c          |   8 +-
 src/libtracker-common/tracker-dbus.c               |  40 +--
 src/libtracker-common/tracker-domain-ontology.c    |  18 +-
 src/libtracker-common/tracker-file-utils.c         |  12 +-
 src/libtracker-common/tracker-language.c           |  12 +-
 src/libtracker-common/tracker-log.c                |  26 +-
 src/libtracker-common/tracker-parser-libicu.c      |  48 +--
 .../tracker-parser-libunistring.c                  |  32 +-
 src/libtracker-common/tracker-parser-utils.c       |   4 +-
 src/libtracker-common/tracker-type-utils.c         |  70 ++---
 src/libtracker-common/tracker-utils.c              |  24 +-
 src/libtracker-control/tracker-miner-manager.c     |  42 +--
 src/libtracker-data/tracker-class.c                |  10 +-
 src/libtracker-data/tracker-crc32.c                |  76 ++---
 src/libtracker-data/tracker-data-backup.c          |  28 +-
 src/libtracker-data/tracker-data-manager.c         | 108 +++----
 src/libtracker-data/tracker-data-query.c           |   4 +-
 src/libtracker-data/tracker-data-update.c          | 162 +++++------
 src/libtracker-data/tracker-db-backup.c            |  14 +-
 src/libtracker-data/tracker-db-config.c            |   8 +-
 src/libtracker-data/tracker-db-interface-sqlite.c  | 100 +++----
 src/libtracker-data/tracker-db-interface.c         |   6 +-
 src/libtracker-data/tracker-db-journal.c           |  98 +++----
 src/libtracker-data/tracker-db-manager.c           |  74 ++---
 src/libtracker-data/tracker-namespace.c            |   4 +-
 src/libtracker-data/tracker-ontologies.c           |  26 +-
 src/libtracker-data/tracker-ontology.c             |   2 +-
 src/libtracker-data/tracker-property.c             |  60 ++--
 src/libtracker-data/tracker-sparql-parser.c        |  52 ++--
 src/libtracker-data/tracker-sparql-types.c         |  46 +--
 src/libtracker-data/tracker-sparql.c               | 322 ++++++++++-----------
 src/libtracker-data/tracker-string-builder.c       |  12 +-
 src/libtracker-data/tracker-uuid.c                 |   4 +-
 src/libtracker-data/tracker-vtab-triples.c         |  24 +-
 src/libtracker-direct/tracker-direct-statement.c   |   6 +-
 src/libtracker-direct/tracker-direct.c             |  16 +-
 src/libtracker-fts/tracker-fts-config.c            |  22 +-
 src/libtracker-fts/tracker-fts-tokenizer.c         |   2 +-
 src/libtracker-fts/tracker-fts.c                   |  38 +--
 src/libtracker-miner/tracker-crawler.c             |  94 +++---
 src/libtracker-miner/tracker-decorator-fs.c        |  40 +--
 src/libtracker-miner/tracker-decorator.c           |  64 ++--
 src/libtracker-miner/tracker-file-data-provider.c  |   2 +-
 src/libtracker-miner/tracker-file-notifier.c       |  70 ++---
 src/libtracker-miner/tracker-file-system.c         |  28 +-
 src/libtracker-miner/tracker-indexing-tree.c       |  12 +-
 src/libtracker-miner/tracker-miner-fs.c            | 194 ++++++-------
 src/libtracker-miner/tracker-miner-object.c        |   8 +-
 src/libtracker-miner/tracker-miner-online.c        |   6 +-
 src/libtracker-miner/tracker-miner-proxy.c         |  90 +++---
 src/libtracker-miner/tracker-monitor.c             |  22 +-
 src/libtracker-miner/tracker-priority-queue.c      |   2 +-
 src/libtracker-miner/tracker-task-pool.c           |   2 +-
 src/libtracker-sparql/tracker-namespace-manager.c  |   2 +-
 src/libtracker-sparql/tracker-notifier.c           |  20 +-
 src/libtracker-sparql/tracker-resource.c           |  34 +--
 src/libtracker-sparql/tracker-uri.c                |   4 +-
 src/tracker-store/tracker-config.c                 |  10 +-
 src/tracker-store/tracker-events.c                 |   2 +-
 src/tracker-store/tracker-writeback.c              |   2 +-
 src/tracker/tracker-config.c                       |   4 +-
 src/tracker/tracker-daemon.c                       |  58 ++--
 src/tracker/tracker-extract.c                      |  14 +-
 src/tracker/tracker-help.c                         |   2 +-
 src/tracker/tracker-index.c                        |   8 +-
 src/tracker/tracker-info.c                         |   8 +-
 src/tracker/tracker-main.c                         |   8 +-
 src/tracker/tracker-process.c                      |  20 +-
 src/tracker/tracker-reset.c                        |   6 +-
 src/tracker/tracker-search.c                       |  40 +--
 src/tracker/tracker-sparql.c                       |  32 +-
 src/tracker/tracker-sql.c                          |   4 +-
 src/tracker/tracker-status.c                       |  20 +-
 src/tracker/tracker-tag.c                          |  82 +++---
 74 files changed, 1337 insertions(+), 1337 deletions(-)
---
diff --git a/src/libtracker-common/tracker-date-time.c b/src/libtracker-common/tracker-date-time.c
index e8279d728..e8d2dfe9b 100644
--- a/src/libtracker-common/tracker-date-time.c
+++ b/src/libtracker-common/tracker-date-time.c
@@ -41,8 +41,8 @@ GQuark tracker_date_error_quark (void) {
 }
 
 gdouble
-tracker_string_to_date (const gchar *date_string,
-                        gint        *offset_p,
+tracker_string_to_date (const gchar  *date_string,
+                        gint         *offset_p,
                         GError      **error)
 {
        /* TODO Add more checks.
@@ -203,12 +203,12 @@ tracker_string_to_date (const gchar *date_string,
 gchar *
 tracker_date_to_string (gdouble date_time)
 {
-       gchar     buffer[30];
+       gchar  buffer[30];
        time_t seconds;
        gint64 total_milliseconds;
        gint milliseconds;
        struct tm utc_time;
-       size_t    count;
+       size_t count;
 
        memset (buffer, '\0', sizeof (buffer));
        memset (&utc_time, 0, sizeof (struct tm));
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-common/tracker-dbus.c
index 5907d29fa..4f53a1732 100644
--- a/src/libtracker-common/tracker-dbus.c
+++ b/src/libtracker-common/tracker-dbus.c
@@ -47,7 +47,7 @@ typedef struct {
        gchar *sender;
        gchar *binary;
        gulong pid;
-       guint clean_up_id;
+       guint  clean_up_id;
        gint n_active_requests;
 } ClientData;
 
@@ -135,7 +135,7 @@ client_data_new (gchar *sender)
 {
        ClientData *cd;
        gboolean get_binary = TRUE;
-       GError *error = NULL;
+       GError  *error = NULL;
 
        cd = g_slice_new0 (ClientData);
        cd->sender = sender;
@@ -165,9 +165,9 @@ client_data_new (gchar *sender)
 
        if (get_binary) {
 #ifndef __OpenBSD__
-               gchar *filename;
-               gchar *pid_str;
-               gchar *contents = NULL;
+               gchar  *filename;
+               gchar  *pid_str;
+               gchar  *contents = NULL;
                GError *error = NULL;
                gchar **strv;
 #ifdef __sun /* Solaris */
@@ -213,7 +213,7 @@ client_data_new (gchar *sender)
 #else
                gint nproc;
                struct kinfo_proc *kp;
-               kvm_t *kd;
+               kvm_t  *kd;
                gchar **strv;
 
                if ((kd = kvm_openfiles (NULL, NULL, NULL, KVM_NO_FILES, NULL)) == NULL)
@@ -314,7 +314,7 @@ tracker_dbus_slist_to_strv (GSList *list)
 {
        GSList  *l;
        gchar  **strv;
-       gint     i = 0;
+       gint i = 0;
 
        strv = g_new0 (gchar*, g_slist_length (list) + 1);
 
@@ -347,7 +347,7 @@ tracker_dbus_request_begin (const gchar *sender,
                             ...)
 {
        TrackerDBusRequest *request;
-       gchar *str;
+       gchar  *str;
        va_list args;
 
        va_start (args, format);
@@ -376,17 +376,17 @@ tracker_dbus_request_end (TrackerDBusRequest *request,
 {
        if (!error) {
                g_debug ("---> [%d%s%s|%lu] Success, no error given",
-                        request->request_id,
-                        request->cd ? "|" : "",
-                        request->cd ? request->cd->binary : "",
-                        request->cd ? request->cd->pid : 0);
+                        request->request_id,
+                        request->cd ? "|" : "",
+                        request->cd ? request->cd->binary : "",
+                        request->cd ? request->cd->pid : 0);
        } else {
                g_message ("---> [%d%s%s|%lu] Failed, %s",
-                          request->request_id,
-                          request->cd ? "|" : "",
-                          request->cd ? request->cd->binary : "",
-                          request->cd ? request->cd->pid : 0,
-                          error->message);
+                          request->request_id,
+                          request->cd ? "|" : "",
+                          request->cd ? request->cd->binary : "",
+                          request->cd ? request->cd->pid : 0,
+                          error->message);
        }
 
        if (request->cd) {
@@ -405,7 +405,7 @@ tracker_dbus_request_info (TrackerDBusRequest    *request,
                            const gchar           *format,
                            ...)
 {
-       gchar *str;
+       gchar  *str;
        va_list args;
 
        va_start (args, format);
@@ -426,7 +426,7 @@ tracker_dbus_request_comment (TrackerDBusRequest    *request,
                               const gchar           *format,
                               ...)
 {
-       gchar *str;
+       gchar  *str;
        va_list args;
 
        va_start (args, format);
@@ -447,7 +447,7 @@ tracker_dbus_request_debug (TrackerDBusRequest    *request,
                             const gchar           *format,
                             ...)
 {
-       gchar *str;
+       gchar  *str;
        va_list args;
 
        va_start (args, format);
diff --git a/src/libtracker-common/tracker-domain-ontology.c b/src/libtracker-common/tracker-domain-ontology.c
index 750abf082..9ff4fa5e8 100644
--- a/src/libtracker-common/tracker-domain-ontology.c
+++ b/src/libtracker-common/tracker-domain-ontology.c
@@ -26,12 +26,12 @@
 
 typedef struct {
        /* DomainOntologies section */
-       GFile *cache_location;
-       GFile *journal_location;
-       GFile *ontology_location;
-       gchar *name;
-       gchar *domain;
-       gchar *ontology_name;
+       GFile  *cache_location;
+       GFile  *journal_location;
+       GFile  *ontology_location;
+       gchar  *name;
+       gchar  *domain;
+       gchar  *ontology_name;
        gchar **miners;
 } TrackerDomainOntologyPrivate;
 
@@ -198,8 +198,8 @@ key_file_get_location (GKeyFile     *key_file,
                        GError      **error)
 {
        GError *inner_error = NULL;
-       gchar *value;
-       GFile *file;
+       gchar  *value;
+       GFile  *file;
 
        value = g_key_file_get_string (key_file, section, key, &inner_error);
        if (inner_error) {
@@ -267,7 +267,7 @@ find_rule_in_data_dirs (const gchar *name)
 {
        const gchar* const *data_dirs;
        gchar *path, *rule_name;
-       guint i;
+       guint  i;
 
        data_dirs = g_get_system_data_dirs ();
        rule_name = g_strconcat (name, ".rule", NULL);
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-common/tracker-file-utils.c
index 57ced9142..f1320ce1a 100644
--- a/src/libtracker-common/tracker-file-utils.c
+++ b/src/libtracker-common/tracker-file-utils.c
@@ -108,7 +108,7 @@ tracker_file_get_size (const gchar *path)
        GFileInfo *info;
        GFile     *file;
        GError    *error = NULL;
-       goffset    size;
+       goffset size;
 
        g_return_val_if_fail (path != NULL, 0);
 
@@ -145,7 +145,7 @@ file_get_mtime (GFile *file)
 {
        GFileInfo *info;
        GError    *error = NULL;
-       guint64    mtime;
+       guint64 mtime;
 
        info = g_file_query_info (file,
                                  G_FILE_ATTRIBUTE_TIME_MODIFIED,
@@ -175,7 +175,7 @@ guint64
 tracker_file_get_mtime (const gchar *path)
 {
        GFile     *file;
-       guint64    mtime;
+       guint64 mtime;
 
        g_return_val_if_fail (path != NULL, 0);
 
@@ -193,7 +193,7 @@ guint64
 tracker_file_get_mtime_uri (const gchar *uri)
 {
        GFile     *file;
-       guint64    mtime;
+       guint64 mtime;
 
        g_return_val_if_fail (uri != NULL, 0);
 
@@ -328,7 +328,7 @@ tracker_file_system_has_enough_space (const gchar *path,
        gchar *str1;
        gchar *str2;
        gboolean enough;
-       guint64 remaining;
+       guint64  remaining;
 
        g_return_val_if_fail (path != NULL, FALSE);
 
@@ -405,7 +405,7 @@ tracker_path_list_filter_duplicates (GSList      *roots,
        while (l1) {
                const gchar *path;
                gchar       *p;
-               gboolean     reset = FALSE;
+               gboolean reset = FALSE;
 
                path = l1->data;
 
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index 97fc41158..5597edbe7 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -32,15 +32,15 @@
 #include "tracker-language.h"
 
 typedef struct _TrackerLanguagePrivate TrackerLanguagePrivate;
-typedef struct _Languages           Languages;
+typedef struct _Languages Languages;
 
 struct _TrackerLanguagePrivate {
        GHashTable    *stop_words;
-       gboolean       enable_stemmer;
+       gboolean enable_stemmer;
        gchar         *language_code;
 
-       GMutex         stemmer_mutex;
-       gpointer       stemmer;
+       GMutex stemmer_mutex;
+       gpointer stemmer;
 };
 
 struct _Languages {
@@ -164,7 +164,7 @@ language_finalize (GObject *object)
 
        g_free (priv->language_code);
 
-       (G_OBJECT_CLASS (tracker_language_parent_class)->finalize) (object);
+       (G_OBJECT_CLASS (tracker_language_parent_class)->finalize)(object);
 }
 
 static void
@@ -264,7 +264,7 @@ language_add_stopwords (TrackerLanguage *language,
        }
 
        content = g_mapped_file_get_contents (mapped_file);
-       words = g_strsplit_set (content, "\n" , -1);
+       words = g_strsplit_set (content, "\n", -1);
 
        g_mapped_file_unref (mapped_file);
 
diff --git a/src/libtracker-common/tracker-log.c b/src/libtracker-common/tracker-log.c
index d300ee795..72e6f41a6 100644
--- a/src/libtracker-common/tracker-log.c
+++ b/src/libtracker-common/tracker-log.c
@@ -36,18 +36,18 @@
 
 static gboolean  initialized;
 static FILE     *fd;
-static gint      verbosity;
-static guint     log_handler_id;
-static gboolean  use_log_files;
-static GMutex    mutex;
+static gint  verbosity;
+static guint log_handler_id;
+static gboolean use_log_files;
+static GMutex mutex;
 
 static inline void
 log_output (const gchar    *domain,
             GLogLevelFlags  log_level,
             const gchar    *message)
 {
-       time_t        now;
-       gchar         time_str[64];
+       time_t now;
+       gchar  time_str[64];
        gchar        *output;
        struct tm    *local_time;
        const gchar  *log_level_str;
@@ -237,22 +237,22 @@ tracker_log_init (gint    this_verbosity,
        g_mutex_init (&mutex);
 
        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:
                hide_levels = G_LOG_LEVEL_DEBUG;
                break;
 
-               /* Log level 1: CRITICAL/ERROR/WARNING/INFO only */
+       /* Log level 1: CRITICAL/ERROR/WARNING/INFO only */
        case 1:
                hide_levels = G_LOG_LEVEL_DEBUG |
                              G_LOG_LEVEL_MESSAGE;
                break;
 
-               /* Log level 0: CRITICAL/ERROR/WARNING only (default) */
+       /* Log level 0: CRITICAL/ERROR/WARNING only (default) */
        default:
        case 0:
                hide_levels = G_LOG_LEVEL_DEBUG |
@@ -264,9 +264,9 @@ tracker_log_init (gint    this_verbosity,
        if (hide_levels) {
                /* Hide log levels according to configuration */
                log_handler_id = g_log_set_handler (G_LOG_DOMAIN,
-                                                   hide_levels,
-                                                   hide_log_handler,
-                                                   NULL);
+                                                   hide_levels,
+                                                   hide_log_handler,
+                                                   NULL);
        }
 
        /* Set log handler function for the rest */
diff --git a/src/libtracker-common/tracker-parser-libicu.c b/src/libtracker-common/tracker-parser-libicu.c
index cbd260a2c..bf4d21967 100644
--- a/src/libtracker-common/tracker-parser-libicu.c
+++ b/src/libtracker-common/tracker-parser-libicu.c
@@ -46,25 +46,25 @@ typedef enum {
 
 struct TrackerParser {
        const gchar           *txt;
-       gint                   txt_size;
+       gint txt_size;
 
        TrackerLanguage       *language;
-       guint                  max_word_length;
-       gboolean               enable_stemmer;
-       gboolean               enable_unaccent;
-       gboolean               ignore_stop_words;
-       gboolean               ignore_reserved_words;
-       gboolean               ignore_numbers;
-       gboolean               enable_forced_wordbreaks;
+       guint max_word_length;
+       gboolean enable_stemmer;
+       gboolean enable_unaccent;
+       gboolean ignore_stop_words;
+       gboolean ignore_reserved_words;
+       gboolean ignore_numbers;
+       gboolean enable_forced_wordbreaks;
 
        /* Private members */
        gchar                 *word;
-       gint                   word_length;
-       guint                  word_position;
+       gint  word_length;
+       guint word_position;
 
        /* Text as UChars */
        UChar                 *utxt;
-       gint                   utxt_size;
+       gint  utxt_size;
        /* Original offset of each UChar in the input txt string */
        gint32                *offsets;
 
@@ -72,7 +72,7 @@ struct TrackerParser {
        UBreakIterator        *bi;
 
        /* Cursor, as index of the utxt array of bytes */
-       gsize                  cursor;
+       gsize cursor;
 };
 
 
@@ -85,7 +85,7 @@ get_word_info (const UChar           *word,
 {
        UCharIterator iter;
        UChar32 unichar;
-       guint8 unichar_gc;
+       guint8  unichar_gc;
 
        /* Get first character of the word as UCS4 */
        uiter_setString (&iter, word, word_length);
@@ -149,9 +149,9 @@ tracker_parser_unaccent_nfkd_string (gpointer  str,
                                      gsize    *str_length)
 {
        UChar *word;
-       gsize word_length;
-       gsize i;
-       gsize j;
+       gsize  word_length;
+       gsize  i;
+       gsize  j;
 
        g_return_val_if_fail (str != NULL, FALSE);
        g_return_val_if_fail (str_length != NULL, FALSE);
@@ -163,7 +163,7 @@ tracker_parser_unaccent_nfkd_string (gpointer  str,
        j = 0;
        while (i < word_length) {
                UChar32 unichar;
-               gint utf16_len; /* given in UChars */
+               gint  utf16_len; /* given in UChars */
                gsize aux_i;
 
                /* Get next character of the word as UCS4 */
@@ -212,7 +212,7 @@ convert_UChar_to_utf8 (const UChar *word,
                        gsize       *utf8_len)
 {
        gchar *utf8_str;
-       UErrorCode icu_error = U_ZERO_ERROR;
+       UErrorCode  icu_error = U_ZERO_ERROR;
        UConverter *converter;
        gsize new_utf8_len;
 
@@ -260,9 +260,9 @@ process_word_uchar (TrackerParser         *parser,
                     gboolean              *stop_word)
 {
        UErrorCode error = U_ZERO_ERROR;
-       UChar normalized_buffer[WORD_BUFFER_LENGTH];
+       UChar  normalized_buffer[WORD_BUFFER_LENGTH];
        gchar *utf8_str = NULL;
-       gsize new_word_length;
+       gsize  new_word_length;
 
        /* Log original word */
        tracker_parser_message_hex ("ORIGINAL word",
@@ -436,10 +436,10 @@ parser_next (TrackerParser *parser,
              gint          *byte_offset_end,
              gboolean      *stop_word)
 {
-       gsize word_length_uchar = 0;
-       gsize word_length_utf8 = 0;
+       gsize  word_length_uchar = 0;
+       gsize  word_length_utf8 = 0;
        gchar *processed_word = NULL;
-       gsize current_word_offset_utf8;
+       gsize  current_word_offset_utf8;
 
        *byte_offset_start = 0;
        *byte_offset_end = 0;
@@ -616,7 +616,7 @@ tracker_parser_reset (TrackerParser *parser,
                       gboolean       ignore_reserved_words,
                       gboolean       ignore_numbers)
 {
-       UErrorCode error = U_ZERO_ERROR;
+       UErrorCode  error = U_ZERO_ERROR;
        UConverter *converter;
        UChar *last_uchar;
        const gchar *last_utf8;
diff --git a/src/libtracker-common/tracker-parser-libunistring.c 
b/src/libtracker-common/tracker-parser-libunistring.c
index d24c5f1cb..81ca2e888 100644
--- a/src/libtracker-common/tracker-parser-libunistring.c
+++ b/src/libtracker-common/tracker-parser-libunistring.c
@@ -45,24 +45,24 @@ typedef enum {
 
 struct TrackerParser {
        const gchar           *txt;
-       gint                   txt_size;
+       gint txt_size;
 
        TrackerLanguage       *language;
-       guint                  max_word_length;
-       gboolean               enable_stemmer;
-       gboolean               enable_unaccent;
-       gboolean               ignore_stop_words;
-       gboolean               ignore_reserved_words;
-       gboolean               ignore_numbers;
-       gboolean               enable_forced_wordbreaks;
+       guint max_word_length;
+       gboolean enable_stemmer;
+       gboolean enable_unaccent;
+       gboolean ignore_stop_words;
+       gboolean ignore_reserved_words;
+       gboolean ignore_numbers;
+       gboolean enable_forced_wordbreaks;
 
        /* Private members */
        gchar                 *word;
-       gint                   word_length;
-       guint                  word_position;
+       gint  word_length;
+       guint word_position;
 
        /* Cursor, as index of the input array of bytes */
-       gsize                  cursor;
+       gsize cursor;
        /* libunistring flags array */
        gchar                 *word_break_flags;
        /* general category of the  start character in words */
@@ -164,9 +164,9 @@ tracker_parser_unaccent_nfkd_string (gpointer  str,
                                      gsize    *str_length)
 {
        gchar *word;
-       gsize word_length;
-       gsize i;
-       gsize j;
+       gsize  word_length;
+       gsize  i;
+       gsize  j;
 
        g_return_val_if_fail (str != NULL, FALSE);
        g_return_val_if_fail (str_length != NULL, FALSE);
@@ -222,7 +222,7 @@ process_word_utf8 (TrackerParser         *parser,
                    TrackerParserWordType  type,
                    gboolean              *stop_word)
 {
-       gchar word_buffer [WORD_BUFFER_LENGTH];
+       gchar  word_buffer [WORD_BUFFER_LENGTH];
        gchar *normalized = NULL;
        gchar *stemmed = NULL;
        size_t new_word_length;
@@ -335,7 +335,7 @@ parser_next (TrackerParser *parser,
              gint          *byte_offset_end,
              gboolean      *stop_word)
 {
-       gsize word_length = 0;
+       gsize  word_length = 0;
        gchar *processed_word = NULL;
 
        *byte_offset_start = 0;
diff --git a/src/libtracker-common/tracker-parser-utils.c b/src/libtracker-common/tracker-parser-utils.c
index dec597747..d5ca5d10d 100644
--- a/src/libtracker-common/tracker-parser-utils.c
+++ b/src/libtracker-common/tracker-parser-utils.c
@@ -31,7 +31,7 @@
  */
 typedef struct {
        const gchar *word;
-       gsize        word_length;
+       gsize word_length;
 } TrackerParserReservedWord;
 
 static const TrackerParserReservedWord reserved_words[] = {
@@ -41,7 +41,7 @@ static const TrackerParserReservedWord reserved_words[] = {
 
 gboolean
 tracker_parser_is_reserved_word_utf8 (const gchar *word,
-                                      gsize word_length)
+                                      gsize        word_length)
 {
        gint i = 0;
 
diff --git a/src/libtracker-common/tracker-type-utils.c b/src/libtracker-common/tracker-type-utils.c
index 63f89dc87..02ae1a06f 100644
--- a/src/libtracker-common/tracker-type-utils.c
+++ b/src/libtracker-common/tracker-type-utils.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #define _XOPEN_SOURCE
-#define _XOPEN_SOURCE_EXTENDED 1       /* strcasecmp is XPG4v2 */
+#define _XOPEN_SOURCE_EXTENDED 1        /* strcasecmp is XPG4v2 */
 #include <time.h>
 
 #include <strings.h>
@@ -39,7 +39,7 @@ tracker_string_in_string_list (const gchar  *str,
                                gchar       **strv)
 {
        gchar **p;
-       gint    i;
+       gint i;
 
        g_return_val_if_fail (str != NULL, -1);
 
@@ -78,8 +78,8 @@ tracker_string_list_to_gslist (gchar **strv,
                                gsize   size)
 {
        GSList *list;
-       gsize   i;
-       gsize   size_used;
+       gsize i;
+       gsize size_used;
 
        if (!strv) {
                return NULL;
@@ -123,7 +123,7 @@ list_to_string_list (GSList *list, gint length)
 {
        GSList  *l;
        gchar  **strv;
-       gint     i;
+       gint i;
 
        strv = g_new0 (gchar*, length + 1);
 
@@ -156,45 +156,45 @@ gboolean
 tracker_gslist_with_string_data_equal (GSList *list1,
                                        GSList *list2)
 {
-        GSList *sl;
+       GSList *sl;
 
-        if (list1 == list2) {
-                return TRUE;
-        }
+       if (list1 == list2) {
+               return TRUE;
+       }
 
-        if (g_slist_length (list1) != g_slist_length (list2)) {
-                return FALSE;
-        }
+       if (g_slist_length (list1) != g_slist_length (list2)) {
+               return FALSE;
+       }
 
-        /* NOTE: This is probably not the most efficient way to do
-         * this, but we don't want to order the list first since that
-         * would involve creating new memory. This would make sense
-         * for large list operations I think. We don't expect to be
-         * doing much if any of that.
-         */
-        for (sl = list1; sl; sl = sl->next) {
-                const gchar *str;
+       /* NOTE: This is probably not the most efficient way to do
+        * this, but we don't want to order the list first since that
+        * would involve creating new memory. This would make sense
+        * for large list operations I think. We don't expect to be
+        * doing much if any of that.
+        */
+       for (sl = list1; sl; sl = sl->next) {
+               const gchar *str;
 
-                str = sl->data;
+               str = sl->data;
 
-                /* If we are not still in the list, remove the dir */
-                if (!tracker_string_in_gslist (str, list2)) {
-                        return FALSE;
-                }
-        }
+               /* If we are not still in the list, remove the dir */
+               if (!tracker_string_in_gslist (str, list2)) {
+                       return FALSE;
+               }
+       }
 
-        for (sl = list2; sl; sl = sl->next) {
-                const gchar *str;
+       for (sl = list2; sl; sl = sl->next) {
+               const gchar *str;
 
-                str = sl->data;
+               str = sl->data;
 
-                /* If we are now in the list, add the dir */
-                if (!tracker_string_in_gslist (str, list1)) {
-                        return FALSE;
-                }
-        }
+               /* If we are now in the list, add the dir */
+               if (!tracker_string_in_gslist (str, list1)) {
+                       return FALSE;
+               }
+       }
 
-        return TRUE;
+       return TRUE;
 }
 
 GSList *
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index f6fb89348..d8ed1a182 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -75,10 +75,10 @@ tracker_seconds_estimate (gdouble seconds_elapsed,
 }
 
 gchar *
-tracker_seconds_estimate_to_string (gdouble   seconds_elapsed,
-                                    gboolean  short_string,
-                                    guint     items_done,
-                                    guint     items_remaining)
+tracker_seconds_estimate_to_string (gdouble  seconds_elapsed,
+                                    gboolean short_string,
+                                    guint    items_done,
+                                    guint    items_remaining)
 {
        guint estimate;
 
@@ -99,7 +99,7 @@ tracker_seconds_to_string (gdouble  seconds_elapsed,
        GString *s;
        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")));
 
@@ -180,9 +180,9 @@ tracker_strhex (const guint8 *data,
                 gsize         size,
                 gchar         delimiter)
 {
-       gsize i;
-       gsize j;
-       gsize new_str_length;
+       gsize  i;
+       gsize  j;
+       gsize  new_str_length;
        gchar *new_str;
 
        /* Get new string length. If input string has N bytes, we need:
@@ -256,8 +256,8 @@ range_is_xdigit (const gchar *str,
 
 static gunichar
 xdigit_to_unichar (const gchar *str,
-                  gssize       start,
-                  gssize       end)
+                   gssize       start,
+                   gssize       end)
 {
        gunichar ch = 0;
        gssize i;
@@ -304,8 +304,8 @@ tracker_unescape_unichars (const gchar  *str,
                        g_string_append_c (copy, str[i + 1]);
                        i += 2;
                } else if (len - i >= 6 &&
-                   strncmp (&str[i], "\\u", 2) == 0 &&
-                   range_is_xdigit (&str[i], 2, 6)) {
+                          strncmp (&str[i], "\\u", 2) == 0 &&
+                          range_is_xdigit (&str[i], 2, 6)) {
                        ch = xdigit_to_unichar (&str[i], 2, 6);
                        g_string_append_unichar (copy, ch);
                        i += 6;
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index 52aa16617..798dc9edc 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -60,10 +60,10 @@ struct MinerData {
        gchar *name_suffix;
 
        GDBusConnection *connection;
-       guint progress_signal;
-       guint paused_signal;
-       guint resumed_signal;
-       guint watch_name_id;
+       guint  progress_signal;
+       guint  paused_signal;
+       guint  resumed_signal;
+       guint  watch_name_id;
        GObject *manager; /* weak */
 };
 
@@ -124,8 +124,8 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
        g_object_class_install_property (object_class,
                                         PROP_AUTO_START,
                                         g_param_spec_boolean ("auto-start",
-                                                             "Auto Start",
-                                                             "If set, auto starts miners when querying their 
status",
+                                                              "Auto Start",
+                                                              "If set, auto starts miners when querying 
their status",
                                                               TRUE,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
        g_object_class_install_property (object_class,
@@ -440,7 +440,7 @@ miner_manager_initable_init (GInitable     *initable,
 
        for (m = priv->miners; m; m = m->next) {
                GDBusProxy *proxy;
-               MinerData *data;
+               MinerData  *data;
 
                data = m->data;
                data->connection = g_object_ref (priv->connection);
@@ -663,7 +663,7 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
        GError *error = NULL;
        GVariant *v;
        GVariantIter *iter;
-       const gchar *str = NULL;
+       const gchar  *str = NULL;
        gchar *prefix;
 
        g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), NULL);
@@ -720,7 +720,7 @@ check_file (GFile    *file,
        TrackerMinerManager *manager;
        TrackerMinerManagerPrivate *priv;
        GKeyFile *key_file;
-       gchar *path, *dbus_path, *display_name, *name_suffix, *full_name_suffix, *description;
+       gchar  *path, *dbus_path, *display_name, *name_suffix, *full_name_suffix, *description;
        GError *error = NULL;
        MinerData *data;
 
@@ -846,7 +846,7 @@ tracker_miner_manager_get_available (TrackerMinerManager *manager)
 {
        TrackerMinerManagerPrivate *priv;
        GSList *list = NULL;
-       GList *m;
+       GList  *m;
 
        priv = tracker_miner_manager_get_instance_private (manager);
 
@@ -881,7 +881,7 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
                              const gchar         *reason,
                              guint32             *cookie)
 {
-       GDBusProxy *proxy;
+       GDBusProxy  *proxy;
        const gchar *app_name;
        GError *error = NULL;
        GVariant *v;
@@ -959,7 +959,7 @@ tracker_miner_manager_pause_for_process (TrackerMinerManager *manager,
                                          const gchar         *reason,
                                          guint32             *cookie)
 {
-       GDBusProxy *proxy;
+       GDBusProxy  *proxy;
        const gchar *app_name;
        GError *error = NULL;
        GVariant *v;
@@ -1076,8 +1076,8 @@ tracker_miner_manager_is_active (TrackerMinerManager *manager,
                                  const gchar         *miner)
 {
        TrackerMinerManagerPrivate *priv;
-       GError *error = NULL;
-       gboolean active = FALSE;
+       GError   *error = NULL;
+       gboolean  active = FALSE;
        GVariant *v;
 
        g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), FALSE);
@@ -1254,8 +1254,8 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
 {
        GDBusProxy *proxy;
        GStrv apps, r;
-       GError *error = NULL;
-       gboolean paused;
+       GError   *error = NULL;
+       gboolean  paused;
        GVariant *v;
 
        if (applications) {
@@ -1518,13 +1518,13 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
 }
 
 static void
-miner_manager_index_file_thread (GTask *task,
-                                 gpointer source_object,
-                                 gpointer task_data,
+miner_manager_index_file_thread (GTask        *task,
+                                 gpointer      source_object,
+                                 gpointer      task_data,
                                  GCancellable *cancellable)
 {
        TrackerMinerManager *manager = source_object;
-       GFile *file = task_data;
+       GFile  *file = task_data;
        GError *error = NULL;
 
        miner_manager_index_file_sync (manager, METHOD_INDEX_FILE,
@@ -1621,7 +1621,7 @@ miner_manager_index_file_for_process_thread (GTask        *task,
                                              GCancellable *cancellable)
 {
        TrackerMinerManager *manager = source_object;
-       GFile *file = task_data;
+       GFile  *file = task_data;
        GError *error = NULL;
 
        miner_manager_index_file_sync (manager, METHOD_INDEX_FILE_FOR_PROCESS,
diff --git a/src/libtracker-data/tracker-class.c b/src/libtracker-data/tracker-class.c
index 4a1b4d3f1..9f593c56a 100644
--- a/src/libtracker-data/tracker-class.c
+++ b/src/libtracker-data/tracker-class.c
@@ -42,10 +42,10 @@ struct _TrackerClassPrivate {
 
        gboolean use_gvdb;
 
-       GArray *super_classes;
-       GArray *domain_indexes;
-       GArray *last_domain_indexes;
-       GArray *last_super_classes;
+       GArray  *super_classes;
+       GArray  *domain_indexes;
+       GArray  *last_domain_indexes;
+       GArray  *last_super_classes;
 
        TrackerOntologies *ontologies;
 };
@@ -371,7 +371,7 @@ tracker_class_reset_super_classes (TrackerClass *service)
 }
 
 void
-tracker_class_add_domain_index (TrackerClass *service,
+tracker_class_add_domain_index (TrackerClass    *service,
                                 TrackerProperty *value)
 {
        TrackerClassPrivate *priv;
diff --git a/src/libtracker-data/tracker-crc32.c b/src/libtracker-data/tracker-crc32.c
index 152044fdb..1579b6daa 100644
--- a/src/libtracker-data/tracker-crc32.c
+++ b/src/libtracker-data/tracker-crc32.c
@@ -47,49 +47,49 @@
 #include "tracker-crc32.h"
 
 static const guint32 crcTable[256] = {
-  0x00000000UL, 0x77073096UL, 0xEE0E612CUL, 0x990951BAUL, 0x076DC419UL, 0x706AF48FUL, 0xE963A535UL, 
0x9E6495A3UL,
-  0x0EDB8832UL, 0x79DCB8A4UL, 0xE0D5E91EUL, 0x97D2D988UL, 0x09B64C2BUL, 0x7EB17CBDUL, 0xE7B82D07UL, 
0x90BF1D91UL,
-  0x1DB71064UL, 0x6AB020F2UL, 0xF3B97148UL, 0x84BE41DEUL, 0x1ADAD47DUL, 0x6DDDE4EBUL, 0xF4D4B551UL, 
0x83D385C7UL,
-  0x136C9856UL, 0x646BA8C0UL, 0xFD62F97AUL, 0x8A65C9ECUL, 0x14015C4FUL, 0x63066CD9UL, 0xFA0F3D63UL, 
0x8D080DF5UL,
-  0x3B6E20C8UL, 0x4C69105EUL, 0xD56041E4UL, 0xA2677172UL, 0x3C03E4D1UL, 0x4B04D447UL, 0xD20D85FDUL, 
0xA50AB56BUL,
-  0x35B5A8FAUL, 0x42B2986CUL, 0xDBBBC9D6UL, 0xACBCF940UL, 0x32D86CE3UL, 0x45DF5C75UL, 0xDCD60DCFUL, 
0xABD13D59UL,
-  0x26D930ACUL, 0x51DE003AUL, 0xC8D75180UL, 0xBFD06116UL, 0x21B4F4B5UL, 0x56B3C423UL, 0xCFBA9599UL, 
0xB8BDA50FUL,
-  0x2802B89EUL, 0x5F058808UL, 0xC60CD9B2UL, 0xB10BE924UL, 0x2F6F7C87UL, 0x58684C11UL, 0xC1611DABUL, 
0xB6662D3DUL,
-  0x76DC4190UL, 0x01DB7106UL, 0x98D220BCUL, 0xEFD5102AUL, 0x71B18589UL, 0x06B6B51FUL, 0x9FBFE4A5UL, 
0xE8B8D433UL,
-  0x7807C9A2UL, 0x0F00F934UL, 0x9609A88EUL, 0xE10E9818UL, 0x7F6A0DBBUL, 0x086D3D2DUL, 0x91646C97UL, 
0xE6635C01UL,
-  0x6B6B51F4UL, 0x1C6C6162UL, 0x856530D8UL, 0xF262004EUL, 0x6C0695EDUL, 0x1B01A57BUL, 0x8208F4C1UL, 
0xF50FC457UL,
-  0x65B0D9C6UL, 0x12B7E950UL, 0x8BBEB8EAUL, 0xFCB9887CUL, 0x62DD1DDFUL, 0x15DA2D49UL, 0x8CD37CF3UL, 
0xFBD44C65UL,
-  0x4DB26158UL, 0x3AB551CEUL, 0xA3BC0074UL, 0xD4BB30E2UL, 0x4ADFA541UL, 0x3DD895D7UL, 0xA4D1C46DUL, 
0xD3D6F4FBUL,
-  0x4369E96AUL, 0x346ED9FCUL, 0xAD678846UL, 0xDA60B8D0UL, 0x44042D73UL, 0x33031DE5UL, 0xAA0A4C5FUL, 
0xDD0D7CC9UL,
-  0x5005713CUL, 0x270241AAUL, 0xBE0B1010UL, 0xC90C2086UL, 0x5768B525UL, 0x206F85B3UL, 0xB966D409UL, 
0xCE61E49FUL,
-  0x5EDEF90EUL, 0x29D9C998UL, 0xB0D09822UL, 0xC7D7A8B4UL, 0x59B33D17UL, 0x2EB40D81UL, 0xB7BD5C3BUL, 
0xC0BA6CADUL,
-  0xEDB88320UL, 0x9ABFB3B6UL, 0x03B6E20CUL, 0x74B1D29AUL, 0xEAD54739UL, 0x9DD277AFUL, 0x04DB2615UL, 
0x73DC1683UL,
-  0xE3630B12UL, 0x94643B84UL, 0x0D6D6A3EUL, 0x7A6A5AA8UL, 0xE40ECF0BUL, 0x9309FF9DUL, 0x0A00AE27UL, 
0x7D079EB1UL,
-  0xF00F9344UL, 0x8708A3D2UL, 0x1E01F268UL, 0x6906C2FEUL, 0xF762575DUL, 0x806567CBUL, 0x196C3671UL, 
0x6E6B06E7UL,
-  0xFED41B76UL, 0x89D32BE0UL, 0x10DA7A5AUL, 0x67DD4ACCUL, 0xF9B9DF6FUL, 0x8EBEEFF9UL, 0x17B7BE43UL, 
0x60B08ED5UL,
-  0xD6D6A3E8UL, 0xA1D1937EUL, 0x38D8C2C4UL, 0x4FDFF252UL, 0xD1BB67F1UL, 0xA6BC5767UL, 0x3FB506DDUL, 
0x48B2364BUL,
-  0xD80D2BDAUL, 0xAF0A1B4CUL, 0x36034AF6UL, 0x41047A60UL, 0xDF60EFC3UL, 0xA867DF55UL, 0x316E8EEFUL, 
0x4669BE79UL,
-  0xCB61B38CUL, 0xBC66831AUL, 0x256FD2A0UL, 0x5268E236UL, 0xCC0C7795UL, 0xBB0B4703UL, 0x220216B9UL, 
0x5505262FUL,
-  0xC5BA3BBEUL, 0xB2BD0B28UL, 0x2BB45A92UL, 0x5CB36A04UL, 0xC2D7FFA7UL, 0xB5D0CF31UL, 0x2CD99E8BUL, 
0x5BDEAE1DUL,
-  0x9B64C2B0UL, 0xEC63F226UL, 0x756AA39CUL, 0x026D930AUL, 0x9C0906A9UL, 0xEB0E363FUL, 0x72076785UL, 
0x05005713UL,
-  0x95BF4A82UL, 0xE2B87A14UL, 0x7BB12BAEUL, 0x0CB61B38UL, 0x92D28E9BUL, 0xE5D5BE0DUL, 0x7CDCEFB7UL, 
0x0BDBDF21UL,
-  0x86D3D2D4UL, 0xF1D4E242UL, 0x68DDB3F8UL, 0x1FDA836EUL, 0x81BE16CDUL, 0xF6B9265BUL, 0x6FB077E1UL, 
0x18B74777UL,
-  0x88085AE6UL, 0xFF0F6A70UL, 0x66063BCAUL, 0x11010B5CUL, 0x8F659EFFUL, 0xF862AE69UL, 0x616BFFD3UL, 
0x166CCF45UL,
-  0xA00AE278UL, 0xD70DD2EEUL, 0x4E048354UL, 0x3903B3C2UL, 0xA7672661UL, 0xD06016F7UL, 0x4969474DUL, 
0x3E6E77DBUL,
-  0xAED16A4AUL, 0xD9D65ADCUL, 0x40DF0B66UL, 0x37D83BF0UL, 0xA9BCAE53UL, 0xDEBB9EC5UL, 0x47B2CF7FUL, 
0x30B5FFE9UL,
-  0xBDBDF21CUL, 0xCABAC28AUL, 0x53B39330UL, 0x24B4A3A6UL, 0xBAD03605UL, 0xCDD70693UL, 0x54DE5729UL, 
0x23D967BFUL,
-  0xB3667A2EUL, 0xC4614AB8UL, 0x5D681B02UL, 0x2A6F2B94UL, 0xB40BBE37UL, 0xC30C8EA1UL, 0x5A05DF1BUL, 
0x2D02EF8DUL
+       0x00000000UL, 0x77073096UL, 0xEE0E612CUL, 0x990951BAUL, 0x076DC419UL, 0x706AF48FUL, 0xE963A535UL, 
0x9E6495A3UL,
+       0x0EDB8832UL, 0x79DCB8A4UL, 0xE0D5E91EUL, 0x97D2D988UL, 0x09B64C2BUL, 0x7EB17CBDUL, 0xE7B82D07UL, 
0x90BF1D91UL,
+       0x1DB71064UL, 0x6AB020F2UL, 0xF3B97148UL, 0x84BE41DEUL, 0x1ADAD47DUL, 0x6DDDE4EBUL, 0xF4D4B551UL, 
0x83D385C7UL,
+       0x136C9856UL, 0x646BA8C0UL, 0xFD62F97AUL, 0x8A65C9ECUL, 0x14015C4FUL, 0x63066CD9UL, 0xFA0F3D63UL, 
0x8D080DF5UL,
+       0x3B6E20C8UL, 0x4C69105EUL, 0xD56041E4UL, 0xA2677172UL, 0x3C03E4D1UL, 0x4B04D447UL, 0xD20D85FDUL, 
0xA50AB56BUL,
+       0x35B5A8FAUL, 0x42B2986CUL, 0xDBBBC9D6UL, 0xACBCF940UL, 0x32D86CE3UL, 0x45DF5C75UL, 0xDCD60DCFUL, 
0xABD13D59UL,
+       0x26D930ACUL, 0x51DE003AUL, 0xC8D75180UL, 0xBFD06116UL, 0x21B4F4B5UL, 0x56B3C423UL, 0xCFBA9599UL, 
0xB8BDA50FUL,
+       0x2802B89EUL, 0x5F058808UL, 0xC60CD9B2UL, 0xB10BE924UL, 0x2F6F7C87UL, 0x58684C11UL, 0xC1611DABUL, 
0xB6662D3DUL,
+       0x76DC4190UL, 0x01DB7106UL, 0x98D220BCUL, 0xEFD5102AUL, 0x71B18589UL, 0x06B6B51FUL, 0x9FBFE4A5UL, 
0xE8B8D433UL,
+       0x7807C9A2UL, 0x0F00F934UL, 0x9609A88EUL, 0xE10E9818UL, 0x7F6A0DBBUL, 0x086D3D2DUL, 0x91646C97UL, 
0xE6635C01UL,
+       0x6B6B51F4UL, 0x1C6C6162UL, 0x856530D8UL, 0xF262004EUL, 0x6C0695EDUL, 0x1B01A57BUL, 0x8208F4C1UL, 
0xF50FC457UL,
+       0x65B0D9C6UL, 0x12B7E950UL, 0x8BBEB8EAUL, 0xFCB9887CUL, 0x62DD1DDFUL, 0x15DA2D49UL, 0x8CD37CF3UL, 
0xFBD44C65UL,
+       0x4DB26158UL, 0x3AB551CEUL, 0xA3BC0074UL, 0xD4BB30E2UL, 0x4ADFA541UL, 0x3DD895D7UL, 0xA4D1C46DUL, 
0xD3D6F4FBUL,
+       0x4369E96AUL, 0x346ED9FCUL, 0xAD678846UL, 0xDA60B8D0UL, 0x44042D73UL, 0x33031DE5UL, 0xAA0A4C5FUL, 
0xDD0D7CC9UL,
+       0x5005713CUL, 0x270241AAUL, 0xBE0B1010UL, 0xC90C2086UL, 0x5768B525UL, 0x206F85B3UL, 0xB966D409UL, 
0xCE61E49FUL,
+       0x5EDEF90EUL, 0x29D9C998UL, 0xB0D09822UL, 0xC7D7A8B4UL, 0x59B33D17UL, 0x2EB40D81UL, 0xB7BD5C3BUL, 
0xC0BA6CADUL,
+       0xEDB88320UL, 0x9ABFB3B6UL, 0x03B6E20CUL, 0x74B1D29AUL, 0xEAD54739UL, 0x9DD277AFUL, 0x04DB2615UL, 
0x73DC1683UL,
+       0xE3630B12UL, 0x94643B84UL, 0x0D6D6A3EUL, 0x7A6A5AA8UL, 0xE40ECF0BUL, 0x9309FF9DUL, 0x0A00AE27UL, 
0x7D079EB1UL,
+       0xF00F9344UL, 0x8708A3D2UL, 0x1E01F268UL, 0x6906C2FEUL, 0xF762575DUL, 0x806567CBUL, 0x196C3671UL, 
0x6E6B06E7UL,
+       0xFED41B76UL, 0x89D32BE0UL, 0x10DA7A5AUL, 0x67DD4ACCUL, 0xF9B9DF6FUL, 0x8EBEEFF9UL, 0x17B7BE43UL, 
0x60B08ED5UL,
+       0xD6D6A3E8UL, 0xA1D1937EUL, 0x38D8C2C4UL, 0x4FDFF252UL, 0xD1BB67F1UL, 0xA6BC5767UL, 0x3FB506DDUL, 
0x48B2364BUL,
+       0xD80D2BDAUL, 0xAF0A1B4CUL, 0x36034AF6UL, 0x41047A60UL, 0xDF60EFC3UL, 0xA867DF55UL, 0x316E8EEFUL, 
0x4669BE79UL,
+       0xCB61B38CUL, 0xBC66831AUL, 0x256FD2A0UL, 0x5268E236UL, 0xCC0C7795UL, 0xBB0B4703UL, 0x220216B9UL, 
0x5505262FUL,
+       0xC5BA3BBEUL, 0xB2BD0B28UL, 0x2BB45A92UL, 0x5CB36A04UL, 0xC2D7FFA7UL, 0xB5D0CF31UL, 0x2CD99E8BUL, 
0x5BDEAE1DUL,
+       0x9B64C2B0UL, 0xEC63F226UL, 0x756AA39CUL, 0x026D930AUL, 0x9C0906A9UL, 0xEB0E363FUL, 0x72076785UL, 
0x05005713UL,
+       0x95BF4A82UL, 0xE2B87A14UL, 0x7BB12BAEUL, 0x0CB61B38UL, 0x92D28E9BUL, 0xE5D5BE0DUL, 0x7CDCEFB7UL, 
0x0BDBDF21UL,
+       0x86D3D2D4UL, 0xF1D4E242UL, 0x68DDB3F8UL, 0x1FDA836EUL, 0x81BE16CDUL, 0xF6B9265BUL, 0x6FB077E1UL, 
0x18B74777UL,
+       0x88085AE6UL, 0xFF0F6A70UL, 0x66063BCAUL, 0x11010B5CUL, 0x8F659EFFUL, 0xF862AE69UL, 0x616BFFD3UL, 
0x166CCF45UL,
+       0xA00AE278UL, 0xD70DD2EEUL, 0x4E048354UL, 0x3903B3C2UL, 0xA7672661UL, 0xD06016F7UL, 0x4969474DUL, 
0x3E6E77DBUL,
+       0xAED16A4AUL, 0xD9D65ADCUL, 0x40DF0B66UL, 0x37D83BF0UL, 0xA9BCAE53UL, 0xDEBB9EC5UL, 0x47B2CF7FUL, 
0x30B5FFE9UL,
+       0xBDBDF21CUL, 0xCABAC28AUL, 0x53B39330UL, 0x24B4A3A6UL, 0xBAD03605UL, 0xCDD70693UL, 0x54DE5729UL, 
0x23D967BFUL,
+       0xB3667A2EUL, 0xC4614AB8UL, 0x5D681B02UL, 0x2A6F2B94UL, 0xB40BBE37UL, 0xC30C8EA1UL, 0x5A05DF1BUL, 
0x2D02EF8DUL
 };
 
 guint32
 tracker_crc32 (gconstpointer ptr, gsize len)
 {
-  guint32 crc = 0xFFFFFFFF;
-  const guint8 *bp = (const guint8 *) ptr;
-  size_t i;
+       guint32 crc = 0xFFFFFFFF;
+       const guint8 *bp = (const guint8 *) ptr;
+       size_t i;
 
-  for (i=0; i<len; i++)
-    crc = crcTable[(crc ^ bp[i]) & 0xFF] ^ (crc >> 8);
+       for (i=0; i<len; i++)
+               crc = crcTable[(crc ^ bp[i]) & 0xFF] ^ (crc >> 8);
 
-  return crc ^ 0xFFFFFFFF;
+       return crc ^ 0xFFFFFFFF;
 }
diff --git a/src/libtracker-data/tracker-data-backup.c b/src/libtracker-data/tracker-data-backup.c
index b68ab4004..fcf207d2c 100644
--- a/src/libtracker-data/tracker-data-backup.c
+++ b/src/libtracker-data/tracker-data-backup.c
@@ -33,17 +33,17 @@
 #include "tracker-db-backup.h"
 
 typedef struct {
-       GFile *destination, *journal;
+       GFile   *destination, *journal;
        TrackerDataBackupFinished callback;
        gpointer user_data;
        GDestroyNotify destroy;
-       GError *error;
+       GError  *error;
 } BackupSaveInfo;
 
 #ifndef DISABLE_JOURNAL
 
 typedef struct {
-       GPid pid;
+       GPid  pid;
        guint stdout_watch_id;
        guint stderr_watch_id;
        GIOChannel *stdin_channel;
@@ -228,7 +228,7 @@ process_context_child_watch_cb (GPid     pid,
 
 #ifdef DISABLE_JOURNAL
 static void
-on_backup_finished (GError *error,
+on_backup_finished (GError  *error,
                     gpointer user_data)
 {
        BackupSaveInfo *info = user_data;
@@ -315,7 +315,7 @@ dir_move_to_temp (const gchar *path,
        temp_dir = g_build_filename (path, tmpname, NULL);
        if (g_mkdir (temp_dir, 0777) < 0) {
                g_critical ("Could not move %s to temp directory: %m",
-                           path);
+                           path);
                g_free (temp_dir);
                return;
        }
@@ -419,14 +419,14 @@ tracker_data_backup_save (TrackerDataManager        *data_manager,
        BackupSaveInfo *info;
        ProcessContext *context;
        gchar **argv;
-       gchar *path, *directory;
+       gchar  *path, *directory;
        GError *local_error = NULL;
        GDir *journal_dir;
-       GPid pid;
+       GPid  pid;
        GPtrArray *files;
        const gchar *f_name;
        gboolean result;
-       gint stdin_fd, stdout_fd, stderr_fd;
+       gint  stdin_fd, stdout_fd, stderr_fd;
        guint i;
 
        info = g_new0 (BackupSaveInfo, 1);
@@ -586,11 +586,11 @@ tracker_data_backup_restore (TrackerDataManager   *manager,
                TrackerDBJournal *journal_writer;
                guint select_cache_size, update_cache_size;
 #ifndef DISABLE_JOURNAL
-               GError *n_error = NULL;
-               GFile *parent = g_file_get_parent (info->destination);
-               gchar *tmp_stdout = NULL;
-               gchar *tmp_stderr = NULL;
-               gchar **argv;
+               GError  *n_error = NULL;
+               GFile   *parent = g_file_get_parent (info->destination);
+               gchar   *tmp_stdout = NULL;
+               gchar   *tmp_stderr = NULL;
+               gchar  **argv;
                gboolean result;
                gint exit_status;
 #endif /* DISABLE_JOURNAL */
@@ -657,7 +657,7 @@ tracker_data_backup_restore (TrackerDataManager   *manager,
                flags &= ~TRACKER_DB_MANAGER_FORCE_REINDEX;
 
                g_file_copy (info->journal, info->destination,
-                            G_FILE_COPY_OVERWRITE, 
+                            G_FILE_COPY_OVERWRITE,
                             NULL, NULL, NULL,
                             &info->error);
 #endif /* DISABLE_JOURNAL */
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 900861505..7ee676ebb 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -69,25 +69,25 @@
 struct _TrackerDataManager {
        GObject parent_instance;
 
-       GFile *ontology_location;
-       GFile *cache_location;
-       GFile *data_location;
+       GFile  *ontology_location;
+       GFile  *cache_location;
+       GFile  *data_location;
        guint initialized      : 1;
        guint journal_check    : 1;
        guint restoring_backup : 1;
        guint first_time_index : 1;
        guint flags;
 
-       gint select_cache_size;
-       gint update_cache_size;
+       gint  select_cache_size;
+       gint  update_cache_size;
 
 #ifndef DISABLE_JOURNAL
-       gboolean  in_journal_replay;
-       TrackerDBJournal *journal_writer;
-       TrackerDBJournal *ontology_writer;
+       gboolean in_journal_replay;
+       TrackerDBJournal  *journal_writer;
+       TrackerDBJournal  *ontology_writer;
 #endif
 
-       TrackerDBManager *db_manager;
+       TrackerDBManager  *db_manager;
        TrackerOntologies *ontologies;
        TrackerData *data_update;
 
@@ -400,7 +400,7 @@ check_unsupported_property_value_change (TrackerDataManager *manager,
                                          const gchar        *predicate,
                                          const gchar        *object)
 {
-       GError *error = NULL;
+       GError  *error = NULL;
        gboolean needed = TRUE;
        gchar *query = NULL;
        TrackerDBCursor *cursor;
@@ -451,7 +451,7 @@ update_property_value (TrackerDataManager  *manager,
                        TrackerProperty     *property,
                        GError             **error_in)
 {
-       GError *error = NULL;
+       GError  *error = NULL;
        gboolean needed = TRUE;
        gboolean is_new = FALSE;
 
@@ -583,8 +583,8 @@ fix_indexed (TrackerDataManager  *manager,
        GError *internal_error = NULL;
        TrackerDBInterface *iface;
        TrackerClass *class;
-       const gchar *service_name;
-       const gchar *field_name;
+       const gchar  *service_name;
+       const gchar  *field_name;
 
        iface = tracker_db_manager_get_writable_db_interface (manager->db_manager);
 
@@ -867,7 +867,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                tracker_class_set_notify (class, (strcmp (object, "true") == 0));
        } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "domainIndex") == 0) {
                TrackerClass *class;
-               TrackerProperty *property;
+               TrackerProperty  *property;
                TrackerProperty **properties;
                gboolean ignore = FALSE;
                gboolean had = FALSE;
@@ -1405,12 +1405,12 @@ check_for_max_cardinality_change (TrackerDataManager  *manager,
 {
        gboolean orig_multiple_values = tracker_property_get_orig_multiple_values (property);
        gboolean new_multiple_values = tracker_property_get_multiple_values (property);
-       GError *n_error = NULL;
+       GError  *n_error = NULL;
        const gchar *ontology_path = "Unknown";
 
        if (tracker_property_get_is_new (property) == FALSE &&
            (orig_multiple_values != new_multiple_values &&
-                orig_multiple_values == TRUE)) {
+            orig_multiple_values == TRUE)) {
                const gchar *ontology_path = "Unknown";
                const gchar *subject = tracker_property_get_uri (property);
 
@@ -1579,7 +1579,7 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
        if (seen_classes) {
                for (i = 0; i < seen_classes->len; i++) {
                        TrackerClass *class = g_ptr_array_index (seen_classes, i);
-                       const gchar *subject;
+                       const gchar  *subject;
                        GError *n_error = NULL;
 
                        subject = tracker_class_get_uri (class);
@@ -1614,7 +1614,7 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
                        gchar *query;
                        TrackerProperty *secondary_index;
                        gboolean indexed_set = FALSE, in_onto;
-                       GError *n_error = NULL;
+                       GError  *n_error = NULL;
                        TrackerSparqlCursor *cursor;
 
                        subject = tracker_property_get_uri (property);
@@ -2132,7 +2132,7 @@ class_add_super_classes_from_db (TrackerDBInterface *iface,
        if (cursor) {
                while (tracker_db_cursor_iter_next (cursor, NULL, NULL)) {
                        TrackerClass *super_class;
-                       const gchar *super_class_uri;
+                       const gchar  *super_class_uri;
 
                        super_class_uri = tracker_db_cursor_get_string (cursor, 0, NULL);
                        super_class = tracker_ontologies_get_class_by_uri (manager->ontologies, 
super_class_uri);
@@ -2246,7 +2246,7 @@ db_get_static_data (TrackerDBInterface  *iface,
                while (tracker_db_cursor_iter_next (cursor, NULL, &internal_error)) {
                        TrackerOntology *ontology;
                        const gchar     *uri;
-                       time_t           last_mod;
+                       time_t last_mod;
 
                        ontology = tracker_ontology_new ();
                        tracker_ontology_set_ontologies (ontology, manager->ontologies);
@@ -2325,9 +2325,9 @@ db_get_static_data (TrackerDBInterface  *iface,
                while (tracker_db_cursor_iter_next (cursor, NULL, &internal_error)) {
                        TrackerClass *class;
                        const gchar  *uri;
-                       gint          id;
-                       GValue        value = { 0 };
-                       gboolean      notify;
+                       gint id;
+                       GValue value = { 0 };
+                       gboolean notify;
 
                        class = tracker_class_new (FALSE);
 
@@ -2396,10 +2396,10 @@ db_get_static_data (TrackerDBInterface  *iface,
                        GValue value = { 0 };
                        TrackerProperty *property;
                        const gchar     *uri, *domain_uri, *range_uri, *secondary_index_uri, *default_value;
-                       gboolean         multi_valued, indexed, fulltext_indexed;
-                       gboolean         transient, is_inverse_functional_property;
-                       gboolean         writeback, force_journal;
-                       gint             id;
+                       gboolean multi_valued, indexed, fulltext_indexed;
+                       gboolean transient, is_inverse_functional_property;
+                       gboolean writeback, force_journal;
+                       gint id;
 
                        property = tracker_property_new (FALSE);
 
@@ -2596,8 +2596,8 @@ range_change_for (TrackerProperty *property,
 
        if (tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_INTEGER ||
            tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_DOUBLE) {
-                       g_string_append_printf (sel_col_sql, ", \"%s\" + 0, \"%s:graph\"",
-                                               field_name, field_name);
+               g_string_append_printf (sel_col_sql, ", \"%s\" + 0, \"%s:graph\"",
+                                       field_name, field_name);
        } else if (tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_DATETIME) {
 
                /* TODO (see above) */
@@ -2635,7 +2635,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
        GError *internal_error = NULL;
        const char *field_name;
        const char *sql_type;
-       gboolean    not_single;
+       gboolean not_single;
 
        field_name = tracker_property_get_name (property);
 
@@ -2857,7 +2857,7 @@ copy_from_domain_to_domain_index (TrackerDBInterface  *iface,
 {
        GError *internal_error = NULL;
        TrackerClass *source_domain;
-       const gchar *source_name, *dest_name;
+       const gchar  *source_name, *dest_name;
        gchar *query;
 
        source_domain = tracker_property_get_domain (domain_index);
@@ -2894,10 +2894,10 @@ typedef struct {
 } ScheduleCopy;
 
 static void
-schedule_copy (GPtrArray *schedule,
+schedule_copy (GPtrArray       *schedule,
                TrackerProperty *prop,
-               const gchar *field_name,
-               const gchar *suffix)
+               const gchar     *field_name,
+               const gchar     *suffix)
 {
        ScheduleCopy *sched = g_new0 (ScheduleCopy, 1);
        sched->prop = prop;
@@ -2913,7 +2913,7 @@ create_insert_delete_triggers (TrackerDBInterface  *iface,
                                gint                 n_properties,
                                GError             **error)
 {
-       GError *internal_error = NULL;
+       GError  *internal_error = NULL;
        GString *trigger_query;
        gint i;
 
@@ -3093,9 +3093,9 @@ create_decomposed_metadata_tables (TrackerDataManager  *manager,
        GString          *sel_col_sql = NULL;
        TrackerProperty **properties, *property, **domain_indexes;
        GSList           *class_properties = NULL, *field_it;
-       gboolean          main_class;
-       guint             i, n_props;
-       gboolean          in_alter = in_update;
+       gboolean main_class;
+       guint i, n_props;
+       gboolean in_alter = in_update;
        GError           *internal_error = NULL;
        GPtrArray        *copy_schedule = NULL;
 
@@ -3425,7 +3425,7 @@ create_decomposed_metadata_tables (TrackerDataManager  *manager,
        }
 
        if (!tracker_class_get_is_new (service) && in_change && sel_col_sql && in_col_sql) {
-               guint i;
+               guint  i;
                gchar *query;
 
                query = g_strdup_printf ("INSERT INTO \"%s\"(%s) "
@@ -3441,7 +3441,7 @@ create_decomposed_metadata_tables (TrackerDataManager  *manager,
                        g_propagate_error (error, internal_error);
                        goto error_out;
                }
-               
+
                g_free (query);
 
                for (i = 0; i < n_props; i++) {
@@ -3457,7 +3457,7 @@ create_decomposed_metadata_tables (TrackerDataManager  *manager,
                                /* Function does what it must do, so reusable atm */
                                range_change_for (property, n_in_col_sql, n_sel_col_sql, field_name);
 
-                                /* Columns happen to be the same for decomposed multi-value and single value 
atm */
+                               /* Columns happen to be the same for decomposed multi-value and single value 
atm */
 
                                query = g_strdup_printf ("INSERT INTO \"%s_%s\"(%s) "
                                                         "SELECT %s FROM \"%s_TEMP\" "
@@ -3477,7 +3477,7 @@ create_decomposed_metadata_tables (TrackerDataManager  *manager,
                                        g_propagate_error (error, internal_error);
                                        goto error_out;
                                }
-               
+
                                g_free (query);
                        }
                }
@@ -3547,7 +3547,7 @@ clean_decomposed_transient_metadata (TrackerDataManager *manager,
                                      TrackerDBInterface *iface)
 {
        TrackerProperty **properties;
-       TrackerProperty *property;
+       TrackerProperty  *property;
        guint i, n_props;
 
        properties = tracker_ontologies_get_properties (manager->ontologies, &n_props);
@@ -3557,8 +3557,8 @@ clean_decomposed_transient_metadata (TrackerDataManager *manager,
 
                if (tracker_property_get_transient (property)) {
                        TrackerClass *domain;
-                       const gchar *service_name;
-                       const gchar *prop_name;
+                       const gchar  *service_name;
+                       const gchar  *prop_name;
                        GError *error = NULL;
 
                        domain = tracker_property_get_domain (property);
@@ -4216,7 +4216,7 @@ tracker_data_manager_initable_init (GInitable     *initable,
        }
 
        tracker_db_manager_set_vtab_user_data (manager->db_manager,
-                                              manager->ontologies);
+                                              manager->ontologies);
 
        manager->first_time_index = is_first_time_index;
 
@@ -4277,8 +4277,8 @@ tracker_data_manager_initable_init (GInitable     *initable,
                } else {
                        if (internal_error) {
                                if (!g_error_matches (internal_error,
-                                                         TRACKER_DB_JOURNAL_ERROR,
-                                                         TRACKER_DB_JOURNAL_ERROR_BEGIN_OF_JOURNAL)) {
+                                                     TRACKER_DB_JOURNAL_ERROR,
+                                                     TRACKER_DB_JOURNAL_ERROR_BEGIN_OF_JOURNAL)) {
                                        g_propagate_error (error, internal_error);
                                        return FALSE;
                                } else {
@@ -4316,8 +4316,8 @@ tracker_data_manager_initable_init (GInitable     *initable,
 
                for (l = sorted; l; l = l->next) {
                        GError *ontology_error = NULL;
-                       GFile *ontology_file = l->data;
-                       gchar *uri = g_file_get_uri (ontology_file);
+                       GFile  *ontology_file = l->data;
+                       gchar  *uri = g_file_get_uri (ontology_file);
 
                        g_debug ("Loading ontology %s", uri);
 
@@ -4453,7 +4453,7 @@ tracker_data_manager_initable_init (GInitable     *initable,
                GList *ontos = NULL;
                GPtrArray *seen_classes;
                GPtrArray *seen_properties;
-               GError *n_error = NULL;
+               GError  *n_error = NULL;
                gboolean transaction_started = FALSE;
 
                seen_classes = g_ptr_array_new ();
@@ -4629,7 +4629,7 @@ tracker_data_manager_initable_init (GInitable     *initable,
                                }
                        } else {
                                GError *ontology_error = NULL;
-                               gchar *uri = g_file_get_uri (ontology_file);
+                               gchar  *uri = g_file_get_uri (ontology_file);
 
                                g_debug ("Ontology file '%s' got added", uri);
                                g_free (uri);
@@ -4810,7 +4810,7 @@ tracker_data_manager_initable_init (GInitable     *initable,
        }
 
        tracker_db_manager_set_vtab_user_data (manager->db_manager,
-                                              manager->ontologies);
+                                              manager->ontologies);
 
 skip_ontology_check:
 
@@ -4950,7 +4950,7 @@ tracker_data_manager_dispose (GObject *object)
        TrackerDataManager *manager = TRACKER_DATA_MANAGER (object);
        TrackerDBStatement *stmt;
        TrackerDBInterface *iface;
-       GError *error = NULL;
+       GError  *error = NULL;
        gboolean readonly = TRUE;
 
        if (manager->db_manager) {
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 2694d6d0b..3e0ac316b 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -66,7 +66,7 @@ tracker_data_query_rdf_type (TrackerDataManager *manager,
 
                ret = g_ptr_array_sized_new (20);
                while (tracker_db_cursor_iter_next (cursor, NULL, &error)) {
-                       const gchar *class_uri;
+                       const gchar  *class_uri;
                        TrackerClass *cl;
 
                        class_uri = tracker_db_cursor_get_string (cursor, 0, NULL);
@@ -137,7 +137,7 @@ tracker_data_query_unused_uuid (TrackerDataManager *manager,
        TrackerDBCursor *cursor = NULL;
        TrackerDBStatement *stmt;
        GError *error = NULL;
-       gchar *uuid = NULL;
+       gchar  *uuid = NULL;
 
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, &error,
                                                      "SELECT SparqlUUID()");
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index c5d2941fc..4624778fc 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -76,7 +76,7 @@ struct _TrackerDataUpdateBufferResource {
        /* string -> TrackerDataUpdateBufferTable */
        GHashTable *tables;
        /* TrackerClass */
-       GPtrArray *types;
+       GPtrArray  *types;
 
 #if HAVE_TRACKER_FTS
        gboolean fts_updated;
@@ -101,14 +101,14 @@ struct _TrackerDataUpdateBufferTable {
        gboolean multiple_values;
        TrackerClass *class;
        /* TrackerDataUpdateBufferProperty */
-       GArray *properties;
+       GArray  *properties;
 };
 
 /* buffer for anonymous blank nodes
  * that are not yet in the database */
 struct _TrackerDataBlankBuffer {
        GHashTable *table;
-       gchar *subject;
+       gchar  *subject;
        /* string */
        GArray *predicates;
        /* string */
@@ -136,7 +136,7 @@ typedef struct {
 } QueuedStatement;
 
 struct _TrackerData {
-       GObject parent_instance;
+       GObject  parent_instance;
 
        TrackerDataManager *manager;
 
@@ -147,7 +147,7 @@ struct _TrackerData {
 
        /* current resource */
        TrackerDataUpdateBufferResource *resource_buffer;
-       TrackerDataBlankBuffer blank_buffer;
+       TrackerDataBlankBuffer  blank_buffer;
        time_t resource_time;
        gint transaction_modseq;
        gboolean has_persistent;
@@ -188,8 +188,8 @@ static void         cache_insert_value         (TrackerData      *data,
 static GArray      *get_old_property_values    (TrackerData      *data,
                                                 TrackerProperty  *property,
                                                 GError          **error);
-static gchar*       gvalue_to_string           (TrackerPropertyType  type,
-                                                GValue           *gvalue);
+static gchar*       gvalue_to_string           (TrackerPropertyType type,
+                                                GValue             *gvalue);
 static gboolean     delete_metadata_decomposed (TrackerData      *data,
                                                 TrackerProperty  *property,
                                                 const gchar      *value,
@@ -431,7 +431,7 @@ tracker_data_update_get_next_modseq (TrackerData *data)
        TrackerDBInterface *temp_iface;
        TrackerDBStatement *stmt;
        GError             *error = NULL;
-       gint                max_modseq = 0;
+       gint max_modseq = 0;
 
        temp_iface = tracker_data_manager_get_writable_db_interface (data->manager);
 
@@ -557,7 +557,7 @@ static void
 cache_table_free (TrackerDataUpdateBufferTable *table)
 {
        TrackerDataUpdateBufferProperty *property;
-       gint                            i;
+       gint i;
 
        for (i = 0; i < table->properties->len; i++) {
                property = &g_array_index (table->properties, TrackerDataUpdateBufferProperty, i);
@@ -748,7 +748,7 @@ ensure_resource_id (TrackerData *data,
 static gint
 ensure_graph_id (TrackerData *data,
                  const gchar *uri,
-                gboolean    *create)
+                 gboolean    *create)
 {
        TrackerDBInterface *iface;
        TrackerDBStatement *stmt;
@@ -831,13 +831,13 @@ static void
 tracker_data_resource_buffer_flush (TrackerData  *data,
                                     GError      **error)
 {
-       TrackerDBInterface             *iface;
-       TrackerDBStatement             *stmt;
+       TrackerDBInterface              *iface;
+       TrackerDBStatement              *stmt;
        TrackerDataUpdateBufferTable    *table;
        TrackerDataUpdateBufferProperty *property;
-       GHashTableIter                  iter;
+       GHashTableIter iter;
        const gchar                    *table_name;
-       gint                            i, param;
+       gint i, param;
        GError                         *actual_error = NULL;
 
        iface = tracker_data_manager_get_writable_db_interface (data->manager);
@@ -1012,7 +1012,7 @@ tracker_data_resource_buffer_flush (TrackerData  *data,
                                tracker_db_statement_bind_int (stmt, 0, data->resource_buffer->id);
 
                                if (strcmp (table_name, "rdfs:Resource") == 0) {
-                                       g_warn_if_fail  (data->resource_time != 0);
+                                       g_warn_if_fail  (data->resource_time != 0);
                                        tracker_db_statement_bind_int (stmt, 1, (gint64) data->resource_time);
                                        tracker_db_statement_bind_int (stmt, 2, get_transaction_modseq 
(data));
                                        param = 3;
@@ -1174,7 +1174,7 @@ tracker_data_update_buffer_clear (TrackerData *data)
                /* revert class count changes */
 
                GHashTableIter iter;
-               TrackerClass *class;
+               TrackerClass  *class;
                gpointer count_ptr;
 
                g_hash_table_iter_init (&iter, data->update_buffer.class_counts);
@@ -1273,8 +1273,8 @@ cache_create_service_decomposed (TrackerData  *data,
 {
        TrackerClass       **super_classes;
        TrackerProperty    **domain_indexes;
-       GValue              gvalue = { 0 };
-       gint                i, final_graph_id, class_id;
+       GValue gvalue = { 0 };
+       gint i, final_graph_id, class_id;
        TrackerOntologies  *ontologies;
 
        /* also create instance of all super classes */
@@ -1354,7 +1354,7 @@ cache_create_service_decomposed (TrackerData  *data,
                if (old_values &&
                    old_values->len > 0) {
                        GValue *v;
-                       GValue gvalue_copy = { 0 };
+                       GValue  gvalue_copy = { 0 };
 
                        /* Don't expect several values for property which is a domain index */
                        g_assert_cmpint (old_values->len, ==, 1);
@@ -1480,8 +1480,8 @@ static GArray *
 get_property_values (TrackerData     *data,
                      TrackerProperty *property)
 {
-       gboolean            multiple_values;
-       GArray *old_values;
+       gboolean multiple_values;
+       GArray  *old_values;
 
        multiple_values = tracker_property_get_multiple_values (property);
 
@@ -1777,14 +1777,14 @@ cache_insert_metadata_decomposed (TrackerData      *data,
                                   gint              graph_id,
                                   GError          **error)
 {
-       gboolean            multiple_values;
+       gboolean multiple_values;
        const gchar        *table_name;
        const gchar        *field_name;
        TrackerProperty   **super_properties;
-       GValue              gvalue = { 0 };
+       GValue gvalue = { 0 };
        GArray             *old_values;
        GError             *new_error = NULL;
-       gboolean            change = FALSE;
+       gboolean change = FALSE;
 
        /* read existing property values */
        old_values = get_old_property_values (data, property, &new_error);
@@ -1832,11 +1832,11 @@ cache_insert_metadata_decomposed (TrackerData      *data,
                g_value_unset (&gvalue);
        } else if (!multiple_values && old_values->len > 1) {
                /* trying to add second value to single valued property */
-               GValue old_value = { 0 };
-               GValue new_value = { 0 };
+               GValue  old_value = { 0 };
+               GValue  new_value = { 0 };
                GValue *v;
-               gchar *old_value_str = NULL;
-               gchar *new_value_str = NULL;
+               gchar  *old_value_str = NULL;
+               gchar  *new_value_str = NULL;
 
                g_value_init (&old_value, G_TYPE_STRING);
                g_value_init (&new_value, G_TYPE_STRING);
@@ -1931,7 +1931,7 @@ delete_first_object (TrackerData      *data,
        } else {
                GValue *v;
                GError *new_error = NULL;
-               gchar *object_str = NULL;
+               gchar  *object_str = NULL;
 
                object_id = 0;
                v = &g_array_index (old_values, GValue, 0);
@@ -1948,7 +1948,7 @@ delete_first_object (TrackerData      *data,
 #ifndef DISABLE_JOURNAL
                if (!data->in_journal_replay && change && !tracker_property_get_transient (field)) {
                        if (!tracker_property_get_force_journal (field) &&
-                               g_strcmp0 (graph, TRACKER_OWN_GRAPH_URN) == 0) {
+                           g_strcmp0 (graph, TRACKER_OWN_GRAPH_URN) == 0) {
                                /* do not journal this statement extracted from filesystem */
                                TrackerProperty *damaged;
                                TrackerOntologies *ontologies;
@@ -2003,13 +2003,13 @@ cache_update_metadata_decomposed (TrackerData      *data,
                                   gint              graph_id,
                                   GError          **error)
 {
-       gboolean            multiple_values;
+       gboolean multiple_values;
        const gchar        *table_name;
        const gchar        *field_name;
        TrackerProperty   **super_properties;
-       GValue              gvalue = { 0 };
+       GValue gvalue = { 0 };
        GError             *new_error = NULL;
-       gboolean            change = FALSE;
+       gboolean change = FALSE;
 
        multiple_values = tracker_property_get_multiple_values (property);
 
@@ -2105,14 +2105,14 @@ delete_metadata_decomposed (TrackerData      *data,
                             gint              value_id,
                             GError          **error)
 {
-       gboolean            multiple_values;
+       gboolean multiple_values;
        const gchar        *table_name;
        const gchar        *field_name;
        TrackerProperty   **super_properties;
        GValue gvalue = { 0 };
        GArray             *old_values;
        GError             *new_error = NULL;
-       gboolean            change = FALSE;
+       gboolean change = FALSE;
 
        multiple_values = tracker_property_get_multiple_values (property);
        table_name = tracker_property_get_table_name (property);
@@ -2218,9 +2218,9 @@ cache_delete_resource_type_full (TrackerData  *data,
        TrackerDBStatement *stmt;
        TrackerDBCursor    *cursor = NULL;
        TrackerProperty   **properties, *prop;
-       gboolean            found, direct_delete;
-       gint                i;
-       guint               p, n_props;
+       gboolean found, direct_delete;
+       gint  i;
+       guint p, n_props;
        GError             *error = NULL;
        TrackerOntologies  *ontologies;
 
@@ -2266,9 +2266,9 @@ cache_delete_resource_type_full (TrackerData  *data,
                /* 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, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&error,
-                                                             "SELECT (SELECT Uri FROM 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 Resource WHERE Uri = ?)");
+                                                             "SELECT (SELECT Uri FROM 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 Resource WHERE Uri = ?)");
 
                if (stmt) {
                        tracker_db_statement_bind_int (stmt, 0, data->resource_buffer->id);
@@ -2283,7 +2283,7 @@ cache_delete_resource_type_full (TrackerData  *data,
 
                                class_uri = tracker_db_cursor_get_string (cursor, 0, NULL);
                                cache_delete_resource_type_full (data, tracker_ontologies_get_class_by_uri 
(ontologies, class_uri),
-                                                                graph, graph_id, FALSE);
+                                                                graph, graph_id, FALSE);
                        }
 
                        g_object_unref (cursor);
@@ -2304,11 +2304,11 @@ cache_delete_resource_type_full (TrackerData  *data,
        properties = tracker_ontologies_get_properties (ontologies, &n_props);
 
        for (p = 0; p < n_props; p++) {
-               gboolean            multiple_values;
+               gboolean multiple_values;
                const gchar        *table_name;
                const gchar        *field_name;
                GArray *old_values;
-               gint                y;
+               gint y;
 
                prop = properties[p];
 
@@ -2330,7 +2330,7 @@ cache_delete_resource_type_full (TrackerData  *data,
 
                old_values = get_old_property_values (data, prop, NULL);
 
-               for (y = old_values->len - 1; y >= 0 ; y--) {
+               for (y = old_values->len - 1; y >= 0; y--) {
                        GValue *old_gvalue;
                        GValue  gvalue = { 0 };
 
@@ -2379,7 +2379,7 @@ cache_delete_resource_type_full (TrackerData  *data,
                        /* this is not necessary when deleting the whole resource
                           as all property values are deleted implicitly */
                        stmt = tracker_db_interface_create_statement (iface, 
TRACKER_DB_STATEMENT_CACHE_TYPE_UPDATE, &error,
-                                                                     "DELETE FROM \"rdfs:Resource_rdf:type\" 
WHERE ID = ? AND \"rdf:type\" = ?");
+                                                                     "DELETE FROM \"rdfs:Resource_rdf:type\" 
WHERE ID = ? AND \"rdf:type\" = ?");
 
                        if (stmt) {
                                tracker_db_statement_bind_int (stmt, 0, data->resource_buffer->id);
@@ -2402,7 +2402,7 @@ cache_delete_resource_type_full (TrackerData  *data,
 
        if (!data->in_journal_replay && data->delete_callbacks) {
                guint n;
-               gint final_graph_id;
+               gint  final_graph_id;
 
                final_graph_id = (graph != NULL ? ensure_graph_id (data, graph, NULL) : graph_id);
 
@@ -2507,8 +2507,8 @@ tracker_data_delete_statement (TrackerData  *data,
                                GError      **error)
 {
        TrackerClass       *class;
-       gint                subject_id = 0;
-       gboolean            change = FALSE;
+       gint subject_id = 0;
+       gboolean change = FALSE;
        TrackerOntologies  *ontologies;
        TrackerDBInterface *iface;
 
@@ -2536,11 +2536,11 @@ tracker_data_delete_statement (TrackerData  *data,
 #ifndef DISABLE_JOURNAL
                        if (!data->in_journal_replay) {
                                tracker_db_journal_append_delete_statement_id (
-                                      data->journal_writer,
-                                      (graph != NULL ? query_resource_id (data, graph) : 0),
-                                      data->resource_buffer->id,
-                                      tracker_data_query_resource_id (data->manager, iface, predicate),
-                                      tracker_class_get_id (class));
+                                       data->journal_writer,
+                                       (graph != NULL ? query_resource_id (data, graph) : 0),
+                                       data->resource_buffer->id,
+                                       tracker_data_query_resource_id (data->manager, iface, predicate),
+                                       tracker_class_get_id (class));
                        }
 #endif /* DISABLE_JOURNAL */
 
@@ -2645,7 +2645,7 @@ delete_all_objects (TrackerData  *data,
 {
        gint subject_id = 0;
        gboolean change = FALSE;
-       GError *new_error = NULL;
+       GError  *new_error = NULL;
        TrackerProperty *field;
        TrackerOntologies *ontologies;
 
@@ -2704,7 +2704,7 @@ tracker_data_insert_statement_common (TrackerData  *data,
        if (g_str_has_prefix (subject, ":")) {
                /* blank node definition
                   pile up statements until the end of the blank node */
-               gchar *value;
+               gchar  *value;
                GError *actual_error = NULL;
 
                if (data->blank_buffer.subject != NULL) {
@@ -2837,10 +2837,10 @@ tracker_data_insert_statement_with_uri (TrackerData  *data,
        GError          *actual_error = NULL;
        TrackerClass    *class;
        TrackerProperty *property;
-       gint             prop_id = 0, graph_id = 0;
-       gint             final_prop_id = 0, object_id = 0;
+       gint prop_id = 0, graph_id = 0;
+       gint final_prop_id = 0, object_id = 0;
        gboolean change = FALSE;
-       TrackerOntologies *ontologies;
+       TrackerOntologies  *ontologies;
        TrackerDBInterface *iface;
 
        g_return_if_fail (subject != NULL);
@@ -2961,12 +2961,12 @@ tracker_data_insert_statement_with_string (TrackerData  *data,
 {
        GError          *actual_error = NULL;
        TrackerProperty *property;
-       gboolean         change;
-       gint             graph_id = 0, pred_id = 0;
-       TrackerOntologies *ontologies;
+       gboolean change;
+       gint graph_id = 0, pred_id = 0;
+       TrackerOntologies  *ontologies;
        TrackerDBInterface *iface;
 #ifndef DISABLE_JOURNAL
-       gboolean         tried = FALSE;
+       gboolean tried = FALSE;
 #endif
 
        g_return_if_fail (subject != NULL);
@@ -3046,15 +3046,15 @@ tracker_data_insert_statement_with_string (TrackerData  *data,
                        damaged = tracker_ontologies_get_property_by_uri (ontologies, TRACKER_PREFIX_TRACKER 
"damaged");
                        tracker_db_journal_append_insert_statement (data->journal_writer,
                                                                    graph_id,
-                                                                   data->resource_buffer->id,
-                                                                   tracker_property_get_id (damaged),
-                                                                   "true");
+                                                                   data->resource_buffer->id,
+                                                                   tracker_property_get_id (damaged),
+                                                                   "true");
                } else {
                        tracker_db_journal_append_insert_statement (data->journal_writer,
                                                                    graph_id,
-                                                                   data->resource_buffer->id,
-                                                                   pred_id,
-                                                                   object);
+                                                                   data->resource_buffer->id,
+                                                                   pred_id,
+                                                                   object);
                }
        }
 #endif /* DISABLE_JOURNAL */
@@ -3071,10 +3071,10 @@ tracker_data_update_statement_with_uri (TrackerData  *data,
        GError          *actual_error = NULL;
        TrackerClass    *class;
        TrackerProperty *property;
-       gint             prop_id = 0, graph_id = 0;
-       gint             final_prop_id = 0, object_id = 0;
-       gboolean         change = FALSE;
-       TrackerOntologies *ontologies;
+       gint prop_id = 0, graph_id = 0;
+       gint final_prop_id = 0, object_id = 0;
+       gboolean change = FALSE;
+       TrackerOntologies  *ontologies;
        TrackerDBInterface *iface;
 
        g_return_if_fail (subject != NULL);
@@ -3146,9 +3146,9 @@ tracker_data_update_statement_with_uri (TrackerData  *data,
                change = TRUE;
        } else {
                gint old_object_id = 0;
-               GArray *old_values;
+               GArray  *old_values;
                gboolean multiple_values;
-               GError *new_error = NULL;
+               GError  *new_error = NULL;
                gboolean domain_unchecked = TRUE;
 
                multiple_values = tracker_property_get_multiple_values (property);
@@ -3283,7 +3283,7 @@ tracker_data_update_statement_with_string (TrackerData  *data,
        gboolean change;
        gint graph_id = 0, pred_id = 0;
        gboolean multiple_values;
-       TrackerOntologies *ontologies;
+       TrackerOntologies  *ontologies;
        TrackerDBInterface *iface;
 #ifndef DISABLE_JOURNAL
        gboolean tried = FALSE;
@@ -3491,7 +3491,7 @@ tracker_data_begin_transaction (TrackerData  *data,
 
        if (!tracker_db_manager_has_enough_space (db_manager)) {
                g_set_error (error, TRACKER_SPARQL_ERROR, TRACKER_SPARQL_ERROR_NO_SPACE,
-                       "There is not enough space on the file system for update operations");
+                            "There is not enough space on the file system for update operations");
                return;
        }
 
@@ -3523,8 +3523,8 @@ tracker_data_begin_transaction (TrackerData  *data,
                g_assert (data->journal_writer == NULL);
                /* Pick the right journal writer for this transaction */
                data->journal_writer = data->in_ontology_transaction ?
-                       tracker_data_manager_get_ontology_writer (data->manager) :
-                       tracker_data_manager_get_journal_writer (data->manager);
+                                      tracker_data_manager_get_ontology_writer (data->manager) :
+                                      tracker_data_manager_get_journal_writer (data->manager);
 
                tracker_db_journal_start_transaction (data->journal_writer, data->resource_time);
        }
@@ -3776,7 +3776,7 @@ tracker_data_replay_journal (TrackerData          *data,
        gint last_operation_type = 0;
        const gchar *uri;
        GError *n_error = NULL;
-       GFile *data_location;
+       GFile  *data_location;
        TrackerDBJournalReader *reader;
        TrackerOntologies *ontologies;
 
@@ -4045,7 +4045,7 @@ tracker_data_replay_journal (TrackerData          *data,
 
        if (journal_error) {
                GError *n_error = NULL;
-               gsize size;
+               gsize  size;
                GFile *cache_location, *data_location;
                TrackerDBJournal *writer;
 
diff --git a/src/libtracker-data/tracker-db-backup.c b/src/libtracker-data/tracker-db-backup.c
index 49bbcb38b..c8e64a80d 100644
--- a/src/libtracker-data/tracker-db-backup.c
+++ b/src/libtracker-data/tracker-db-backup.c
@@ -34,15 +34,15 @@
 
 #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 {
-       GFile *destination;
-       GFile *file;
+       GFile   *destination;
+       GFile   *file;
        TrackerDBBackupFinished callback;
        gpointer user_data;
        GDestroyNotify destroy;
-       GError *error;
+       GError  *error;
 } BackupInfo;
 
 GQuark
@@ -121,7 +121,7 @@ backup_job (GTask        *task,
 
                if (!backup) {
                        g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR, TRACKER_DB_BACKUP_ERROR_UNKNOWN,
-                                    "Unable to initialize sqlite3 backup from '%s' to '%s'", src_path, 
temp_path);
+                                    "Unable to initialize sqlite3 backup from '%s' to '%s'", src_path, 
temp_path);
                }
        }
 
@@ -139,8 +139,8 @@ backup_job (GTask        *task,
                        g_set_error (&info->error,
                                     TRACKER_DB_BACKUP_ERROR,
                                     TRACKER_DB_BACKUP_ERROR_UNKNOWN,
-                                    "Unable to finish sqlite3 backup: %s",
-                                    sqlite3_errmsg (temp_db));
+                                    "Unable to finish sqlite3 backup: %s",
+                                    sqlite3_errmsg (temp_db));
                }
                backup = NULL;
        }
diff --git a/src/libtracker-data/tracker-db-config.c b/src/libtracker-data/tracker-db-config.c
index 25d58ca79..6aa457747 100644
--- a/src/libtracker-data/tracker-db-config.c
+++ b/src/libtracker-data/tracker-db-config.c
@@ -97,13 +97,13 @@ tracker_db_config_init (TrackerDBConfig *object)
 }
 
 static void
-config_set_property (GObject      *object,
-                     guint         param_id,
-                     const GValue *value,
+config_set_property (GObject              *object,
+                     guint                 param_id,
+                     const GValue         *value,
                      GParamSpec           *pspec)
 {
        switch (param_id) {
-               /* Journal */
+       /* Journal */
        case PROP_JOURNAL_CHUNK_SIZE:
                tracker_db_config_set_journal_chunk_size (TRACKER_DB_CONFIG (object),
                                                          g_value_get_int(value));
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index b891696c8..e551768a9 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -72,9 +72,9 @@ typedef struct {
 } TrackerDBReplaceFuncChecks;
 
 struct TrackerDBInterface {
-       GObject parent_instance;
+       GObject  parent_instance;
 
-       gchar *filename;
+       gchar   *filename;
        sqlite3 *db;
 
        GHashTable *dynamic_statements;
@@ -83,7 +83,7 @@ struct TrackerDBInterface {
        TrackerDBReplaceFuncChecks replace_func_checks;
 
        /* Number of active cursors */
-       gint n_active_cursors;
+       gint  n_active_cursors;
 
        guint flags;
        GCancellable *cancellable;
@@ -110,9 +110,9 @@ struct TrackerDBInterfaceClass {
 };
 
 struct TrackerDBCursor {
-       TrackerSparqlCursor parent_instance;
+       TrackerSparqlCursor  parent_instance;
        sqlite3_stmt *stmt;
-       TrackerDBStatement *ref_stmt;
+       TrackerDBStatement  *ref_stmt;
        gboolean finished;
        TrackerPropertyType *types;
        gint n_types;
@@ -415,7 +415,7 @@ function_sparql_format_time (sqlite3_context *context,
                              sqlite3_value   *argv[])
 {
        gdouble seconds;
-       gchar *str;
+       gchar  *str;
 
        if (argc != 1) {
                sqlite3_result_error (context, "Invalid argument count", -1);
@@ -528,7 +528,7 @@ function_sparql_regex (sqlite3_context *context,
                flags = (gchar *)sqlite3_value_text (argv[2]);
 
        if (regex == NULL) {
-               gchar *err_str;
+               gchar  *err_str;
                GError *error = NULL;
 
                pattern = (gchar *)sqlite3_value_text (argv[1]);
@@ -600,7 +600,7 @@ function_sparql_replace (sqlite3_context *context,
        TrackerDBReplaceFuncChecks *checks = &db_interface->replace_func_checks;
        gboolean store_regex = FALSE, store_replace_regex = FALSE;
        const gchar *input, *pattern, *replacement, *flags;
-       gchar *err_str, *output = NULL, *replaced = NULL, *unescaped = NULL;
+       gchar  *err_str, *output = NULL, *replaced = NULL, *unescaped = NULL;
        GError *error = NULL;
        GRegexCompileFlags regex_flags = 0;
        GRegex *regex, *replace_regex;
@@ -878,7 +878,7 @@ function_sparql_unaccent (sqlite3_context *context,
 {
        const gchar *zInput;
        gchar *zOutput;
-       gsize written = 0;
+       gsize  written = 0;
        int nInput;
 
        g_assert (argc == 1);
@@ -931,7 +931,7 @@ function_sparql_lower_case (sqlite3_context *context,
 
        u_strToLower (zOutput, nOutput/2, zInput, nInput/2, NULL, &status);
 
-       if (!U_SUCCESS (status)){
+       if (!U_SUCCESS (status)) {
                char zBuf[128];
                sqlite3_snprintf (128, zBuf, "ICU error: u_strToLower(): %s", u_errorName (status));
                zBuf[127] = '\0';
@@ -973,7 +973,7 @@ function_sparql_upper_case (sqlite3_context *context,
 
        u_strToUpper (zOutput, nOutput / 2, zInput, nInput / 2, NULL, &status);
 
-       if (!U_SUCCESS (status)){
+       if (!U_SUCCESS (status)) {
                char zBuf[128];
                sqlite3_snprintf (128, zBuf, "ICU error: u_strToUpper(): %s", u_errorName (status));
                zBuf[127] = '\0';
@@ -1015,7 +1015,7 @@ function_sparql_case_fold (sqlite3_context *context,
 
        u_strFoldCase (zOutput, nOutput/2, zInput, nInput/2, U_FOLD_CASE_DEFAULT, &status);
 
-       if (!U_SUCCESS (status)){
+       if (!U_SUCCESS (status)) {
                char zBuf[128];
                sqlite3_snprintf (128, zBuf, "ICU error: u_strFoldCase: %s", u_errorName (status));
                zBuf[127] = '\0';
@@ -1301,10 +1301,10 @@ function_sparql_rand (sqlite3_context *context,
 
 static void
 function_sparql_checksum (sqlite3_context *context,
-                         int              argc,
-                         sqlite3_value   *argv[])
+                          int              argc,
+                          sqlite3_value   *argv[])
 {
-       const gchar *str, *checksumstr;
+       const gchar  *str, *checksumstr;
        GChecksumType checksum;
        gchar *result;
 
@@ -1386,7 +1386,7 @@ function_sparql_uuid (sqlite3_context *context,
        db = sqlite3_context_db_handle (context);
 
        result = sqlite3_prepare_v2 (db, "SELECT ID FROM Resource WHERE Uri=?",
-                                    -1, &stmt, NULL);
+                                    -1, &stmt, NULL);
        if (result != SQLITE_OK) {
                sqlite3_result_error (context, sqlite3_errstr (result), -1);
                return;
@@ -1660,7 +1660,7 @@ _fts_create_properties (GHashTable *properties)
        cols = g_ptr_array_new ();
 
        while (g_hash_table_iter_next (&iter, (gpointer *) &table,
-                                      (gpointer *) &columns)) {
+                                      (gpointer *) &columns)) {
                while (columns) {
                        g_ptr_array_add (cols, g_strdup (columns->data));
                        columns = columns->next;
@@ -1686,7 +1686,7 @@ tracker_db_interface_sqlite_fts_init (TrackerDBInterface  *db_interface,
 
        if (create &&
            !tracker_fts_create_table (db_interface->db, "fts5",
-                                      properties, multivalued)) {
+                                      properties, multivalued)) {
                g_warning ("FTS tables creation failed");
        }
 
@@ -1723,8 +1723,8 @@ tracker_db_interface_sqlite_fts_delete_table (TrackerDBInterface  *db_interface)
 
 void
 tracker_db_interface_sqlite_fts_alter_table (TrackerDBInterface  *db_interface,
-                                            GHashTable          *properties,
-                                            GHashTable          *multivalued)
+                                             GHashTable          *properties,
+                                             GHashTable          *multivalued)
 {
        if (!tracker_fts_alter_table (db_interface->db, "fts5", properties, multivalued)) {
                g_critical ("Failed to update FTS columns");
@@ -1784,7 +1784,7 @@ tracker_db_interface_sqlite_fts_update_text (TrackerDBInterface  *db_interface,
 {
        TrackerDBStatement *stmt;
        GError *error = NULL;
-       gchar *query;
+       gchar  *query;
        gint i;
 
        query = tracker_db_interface_sqlite_fts_create_query (db_interface,
@@ -1795,30 +1795,30 @@ tracker_db_interface_sqlite_fts_update_text (TrackerDBInterface  *db_interface,
                                                      "%s", query);
        g_free (query);
 
-        if (!stmt || error) {
-                if (error) {
-                        g_warning ("Could not create FTS insert statement: %s\n",
-                                   error->message);
-                        g_error_free (error);
-                }
-                return FALSE;
-        }
+       if (!stmt || error) {
+               if (error) {
+                       g_warning ("Could not create FTS insert statement: %s\n",
+                                  error->message);
+                       g_error_free (error);
+               }
+               return FALSE;
+       }
 
-        tracker_db_statement_bind_int (stmt, 0, id);
-        for (i = 0; text[i] != NULL; i++) {
-               tracker_db_statement_bind_text (stmt, i + 1, text[i]);
-        }
+       tracker_db_statement_bind_int (stmt, 0, id);
+       for (i = 0; text[i] != NULL; i++) {
+               tracker_db_statement_bind_text (stmt, i + 1, text[i]);
+       }
 
-        tracker_db_statement_execute (stmt, &error);
-        g_object_unref (stmt);
+       tracker_db_statement_execute (stmt, &error);
+       g_object_unref (stmt);
 
-        if (error) {
-                g_warning ("Could not insert FTS text: %s", error->message);
-                g_error_free (error);
-                return FALSE;
-        }
+       if (error) {
+               g_warning ("Could not insert FTS text: %s", error->message);
+               g_error_free (error);
+               return FALSE;
+       }
 
-        return TRUE;
+       return TRUE;
 }
 
 gboolean
@@ -1867,7 +1867,7 @@ tracker_db_interface_sqlite_fts_delete_id (TrackerDBInterface *db_interface,
 {
        TrackerDBStatement *stmt;
        GError *error = NULL;
-       gchar *query;
+       gchar  *query;
 
        query = tracker_db_interface_sqlite_fts_create_delete_all_query (db_interface);
        stmt = tracker_db_interface_create_statement (db_interface,
@@ -2140,7 +2140,7 @@ tracker_db_interface_lru_insert_unchecked (TrackerDBInterface          *db_inter
 
        /* LRU holds a reference to the stmt */
        stmt_lru = cache_type == TRACKER_DB_STATEMENT_CACHE_TYPE_UPDATE ?
-               &db_interface->update_stmt_lru : &db_interface->select_stmt_lru;
+                  &db_interface->update_stmt_lru : &db_interface->select_stmt_lru;
 
        /* use replace instead of insert to make sure we store the string that
         * belongs to the right sqlite statement to ensure the lifetime of the string
@@ -2203,7 +2203,7 @@ tracker_db_interface_lru_update (TrackerDBInterface          *db_interface,
                          cache_type == TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT);
 
        stmt_lru = cache_type == TRACKER_DB_STATEMENT_CACHE_TYPE_UPDATE ?
-               &db_interface->update_stmt_lru : &db_interface->select_stmt_lru;
+                  &db_interface->update_stmt_lru : &db_interface->select_stmt_lru;
 
        tracker_db_statement_sqlite_reset (stmt);
 
@@ -2243,7 +2243,7 @@ tracker_db_interface_create_statement (TrackerDBInterface           *db_interfac
 {
        TrackerDBStatement *stmt = NULL;
        va_list args;
-       gchar *full_query;
+       gchar  *full_query;
 
        g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (db_interface), NULL);
 
@@ -2565,7 +2565,7 @@ tracker_db_cursor_iter_next_thread (GTask        *task,
        /* run in thread */
 
        TrackerDBCursor *cursor = object;
-       GError *error = NULL;
+       GError  *error = NULL;
        gboolean result;
 
        result = db_cursor_iter_next (cursor, cancellable, &error);
@@ -2723,8 +2723,8 @@ tracker_db_statement_bind_text (TrackerDBStatement *stmt,
 
 void
 tracker_db_statement_bind_value (TrackerDBStatement *stmt,
-                                int                 index,
-                                const GValue       *value)
+                                 int                 index,
+                                 const GValue       *value)
 {
        GType type;
 
@@ -2746,7 +2746,7 @@ tracker_db_statement_bind_value (TrackerDBStatement *stmt,
                sqlite3_bind_double (stmt->stmt, index + 1, g_value_get_float (value));
        } else if (type == G_TYPE_STRING) {
                sqlite3_bind_text (stmt->stmt, index + 1,
-                                  g_value_get_string (value), -1, SQLITE_TRANSIENT);
+                                  g_value_get_string (value), -1, SQLITE_TRANSIENT);
        } else {
                GValue dest = G_VALUE_INIT;
 
@@ -2754,7 +2754,7 @@ tracker_db_statement_bind_value (TrackerDBStatement *stmt,
 
                if (g_value_transform (value, &dest)) {
                        sqlite3_bind_text (stmt->stmt, index + 1,
-                                          g_value_get_string (&dest), -1, SQLITE_TRANSIENT);
+                                          g_value_get_string (&dest), -1, SQLITE_TRANSIENT);
                        g_value_unset (&dest);
                } else {
                        g_assert_not_reached ();
diff --git a/src/libtracker-data/tracker-db-interface.c b/src/libtracker-data/tracker-db-interface.c
index d7b5b494e..de2724221 100644
--- a/src/libtracker-data/tracker-db-interface.c
+++ b/src/libtracker-data/tracker-db-interface.c
@@ -39,9 +39,9 @@ tracker_db_interface_execute_query (TrackerDBInterface  *interface,
 
        va_start (args, query);
        tracker_db_interface_execute_vquery (interface,
-                                            error,
-                                            query,
-                                            args);
+                                            error,
+                                            query,
+                                            args);
        va_end (args);
 }
 
diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
index 0c5711494..c0d0962aa 100644
--- a/src/libtracker-data/tracker-db-journal.c
+++ b/src/libtracker-data/tracker-db-journal.c
@@ -74,36 +74,36 @@ struct _TrackerDBJournalReader {
        GDataInputStream *stream;
        GInputStream *underlying_stream;
        GFileInfo *underlying_stream_info;
-       GMappedFile *file;
-       const gchar *current;
-       const gchar *end;
-       const gchar *entry_begin;
-       const gchar *entry_end;
-       const gchar *last_success;
-       const gchar *start;
+       GMappedFile  *file;
+       const gchar  *current;
+       const gchar  *end;
+       const gchar  *entry_begin;
+       const gchar  *entry_end;
+       const gchar  *last_success;
+       const gchar  *start;
        guint32 amount_of_triples;
-       gint64 time;
+       gint64  time;
        TrackerDBJournalEntryType type;
-       gchar *uri;
-       gint g_id;
-       gint s_id;
-       gint p_id;
-       gint o_id;
+       gchar  *uri;
+       gint   g_id;
+       gint   s_id;
+       gint   p_id;
+       gint   o_id;
        gchar *object;
-       guint current_file;
-       guint total_chunks;
+       guint  current_file;
+       guint  total_chunks;
 };
 
 struct _TrackerDBJournal {
        gchar *journal_filename;
        GFile *journal_location;
        int journal;
-       gsize cur_size;
-       guint cur_block_len;
-       guint cur_block_alloc;
+       gsize  cur_size;
+       guint  cur_block_len;
+       guint  cur_block_alloc;
        gchar *cur_block;
-       guint cur_entry_amount;
-       guint cur_pos;
+       guint  cur_entry_amount;
+       guint  cur_pos;
 
        TransactionFormat transaction_format;
        gboolean in_transaction;
@@ -111,7 +111,7 @@ struct _TrackerDBJournal {
 };
 
 static struct {
-       gsize chunk_size;
+       gsize  chunk_size;
        gboolean do_rotating;
        gchar *rotate_to;
        gboolean rotate_progress_flag;
@@ -157,9 +157,9 @@ static guint32
 read_uint32 (const guint8 *data)
 {
        return data[0] << 24 |
-              data[1] << 16 |
-              data[2] << 8 |
-              data[3];
+               data[1] << 16 |
+               data[2] << 8 |
+               data[3];
 }
 
 static guint32
@@ -194,7 +194,7 @@ scan_for_nul (GBufferedInputStream *stream,
 {
        const gchar *buffer;
        gsize start, end, peeked;
-       gint i;
+       gint  i;
        gsize available, checked;
 
        checked = *checked_out;
@@ -226,7 +226,7 @@ journal_read_string (TrackerDBJournalReader  *jreader,
                /* based on GDataInputStream code */
 
                GBufferedInputStream *bstream;
-               gsize checked;
+               gsize  checked;
                gssize found_pos;
 
                bstream = G_BUFFERED_INPUT_STREAM (jreader->stream);
@@ -285,7 +285,7 @@ static gboolean
 journal_verify_header (TrackerDBJournalReader *jreader)
 {
        gchar header[8];
-       gint i;
+       gint  i;
        GError *error = NULL;
 
        /* Version 00003 is identical, it just has no UPDATE operations */
@@ -532,7 +532,7 @@ db_journal_writer_init (TrackerDBJournal  *jwriter,
 {
        gchar *directory;
        gint mode;
-       GError *n_error = NULL;
+       GError  *n_error = NULL;
        gboolean ret;
 
        directory = g_path_get_dirname (filename);
@@ -573,9 +573,9 @@ tracker_db_journal_new (GFile        *data_location,
 {
        TrackerDBJournal *writer;
        gboolean ret;
-       gchar *filename;
-       GError *n_error = NULL;
-       GFile *child;
+       gchar   *filename;
+       GError  *n_error = NULL;
+       GFile   *child;
 
        writer = g_new0 (TrackerDBJournal, 1);
        writer->transaction_format = TRANSACTION_FORMAT_DATA;
@@ -603,9 +603,9 @@ tracker_db_journal_ontology_new (GFile     *data_location,
 {
        TrackerDBJournal *writer;
        gboolean ret;
-       gchar *filename;
-       GError *n_error = NULL;
-       GFile *child;
+       gchar   *filename;
+       GError  *n_error = NULL;
+       GFile   *child;
 
        writer = g_new0 (TrackerDBJournal, 1);
        writer->transaction_format = TRANSACTION_FORMAT_ONTOLOGY;
@@ -1089,7 +1089,7 @@ tracker_db_journal_commit_db_transaction (TrackerDBJournal  *writer,
                                           GError           **error)
 {
        gboolean ret;
-       GError *n_error = NULL;
+       GError  *n_error = NULL;
 
        g_return_val_if_fail (writer->in_transaction == TRUE, FALSE);
 
@@ -1238,7 +1238,7 @@ db_journal_reader_init (TrackerDBJournalReader  *jreader,
                         GFile                   *data_location,
                         GError                 **error)
 {
-       gchar *filename_open;
+       gchar  *filename_open;
        GError *n_error = NULL;
 
        g_return_val_if_fail (jreader->file == NULL, FALSE);
@@ -1285,8 +1285,8 @@ tracker_db_journal_reader_new (GFile   *data_location,
 {
        TrackerDBJournalReader *reader;
        GError *n_error = NULL;
-       gchar *filename;
-       GFile *child;
+       gchar  *filename;
+       GFile  *child;
 
        child = g_file_get_child (data_location, TRACKER_DB_JOURNAL_FILENAME);
        filename = g_file_get_path (child);
@@ -1310,9 +1310,9 @@ tracker_db_journal_reader_ontology_new (GFile   *data_location,
                                         GError **error)
 {
        TrackerDBJournalReader *reader;
-       gchar *filename;
+       gchar  *filename;
        GError *n_error = NULL;
-       GFile *child;
+       GFile  *child;
 
        child = g_file_get_child (data_location, TRACKER_DB_JOURNAL_ONTOLOGY_FILENAME);
        filename = g_file_get_path (child);
@@ -1753,12 +1753,12 @@ gboolean
 tracker_db_journal_reader_verify_last (GFile   *data_location,
                                        GError **error)
 {
-       guint32 entry_size_check;
+       guint32  entry_size_check;
        gboolean success = FALSE;
        TrackerDBJournalReader jreader = { 0 };
        GError *n_error = NULL;
-       gchar *filename;
-       GFile *child;
+       gchar  *filename;
+       GFile  *child;
 
        child = g_file_get_child (data_location, TRACKER_DB_JOURNAL_FILENAME);
        filename = g_file_get_path (child);
@@ -1957,7 +1957,7 @@ on_chunk_copied_delete (GObject      *source_object,
 {
        GOutputStream *ostream = G_OUTPUT_STREAM (source_object);
        GError *error = NULL;
-       GFile *source = G_FILE (user_data);
+       GFile  *source = G_FILE (user_data);
 
        g_output_stream_splice_finish (ostream, res, &error);
        if (!error) {
@@ -1981,9 +1981,9 @@ tracker_db_journal_rotate (TrackerDBJournal  *writer,
        gchar *filename, *gzfilename;
        gchar *fullpath;
        GConverter *converter;
-       GInputStream *istream;
+       GInputStream  *istream;
        GOutputStream *ostream, *cstream;
-       GError *n_error = NULL;
+       GError  *n_error = NULL;
        gboolean ret;
 
 #ifdef DISABLE_JOURNAL
@@ -1992,7 +1992,7 @@ tracker_db_journal_rotate (TrackerDBJournal  *writer,
 
        if (writer->cur_journal_file == 0) {
                gchar *directory;
-               GDir *journal_dir;
+               GDir  *journal_dir;
                const gchar *f_name;
 
                directory = g_path_get_dirname (writer->journal_filename);
@@ -2037,9 +2037,9 @@ tracker_db_journal_rotate (TrackerDBJournal  *writer,
 
        if (g_rename (writer->journal_filename, fullpath) < 0) {
                g_set_error (error, TRACKER_DB_JOURNAL_ERROR,
-                            TRACKER_DB_JOURNAL_ERROR_COULD_NOT_WRITE,
+                            TRACKER_DB_JOURNAL_ERROR_COULD_NOT_WRITE,
                             "Could not rotate journal file %s: %s",
-                            writer->journal_filename,
+                            writer->journal_filename,
                             g_strerror (errno));
                return FALSE;
        }
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 09cb94b5b..040ed0ca5 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -109,11 +109,11 @@ typedef struct {
        const gchar        *file;
        const gchar        *name;
        gchar              *abs_filename;
-       gint                cache_size;
-       gint                page_size;
-       gboolean            attached;
-       gboolean            is_index;
-       guint64             mtime;
+       gint cache_size;
+       gint page_size;
+       gboolean attached;
+       gboolean is_index;
+       guint64 mtime;
 } TrackerDBDefinition;
 
 static TrackerDBDefinition db_base = {
@@ -137,8 +137,8 @@ struct _TrackerDBManager {
        GFile *cache_location;
        GFile *data_location;
        TrackerDBManagerFlags flags;
-       guint s_cache_size;
-       guint u_cache_size;
+       guint  s_cache_size;
+       guint  u_cache_size;
 
        gpointer vtab_data;
 
@@ -163,7 +163,7 @@ db_exec_no_reply (TrackerDBInterface *iface,
                   const gchar        *query,
                   ...)
 {
-       va_list                     args;
+       va_list args;
 
        va_start (args, query);
        tracker_db_interface_execute_vquery (iface, NULL, query, args);
@@ -393,7 +393,7 @@ db_get_locale (TrackerDBManager *db_manager)
 
 static void
 db_set_locale (TrackerDBManager *db_manager,
-              const gchar      *locale)
+               const gchar      *locale)
 {
        GError *error = NULL;
        gchar  *filename;
@@ -471,7 +471,7 @@ static void
 db_manager_analyze (TrackerDBManager   *db_manager,
                     TrackerDBInterface *iface)
 {
-       guint64             current_mtime;
+       guint64 current_mtime;
 
        current_mtime = tracker_file_get_mtime (db_manager->db.abs_filename);
 
@@ -488,9 +488,9 @@ db_manager_analyze (TrackerDBManager   *db_manager,
 
 static void
 db_recreate_all (TrackerDBManager  *db_manager,
-                GError           **error)
+                 GError           **error)
 {
-       gchar *locale;
+       gchar  *locale;
        GError *internal_error = NULL;
 
        /* We call an internal version of this function here
@@ -546,8 +546,8 @@ tracker_db_manager_ensure_locations (TrackerDBManager *db_manager,
 
 static void
 perform_recreate (TrackerDBManager  *db_manager,
-                 gboolean          *first_time,
-                 GError           **error)
+                  gboolean          *first_time,
+                  GError           **error)
 {
        GError *internal_error = NULL;
 
@@ -575,21 +575,21 @@ perform_recreate (TrackerDBManager  *db_manager,
 
 TrackerDBManager *
 tracker_db_manager_new (TrackerDBManagerFlags   flags,
-                       GFile                  *cache_location,
-                       GFile                  *data_location,
-                       gboolean               *first_time,
-                       gboolean                restoring_backup,
-                       gboolean                shared_cache,
-                       guint                   select_cache_size,
-                       guint                   update_cache_size,
-                       TrackerBusyCallback     busy_callback,
-                       gpointer                busy_user_data,
-                       const gchar            *busy_operation,
+                        GFile                  *cache_location,
+                        GFile                  *data_location,
+                        gboolean               *first_time,
+                        gboolean                restoring_backup,
+                        gboolean                shared_cache,
+                        guint                   select_cache_size,
+                        guint                   update_cache_size,
+                        TrackerBusyCallback     busy_callback,
+                        gpointer                busy_user_data,
+                        const gchar            *busy_operation,
                         GObject                *iface_data,
-                       GError                **error)
+                        GError                **error)
 {
        TrackerDBManager *db_manager;
-       TrackerDBVersion version;
+       TrackerDBVersion  version;
        gboolean need_reindex;
        int in_use_file;
        gboolean loaded = FALSE;
@@ -627,8 +627,8 @@ tracker_db_manager_new (TrackerDBManagerFlags   flags,
 
        tracker_db_manager_ensure_locations (db_manager, cache_location, data_location);
        db_manager->in_use_filename = g_build_filename (db_manager->user_data_dir,
-                                                       IN_USE_FILENAME,
-                                                       NULL);
+                                                       IN_USE_FILENAME,
+                                                       NULL);
 
        /* Don't do need_reindex checks for readonly (direct-access) */
        if ((flags & TRACKER_DB_MANAGER_READONLY) == 0) {
@@ -879,12 +879,12 @@ tracker_db_manager_new (TrackerDBManagerFlags   flags,
        if ((flags & TRACKER_DB_MANAGER_READONLY) == 0) {
                /* do not create in-use file for read-only mode (direct access) */
                in_use_file = g_open (db_manager->in_use_filename,
-                                     O_WRONLY | O_APPEND | O_CREAT | O_SYNC,
-                                     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+                                     O_WRONLY | O_APPEND | O_CREAT | O_SYNC,
+                                     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 
                if (in_use_file >= 0) {
-                       fsync (in_use_file);
-                       close (in_use_file);
+                       fsync (in_use_file);
+                       close (in_use_file);
                }
        }
 
@@ -1114,8 +1114,8 @@ wal_checkpoint (TrackerDBInterface *iface,
 
        if (error) {
                g_warning ("Error in %s WAL checkpoint: %s",
-                          blocking ? "blocking" : "deferred",
-                          error->message);
+                          blocking ? "blocking" : "deferred",
+                          error->message);
                g_error_free (error);
        }
 
@@ -1154,7 +1154,7 @@ wal_hook (TrackerDBInterface *iface,
        } else {
                /* Defer non-blocking checkpoint to thread */
                db_manager->wal_thread = g_thread_try_new ("wal-checkpoint", wal_checkpoint_thread,
-                                                          db_manager, NULL);
+                                                          db_manager, NULL);
        }
 }
 
@@ -1162,7 +1162,7 @@ static TrackerDBInterface *
 init_writable_db_interface (TrackerDBManager *db_manager)
 {
        TrackerDBInterface *iface;
-       GError *error = NULL;
+       GError  *error = NULL;
        gboolean readonly;
 
        /* Honor anyway the DBManager readonly flag */
@@ -1237,7 +1237,7 @@ void
 tracker_db_manager_tokenizer_update (TrackerDBManager *db_manager)
 {
        GError *error = NULL;
-       gchar *filename;
+       gchar  *filename;
 
        filename = get_parser_version_filename (db_manager);
 
diff --git a/src/libtracker-data/tracker-namespace.c b/src/libtracker-data/tracker-namespace.c
index bdd6625a2..ff8a53abf 100644
--- a/src/libtracker-data/tracker-namespace.c
+++ b/src/libtracker-data/tracker-namespace.c
@@ -127,7 +127,7 @@ tracker_namespace_get_is_new (TrackerNamespace *namespace)
 
 void
 tracker_namespace_set_uri (TrackerNamespace *namespace,
-                           const gchar    *value)
+                           const gchar      *value)
 {
        TrackerNamespacePrivate *priv;
 
@@ -146,7 +146,7 @@ tracker_namespace_set_uri (TrackerNamespace *namespace,
 
 void
 tracker_namespace_set_prefix (TrackerNamespace *namespace,
-                              const gchar    *value)
+                              const gchar      *value)
 {
        TrackerNamespacePrivate *priv;
 
diff --git a/src/libtracker-data/tracker-ontologies.c b/src/libtracker-data/tracker-ontologies.c
index b8cbd90da..525666d2f 100644
--- a/src/libtracker-data/tracker-ontologies.c
+++ b/src/libtracker-data/tracker-ontologies.c
@@ -60,7 +60,7 @@ struct _TrackerOntologiesPrivate {
        GHashTable *property_uris;
 
        /* FieldType enum class */
-       gpointer    property_type_enum_class;
+       gpointer property_type_enum_class;
 
        /* Hash (int id, const gchar *uri) */
        GHashTable *id_uri_pairs;
@@ -222,8 +222,8 @@ tracker_ontologies_get_class_by_uri (TrackerOntologies *ontologies,
                        tracker_class_set_uri (class, class_uri);
 
                        g_hash_table_insert (priv->class_uris,
-                                            g_strdup (class_uri),
-                                            class);
+                                            g_strdup (class_uri),
+                                            class);
                }
        }
 
@@ -384,8 +384,8 @@ tracker_ontologies_get_property_by_uri (TrackerOntologies *ontologies,
                        tracker_property_set_uri (property, uri);
 
                        g_hash_table_insert (priv->property_uris,
-                                            g_strdup (uri),
-                                            property);
+                                            g_strdup (uri),
+                                            property);
                }
        }
 
@@ -448,8 +448,8 @@ tracker_ontologies_get_namespace_by_uri (TrackerOntologies *ontologies,
                        tracker_namespace_set_uri (namespace, uri);
 
                        g_hash_table_insert (priv->namespace_uris,
-                                            g_strdup (uri),
-                                            namespace);
+                                            g_strdup (uri),
+                                            namespace);
                }
        }
 
@@ -486,8 +486,8 @@ gvdb_hash_table_insert_variant (GHashTable  *table,
 }
 
 static GvdbItem *
-gvdb_hash_table_insert_item (GHashTable *table,
-                             GvdbItem   *root,
+gvdb_hash_table_insert_item (GHashTable  *table,
+                             GvdbItem    *root,
                              const gchar *uri)
 {
        GvdbItem *item;
@@ -539,8 +539,8 @@ tracker_ontologies_write_gvdb (TrackerOntologies  *ontologies,
        table = gvdb_hash_table_new (root_table, "classes");
        root = gvdb_hash_table_insert (table, "");
        for (i = 0; i < priv->classes->len; i++) {
-               TrackerClass *class;
-               TrackerClass **super_classes;
+               TrackerClass   *class;
+               TrackerClass  **super_classes;
                GVariantBuilder builder;
 
                class = priv->classes->pdata[i];
@@ -568,8 +568,8 @@ tracker_ontologies_write_gvdb (TrackerOntologies  *ontologies,
        root = gvdb_hash_table_insert (table, "");
        for (i = 0; i < priv->properties->len; i++) {
                TrackerProperty *property;
-               TrackerClass **domain_indexes;
-               GVariantBuilder builder;
+               TrackerClass   **domain_indexes;
+               GVariantBuilder  builder;
 
                property = priv->properties->pdata[i];
                uri = tracker_property_get_uri (property);
diff --git a/src/libtracker-data/tracker-ontology.c b/src/libtracker-data/tracker-ontology.c
index e12825f3a..1bbbf3266 100644
--- a/src/libtracker-data/tracker-ontology.c
+++ b/src/libtracker-data/tracker-ontology.c
@@ -130,7 +130,7 @@ tracker_ontology_get_uri (TrackerOntology *ontology)
 
 void
 tracker_ontology_set_uri (TrackerOntology *ontology,
-                          const gchar    *value)
+                          const gchar     *value)
 {
        TrackerOntologyPrivate *priv;
 
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c
index 548d9bb46..23847ed8e 100644
--- a/src/libtracker-data/tracker-property.c
+++ b/src/libtracker-data/tracker-property.c
@@ -44,34 +44,34 @@ struct _TrackerPropertyPrivate {
        gchar         *name;
        gchar         *table_name;
 
-       gboolean       use_gvdb;
-
-       TrackerPropertyType  data_type;
-       TrackerClass   *domain;
-       TrackerClass   *domain_index;
-       TrackerClass   *range;
-       gint           weight;
-       gint           id;
-       gboolean       indexed;
+       gboolean use_gvdb;
+
+       TrackerPropertyType data_type;
+       TrackerClass    *domain;
+       TrackerClass    *domain_index;
+       TrackerClass    *range;
+       gint weight;
+       gint id;
+       gboolean indexed;
        TrackerProperty *secondary_index;
-       gboolean       orig_fulltext_indexed;
-       gboolean       fulltext_indexed;
-       gboolean       multiple_values;
-       gboolean       last_multiple_values;
-       gboolean       transient;
-       gboolean       is_inverse_functional_property;
-       gboolean       is_new;
-       gboolean       db_schema_changed;
-       gboolean       writeback;
+       gboolean orig_fulltext_indexed;
+       gboolean fulltext_indexed;
+       gboolean multiple_values;
+       gboolean last_multiple_values;
+       gboolean transient;
+       gboolean is_inverse_functional_property;
+       gboolean is_new;
+       gboolean db_schema_changed;
+       gboolean writeback;
        gchar         *default_value;
        GPtrArray     *is_new_domain_index;
-       gboolean       force_journal;
+       gboolean force_journal;
 
        GArray        *super_properties;
        GArray        *domain_indexes;
        GArray        *last_super_properties;
-       gboolean       cardinality_changed;
-       gboolean       orig_multiple_values;
+       gboolean cardinality_changed;
+       gboolean orig_multiple_values;
 
        TrackerOntologies *ontologies;
 };
@@ -257,8 +257,8 @@ tracker_property_get_table_name (TrackerProperty *property)
        if (!priv->table_name) {
                if (tracker_property_get_multiple_values (property)) {
                        priv->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 {
                        priv->table_name = g_strdup (tracker_class_get_name (tracker_property_get_domain 
(property)));
                }
@@ -306,7 +306,7 @@ tracker_property_get_domain (TrackerProperty *property)
        TrackerPropertyPrivate *priv;
 
        /* Removed for performance:
-        g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
+          g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
 
        g_return_val_if_fail (property != NULL, NULL);
 
@@ -328,7 +328,7 @@ tracker_property_get_domain_indexes (TrackerProperty *property)
        TrackerPropertyPrivate *priv;
 
        /* Removed for performance:
-        g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
+          g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
 
        g_return_val_if_fail (property != NULL, NULL);
 
@@ -463,7 +463,7 @@ tracker_property_get_fulltext_indexed (TrackerProperty *property)
        TrackerPropertyPrivate *priv;
 
        /* Removed for performance:
-        g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
+          g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL); */
 
        g_return_val_if_fail (property != NULL, FALSE);
 
@@ -471,7 +471,7 @@ tracker_property_get_fulltext_indexed (TrackerProperty *property)
 
        if (priv->use_gvdb) {
                GVariant *value;
-               gboolean result;
+               gboolean  result;
 
                value = tracker_ontologies_get_property_value_gvdb (priv->ontologies, priv->uri, 
"fulltext-indexed");
                if (value != NULL) {
@@ -583,7 +583,7 @@ tracker_property_get_multiple_values (TrackerProperty *property)
 
        if (priv->use_gvdb) {
                GVariant *value;
-               gboolean result;
+               gboolean  result;
 
                value = tracker_ontologies_get_property_value_gvdb (priv->ontologies, priv->uri, 
"max-cardinality");
                if (value != NULL) {
@@ -634,7 +634,7 @@ tracker_property_get_is_inverse_functional_property (TrackerProperty *property)
 
        if (priv->use_gvdb) {
                GVariant *value;
-               gboolean result;
+               gboolean  result;
 
                value = tracker_ontologies_get_property_value_gvdb (priv->ontologies, priv->uri, 
"inverse-functional");
                if (value != NULL) {
@@ -835,7 +835,7 @@ tracker_property_set_secondary_index (TrackerProperty *property,
 }
 
 void
-tracker_property_set_range (TrackerProperty *property,
+tracker_property_set_range (TrackerProperty  *property,
                             TrackerClass     *value)
 {
        TrackerPropertyPrivate *priv;
diff --git a/src/libtracker-data/tracker-sparql-parser.c b/src/libtracker-data/tracker-sparql-parser.c
index d6cc6e532..c2acadce9 100644
--- a/src/libtracker-data/tracker-sparql-parser.c
+++ b/src/libtracker-data/tracker-sparql-parser.c
@@ -39,8 +39,8 @@ struct _TrackerRuleState {
        TrackerParserNode *node;
        gssize start_pos;
        gint cur_child;
-       guint visited  : 1;
-       guint finished : 1;
+       guint  visited  : 1;
+       guint  finished : 1;
 };
 
 struct _TrackerNodeTree {
@@ -50,11 +50,11 @@ struct _TrackerNodeTree {
 };
 
 struct _TrackerParserNode {
-       GNode node;
+       GNode  node;
        const TrackerGrammarRule *rule;
        gssize start;
        gssize end;
-       guint n_children;
+       guint  n_children;
        gint cur_child;
 };
 
@@ -79,16 +79,16 @@ struct _TrackerGrammarParser {
 };
 
 static void tracker_grammar_rule_print_helper (GString                  *str,
-                                              const TrackerGrammarRule *rule,
-                                              gint                      depth);
+                                               const TrackerGrammarRule *rule,
+                                               gint                      depth);
 
 static void
 tracker_grammar_rule_print_children (GString                  *str,
-                                    const TrackerGrammarRule *rules,
-                                    const gchar              *start,
-                                    const gchar              *sep,
-                                    const gchar              *end,
-                                    gint                      depth)
+                                     const TrackerGrammarRule *rules,
+                                     const gchar              *start,
+                                     const gchar              *sep,
+                                     const gchar              *end,
+                                     gint                      depth)
 {
        gint i;
 
@@ -105,8 +105,8 @@ tracker_grammar_rule_print_children (GString                  *str,
 
 static void
 tracker_grammar_rule_print_helper (GString                  *str,
-                                  const TrackerGrammarRule *rule,
-                                  gint                      depth)
+                                   const TrackerGrammarRule *rule,
+                                   gint                      depth)
 {
        if (depth == 0) {
                g_string_append (str, "…");
@@ -125,23 +125,23 @@ tracker_grammar_rule_print_helper (GString                  *str,
                break;
        case RULE_TYPE_SEQUENCE:
                tracker_grammar_rule_print_children (str, rule->data.children,
-                                                    "(", " ", ")", depth);
+                                                    "(", " ", ")", depth);
                break;
        case RULE_TYPE_OR:
                tracker_grammar_rule_print_children (str, rule->data.children,
-                                                    "(", " | ", ")", depth);
+                                                    "(", " | ", ")", depth);
                break;
        case RULE_TYPE_GTE0:
                tracker_grammar_rule_print_children (str, rule->data.children,
-                                                    "(", " ", ")*", depth);
+                                                    "(", " ", ")*", depth);
                break;
        case RULE_TYPE_GT0:
                tracker_grammar_rule_print_children (str, rule->data.children,
-                                                    "(", " ", ")+", depth);
+                                                    "(", " ", ")+", depth);
                break;
        case RULE_TYPE_OPTIONAL:
                tracker_grammar_rule_print_children (str, rule->data.children,
-                                                    "(", " ", ")?", depth);
+                                                    "(", " ", ")?", depth);
                break;
        case RULE_TYPE_NIL:
                break;
@@ -307,7 +307,7 @@ tracker_parser_state_peek (TrackerParserState *state)
 static TrackerParserNode *
 tracker_parser_state_pop (TrackerParserState *state)
 {
-       TrackerRuleState *rule_state;
+       TrackerRuleState  *rule_state;
        TrackerParserNode *node = NULL;
 
        rule_state = tracker_parser_state_peek (state);
@@ -437,8 +437,8 @@ tracker_parser_state_take_error (TrackerParserState       *state,
 
 static void
 tracker_parser_state_forward (TrackerParserState   *state,
-                             TrackerGrammarParser *parser,
-                             gssize                len)
+                              TrackerGrammarParser *parser,
+                              gssize                len)
 {
        g_assert (len >= 0 && state->current + len <= parser->query_len);
        state->current += len;
@@ -456,7 +456,7 @@ tracker_parser_state_rewind (TrackerParserState *state)
 
 static void
 tracker_parser_state_skip_whitespace (TrackerParserState   *state,
-                                     TrackerGrammarParser *parser)
+                                      TrackerGrammarParser *parser)
 {
        while (state->current < parser->query_len) {
                /* Skip comments too */
@@ -534,7 +534,7 @@ tracker_grammar_parser_apply_rule_terminal (TrackerGrammarParser     *parser,
                                             TrackerParserState       *state,
                                             const TrackerGrammarRule *rule)
 {
-       TrackerParserNode *node;
+       TrackerParserNode  *node;
        TrackerTerminalFunc func;
        const gchar *str, *end;
 
@@ -651,7 +651,7 @@ tracker_parser_state_rollback (TrackerParserState   *state,
                        if (!tracker_parser_state_peek (state)->visited)
                                break;
 
-                       /* Fall through */
+               /* Fall through */
                case RULE_TYPE_GTE0:
                case RULE_TYPE_OPTIONAL:
                        tracker_parser_state_iterate (state, parser, FALSE);
@@ -801,8 +801,8 @@ tracker_parser_node_get_rule (TrackerParserNode *node)
 
 gboolean
 tracker_parser_node_get_extents (TrackerParserNode *node,
-                                gssize            *start,
-                                gssize            *end)
+                                 gssize            *start,
+                                 gssize            *end)
 {
        if (start)
                *start = node->start;
diff --git a/src/libtracker-data/tracker-sparql-types.c b/src/libtracker-data/tracker-sparql-types.c
index 38765cb44..092e60eac 100644
--- a/src/libtracker-data/tracker-sparql-types.c
+++ b/src/libtracker-data/tracker-sparql-types.c
@@ -33,7 +33,7 @@ enum {
 /* Helper structs */
 static TrackerDataTable *
 tracker_data_table_new (const gchar *tablename,
-                       const gchar *subject,
+                        const gchar *subject,
                         gint         idx)
 {
        TrackerDataTable *table;
@@ -64,7 +64,7 @@ tracker_data_table_set_predicate_variable (TrackerDataTable *table,
 
 static TrackerVariable *
 tracker_variable_new (const gchar *sql_prefix,
-                     const gchar *name)
+                      const gchar *name)
 {
        TrackerVariable *variable;
 
@@ -100,7 +100,7 @@ tracker_variable_get_sql_expression (TrackerVariable *variable)
 
 gchar *
 tracker_variable_get_extra_sql_expression (TrackerVariable *variable,
-                                          const gchar     *suffix)
+                                           const gchar     *suffix)
 {
        return g_strdup_printf ("%s:%s", variable->sql_expression, suffix);
 }
@@ -157,7 +157,7 @@ tracker_token_variable_init (TrackerToken    *token,
 
 void
 tracker_token_parameter_init (TrackerToken *token,
-                             const gchar  *parameter)
+                              const gchar  *parameter)
 {
        token->type = TOKEN_TYPE_PARAMETER;
        token->content.parameter = g_strdup (parameter);
@@ -340,7 +340,7 @@ tracker_binding_get_table (TrackerBinding *binding)
 
 void
 tracker_binding_set_db_column_name (TrackerBinding *binding,
-                                   const gchar    *column_name)
+                                    const gchar    *column_name)
 {
        g_free (binding->sql_db_column_name);
        binding->sql_db_column_name = g_strdup (column_name);
@@ -348,7 +348,7 @@ tracker_binding_set_db_column_name (TrackerBinding *binding,
 
 void
 tracker_binding_set_sql_expression (TrackerBinding *binding,
-                                   const gchar    *sql_expression)
+                                    const gchar    *sql_expression)
 {
        g_free (binding->sql_expression);
        binding->sql_expression = g_strdup (sql_expression);
@@ -359,8 +359,8 @@ tracker_binding_get_sql_expression (TrackerBinding *binding)
 {
        if (!binding->sql_expression && binding->table) {
                binding->sql_expression =  g_strdup_printf ("\"%s\".\"%s\"",
-                                                           binding->table->sql_query_tablename,
-                                                           binding->sql_db_column_name);
+                                                           binding->table->sql_query_tablename,
+                                                           binding->sql_db_column_name);
        }
 
        return binding->sql_expression;
@@ -371,9 +371,9 @@ tracker_binding_get_extra_sql_expression (TrackerBinding *binding,
                                           const gchar    *suffix)
 {
        return g_strdup_printf ("\"%s\".\"%s:%s\"",
-                               binding->table->sql_query_tablename,
-                               binding->sql_db_column_name,
-                               suffix);
+                               binding->table->sql_query_tablename,
+                               binding->sql_db_column_name,
+                               suffix);
 }
 
 void
@@ -411,7 +411,7 @@ tracker_literal_binding_init (TrackerLiteralBinding *binding)
 
 TrackerBinding *
 tracker_literal_binding_new (const gchar      *literal,
-                            TrackerDataTable *table)
+                             TrackerDataTable *table)
 {
        TrackerBinding *binding;
 
@@ -450,7 +450,7 @@ tracker_parameter_binding_init (TrackerParameterBinding *binding)
 
 TrackerBinding *
 tracker_parameter_binding_new (const gchar      *name,
-                              TrackerDataTable *table)
+                               TrackerDataTable *table)
 {
        TrackerBinding *binding;
 
@@ -476,8 +476,8 @@ tracker_variable_binding_init (TrackerVariableBinding *binding)
 
 TrackerBinding *
 tracker_variable_binding_new (TrackerVariable  *variable,
-                             TrackerClass     *type,
-                             TrackerDataTable *table)
+                              TrackerClass     *type,
+                              TrackerDataTable *table)
 {
        TrackerBinding *binding;
 
@@ -491,7 +491,7 @@ tracker_variable_binding_new (TrackerVariable  *variable,
 
 void
 tracker_variable_binding_set_nullable (TrackerVariableBinding *binding,
-                                      gboolean                nullable)
+                                       gboolean                nullable)
 {
        binding->nullable = !!nullable;
 }
@@ -654,7 +654,7 @@ tracker_context_get_parent (TrackerContext *context)
 
 void
 tracker_context_add_variable_ref (TrackerContext  *context,
-                                 TrackerVariable *variable)
+                                  TrackerVariable *variable)
 {
        g_hash_table_add (context->variable_set, variable);
 }
@@ -735,7 +735,7 @@ tracker_select_context_ensure_variable (TrackerSelectContext *context,
        if (!context->variables) {
                context->variables =
                        g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
-                                              (GDestroyNotify) tracker_variable_free);
+                                              (GDestroyNotify) tracker_variable_free);
        }
 
        variable = g_hash_table_lookup (context->variables, name);
@@ -866,7 +866,7 @@ tracker_triple_context_init (TrackerTripleContext *context)
        context->variable_bindings =
                g_hash_table_new_full (tracker_variable_hash,
                                       tracker_variable_equal, NULL,
-                                      (GDestroyNotify) g_ptr_array_unref);
+                                      (GDestroyNotify) g_ptr_array_unref);
 }
 
 TrackerContext *
@@ -918,7 +918,7 @@ tracker_triple_context_add_literal_binding (TrackerTripleContext  *context,
 
 GPtrArray *
 tracker_triple_context_lookup_variable_binding_list (TrackerTripleContext *context,
-                                                    TrackerVariable      *variable)
+                                                     TrackerVariable      *variable)
 {
        return g_hash_table_lookup (context->variable_bindings, variable);
 }
@@ -954,11 +954,11 @@ tracker_triple_context_get_variable_binding_list (TrackerTripleContext *context,
 
                                        sample = tracker_variable_get_sample_binding (variable);
                                        binding = tracker_variable_binding_new (variable, sample->type,
-                                                                               tracker_binding_get_table 
(TRACKER_BINDING (sample)));
+                                                                               tracker_binding_get_table 
(TRACKER_BINDING (sample)));
                                        tracker_binding_set_sql_expression (binding,
-                                                                           
tracker_variable_get_sql_expression (variable));
+                                                                           
tracker_variable_get_sql_expression (variable));
                                        tracker_binding_set_data_type (binding,
-                                                                      TRACKER_BINDING (sample)->data_type);
+                                                                      TRACKER_BINDING (sample)->data_type);
                                        g_ptr_array_add (binding_list, binding);
                                        break;
                                }
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index e36d2341e..c1911d1cc 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -68,10 +68,10 @@ static inline TrackerVariable * _ensure_variable (TrackerSparql *sparql,
 
 #define _raise(v,s,sub)   \
        G_STMT_START { \
-       g_set_error (error, TRACKER_SPARQL_ERROR, \
-                    TRACKER_SPARQL_ERROR_##v, \
-                    s " '%s'", sub); \
-       return FALSE; \
+               g_set_error (error, TRACKER_SPARQL_ERROR, \
+                            TRACKER_SPARQL_ERROR_##v, \
+                            s " '%s'", sub); \
+               return FALSE; \
        } G_STMT_END
 
 #define _unimplemented(s) _raise(UNSUPPORTED, "Unsupported syntax", s)
@@ -81,8 +81,8 @@ static inline TrackerVariable * _ensure_variable (TrackerSparql *sparql,
  */
 #define _call_rule(c,r,e) \
        G_STMT_START { \
-       if (!_call_rule_func(c, r, e)) \
-               return FALSE; \
+               if (!_call_rule_func(c, r, e)) \
+                       return FALSE; \
        } G_STMT_END
 
 typedef gboolean (* RuleTranslationFunc) (TrackerSparql  *sparql,
@@ -100,7 +100,7 @@ struct _TrackerSparql
 {
        GObject parent_instance;
        TrackerDataManager *data_manager;
-       gchar *sparql;
+       gchar  *sparql;
 
        TrackerNodeTree *tree;
        GError *parser_error;
@@ -111,7 +111,7 @@ struct _TrackerSparql
        GHashTable *prefix_map;
        GList *filter_clauses;
 
-       GPtrArray *var_names;
+       GPtrArray  *var_names;
        GArray *var_types;
 
        GVariantBuilder *blank_nodes;
@@ -130,18 +130,18 @@ struct _TrackerSparql
                TrackerParserNode *node;
                TrackerParserNode *prev_node;
 
-               TrackerToken graph;
-               TrackerToken subject;
-               TrackerToken predicate;
-               TrackerToken object;
+               TrackerToken  graph;
+               TrackerToken  subject;
+               TrackerToken  predicate;
+               TrackerToken  object;
 
                TrackerToken *token;
 
                TrackerPathElement *path;
 
-               GHashTable *blank_node_map;
+               GHashTable   *blank_node_map;
 
-               const gchar *expression_list_separator;
+               const gchar  *expression_list_separator;
                TrackerPropertyType expression_type;
                guint type;
 
@@ -528,10 +528,10 @@ _append_variable_sql (TrackerSparql   *sparql,
                g_free (name);
 
                _append_string_printf (sparql, "%s ",
-                                      tracker_variable_get_sql_expression (local_time));
+                                      tracker_variable_get_sql_expression (local_time));
        } else {
                _append_string_printf (sparql, "%s ",
-                                      tracker_variable_get_sql_expression (variable));
+                                      tracker_variable_get_sql_expression (variable));
        }
 }
 
@@ -606,27 +606,27 @@ _prepend_path_element (TrackerSparql      *sparql,
                _append_string_printf (sparql,
                                       "\"%s\" (ID, value, graph) AS "
                                       "(SELECT ID, value, graph "
-                                      "FROM \"%s\" "
-                                      "UNION "
-                                      "SELECT a.ID, b.value, b.graph "
-                                      "FROM \"%s\" AS a, \"%s\" AS b "
-                                      "WHERE b.ID = a.value) ",
-                                      path_elem->name,
-                                      path_elem->data.composite.child1->name,
+                                      "FROM \"%s\" "
+                                      "UNION "
+                                      "SELECT a.ID, b.value, b.graph "
+                                      "FROM \"%s\" AS a, \"%s\" AS b "
+                                      "WHERE b.ID = a.value) ",
+                                      path_elem->name,
+                                      path_elem->data.composite.child1->name,
                                       path_elem->data.composite.child1->name,
-                                      path_elem->name);
+                                      path_elem->name);
                break;
        case TRACKER_PATH_OPERATOR_ZEROORONE:
                _append_string_printf (sparql,
                                       "\"%s\" (ID, value, graph) AS "
                                       "(SELECT ID, ID, graph "
-                                      "FROM \"%s\" "
-                                      "UNION ALL "
-                                      "SELECT ID, value, graph "
-                                      "FROM \"%s\") ",
-                                      path_elem->name,
-                                      path_elem->data.composite.child1->name,
-                                      path_elem->data.composite.child1->name);
+                                      "FROM \"%s\" "
+                                      "UNION ALL "
+                                      "SELECT ID, value, graph "
+                                      "FROM \"%s\") ",
+                                      path_elem->name,
+                                      path_elem->data.composite.child1->name,
+                                      path_elem->data.composite.child1->name);
                break;
        }
 
@@ -688,12 +688,12 @@ _extract_node_string (TrackerParserNode *node,
                        break;
                case TERMINAL_TYPE_PNAME_NS:
                        subtract_end = 1;
-                       /* Fall through */
+               /* Fall through */
                case TERMINAL_TYPE_PNAME_LN: {
                        gchar *unexpanded;
 
                        unexpanded = g_strndup (terminal_start + add_start,
-                                               terminal_end - terminal_start - subtract_end);
+                                               terminal_end - terminal_start - subtract_end);
                        str = tracker_sparql_expand_prefix (sparql, unexpanded);
                        g_free (unexpanded);
                        break;
@@ -754,7 +754,7 @@ _convert_terminal (TrackerSparql *sparql)
 
 static void
 _add_binding (TrackerSparql  *sparql,
-             TrackerBinding *binding)
+              TrackerBinding *binding)
 {
        TrackerTripleContext *context;
 
@@ -762,19 +762,19 @@ _add_binding (TrackerSparql  *sparql,
 
        if (TRACKER_IS_LITERAL_BINDING (binding)) {
                tracker_triple_context_add_literal_binding (context,
-                                                           TRACKER_LITERAL_BINDING (binding));
+                                                           TRACKER_LITERAL_BINDING (binding));
 
                /* Also add on the root SelectContext right away */
                tracker_select_context_add_literal_binding (TRACKER_SELECT_CONTEXT (sparql->context),
-                                                           TRACKER_LITERAL_BINDING (binding));
+                                                           TRACKER_LITERAL_BINDING (binding));
        } else if (TRACKER_IS_VARIABLE_BINDING (binding)) {
                TrackerVariableBinding *variable_binding = TRACKER_VARIABLE_BINDING (binding);
                TrackerVariable *variable;
 
                variable = tracker_variable_binding_get_variable (variable_binding);
                tracker_triple_context_add_variable_binding (context,
-                                                            variable,
-                                                            variable_binding);
+                                                            variable,
+                                                            variable_binding);
 
                if (!tracker_variable_has_bindings (variable))
                        tracker_variable_set_sample_binding (variable, variable_binding);
@@ -785,7 +785,7 @@ _add_binding (TrackerSparql  *sparql,
 
 static inline TrackerVariable *
 _ensure_variable (TrackerSparql *sparql,
-                 const gchar   *name)
+                  const gchar   *name)
 {
        TrackerVariable *var;
 
@@ -945,7 +945,7 @@ introspect_fts_snippet (TrackerSparql         *sparql,
                gchar *match_start = NULL, *match_end = NULL, *ellipsis = NULL, *num_tokens = NULL;
                gchar *str, *var_name, *sql_expression;
                const TrackerGrammarRule *rule;
-               TrackerBinding *binding;
+               TrackerBinding  *binding;
                TrackerVariable *var;
 
                rule = tracker_parser_node_get_rule (node);
@@ -1016,16 +1016,16 @@ introspect_fts_snippet (TrackerSparql         *sparql,
 static gboolean
 _add_quad (TrackerSparql  *sparql,
            TrackerToken   *graph,
-          TrackerToken   *subject,
-          TrackerToken   *predicate,
-          TrackerToken   *object,
-          GError        **error)
+           TrackerToken   *subject,
+           TrackerToken   *predicate,
+           TrackerToken   *object,
+           GError        **error)
 {
        TrackerTripleContext *triple_context;
        TrackerOntologies *ontologies;
-       TrackerDataTable *table = NULL;
+       TrackerDataTable  *table = NULL;
        TrackerVariable *variable;
-       TrackerBinding *binding;
+       TrackerBinding  *binding;
        TrackerProperty *property = NULL;
        TrackerClass *subject_type = NULL;
        gboolean new_table = FALSE, is_fts = FALSE, is_rdf_type = FALSE;
@@ -1048,8 +1048,8 @@ _add_quad (TrackerSparql  *sparql,
                                                                            tracker_token_get_literal 
(object));
                        if (!subject_type) {
                                g_set_error (error, TRACKER_SPARQL_ERROR,
-                                            TRACKER_SPARQL_ERROR_UNKNOWN_CLASS,
-                                            "Unknown class '%s'",
+                                            TRACKER_SPARQL_ERROR_UNKNOWN_CLASS,
+                                            "Unknown class '%s'",
                                             tracker_token_get_literal (object));
                                return FALSE;
                        }
@@ -1068,10 +1068,10 @@ _add_quad (TrackerSparql  *sparql,
 
                                variable = tracker_token_get_variable (subject);
                                binding_list = tracker_triple_context_lookup_variable_binding_list 
(triple_context,
-                                                                                                   variable);
+                                                                                                   variable);
                                /* Domain specific index might be a possibility, let's check */
                                if (binding_list) {
-                                       TrackerClass *domain_index = NULL;
+                                       TrackerClass  *domain_index = NULL;
                                        TrackerClass **classes;
                                        gint i = 0, j;
 
@@ -1105,22 +1105,22 @@ _add_quad (TrackerSparql  *sparql,
                        subject_type = tracker_property_get_domain (property);
                } else if (property == NULL) {
                        g_set_error (error, TRACKER_SPARQL_ERROR,
-                                    TRACKER_SPARQL_ERROR_UNKNOWN_PROPERTY,
-                                    "Unknown property '%s'",
+                                    TRACKER_SPARQL_ERROR_UNKNOWN_PROPERTY,
+                                    "Unknown property '%s'",
                                     tracker_token_get_literal (predicate));
                        return FALSE;
                }
 
                if (share_table) {
                        table = tracker_triple_context_lookup_table (triple_context,
-                                                                    tracker_token_get_idstring (subject),
-                                                                    db_table);
+                                                                    tracker_token_get_idstring (subject),
+                                                                    db_table);
                }
 
                if (!table) {
                        table = tracker_triple_context_add_table (triple_context,
-                                                                 tracker_token_get_idstring (subject),
-                                                                 db_table);
+                                                                 tracker_token_get_idstring (subject),
+                                                                 db_table);
                        new_table = TRUE;
                }
        } else if (tracker_token_get_variable (predicate)) {
@@ -1156,7 +1156,7 @@ _add_quad (TrackerSparql  *sparql,
                                                               table);
                } else if (tracker_token_get_parameter (subject)) {
                        binding = tracker_parameter_binding_new (tracker_token_get_parameter (subject),
-                                                                table);
+                                                                table);
                } else {
                        g_assert_not_reached ();
                }
@@ -1175,8 +1175,8 @@ _add_quad (TrackerSparql  *sparql,
        if (tracker_token_get_variable (object)) {
                variable = tracker_token_get_variable (object);
                binding = tracker_variable_binding_new (variable,
-                                                       property ? tracker_property_get_range (property) : 
NULL,
-                                                       table);
+                                                       property ? tracker_property_get_range (property) : 
NULL,
+                                                       table);
 
                if (tracker_token_get_variable (predicate)) {
                        tracker_binding_set_data_type (binding, TRACKER_PROPERTY_TYPE_STRING);
@@ -1212,7 +1212,7 @@ _add_quad (TrackerSparql  *sparql,
                                local_date = tracker_binding_get_extra_sql_expression (binding, "localDate");
                                local_time = tracker_binding_get_extra_sql_expression (binding, "localTime");
                                sql_expression = g_strdup_printf ("((%s * 24 * 3600) + %s)",
-                                                                 local_date, local_time);
+                                                                 local_date, local_time);
 
                                local_time_binding = tracker_variable_binding_new (variable, NULL, NULL);
                                tracker_binding_set_sql_expression (local_time_binding,
@@ -1414,12 +1414,12 @@ _begin_triples_block (TrackerSparql *sparql)
 
 static gboolean
 _end_triples_block (TrackerSparql  *sparql,
-                   GError        **error)
+                    GError        **error)
 {
        TrackerTripleContext *triple_context;
        TrackerStringBuilder *where_placeholder;
        TrackerVariable *var;
-       TrackerContext *context;
+       TrackerContext  *context;
        GHashTableIter iter;
        gboolean first = TRUE;
        gint i;
@@ -1453,8 +1453,8 @@ _end_triples_block (TrackerSparql  *sparql,
                first = FALSE;
                binding = g_ptr_array_index (binding_list, 0);
                _append_string_printf (sparql, "%s AS %s ",
-                                      tracker_binding_get_sql_expression (binding),
-                                      tracker_variable_get_sql_expression (var));
+                                      tracker_binding_get_sql_expression (binding),
+                                      tracker_variable_get_sql_expression (var));
        }
 
        if (first)
@@ -1494,7 +1494,7 @@ _end_triples_block (TrackerSparql  *sparql,
                guint i;
 
                binding_list = tracker_triple_context_lookup_variable_binding_list (triple_context,
-                                                                                   var);
+                                                                                   var);
                if (!binding_list)
                        continue;
 
@@ -1636,8 +1636,8 @@ translate_Update (TrackerSparql  *sparql,
 
 static void
 tracker_sparql_add_select_var (TrackerSparql       *sparql,
-                              const gchar         *name,
-                              TrackerPropertyType  type)
+                               const gchar         *name,
+                               TrackerPropertyType  type)
 {
        g_ptr_array_add (sparql->var_names, g_strdup (name));
        g_array_append_val (sparql->var_types, type);
@@ -1645,10 +1645,10 @@ tracker_sparql_add_select_var (TrackerSparql       *sparql,
 
 static gboolean
 handle_as (TrackerSparql        *sparql,
-          TrackerPropertyType   type,
-          GError              **error)
+           TrackerPropertyType   type,
+           GError              **error)
 {
-       TrackerBinding *binding;
+       TrackerBinding  *binding;
        TrackerVariable *var;
 
        _call_rule (sparql, NAMED_RULE_Var, error);
@@ -1658,7 +1658,7 @@ handle_as (TrackerSparql        *sparql,
        tracker_binding_set_data_type (binding, type);
        tracker_variable_set_sample_binding (var, TRACKER_VARIABLE_BINDING (binding));
        _append_string_printf (sparql, "AS %s ",
-                              tracker_variable_get_sql_expression (var));
+                              tracker_variable_get_sql_expression (var));
 
        if (sparql->current_state.select_context == sparql->context)
                tracker_sparql_add_select_var (sparql, var->name, type);
@@ -1723,7 +1723,7 @@ translate_SelectClause (TrackerSparql  *sparql,
        } else {
                do {
                        TrackerVariable *var;
-                       TrackerBinding *binding;
+                       TrackerBinding  *binding;
 
                        if (_check_in_rule (sparql, NAMED_RULE_Var)) {
                                if (!first)
@@ -1826,7 +1826,7 @@ translate_BaseDecl (TrackerSparql  *sparql,
 
 static gboolean
 translate_PrefixDecl (TrackerSparql  *sparql,
-                     GError        **error)
+                      GError        **error)
 {
        gchar *ns, *uri;
 
@@ -2597,7 +2597,7 @@ get_solution_for_pattern (TrackerSparql      *sparql,
        cursor = tracker_db_statement_start_sparql_cursor (stmt,
                                                           NULL, 0,
                                                           NULL, 0,
-                                                          error);
+                                                          error);
        g_object_unref (stmt);
 
        if (!cursor)
@@ -3225,7 +3225,7 @@ translate_Bind (TrackerSparql  *sparql,
 {
        TrackerStringBuilder *str, *old;
        TrackerVariable *variable;
-       TrackerBinding *binding;
+       TrackerBinding  *binding;
        TrackerPropertyType type;
        gboolean is_empty;
 
@@ -3258,7 +3258,7 @@ translate_Bind (TrackerSparql  *sparql,
                _raise (PARSE, "Expected undefined variable", "BIND");
 
        _append_string_printf (sparql, "AS %s ",
-                              tracker_variable_get_sql_expression (variable));
+                              tracker_variable_get_sql_expression (variable));
 
        binding = tracker_variable_binding_new (variable, NULL, NULL);
        tracker_binding_set_data_type (binding, type);
@@ -3406,7 +3406,7 @@ translate_MinusGraphPattern (TrackerSparql  *sparql,
 static void
 append_union_select_vars (TrackerSparql  *sparql,
                           TrackerContext *context,
-                         GList          *vars)
+                          GList          *vars)
 {
        GList *l;
 
@@ -3425,7 +3425,7 @@ append_union_select_vars (TrackerSparql  *sparql,
                        _append_string (sparql, "NULL AS ");
 
                _append_string_printf (sparql, "%s ",
-                                      tracker_variable_get_sql_expression (variable));
+                                      tracker_variable_get_sql_expression (variable));
        }
 
        _append_string (sparql, "FROM (");
@@ -3600,7 +3600,7 @@ translate_ExpressionList (TrackerSparql  *sparql,
 
                while (_accept (sparql, RULE_TYPE_LITERAL, LITERAL_COMMA)) {
                        _append_string (sparql,
-                                       sparql->current_state.expression_list_separator);
+                                       sparql->current_state.expression_list_separator);
                        _call_rule (sparql, NAMED_RULE_Expression, error);
                }
 
@@ -4127,7 +4127,7 @@ translate_PathMod (TrackerSparql  *sparql,
 
        path_elem = tracker_path_element_operator_new (op, sparql->current_state.path, NULL);
        tracker_select_context_add_path_element (TRACKER_SELECT_CONTEXT (sparql->context),
-                                                path_elem);
+                                                path_elem);
        _prepend_path_element (sparql, path_elem);
        sparql->current_state.path = path_elem;
        return TRUE;
@@ -4251,7 +4251,7 @@ translate_BlankNodePropertyList (TrackerSparql  *sparql,
         */
        _expect (sparql, RULE_TYPE_LITERAL, LITERAL_OPEN_BRACKET);
 
-        if (sparql->current_state.type == TRACKER_SPARQL_TYPE_SELECT) {
+       if (sparql->current_state.type == TRACKER_SPARQL_TYPE_SELECT) {
                var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
                tracker_token_variable_init (&sparql->current_state.subject, var);
        } else {
@@ -4304,7 +4304,7 @@ static gboolean
 translate_BlankNodePropertyListPath (TrackerSparql  *sparql,
                                      GError        **error)
 {
-       TrackerToken old_subject = sparql->current_state.subject;
+       TrackerToken  old_subject = sparql->current_state.subject;
        TrackerToken *token_location = sparql->current_state.token;
        TrackerVariable *var;
 
@@ -4451,11 +4451,11 @@ translate_GraphNodePath (TrackerSparql  *sparql,
        }
 
        if (!_add_quad (sparql,
-                       &sparql->current_state.graph,
-                       &sparql->current_state.subject,
-                       &sparql->current_state.predicate,
-                       &sparql->current_state.object,
-                       error))
+                       &sparql->current_state.graph,
+                       &sparql->current_state.subject,
+                       &sparql->current_state.predicate,
+                       &sparql->current_state.object,
+                       error))
                return FALSE;
 
        tracker_token_unset (&sparql->current_state.object);
@@ -4503,7 +4503,7 @@ translate_VarOrTerm (TrackerSparql  *sparql,
                _call_rule (sparql, rule, error);
                g_assert (sparql->current_state.token != NULL);
                _init_token (sparql->current_state.token,
-                            sparql->current_state.prev_node, sparql);
+                            sparql->current_state.prev_node, sparql);
                break;
        case NAMED_RULE_GraphTerm:
                _call_rule (sparql, rule, error);
@@ -4588,7 +4588,7 @@ translate_GraphTerm (TrackerSparql  *sparql,
                _call_rule (sparql, rule, error);
                g_assert (sparql->current_state.token != NULL);
                _init_token (sparql->current_state.token,
-                            sparql->current_state.prev_node, sparql);
+                            sparql->current_state.prev_node, sparql);
                break;
        case NAMED_RULE_BlankNode:
                _call_rule (sparql, rule, error);
@@ -4871,7 +4871,7 @@ translate_PrimaryExpression (TrackerSparql  *sparql,
 {
        TrackerSelectContext *select_context;
        TrackerGrammarNamedRule rule;
-       TrackerBinding *binding;
+       TrackerBinding  *binding;
        TrackerVariable *variable;
 
        /* PrimaryExpression ::= BrackettedExpression | BuiltInCall | iriOrFunction | RDFLiteral | 
NumericLiteral | BooleanLiteral | Var
@@ -4920,8 +4920,8 @@ translate_PrimaryExpression (TrackerSparql  *sparql,
 
 static gboolean
 handle_property_function (TrackerSparql    *sparql,
-                         TrackerProperty  *property,
-                         GError          **error)
+                          TrackerProperty  *property,
+                          GError          **error)
 {
        if (tracker_property_get_multiple_values (property)) {
                TrackerStringBuilder *str, *old;
@@ -4934,15 +4934,15 @@ handle_property_function (TrackerSparql    *sparql,
                tracker_sparql_swap_builder (sparql, old);
 
                _append_string_printf (sparql, ", ',') FROM \"%s\" WHERE ID = ",
-                                      tracker_property_get_table_name (property));
+                                      tracker_property_get_table_name (property));
 
                _call_rule (sparql, NAMED_RULE_ArgList, error);
                sparql->current_state.expression_type = TRACKER_PROPERTY_TYPE_STRING;
        } else {
                _append_string_printf (sparql,
-                                      "(SELECT \"%s\" FROM \"%s\" WHERE ID = ",
-                                      tracker_property_get_name (property),
-                                      tracker_property_get_table_name (property));
+                                      "(SELECT \"%s\" FROM \"%s\" WHERE ID = ",
+                                      tracker_property_get_name (property),
+                                      tracker_property_get_table_name (property));
 
                _call_rule (sparql, NAMED_RULE_ArgList, error);
                sparql->current_state.expression_type = tracker_property_get_data_type (property);
@@ -4955,8 +4955,8 @@ handle_property_function (TrackerSparql    *sparql,
 
 static gboolean
 handle_type_cast (TrackerSparql  *sparql,
-                 const gchar    *function,
-                 GError        **error)
+                  const gchar    *function,
+                  GError        **error)
 {
        sparql->current_state.convert_to_string = TRUE;
 
@@ -5134,7 +5134,7 @@ handle_xpath_function (TrackerSparql  *sparql,
                        _raise (PARSE, "Expected variable", "fn:timezone-from-dateTime");
                } else {
                        _append_string_printf (sparql, " - %s ",
-                                              tracker_variable_get_sql_expression (variable));
+                                              tracker_variable_get_sql_expression (variable));
                }
 
                _expect (sparql, RULE_TYPE_LITERAL, LITERAL_CLOSE_PARENS);
@@ -5151,7 +5151,7 @@ handle_xpath_function (TrackerSparql  *sparql,
 static TrackerVariable *
 find_fts_variable (TrackerSparql     *sparql,
                    TrackerParserNode *node,
-                  const gchar       *suffix)
+                   const gchar       *suffix)
 {
        TrackerParserNode *var = NULL;
 
@@ -5179,8 +5179,8 @@ find_fts_variable (TrackerSparql     *sparql,
 
 static gboolean
 handle_custom_function (TrackerSparql  *sparql,
-                       const gchar    *function,
-                       GError        **error)
+                        const gchar    *function,
+                        GError        **error)
 {
        TrackerVariable *variable;
        TrackerParserNode *node;
@@ -5579,7 +5579,7 @@ translate_BuiltInCall (TrackerSparql  *sparql,
                _append_string (sparql, ", \"sha512\") ");
                sparql->current_state.expression_type = TRACKER_PROPERTY_TYPE_STRING;
        } else if (_accept (sparql, RULE_TYPE_LITERAL, LITERAL_ISIRI) ||
-                  _accept (sparql, RULE_TYPE_LITERAL, LITERAL_ISURI)) {
+                  _accept (sparql, RULE_TYPE_LITERAL, LITERAL_ISURI)) {
                TrackerBinding *binding;
                const gchar *str;
 
@@ -5847,7 +5847,7 @@ translate_StrReplaceExpression (TrackerSparql  *sparql,
 
 static gboolean
 translate_ExistsFunc (TrackerSparql  *sparql,
-                     GError        **error)
+                      GError        **error)
 {
        TrackerContext *context;
 
@@ -5959,7 +5959,7 @@ translate_Aggregate (TrackerSparql  *sparql,
 
                        binding = _convert_terminal (sparql);
                        tracker_select_context_add_literal_binding (TRACKER_SELECT_CONTEXT (sparql->context),
-                                                                   TRACKER_LITERAL_BINDING (binding));
+                                                                   TRACKER_LITERAL_BINDING (binding));
                        _append_literal_sql (sparql, TRACKER_LITERAL_BINDING (binding));
                        g_object_unref (binding);
                }
@@ -6222,53 +6222,53 @@ translate_BlankNode (TrackerSparql  *sparql,
 
        iface = tracker_data_manager_get_writable_db_interface (sparql->data_manager);
 
-        if (sparql->current_state.type != TRACKER_SPARQL_TYPE_SELECT) {
-               if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_ANON)) {
-                       bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, iface);
-                       tracker_token_literal_init (sparql->current_state.token, bnode_id);
-                       g_free (bnode_id);
-               } else if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_BLANK_NODE_LABEL)) {
-                       gchar *str;
+       if (sparql->current_state.type != TRACKER_SPARQL_TYPE_SELECT) {
+               if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_ANON)) {
+                       bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, iface);
+                       tracker_token_literal_init (sparql->current_state.token, bnode_id);
+                       g_free (bnode_id);
+               } else if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_BLANK_NODE_LABEL)) {
+                       gchar *str;
 
-                       str = _dup_last_string (sparql);
+                       str = _dup_last_string (sparql);
 
-                       if (sparql->current_state.blank_node_map) {
-                               bnode_id = g_hash_table_lookup (sparql->current_state.blank_node_map, str);
+                       if (sparql->current_state.blank_node_map) {
+                               bnode_id = g_hash_table_lookup (sparql->current_state.blank_node_map, str);
 
-                               if (!bnode_id) {
-                                       bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, 
iface);
-                                       g_hash_table_insert (sparql->current_state.blank_node_map,
-                                                            g_strdup (str), bnode_id);
+                               if (!bnode_id) {
+                                       bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, 
iface);
+                                       g_hash_table_insert (sparql->current_state.blank_node_map,
+                                                            g_strdup (str), bnode_id);
                                        if (sparql->blank_nodes)
                                                g_variant_builder_add (sparql->blank_nodes, "{ss}", str, 
bnode_id);
-                               }
-
-                               tracker_token_literal_init (sparql->current_state.token, bnode_id);
-                       } else {
-                               tracker_token_literal_init (sparql->current_state.token, str);
-                       }
+                               }
 
-                       g_free (str);
-               } else {
-                       g_assert_not_reached ();
-               }
-        } else {
-               if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_ANON)) {
-                       var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
-               } else if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_BLANK_NODE_LABEL)) {
-                       gchar *str, *var_name;
+                               tracker_token_literal_init (sparql->current_state.token, bnode_id);
+                       } else {
+                               tracker_token_literal_init (sparql->current_state.token, str);
+                       }
 
-                       str = _dup_last_string (sparql);
-                       var_name = g_strdup_printf ("BlankNode:%s", str);
-                       var = _ensure_variable (sparql, var_name);
-                       g_free (var_name);
-                       g_free (str);
-               } else {
-                       g_assert_not_reached ();
-               }
+                       g_free (str);
+               } else {
+                       g_assert_not_reached ();
+               }
+       } else {
+               if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_ANON)) {
+                       var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
+               } else if (_accept (sparql, RULE_TYPE_TERMINAL, TERMINAL_TYPE_BLANK_NODE_LABEL)) {
+                       gchar *str, *var_name;
+
+                       str = _dup_last_string (sparql);
+                       var_name = g_strdup_printf ("BlankNode:%s", str);
+                       var = _ensure_variable (sparql, var_name);
+                       g_free (var_name);
+                       g_free (str);
+               } else {
+                       g_assert_not_reached ();
+               }
 
-               tracker_token_variable_init (sparql->current_state.token, var);
-        }
+               tracker_token_variable_init (sparql->current_state.token, var);
+       }
 
        return TRUE;
 }
@@ -6421,7 +6421,7 @@ _call_rule_func (TrackerSparql            *sparql,
 {
        TrackerParserNode *parser_node = sparql->current_state.node;
        const TrackerGrammarRule *rule;
-       GError *inner_error = NULL;
+       GError  *inner_error = NULL;
        gboolean retval;
 
        g_assert (named_rule < N_NAMED_RULES);
@@ -6488,7 +6488,7 @@ tracker_sparql_new (TrackerDataManager *manager,
        sparql->sparql = tracker_unescape_unichars (query, -1);
 
        tree = tracker_sparql_parse_query (sparql->sparql, -1, NULL,
-                                          &sparql->parser_error);
+                                          &sparql->parser_error);
        if (tree) {
                sparql->tree = tree;
                sparql->sql = tracker_string_builder_new ();
@@ -6505,13 +6505,13 @@ static TrackerDBStatement *
 prepare_query (TrackerDBInterface    *iface,
                TrackerStringBuilder  *str,
                GPtrArray             *literals,
-              GHashTable            *parameters,
+               GHashTable            *parameters,
                gboolean               cached,
                GError               **error)
 {
        TrackerDBStatement *stmt;
        gchar *query;
-       guint i;
+       guint  i;
 
        query = tracker_string_builder_to_string (str);
        stmt = tracker_db_interface_create_statement (iface,
@@ -6544,8 +6544,8 @@ prepare_query (TrackerDBInterface    *iface,
                                tracker_db_statement_bind_value (stmt, i, value);
                        } else {
                                g_set_error (error, TRACKER_SPARQL_ERROR,
-                                            TRACKER_SPARQL_ERROR_TYPE,
-                                            "Parameter '%s' has no given value", name);
+                                            TRACKER_SPARQL_ERROR_TYPE,
+                                            "Parameter '%s' has no given value", name);
                        }
                } else if (prop_type == TRACKER_PROPERTY_TYPE_BOOLEAN) {
                        if (g_str_equal (binding->literal, "1") ||
@@ -6556,14 +6556,14 @@ prepare_query (TrackerDBInterface    *iface,
                                tracker_db_statement_bind_int (stmt, i, 0);
                        } else {
                                g_set_error (error, TRACKER_SPARQL_ERROR,
-                                            TRACKER_SPARQL_ERROR_TYPE,
-                                            "'%s' is not a valid boolean",
+                                            TRACKER_SPARQL_ERROR_TYPE,
+                                            "'%s' is not a valid boolean",
                                             binding->literal);
                                g_object_unref (stmt);
                                return NULL;
                        }
                } else if (prop_type == TRACKER_PROPERTY_TYPE_DATE) {
-                       gchar *full_str;
+                       gchar  *full_str;
                        gdouble datetime;
 
                        full_str = g_strdup_printf ("%sT00:00:00Z", binding->literal);
@@ -6619,7 +6619,7 @@ tracker_sparql_execute_cursor (TrackerSparql  *sparql,
        iface = tracker_data_manager_get_db_interface (sparql->data_manager);
        stmt = prepare_query (iface, sparql->sql,
                              TRACKER_SELECT_CONTEXT (sparql->context)->literal_bindings,
-                             parameters,
+                             parameters,
                              sparql->cacheable,
                              error);
        if (!stmt)
@@ -6631,9 +6631,9 @@ tracker_sparql_execute_cursor (TrackerSparql  *sparql,
        n_names = sparql->var_names->len;
 
        cursor = tracker_db_statement_start_sparql_cursor (stmt,
-                                                          types, n_types,
-                                                          names, n_names,
-                                                          error);
+                                                          types, n_types,
+                                                          names, n_names,
+                                                          error);
        g_object_unref (stmt);
 
        return TRACKER_SPARQL_CURSOR (cursor);
@@ -6661,10 +6661,10 @@ tracker_sparql_new_update (TrackerDataManager *manager,
                tracker_node_tree_free (tree);
                tree = NULL;
                g_set_error (&sparql->parser_error,
-                            TRACKER_SPARQL_ERROR,
-                            TRACKER_SPARQL_ERROR_PARSE,
-                            "Parser error at byte %ld: Expected NIL character",
-                            len);
+                            TRACKER_SPARQL_ERROR,
+                            TRACKER_SPARQL_ERROR_PARSE,
+                            "Parser error at byte %ld: Expected NIL character",
+                            len);
        }
 
        if (tree) {
diff --git a/src/libtracker-data/tracker-string-builder.c b/src/libtracker-data/tracker-string-builder.c
index b43d1a29c..971d218b7 100644
--- a/src/libtracker-data/tracker-string-builder.c
+++ b/src/libtracker-data/tracker-string-builder.c
@@ -31,8 +31,8 @@ typedef struct _TrackerStringElement TrackerStringElement;
 struct _TrackerStringChunk
 {
        gchar *string;
-       gsize allocated_size;
-       gsize len;
+       gsize  allocated_size;
+       gsize  len;
 };
 
 enum {
@@ -95,7 +95,7 @@ TrackerStringBuilder *
 tracker_string_builder_append_placeholder (TrackerStringBuilder *builder)
 {
        TrackerStringBuilder *child;
-       TrackerStringElement elem;
+       TrackerStringElement  elem;
 
        child = tracker_string_builder_new ();
 
@@ -110,7 +110,7 @@ TrackerStringBuilder *
 tracker_string_builder_prepend_placeholder (TrackerStringBuilder *builder)
 {
        TrackerStringBuilder *child;
-       TrackerStringElement elem;
+       TrackerStringElement  elem;
 
        child = tracker_string_builder_new ();
 
@@ -125,7 +125,7 @@ static TrackerStringChunk *
 ensure_last_chunk (TrackerStringBuilder *builder)
 {
        TrackerStringElement elem;
-       TrackerStringChunk *chunk;
+       TrackerStringChunk  *chunk;
 
        if (builder->elems->len > 0) {
                TrackerStringElement *last;
@@ -149,7 +149,7 @@ static TrackerStringChunk *
 ensure_first_chunk (TrackerStringBuilder *builder)
 {
        TrackerStringElement elem;
-       TrackerStringChunk *chunk;
+       TrackerStringChunk  *chunk;
 
        /* Always create a new element instead of trying to prepend on
         * the first string chunk. Between memory relocations and memory
diff --git a/src/libtracker-data/tracker-uuid.c b/src/libtracker-data/tracker-uuid.c
index e7962bcfd..fbc25f9a9 100644
--- a/src/libtracker-data/tracker-uuid.c
+++ b/src/libtracker-data/tracker-uuid.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "tracker-uuid.h"
 
-#if ! GLIB_CHECK_VERSION (2, 52, 0)
+#if !GLIB_CHECK_VERSION (2, 52, 0)
 #include <uuid/uuid.h>
 #endif
 
@@ -35,7 +35,7 @@ tracker_generate_uuid (void)
        g_free (uuid);
 #else
        uuid_t base = { 0, };
-       gchar uuid[37];
+       gchar  uuid[37];
 
        uuid_generate (base);
        uuid_unparse_lower (base, uuid);
diff --git a/src/libtracker-data/tracker-vtab-triples.c b/src/libtracker-data/tracker-vtab-triples.c
index 92a5ff86c..f87ea7fd5 100644
--- a/src/libtracker-data/tracker-vtab-triples.c
+++ b/src/libtracker-data/tracker-vtab-triples.c
@@ -62,7 +62,7 @@ typedef struct {
 
 typedef struct {
        struct sqlite3_vtab_cursor parent;
-       TrackerTriplesVTab *vtab;
+       TrackerTriplesVTab  *vtab;
        struct sqlite3_stmt *stmt;
 
        struct {
@@ -73,7 +73,7 @@ typedef struct {
                guint idxFlags;
        } match;
 
-       GList *properties;
+       GList  *properties;
 
        guint64 rowid;
        guint finished : 1;
@@ -223,7 +223,7 @@ triples_destroy (sqlite3_vtab *vtab)
 
 static int
 triples_open (sqlite3_vtab         *vtab_sqlite,
-             sqlite3_vtab_cursor **cursor_ret)
+              sqlite3_vtab_cursor **cursor_ret)
 {
        TrackerTriplesVTab *vtab = (TrackerTriplesVTab *) vtab_sqlite;
        TrackerTriplesCursor *cursor;
@@ -254,7 +254,7 @@ collect_properties (TrackerTriplesCursor *cursor)
        guint n_properties, i;
 
        properties = tracker_ontologies_get_properties (cursor->vtab->module->ontologies,
-                                                       &n_properties);
+                                                       &n_properties);
        for (i = 0; i < n_properties; i++) {
                if (cursor->match.predicate) {
                        gboolean negated = !!(cursor->match.idxFlags & IDX_MATCH_PREDICATE_NEG);
@@ -273,7 +273,7 @@ collect_properties (TrackerTriplesCursor *cursor)
 
 static gchar *
 convert_to_string (const gchar         *table_name,
-                  TrackerPropertyType  type)
+                   TrackerPropertyType  type)
 {
        switch (type) {
        case TRACKER_PROPERTY_TYPE_STRING:
@@ -303,9 +303,9 @@ convert_to_string (const gchar         *table_name,
 
 static void
 add_arg_check (GString       *str,
-              sqlite3_value *value,
-              gboolean       negated,
-              const gchar   *var_name)
+               sqlite3_value *value,
+               gboolean       negated,
+               const gchar   *var_name)
 {
        if (sqlite3_value_type (value) == SQLITE_NULL) {
                if (negated)
@@ -322,8 +322,8 @@ add_arg_check (GString       *str,
 
 static void
 bind_arg (sqlite3_stmt  *stmt,
-         sqlite3_value *value,
-         const gchar   *var_name)
+          sqlite3_value *value,
+          const gchar   *var_name)
 {
        gint idx;
 
@@ -351,7 +351,7 @@ init_stmt (TrackerTriplesCursor *cursor)
                cursor->properties = g_list_remove (cursor->properties, property);
 
                string_expr = convert_to_string (tracker_property_get_name (property),
-                                                tracker_property_get_data_type (property));
+                                                tracker_property_get_data_type (property));
 
                sql = g_string_new (NULL);
                g_string_append_printf (sql,
@@ -382,7 +382,7 @@ init_stmt (TrackerTriplesCursor *cursor)
                }
 
                rc = sqlite3_prepare_v2 (cursor->vtab->module->db,
-                                        sql->str, -1, &cursor->stmt, 0);
+                                        sql->str, -1, &cursor->stmt, 0);
                g_string_free (sql, TRUE);
                g_free (string_expr);
 
diff --git a/src/libtracker-direct/tracker-direct-statement.c 
b/src/libtracker-direct/tracker-direct-statement.c
index 68ede258f..fd6d7bb5b 100644
--- a/src/libtracker-direct/tracker-direct-statement.c
+++ b/src/libtracker-direct/tracker-direct-statement.c
@@ -69,8 +69,8 @@ tracker_direct_statement_constructed (GObject *object)
 
 static GValue *
 insert_value (TrackerDirectStatement *stmt,
-             const gchar            *name,
-             GType                   type)
+              const gchar            *name,
+              GType                   type)
 {
        TrackerDirectStatementPrivate *priv;
        GValue *value;
@@ -173,7 +173,7 @@ static GHashTable *
 create_values_ht (void)
 {
        return g_hash_table_new_full (g_str_hash, g_str_equal,
-                                     g_free, free_gvalue);
+                                     g_free, free_gvalue);
 }
 
 static GHashTable *
diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-direct/tracker-direct.c
index b9443900f..331a2b268 100644
--- a/src/libtracker-direct/tracker-direct.c
+++ b/src/libtracker-direct/tracker-direct.c
@@ -84,7 +84,7 @@ G_DEFINE_TYPE_WITH_CODE (TrackerDirectConnection, tracker_direct_connection,
                                                 tracker_direct_connection_async_initable_iface_init))
 
 static TaskData *
-task_data_query_new (TaskType     type,
+task_data_query_new (TaskType type,
                      const gchar *sparql)
 {
        TaskData *data;
@@ -129,7 +129,7 @@ update_thread_func (gpointer data,
        GTask *task = data;
        TaskData *task_data = g_task_get_task_data (task);
        TrackerData *tracker_data;
-       GError *error = NULL;
+       GError  *error = NULL;
        gpointer retval = NULL;
        GDestroyNotify destroy_notify = NULL;
 
@@ -198,7 +198,7 @@ task_compare_func (GTask    *a,
 
 static gboolean
 set_up_thread_pools (TrackerDirectConnection  *conn,
-                    GError                  **error)
+                     GError                  **error)
 {
        TrackerDirectConnectionPrivate *priv;
 
@@ -459,7 +459,7 @@ tracker_direct_connection_query_async (TrackerSparqlConnection *self,
        TrackerDirectConnectionPrivate *priv;
        TrackerDirectConnection *conn;
        GError *error = NULL;
-       GTask *task;
+       GTask  *task;
 
        conn = TRACKER_DIRECT_CONNECTION (self);
        priv = tracker_direct_connection_get_instance_private (conn);
@@ -556,7 +556,7 @@ update_array_async_thread_func (GTask        *task,
                                 GCancellable *cancellable)
 {
        gchar **updates = task_data;
-       gchar *concatenated;
+       gchar  *concatenated;
        GPtrArray *errors;
        GError *error = NULL;
        gint i;
@@ -600,7 +600,7 @@ tracker_direct_connection_update_array_async (TrackerSparqlConnection  *self,
                                               GAsyncReadyCallback       callback,
                                               gpointer                  user_data)
 {
-       GTask *task;
+       GTask  *task;
        gchar **copy;
        gint i = 0;
 
@@ -805,8 +805,8 @@ tracker_direct_connection_class_init (TrackerDirectConnectionClass *klass)
 
 TrackerDirectConnection *
 tracker_direct_connection_new (TrackerSparqlConnectionFlags   flags,
-                              GFile                         *store,
-                              GFile                         *journal,
+                               GFile                         *store,
+                               GFile                         *journal,
                                GFile                         *ontology,
                                GError                       **error)
 {
diff --git a/src/libtracker-fts/tracker-fts-config.c b/src/libtracker-fts/tracker-fts-config.c
index f8b00707b..1e714a78b 100644
--- a/src/libtracker-fts/tracker-fts-config.c
+++ b/src/libtracker-fts/tracker-fts-config.c
@@ -143,7 +143,7 @@ config_set_property (GObject      *object,
                      GParamSpec   *pspec)
 {
        switch (param_id) {
-               /* Indexing */
+       /* Indexing */
        case PROP_MAX_WORD_LENGTH:
                tracker_fts_config_set_max_word_length (TRACKER_FTS_CONFIG (object),
                                                        g_value_get_int (value));
@@ -181,10 +181,10 @@ config_get_property (GObject    *object,
                      GValue     *value,
                      GParamSpec *pspec)
 {
-        TrackerFTSConfig *config = TRACKER_FTS_CONFIG (object);
+       TrackerFTSConfig *config = TRACKER_FTS_CONFIG (object);
 
        switch (param_id) {
-               /* Indexing */
+       /* Indexing */
        case PROP_MAX_WORD_LENGTH:
                g_value_set_int (value, tracker_fts_config_get_max_word_length (config));
                break;
@@ -286,7 +286,7 @@ tracker_fts_config_save (TrackerFTSConfig *config)
 {
        g_return_val_if_fail (TRACKER_IS_FTS_CONFIG (config), FALSE);
 
-        g_settings_apply (G_SETTINGS (config));
+       g_settings_apply (G_SETTINGS (config));
 
        return TRUE;
 }
@@ -345,7 +345,7 @@ tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_int (G_SETTINGS (config), "max-word-length", value);
+       g_settings_set_int (G_SETTINGS (config), "max-word-length", value);
        g_object_notify (G_OBJECT (config), "max-word-length");
 }
 
@@ -355,17 +355,17 @@ tracker_fts_config_set_enable_stemmer (TrackerFTSConfig *config,
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_boolean (G_SETTINGS (config), "enable-stemmer", value);
+       g_settings_set_boolean (G_SETTINGS (config), "enable-stemmer", value);
        g_object_notify (G_OBJECT (config), "enable-stemmer");
 }
 
 void
 tracker_fts_config_set_enable_unaccent (TrackerFTSConfig *config,
-                                       gboolean          value)
+                                        gboolean          value)
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_boolean (G_SETTINGS (config), "enable-unaccent", value);
+       g_settings_set_boolean (G_SETTINGS (config), "enable-unaccent", value);
        g_object_notify (G_OBJECT (config), "enable-unaccent");
 }
 
@@ -375,7 +375,7 @@ tracker_fts_config_set_ignore_numbers (TrackerFTSConfig *config,
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_boolean (G_SETTINGS (config), "ignore-numbers", value);
+       g_settings_set_boolean (G_SETTINGS (config), "ignore-numbers", value);
        g_object_notify (G_OBJECT (config), "ignore-numbers");
 }
 
@@ -385,7 +385,7 @@ tracker_fts_config_set_ignore_stop_words (TrackerFTSConfig *config,
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_boolean (G_SETTINGS (config), "ignore-stop-words", value);
+       g_settings_set_boolean (G_SETTINGS (config), "ignore-stop-words", value);
        g_object_notify (G_OBJECT (config), "ignore-stop-words");
 }
 
@@ -395,6 +395,6 @@ tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
 {
        g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
 
-        g_settings_set_int (G_SETTINGS (config), "max-words-to-index", value);
+       g_settings_set_int (G_SETTINGS (config), "max-words-to-index", value);
        g_object_notify (G_OBJECT (config), "max-words-to-index");
 }
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.c b/src/libtracker-fts/tracker-fts-tokenizer.c
index a58a8bacd..c9a5486a4 100644
--- a/src/libtracker-fts/tracker-fts-tokenizer.c
+++ b/src/libtracker-fts/tracker-fts-tokenizer.c
@@ -288,7 +288,7 @@ get_fts_weights (TrackerDBInterface *iface,
 
        if (G_UNLIKELY (weights == NULL)) {
                TrackerDataManager *manager;
-               TrackerOntologies *ontologies;
+               TrackerOntologies  *ontologies;
                sqlite3_stmt *stmt;
                sqlite3 *db;
                const gchar *uri;
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
index 49ba4d362..3f418b91f 100644
--- a/src/libtracker-fts/tracker-fts.c
+++ b/src/libtracker-fts/tracker-fts.c
@@ -38,7 +38,7 @@ int sqlite3_fts5_init ();
 static gchar **
 get_fts_properties (GHashTable  *tables)
 {
-       GList *table_columns, *columns;
+       GList  *table_columns, *columns;
        gchar **property_names;
        GHashTableIter iter;
 
@@ -60,7 +60,7 @@ tracker_fts_init_db (sqlite3            *db,
                      TrackerDBInterface *interface,
                      GHashTable         *tables)
 {
-       gchar **property_names;
+       gchar  **property_names;
        gboolean retval;
 #ifndef HAVE_BUILTIN_FTS
        gchar *err;
@@ -100,33 +100,33 @@ tracker_fts_create_table (sqlite3    *db,
 
        fts = g_string_new ("CREATE VIRTUAL TABLE ");
        g_string_append_printf (fts, "%s USING fts5(content=\"fts_view\", ",
-                               table_name);
+                               table_name);
 
        while (g_hash_table_iter_next (&iter, (gpointer *) &index_table,
-                                      (gpointer *) &columns)) {
+                                      (gpointer *) &columns)) {
                while (columns) {
                        if (grouped_columns &&
                            g_hash_table_lookup (grouped_columns, columns->data)) {
                                g_string_append_printf (str, ", group_concat(\"%s\".\"%s\")",
-                                                       index_table,
-                                                       (gchar *) columns->data);
+                                                       index_table,
+                                                       (gchar *) columns->data);
                        } else {
                                g_string_append_printf (str, ", \"%s\".\"%s\"",
-                                                       index_table,
-                                                       (gchar *) columns->data);
+                                                       index_table,
+                                                       (gchar *) columns->data);
                        }
 
                        g_string_append_printf (str, " AS \"%s\" ",
-                                               (gchar *) columns->data);
+                                               (gchar *) columns->data);
                        g_string_append_printf (fts, "\"%s\", ",
-                                               (gchar *) columns->data);
+                                               (gchar *) columns->data);
 
                        columns = columns->next;
                }
 
                g_string_append_printf (from, "LEFT OUTER JOIN \"%s\" ON "
-                                       " Resource.ID = \"%s\".ID ",
-                                       index_table, index_table);
+                                       " Resource.ID = \"%s\".ID ",
+                                       index_table, index_table);
        }
 
        g_string_append (str, from->str);
@@ -179,9 +179,9 @@ tracker_fts_delete_table (sqlite3 *db,
 
 gboolean
 tracker_fts_alter_table (sqlite3    *db,
-                        gchar      *table_name,
-                        GHashTable *tables,
-                        GHashTable *grouped_columns)
+                         gchar      *table_name,
+                         GHashTable *tables,
+                         GHashTable *grouped_columns)
 {
        gchar *query, *tmp_name;
        int rc;
@@ -194,7 +194,7 @@ tracker_fts_alter_table (sqlite3    *db,
        }
 
        query = g_strdup_printf ("INSERT INTO %s (rowid) SELECT rowid FROM fts_view",
-                                tmp_name);
+                                tmp_name);
        rc = sqlite3_exec (db, query, NULL, NULL, NULL);
        g_free (query);
 
@@ -204,7 +204,7 @@ tracker_fts_alter_table (sqlite3    *db,
        }
 
        query = g_strdup_printf ("INSERT INTO %s(%s) VALUES('rebuild')",
-                                tmp_name, tmp_name);
+                                tmp_name, tmp_name);
        rc = sqlite3_exec (db, query, NULL, NULL, NULL);
        g_free (query);
 
@@ -214,7 +214,7 @@ tracker_fts_alter_table (sqlite3    *db,
        }
 
        query = g_strdup_printf ("ALTER TABLE %s RENAME TO %s",
-                                tmp_name, table_name);
+                                tmp_name, table_name);
        rc = sqlite3_exec (db, query, NULL, NULL, NULL);
        g_free (query);
        g_free (tmp_name);
@@ -230,7 +230,7 @@ tracker_fts_rebuild_tokens (sqlite3     *db,
 
        /* This special query rebuilds the tokens in the given FTS table */
        query = g_strdup_printf ("INSERT INTO %s(%s) VALUES('rebuild')",
-                                table_name, table_name);
+                                table_name, table_name);
        sqlite3_exec(db, query, NULL, NULL, NULL);
        g_free (query);
 }
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index bfad387c6..deb20baa4 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -25,7 +25,7 @@
 #include "tracker-miner-enum-types.h"
 #include "tracker-utils.h"
 
-#define FILE_ATTRIBUTES          \
+#define FILE_ATTRIBUTES   \
        G_FILE_ATTRIBUTE_STANDARD_NAME "," \
        G_FILE_ATTRIBUTE_STANDARD_TYPE
 
@@ -39,13 +39,13 @@
 
 #define MAX_SIMULTANEOUS_ITEMS       64
 
-typedef struct TrackerCrawlerPrivate  TrackerCrawlerPrivate;
+typedef struct TrackerCrawlerPrivate TrackerCrawlerPrivate;
 typedef struct DirectoryChildData DirectoryChildData;
 typedef struct DirectoryProcessingData DirectoryProcessingData;
 typedef struct DirectoryRootInfo DirectoryRootInfo;
 
 typedef struct {
-       TrackerCrawler *crawler;
+       TrackerCrawler  *crawler;
        GFileEnumerator *enumerator;
        DirectoryRootInfo  *root_info;
        DirectoryProcessingData *dir_info;
@@ -55,19 +55,19 @@ typedef struct {
 
 struct DirectoryChildData {
        GFile          *child;
-       gboolean        is_dir;
+       gboolean is_dir;
 };
 
 struct DirectoryProcessingData {
-       GNode *node;
+       GNode  *node;
        GSList *children;
        guint was_inspected : 1;
        guint ignored_by_content : 1;
 };
 
 struct DirectoryRootInfo {
-       GFile *directory;
-       GNode *tree;
+       GFile  *directory;
+       GNode  *tree;
 
        GQueue *directory_processing_queue;
 
@@ -91,9 +91,9 @@ struct TrackerCrawlerPrivate {
        GCancellable   *cancellable;
 
        /* Idle handler for processing found data */
-       guint           idle_id;
+       guint idle_id;
 
-       gdouble         throttle;
+       gdouble throttle;
 
        gchar          *file_attributes;
 
@@ -101,10 +101,10 @@ struct TrackerCrawlerPrivate {
        GTimer         *timer;
 
        /* Status */
-       gboolean        is_running;
-       gboolean        is_finished;
-       gboolean        is_paused;
-       gboolean        was_started;
+       gboolean is_running;
+       gboolean is_finished;
+       gboolean is_paused;
+       gboolean was_started;
 };
 
 enum {
@@ -138,14 +138,14 @@ static gboolean check_contents_defaults  (TrackerCrawler  *crawler,
 static void     data_provider_data_free  (DataProviderData        *dpd);
 
 static void     data_provider_begin      (TrackerCrawler          *crawler,
-                                         DirectoryRootInfo       *info,
-                                         DirectoryProcessingData *dir_data);
+                                          DirectoryRootInfo       *info,
+                                          DirectoryProcessingData *dir_data);
 static void     data_provider_end        (TrackerCrawler          *crawler,
                                           DirectoryRootInfo       *info);
 static void     directory_root_info_free (DirectoryRootInfo *info);
 
 
-static guint signals[LAST_SIGNAL] = { 0, };
+static guint  signals[LAST_SIGNAL] = { 0, };
 static GQuark file_info_quark = 0;
 
 G_DEFINE_TYPE_WITH_PRIVATE (TrackerCrawler, tracker_crawler, G_TYPE_OBJECT)
@@ -205,7 +205,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
                              NULL,
                              G_TYPE_NONE,
                              6,
-                             G_TYPE_FILE,
+                             G_TYPE_FILE,
                              G_TYPE_POINTER,
                              G_TYPE_UINT,
                              G_TYPE_UINT,
@@ -217,7 +217,7 @@ tracker_crawler_class_init (TrackerCrawlerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (TrackerCrawlerClass, finished),
                              NULL, NULL,
-                             NULL,
+                             NULL,
                              G_TYPE_NONE,
                              1, G_TYPE_BOOLEAN);
 
@@ -359,7 +359,7 @@ tracker_crawler_new (TrackerDataProvider *data_provider)
 
 static gboolean
 check_file (TrackerCrawler    *crawler,
-           DirectoryRootInfo *info,
+            DirectoryRootInfo *info,
             GFile             *file)
 {
        gboolean use = FALSE;
@@ -386,8 +386,8 @@ check_file (TrackerCrawler    *crawler,
 
 static gboolean
 check_directory (TrackerCrawler    *crawler,
-                DirectoryRootInfo *info,
-                GFile             *file)
+                 DirectoryRootInfo *info,
+                 GFile             *file)
 {
        gboolean use = FALSE;
        TrackerCrawlerPrivate *priv;
@@ -413,7 +413,7 @@ check_directory (TrackerCrawler    *crawler,
 
 static DirectoryChildData *
 directory_child_data_new (GFile    *child,
-                         gboolean  is_dir)
+                          gboolean  is_dir)
 {
        DirectoryChildData *child_data;
 
@@ -453,8 +453,8 @@ directory_processing_data_free (DirectoryProcessingData *data)
 
 static void
 directory_processing_data_add_child (DirectoryProcessingData *data,
-                                    GFile                   *child,
-                                    gboolean                 is_dir)
+                                     GFile                   *child,
+                                     gboolean                 is_dir)
 {
        DirectoryChildData *child_data;
 
@@ -545,7 +545,7 @@ directory_root_info_new (GFile                 *file,
 
 static gboolean
 directory_tree_free_foreach (GNode    *node,
-                            gpointer  user_data)
+                             gpointer  user_data)
 {
        g_object_unref (node->data);
        return FALSE;
@@ -561,16 +561,16 @@ directory_root_info_free (DirectoryRootInfo *info)
        g_object_unref (info->directory);
 
        g_node_traverse (info->tree,
-                        G_PRE_ORDER,
-                        G_TRAVERSE_ALL,
-                        -1,
-                        directory_tree_free_foreach,
-                        NULL);
+                        G_PRE_ORDER,
+                        G_TRAVERSE_ALL,
+                        -1,
+                        directory_tree_free_foreach,
+                        NULL);
        g_node_destroy (info->tree);
 
        g_queue_foreach (info->directory_processing_queue,
-                        (GFunc) directory_processing_data_free,
-                        NULL);
+                        (GFunc) directory_processing_data_free,
+                        NULL);
        g_queue_free (info->directory_processing_queue);
 
        g_slice_free (DirectoryRootInfo, info);
@@ -582,7 +582,7 @@ process_next (TrackerCrawler *crawler)
        TrackerCrawlerPrivate   *priv;
        DirectoryRootInfo       *info;
        DirectoryProcessingData *dir_data = NULL;
-       gboolean                 stop_idle = FALSE;
+       gboolean stop_idle = FALSE;
 
        priv = tracker_crawler_get_instance_private (crawler);
 
@@ -615,8 +615,8 @@ process_next (TrackerCrawler *crawler)
                                stop_idle = TRUE;
                        }
                } else if (dir_data->was_inspected &&
-                          !dir_data->ignored_by_content &&
-                          dir_data->children != NULL) {
+                          !dir_data->ignored_by_content &&
+                          dir_data->children != NULL) {
                        DirectoryChildData *child_data;
                        GNode *child_node = NULL;
 
@@ -636,7 +636,7 @@ process_next (TrackerCrawler *crawler)
                             *   check if it's running before going on */
                            priv->is_running) {
                                child_node = g_node_prepend_data (dir_data->node,
-                                                                 g_object_ref (child_data->child));
+                                                                 g_object_ref (child_data->child));
                        }
 
                        if (G_NODE_IS_ROOT (dir_data->node) && priv->is_running &&
@@ -658,12 +658,12 @@ process_next (TrackerCrawler *crawler)
                 * to process, emit ::directory-crawled and free data.
                 */
                g_signal_emit (crawler, signals[DIRECTORY_CRAWLED], 0,
-                              info->directory,
-                              info->tree,
-                              info->directories_found,
-                              info->directories_ignored,
-                              info->files_found,
-                              info->files_ignored);
+                              info->directory,
+                              info->tree,
+                              info->directories_found,
+                              info->directories_ignored,
+                              info->files_found,
+                              info->files_ignored);
 
                data_provider_end (crawler, info);
                g_queue_pop_head (priv->directories);
@@ -759,8 +759,8 @@ static void
 data_provider_data_process (DataProviderData *dpd)
 {
        TrackerCrawler *crawler;
-       GSList *l;
-       GList *children = NULL;
+       GSList  *l;
+       GList   *children = NULL;
        gboolean use;
 
        crawler = dpd->crawler;
@@ -956,7 +956,7 @@ data_provider_begin_cb (GObject      *object,
        TrackerCrawlerPrivate *priv;
        GFileEnumerator *enumerator;
        DirectoryRootInfo *info;
-       DataProviderData *dpd;
+       DataProviderData  *dpd;
        GError *error = NULL;
 
        enumerator = tracker_data_provider_begin_finish (TRACKER_DATA_PROVIDER (object), result, &error);
@@ -1218,7 +1218,7 @@ tracker_crawler_set_throttle (TrackerCrawler *crawler,
  **/
 void
 tracker_crawler_set_file_attributes (TrackerCrawler *crawler,
-                                    const gchar    *file_attributes)
+                                     const gchar    *file_attributes)
 {
        TrackerCrawlerPrivate *priv;
 
@@ -1262,7 +1262,7 @@ tracker_crawler_get_file_attributes (TrackerCrawler *crawler)
  **/
 GFileInfo *
 tracker_crawler_get_file_info (TrackerCrawler *crawler,
-                              GFile          *file)
+                               GFile          *file)
 {
        GFileInfo *info;
 
diff --git a/src/libtracker-miner/tracker-decorator-fs.c b/src/libtracker-miner/tracker-decorator-fs.c
index 3b2dd4677..a1a997c9d 100644
--- a/src/libtracker-miner/tracker-decorator-fs.c
+++ b/src/libtracker-miner/tracker-decorator-fs.c
@@ -85,9 +85,9 @@ process_files_cb (GObject      *object,
        conn = TRACKER_SPARQL_CONNECTION (object);
        cursor = tracker_sparql_connection_query_finish (conn, result, &error);
 
-        if (error) {
-                g_critical ("Could not check files on mount point for missing metadata: %s", error->message);
-                g_error_free (error);
+       if (error) {
+               g_critical ("Could not check files on mount point for missing metadata: %s", error->message);
+               g_error_free (error);
                return;
        }
 
@@ -101,7 +101,7 @@ process_files_cb (GObject      *object,
 }
 
 static void
-remove_files_cb (GObject *object,
+remove_files_cb (GObject      *object,
                  GAsyncResult *result,
                  gpointer      user_data)
 {
@@ -112,9 +112,9 @@ remove_files_cb (GObject *object,
        conn = TRACKER_SPARQL_CONNECTION (object);
        cursor = tracker_sparql_connection_query_finish (conn, result, &error);
 
-        if (error) {
-                g_critical ("Could not remove files on mount point with missing metadata: %s", 
error->message);
-                g_error_free (error);
+       if (error) {
+               g_critical ("Could not remove files on mount point with missing metadata: %s", 
error->message);
+               g_error_free (error);
                return;
        }
 
@@ -130,25 +130,25 @@ static void
 _tracker_decorator_query_append_rdf_type_filter (TrackerDecorator *decorator,
                                                  GString          *query)
 {
-       const gchar **class_names;
-       gint i = 0;
+       const gchar **class_names;
+       gint i = 0;
 
-       class_names = tracker_decorator_get_class_names (decorator);
+       class_names = tracker_decorator_get_class_names (decorator);
 
-       if (!class_names || !*class_names)
-               return;
+       if (!class_names || !*class_names)
+               return;
 
-       g_string_append (query, "&& ?type IN (");
+       g_string_append (query, "&& ?type IN (");
 
-       while (class_names[i]) {
-               if (i != 0)
-                       g_string_append (query, ",");
+       while (class_names[i]) {
+               if (i != 0)
+                       g_string_append (query, ",");
 
-               g_string_append (query, class_names[i]);
-               i++;
-       }
+               g_string_append (query, class_names[i]);
+               i++;
+       }
 
-       g_string_append (query, ") ");
+       g_string_append (query, ") ");
 }
 
 static void
diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
index 16fa21db7..79273c58c 100644
--- a/src/libtracker-miner/tracker-decorator.c
+++ b/src/libtracker-miner/tracker-decorator.c
@@ -41,7 +41,7 @@
  * #TrackerDecorator queues files for extended metadata extraction
  * (i.e. for tracker-extract to fetch metadata specific to the file
  * type) for example 'nmm:whiteBalance' for a picture.
-**/
+ **/
 
 typedef struct _TrackerDecoratorPrivate TrackerDecoratorPrivate;
 typedef struct _SparqlUpdate SparqlUpdate;
@@ -68,15 +68,15 @@ struct _SparqlUpdate {
 
 struct _TrackerDecoratorPrivate {
        TrackerNotifier *notifier;
-       gchar *data_source;
+       gchar  *data_source;
 
        GArray *classes; /* Array of ClassInfo */
        gchar **class_names;
 
-       gssize n_remaining_items;
-       gssize n_processed_items;
+       gssize  n_remaining_items;
+       gssize  n_processed_items;
 
-       GQueue item_cache; /* Queue of TrackerDecoratorInfo */
+       GQueue  item_cache; /* Queue of TrackerDecoratorInfo */
 
        /* Arrays of tracker IDs */
        GArray *prepended_ids;
@@ -86,11 +86,11 @@ struct _TrackerDecoratorPrivate {
        GArray *sparql_buffer; /* Array of SparqlUpdate */
        GArray *commit_buffer; /* Array of SparqlUpdate */
        GTimer *timer;
-       GQueue next_elem_queue; /* Queue of incoming tasks */
+       GQueue  next_elem_queue; /* Queue of incoming tasks */
 
        GCancellable *cancellable;
 
-       gint batch_size;
+       gint  batch_size;
 
        guint processing : 1;
        guint querying   : 1;
@@ -121,8 +121,8 @@ static void decorator_cache_next_items (TrackerDecorator *decorator);
 static gboolean decorator_check_commit (TrackerDecorator *decorator);
 
 static void notifier_events_cb (TrackerDecorator *decorator,
-                               GPtrArray        *events,
-                               TrackerNotifier  *notifier);
+                                GPtrArray        *events,
+                                TrackerNotifier  *notifier);
 
 /**
  * tracker_decorator_error_quark:
@@ -430,7 +430,7 @@ decorator_commit_info (TrackerDecorator *decorator)
                                                      (gchar **) array->pdata,
                                                      array->len,
                                                      G_PRIORITY_DEFAULT,
-                                                     priv->cancellable,
+                                                     priv->cancellable,
                                                      decorator_commit_cb,
                                                      decorator);
 
@@ -516,7 +516,7 @@ decorator_rebuild_cache (TrackerDecorator *decorator)
                         (GFunc) tracker_decorator_info_unref, NULL);
        g_queue_clear (&priv->item_cache);
 
-        decorator_cache_next_items (decorator);
+       decorator_cache_next_items (decorator);
 }
 
 /* This function is called after the caller has completed the
@@ -532,7 +532,7 @@ decorator_task_done (GObject      *object,
        TrackerDecoratorInfo *info = user_data;
        TrackerDecoratorPrivate *priv;
        GError *error = NULL;
-       gchar *sparql;
+       gchar  *sparql;
 
        priv = decorator->priv;
        sparql = g_task_propagate_pointer (G_TASK (result), &error);
@@ -646,7 +646,7 @@ query_add_processing_filter (TrackerDecorator *decorator,
 
        if ((!priv->sparql_buffer || priv->sparql_buffer->len == 0) &&
            (!priv->commit_buffer || priv->commit_buffer->len == 0))
-           return;
+               return;
 
        g_string_append (query, "&& tracker:id(?urn) NOT IN (");
 
@@ -682,7 +682,7 @@ query_add_id_filter (GString  *query,
 
 static void
 query_append_current_tasks_filter (TrackerDecorator *decorator,
-                                  GString          *query)
+                                   GString          *query)
 {
        TrackerDecoratorPrivate *priv = decorator->priv;
        GHashTableIter iter;
@@ -787,7 +787,7 @@ decorator_query_remaining_items_cb (GObject      *object,
        GError *error = NULL;
 
        cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (object),
-                                                        result, &error);
+                                                        result, &error);
 
        if (error || !tracker_sparql_cursor_next (cursor, NULL, &error)) {
                decorator_notify_task_error (decorator, error);
@@ -799,7 +799,7 @@ decorator_query_remaining_items_cb (GObject      *object,
        priv->querying = FALSE;
 
        priv->n_remaining_items = g_queue_get_length (&priv->item_cache) +
-               tracker_sparql_cursor_get_integer (cursor, 0);
+                                 tracker_sparql_cursor_get_integer (cursor, 0);
        g_object_unref (cursor);
 
        g_debug ("Found %" G_GSIZE_FORMAT " items to extract", priv->n_remaining_items);
@@ -823,7 +823,7 @@ decorator_query_remaining_items (TrackerDecorator *decorator)
        if (query) {
                sparql_conn = tracker_miner_get_connection (TRACKER_MINER (decorator));
                tracker_sparql_connection_query_async (sparql_conn, query,
-                                                      priv->cancellable,
+                                                      priv->cancellable,
                                                       decorator_query_remaining_items_cb,
                                                       decorator);
                g_free (query);
@@ -883,14 +883,14 @@ decorator_cache_items_cb (GObject      *object,
        TrackerDecorator *decorator = user_data;
        TrackerDecoratorPrivate *priv;
        TrackerSparqlConnection *conn;
-       TrackerSparqlCursor *cursor;
+       TrackerSparqlCursor  *cursor;
        TrackerDecoratorInfo *info;
        GError *error = NULL;
 
        conn = TRACKER_SPARQL_CONNECTION (object);
        cursor = tracker_sparql_connection_query_finish (conn, result, &error);
        priv = decorator->priv;
-        priv->querying = FALSE;
+       priv->querying = FALSE;
 
        if (error) {
                decorator_notify_task_error (decorator, error);
@@ -922,7 +922,7 @@ decorator_cache_next_items (TrackerDecorator *decorator)
            !g_queue_is_empty (&priv->item_cache))
                return;
 
-        priv->querying = TRUE;
+       priv->querying = TRUE;
 
        if (priv->n_remaining_items == 0) {
                decorator_query_remaining_items (decorator);
@@ -933,9 +933,9 @@ decorator_cache_next_items (TrackerDecorator *decorator)
                sparql_conn = tracker_miner_get_connection (TRACKER_MINER (decorator));
                query = create_remaining_items_query (decorator);
                tracker_sparql_connection_query_async (sparql_conn, query,
-                                                      priv->cancellable,
-                                                      decorator_cache_items_cb,
-                                                      decorator);
+                                                      priv->cancellable,
+                                                      decorator_cache_items_cb,
+                                                      decorator);
                g_free (query);
        }
 }
@@ -951,18 +951,18 @@ update_notifier (TrackerDecorator *decorator)
                GError *error = NULL;
 
                priv->notifier = tracker_notifier_new ((const gchar * const *) priv->class_names,
-                                                      TRACKER_NOTIFIER_FLAG_NOTIFY_UNEXTRACTED,
-                                                      NULL, &error);
+                                                      TRACKER_NOTIFIER_FLAG_NOTIFY_UNEXTRACTED,
+                                                      NULL, &error);
 
                if (error) {
                        g_warning ("Could not create notifier: %s\n",
-                                  error->message);
+                                  error->message);
                        g_error_free (error);
                }
 
                g_signal_connect_swapped (priv->notifier, "events",
-                                         G_CALLBACK (notifier_events_cb),
-                                         decorator);
+                                         G_CALLBACK (notifier_events_cb),
+                                         decorator);
        }
 }
 
@@ -1057,8 +1057,8 @@ tracker_decorator_set_property (GObject      *object,
 
 static void
 notifier_events_cb (TrackerDecorator *decorator,
-                   GPtrArray       *events,
-                   TrackerNotifier *notifier)
+                    GPtrArray        *events,
+                    TrackerNotifier  *notifier)
 {
        gboolean check_added = FALSE;
        gint64 id;
@@ -1630,8 +1630,8 @@ tracker_decorator_info_get_url (TrackerDecoratorInfo *info)
 const gchar *
 tracker_decorator_info_get_mimetype (TrackerDecoratorInfo *info)
 {
-       g_return_val_if_fail (info != NULL, NULL);
-       return info->mimetype;
+       g_return_val_if_fail (info != NULL, NULL);
+       return info->mimetype;
 }
 
 
diff --git a/src/libtracker-miner/tracker-file-data-provider.c 
b/src/libtracker-miner/tracker-file-data-provider.c
index 8f983ce33..a7c600159 100644
--- a/src/libtracker-miner/tracker-file-data-provider.c
+++ b/src/libtracker-miner/tracker-file-data-provider.c
@@ -124,7 +124,7 @@ enumerate_children_cb (GObject       *source_object,
 {
        GFile *url = G_FILE (source_object);
        GFileEnumerator *enumerator = NULL;
-       GTask *task = G_TASK (user_data);
+       GTask  *task = G_TASK (user_data);
        GError *error = NULL;
 
        enumerator = g_file_enumerate_children_finish (url, res, &error);
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index ca915c63b..b4d9fca7e 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -55,8 +55,8 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
-       GFile *root;
-       GFile *current_dir;
+       GFile  *root;
+       GFile  *current_dir;
        GQueue *pending_dirs;
        GPtrArray *query_files;
        guint flags;
@@ -87,7 +87,7 @@ typedef struct {
        GList *pending_index_roots;
        RootData *current_index_root;
 
-       guint stopped : 1;
+       guint  stopped : 1;
 } TrackerFileNotifierPrivate;
 
 typedef struct {
@@ -249,7 +249,7 @@ crawler_check_directory_contents_cb (TrackerCrawler *crawler,
         */
        if (!tracker_indexing_tree_file_is_root (priv->indexing_tree, parent)) {
                process = tracker_indexing_tree_parent_is_indexable (priv->indexing_tree,
-                                                                    parent, children);
+                                                                    parent, children);
        }
 
        if (process) {
@@ -368,10 +368,10 @@ file_notifier_traverse_tree (TrackerFileNotifier *notifier)
 
        /* We want the directory and its direct contents, hence depth=2 */
        tracker_file_system_traverse (priv->file_system,
-                                     directory,
-                                     G_LEVEL_ORDER,
-                                     file_notifier_traverse_tree_foreach,
-                                     2, notifier);
+                                     directory,
+                                     G_LEVEL_ORDER,
+                                     file_notifier_traverse_tree_foreach,
+                                     2, notifier);
 }
 
 static gboolean
@@ -425,19 +425,19 @@ file_notifier_add_node_foreach (GNode    *node,
 
                /* Intern file in filesystem */
                canonical = tracker_file_system_get_file (priv->file_system,
-                                                         file, file_type,
-                                                         data->cur_parent);
+                                                         file, file_type,
+                                                         data->cur_parent);
 
                if (priv->current_index_root->flags & TRACKER_DIRECTORY_FLAG_CHECK_MTIME) {
                        time = g_file_info_get_attribute_uint64 (file_info,
-                                                                G_FILE_ATTRIBUTE_TIME_MODIFIED);
+                                                                G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
                        time_ptr = g_new (guint64, 1);
                        *time_ptr = time;
 
                        tracker_file_system_set_property (priv->file_system, canonical,
-                                                         quark_property_filesystem_mtime,
-                                                         time_ptr);
+                                                         quark_property_filesystem_mtime,
+                                                         time_ptr);
                }
 
                g_object_unref (file_info);
@@ -517,8 +517,8 @@ _insert_store_info (TrackerFileNotifier *notifier,
 
 static void
 sparql_files_query_populate (TrackerFileNotifier *notifier,
-                            TrackerSparqlCursor *cursor,
-                            gboolean             check_root)
+                             TrackerSparqlCursor *cursor,
+                             gboolean             check_root)
 {
        TrackerFileNotifierPrivate *priv;
        GFile *parent = NULL;
@@ -582,7 +582,7 @@ sparql_contents_check_deleted (TrackerFileNotifier *notifier,
 
        while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
                const gchar *uri;
-               gboolean is_folder;
+               gboolean  is_folder;
                GFileType file_type;
 
                /* Sometimes URI can be NULL when nie:url and
@@ -612,7 +612,7 @@ sparql_contents_check_deleted (TrackerFileNotifier *notifier,
                         * the delete event.
                         */
                        canonical = _insert_store_info (notifier, file,
-                                                       file_type,
+                                                       file_type,
                                                        parent, iri, 0);
                        g_signal_emit (notifier, signals[FILE_DELETED], 0, canonical);
                } else if (priv->current_index_root->current_dir_content_filtered ||
@@ -676,8 +676,8 @@ finish_current_directory (TrackerFileNotifier *notifier,
         */
        tracker_file_system_forget_files (priv->file_system,
                                          directory,
-                                         interrupted ?
-                                         G_FILE_TYPE_UNKNOWN :
+                                         interrupted ?
+                                         G_FILE_TYPE_UNKNOWN :
                                          G_FILE_TYPE_REGULAR);
 
        if (interrupted || !crawl_directory_in_current_root (notifier)) {
@@ -711,7 +711,7 @@ finish_current_directory (TrackerFileNotifier *notifier,
 
 static gboolean
 root_data_remove_directory (RootData *data,
-                           GFile    *directory)
+                            GFile    *directory)
 {
        GList *l = data->pending_dirs->head, *next;
        GFile *file;
@@ -730,12 +730,12 @@ root_data_remove_directory (RootData *data,
        }
 
        return (g_file_equal (data->current_dir, directory) ||
-               g_file_has_prefix (data->current_dir, directory));
+               g_file_has_prefix (data->current_dir, directory));
 }
 
 static void
 file_notifier_current_root_check_remove_directory (TrackerFileNotifier *notifier,
-                                                  GFile               *file)
+                                                   GFile               *file)
 {
        TrackerFileNotifierPrivate *priv;
 
@@ -782,7 +782,7 @@ sparql_contents_query_cb (GObject      *object,
 
 out:
        if (error) {
-               g_error_free (error);
+               g_error_free (error);
        }
 }
 
@@ -827,16 +827,16 @@ sparql_contents_query_start (TrackerFileNotifier *notifier,
 /* Query for file information, used on all elements found during crawling */
 static void
 sparql_files_query_cb (GObject      *object,
-                      GAsyncResult *result,
-                      gpointer      user_data)
+                       GAsyncResult *result,
+                       gpointer      user_data)
 {
        TrackerFileNotifier *notifier = user_data;
        TrackerFileNotifierPrivate *priv;
        TrackerSparqlCursor *cursor;
        gboolean directory_modified;
-       GError *error = NULL;
+       GError  *error = NULL;
        GFile *directory;
-       guint flags;
+       guint  flags;
 
        priv = tracker_file_notifier_get_instance_private (notifier);
        cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (object),
@@ -879,15 +879,15 @@ sparql_files_query_cb (GObject      *object,
 
 static gchar *
 sparql_files_compose_query (GFile **files,
-                           guint   n_files)
+                            guint   n_files)
 {
        GString *str;
        gchar *uri;
        gint i = 0;
 
        str = g_string_new ("SELECT ?url ?u nfo:fileLastModified(?u) {"
-                           "  ?u a rdfs:Resource ; nie:url ?url . "
-                           "FILTER (?url IN (");
+                           "  ?u a rdfs:Resource ; nie:url ?url . "
+                           "FILTER (?url IN (");
        for (i = 0; i < n_files; i++) {
                if (i != 0)
                        g_string_append_c (str, ',');
@@ -1313,7 +1313,7 @@ monitor_item_deleted_cb (TrackerMonitor *monitor,
                                                                  G_FILE_TYPE_DIRECTORY,
                                                                  NULL);
                        tracker_indexing_tree_get_root (priv->indexing_tree,
-                                                       canonical, &flags);
+                                                       canonical, &flags);
                        notifier_queue_root (notifier, canonical, flags, FALSE);
                        return;
                }
@@ -1324,7 +1324,7 @@ monitor_item_deleted_cb (TrackerMonitor *monitor,
        if (!tracker_indexing_tree_file_is_indexable (priv->indexing_tree,
                                                      file, file_type)) {
                /* File was not indexed */
-               return ;
+               return;
        }
 
        /* Fetch the interned copy */
@@ -1400,7 +1400,7 @@ monitor_item_moved_cb (TrackerMonitor *monitor,
                }
                /* else, file, do nothing */
        } else {
-               gboolean source_stored, should_process_other;
+               gboolean  source_stored, should_process_other;
                GFileType file_type;
                GFile *check_file;
 
@@ -1588,7 +1588,7 @@ indexing_tree_directory_removed (TrackerIndexingTree *indexing_tree,
                        } else if (tracker_indexing_tree_file_is_root (indexing_tree,
                                                                       parent)) {
                                g_signal_emit (notifier, signals[FILE_CREATED],
-                                              0, directory);
+                                              0, directory);
                        }
 
                        g_object_unref (parent);
@@ -1707,7 +1707,7 @@ check_disable_monitor (TrackerFileNotifier *notifier)
 {
        TrackerFileNotifierPrivate *priv;
        TrackerSparqlCursor *cursor;
-       gint64 folder_count = 0;
+       gint64  folder_count = 0;
        GError *error = NULL;
 
        priv = tracker_file_notifier_get_instance_private (notifier);
diff --git a/src/libtracker-miner/tracker-file-system.c b/src/libtracker-miner/tracker-file-system.c
index 5e92602f0..0ce3e8daf 100644
--- a/src/libtracker-miner/tracker-file-system.c
+++ b/src/libtracker-miner/tracker-file-system.c
@@ -42,8 +42,8 @@ struct _FileNodeProperty {
 };
 
 struct _FileNodeData {
-       GFile *file;
-       gchar *uri_prefix;
+       GFile  *file;
+       gchar  *uri_prefix;
        GArray *properties;
        guint shallow   : 1;
        guint unowned : 1;
@@ -275,7 +275,7 @@ file_tree_lookup (GNode     *tree,
                else if (ptr[0] == '\0') {
                        g_free (uri);
                        return tree;
-                }
+               }
        }
 
        parent = tree;
@@ -471,8 +471,8 @@ reparent_child_nodes_to_parent (GNode *node)
                child = g_node_next_sibling (child);
 
                uri_prefix = g_strdup_printf ("%s/%s",
-                                             node_data->uri_prefix,
-                                             data->uri_prefix);
+                                             node_data->uri_prefix,
+                                             data->uri_prefix);
 
                g_free (data->uri_prefix);
                data->uri_prefix = uri_prefix;
@@ -730,8 +730,8 @@ tracker_file_system_traverse (TrackerFileSystem             *file_system,
 }
 
 void
-tracker_file_system_register_property (GQuark             prop,
-                                       GDestroyNotify     destroy_notify)
+tracker_file_system_register_property (GQuark         prop,
+                                       GDestroyNotify destroy_notify)
 {
        g_return_if_fail (prop != 0);
 
@@ -775,7 +775,7 @@ tracker_file_system_set_property (TrackerFileSystem *file_system,
 {
        FileNodeProperty property, *match;
        GDestroyNotify destroy_notify;
-       FileNodeData *data;
+       FileNodeData  *data;
        GNode *node;
 
        g_return_if_fail (TRACKER_IS_FILE_SYSTEM (file_system));
@@ -886,7 +886,7 @@ tracker_file_system_unset_property (TrackerFileSystem *file_system,
        FileNodeProperty property, *match;
        GDestroyNotify destroy_notify = NULL;
        GNode *node;
-       guint index;
+       guint  index;
 
        g_return_if_fail (TRACKER_IS_FILE_SYSTEM (file_system));
        g_return_if_fail (file != NULL);
@@ -935,7 +935,7 @@ tracker_file_system_steal_property (TrackerFileSystem *file_system,
        FileNodeData *data;
        FileNodeProperty property, *match;
        GNode *node;
-       guint index;
+       guint  index;
        gpointer prop_value;
 
        g_return_val_if_fail (TRACKER_IS_FILE_SYSTEM (file_system), NULL);
@@ -976,7 +976,7 @@ typedef struct {
 
 static gboolean
 append_deleted_files (GNode    *node,
-                     gpointer  user_data)
+                      gpointer  user_data)
 {
        ForgetFilesData *data;
        FileNodeData *node_data;
@@ -1007,8 +1007,8 @@ forget_file (FileNodeData *node_data)
 
 void
 tracker_file_system_forget_files (TrackerFileSystem *file_system,
-                                 GFile             *root,
-                                 GFileType          file_type)
+                                  GFile             *root,
+                                  GFileType          file_type)
 {
        ForgetFilesData data = { file_system, NULL, file_type };
        GNode *node;
@@ -1025,7 +1025,7 @@ tracker_file_system_forget_files (TrackerFileSystem *file_system,
        g_node_traverse (node,
                         G_PRE_ORDER,
                         (file_type == G_FILE_TYPE_REGULAR) ?
-                          G_TRAVERSE_LEAVES : G_TRAVERSE_ALL,
+                        G_TRAVERSE_LEAVES : G_TRAVERSE_ALL,
                         -1, append_deleted_files,
                         &data);
 
diff --git a/src/libtracker-miner/tracker-indexing-tree.c b/src/libtracker-miner/tracker-indexing-tree.c
index 6b88821ac..03e5ffdfa 100644
--- a/src/libtracker-miner/tracker-indexing-tree.c
+++ b/src/libtracker-miner/tracker-indexing-tree.c
@@ -38,9 +38,9 @@ typedef struct _FindNodeData FindNodeData;
 struct _NodeData
 {
        GFile *file;
-       guint flags;
-       guint shallow : 1;
-       guint removing : 1;
+       guint  flags;
+       guint  shallow : 1;
+       guint  removing : 1;
 };
 
 struct _PatternData
@@ -64,7 +64,7 @@ struct _TrackerIndexingTreePrivate
        TrackerFilterPolicy policies[TRACKER_FILTER_PARENT_DIRECTORY + 1];
 
        GFile *root;
-       guint filter_hidden : 1;
+       guint  filter_hidden : 1;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (TrackerIndexingTree, tracker_indexing_tree, G_TYPE_OBJECT)
@@ -860,14 +860,14 @@ tracker_indexing_tree_file_is_indexable (TrackerIndexingTree *tree,
                file_type = g_file_query_file_type (file, file_flags, NULL);
 
                filter = (file_type == G_FILE_TYPE_DIRECTORY) ?
-                       TRACKER_FILTER_DIRECTORY : TRACKER_FILTER_FILE;
+                        TRACKER_FILTER_DIRECTORY : TRACKER_FILTER_FILE;
 
                if (indexing_tree_file_is_filtered (tree, filter, file)) {
                        return FALSE;
                }
        } else if (file_type != G_FILE_TYPE_UNKNOWN) {
                filter = (file_type == G_FILE_TYPE_DIRECTORY) ?
-                       TRACKER_FILTER_DIRECTORY : TRACKER_FILTER_FILE;
+                        TRACKER_FILTER_DIRECTORY : TRACKER_FILTER_FILE;
 
                if (indexing_tree_file_is_filtered (tree, filter, file)) {
                        return FALSE;
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index c896c5d8d..53d2cdd56 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -59,17 +59,17 @@
                g_free (uri1); \
                g_free (uri2); \
        } while (0)
-#define trace_eq_push_tail(queue_name, gfile, reason)    \
+#define trace_eq_push_tail(queue_name, gfile, reason)     \
        trace_eq_action (TRUE, queue_name, "tail", gfile, NULL, reason)
-#define trace_eq_push_head(queue_name, gfile, reason)    \
+#define trace_eq_push_head(queue_name, gfile, reason)     \
        trace_eq_action (TRUE, queue_name, "head", gfile, NULL, reason)
-#define trace_eq_push_tail_2(queue_name, gfile1, gfile2, reason)         \
+#define trace_eq_push_tail_2(queue_name, gfile1, gfile2, reason)          \
        trace_eq_action (TRUE, queue_name, "tail", gfile1, gfile2, reason)
-#define trace_eq_push_head_2(queue_name, gfile1, gfile2, reason)         \
+#define trace_eq_push_head_2(queue_name, gfile1, gfile2, reason)          \
        trace_eq_action (TRUE, queue_name, "head", gfile1, gfile2, reason)
-#define trace_eq_pop_head(queue_name, gfile)     \
+#define trace_eq_pop_head(queue_name, gfile)      \
        trace_eq_action (FALSE, queue_name, "head", gfile, NULL, NULL)
-#define trace_eq_pop_head_2(queue_name, gfile1, gfile2)          \
+#define trace_eq_pop_head_2(queue_name, gfile1, gfile2)   \
        trace_eq_action (FALSE, queue_name, "head", gfile1, gfile2, NULL)
 static gboolean miner_fs_queues_status_trace_timeout_cb (gpointer data);
 #else
@@ -140,8 +140,8 @@ static gboolean miner_fs_queues_status_trace_timeout_cb (gpointer data);
 typedef struct {
        guint16 type;
        guint attributes_update : 1;
-       GFile *file;
-       GFile *dest_file;
+       GFile  *file;
+       GFile  *dest_file;
 } QueueEvent;
 
 typedef struct {
@@ -155,11 +155,11 @@ typedef struct {
 struct _TrackerMinerFSPrivate {
        TrackerPriorityQueue *items;
 
-       guint item_queues_handler_id;
+       guint  item_queues_handler_id;
        GFile *item_queue_blocker;
 
 #ifdef EVENT_QUEUE_ENABLE_TRACE
-       guint queue_status_timeout_id;
+       guint  queue_status_timeout_id;
 #endif /* EVENT_QUEUE_ENABLE_TRACE */
 
        /* Root / tree / index */
@@ -171,10 +171,10 @@ struct _TrackerMinerFSPrivate {
        /* Sparql insertion tasks */
        TrackerTaskPool *task_pool;
        TrackerSparqlBuffer *sparql_buffer;
-       guint sparql_buffer_limit;
+       guint   sparql_buffer_limit;
 
        /* File properties */
-       GQuark quark_recursive_removal;
+       GQuark  quark_recursive_removal;
 
        /* Properties */
        gdouble throttle;
@@ -183,15 +183,15 @@ struct _TrackerMinerFSPrivate {
        GTimer *timer;
        GTimer *extraction_timer;
 
-       guint been_started : 1;     /* TRUE if miner has been started */
-       guint been_crawled : 1;     /* TRUE if initial crawling has been
+       guint   been_started : 1;   /* TRUE if miner has been started */
+       guint   been_crawled : 1;   /* TRUE if initial crawling has been
                                     * done */
-       guint shown_totals : 1;     /* TRUE if totals have been shown */
-       guint is_paused : 1;        /* TRUE if miner is paused */
+       guint   shown_totals : 1;   /* TRUE if totals have been shown */
+       guint   is_paused : 1;      /* TRUE if miner is paused */
 
-       guint timer_stopped : 1;    /* TRUE if main timer is stopped */
-       guint extraction_timer_stopped : 1; /* TRUE if the extraction
-                                            * timer is stopped */
+       guint   timer_stopped : 1;  /* TRUE if main timer is stopped */
+       guint   extraction_timer_stopped : 1; /* TRUE if the extraction
+                                              * timer is stopped */
 
        GHashTable *roots_to_notify;        /* Used to signal indexing
                                             * trees finished */
@@ -298,15 +298,15 @@ static void           file_notifier_finished              (TrackerFileNotifier *
 
 static void           item_queue_handlers_set_up          (TrackerMinerFS       *fs);
 
-static void           task_pool_cancel_foreach                (gpointer        data,
-                                                               gpointer        user_data);
+static void           task_pool_cancel_foreach                (gpointer data,
+                                                               gpointer user_data);
 static void           task_pool_limit_reached_notify_cb       (GObject        *object,
                                                                GParamSpec     *pspec,
                                                                gpointer        user_data);
 
 static void           miner_fs_queue_event                (TrackerMinerFS *fs,
-                                                          QueueEvent     *event,
-                                                          guint           priority);
+                                                           QueueEvent     *event,
+                                                           guint           priority);
 
 static GQuark quark_last_queue_event = 0;
 static GInitableIface* miner_fs_initable_parent_iface;
@@ -654,7 +654,7 @@ miner_fs_initable_init (GInitable     *initable,
        /* Create the file notifier */
        priv->file_notifier = tracker_file_notifier_new (priv->indexing_tree,
                                                         priv->data_provider,
-                                                        tracker_miner_get_connection (TRACKER_MINER 
(initable)));
+                                                        tracker_miner_get_connection (TRACKER_MINER 
(initable)));
 
        if (!priv->file_notifier) {
                g_set_error (error,
@@ -729,16 +729,16 @@ static GList *
 queue_event_get_last_event_node (QueueEvent *event)
 {
        return g_object_get_qdata (G_OBJECT (event->file),
-                                  quark_last_queue_event);
+                                  quark_last_queue_event);
 }
 
 static void
 queue_event_save_node (QueueEvent *event,
-                      GList      *node)
+                       GList      *node)
 {
        g_assert (node->data == event);
        g_object_set_qdata (G_OBJECT (event->file),
-                           quark_last_queue_event, node);
+                           quark_last_queue_event, node);
 }
 
 static void
@@ -750,7 +750,7 @@ queue_event_dispose_node (QueueEvent *event)
 
        if (node && node->data == event) {
                g_object_steal_qdata (G_OBJECT (event->file),
-                                     quark_last_queue_event);
+                                     quark_last_queue_event);
        }
 }
 
@@ -766,8 +766,8 @@ queue_event_free (QueueEvent *event)
 
 static QueueCoalesceAction
 queue_event_coalesce (const QueueEvent  *first,
-                     const QueueEvent  *second,
-                     QueueEvent       **replacement)
+                      const QueueEvent  *second,
+                      QueueEvent       **replacement)
 {
        *replacement = NULL;
 
@@ -777,13 +777,13 @@ queue_event_coalesce (const QueueEvent  *first,
                    first->file == second->file) {
                        return QUEUE_ACTION_DELETE_SECOND;
                } else if (second->type == TRACKER_MINER_FS_EVENT_MOVED &&
-                          first->file == second->file) {
+                          first->file == second->file) {
                        *replacement = queue_event_new (TRACKER_MINER_FS_EVENT_CREATED,
-                                                       second->dest_file);
+                                                       second->dest_file);
                        return (QUEUE_ACTION_DELETE_FIRST |
-                               QUEUE_ACTION_DELETE_SECOND);
+                               QUEUE_ACTION_DELETE_SECOND);
                } else if (second->type == TRACKER_MINER_FS_EVENT_DELETED &&
-                          first->file == second->file) {
+                          first->file == second->file) {
                        /* We can't be sure that "create" is replacing a file
                         * here. Preserve the second event just in case.
                         */
@@ -797,7 +797,7 @@ queue_event_coalesce (const QueueEvent  *first,
                        else
                                return QUEUE_ACTION_DELETE_SECOND;
                } else if (second->type == TRACKER_MINER_FS_EVENT_DELETED &&
-                          first->file == second->file) {
+                          first->file == second->file) {
                        return QUEUE_ACTION_DELETE_FIRST;
                }
        } else if (first->type == TRACKER_MINER_FS_EVENT_MOVED) {
@@ -805,20 +805,20 @@ queue_event_coalesce (const QueueEvent  *first,
                    first->dest_file == second->file) {
                        if (first->file != second->dest_file) {
                                *replacement = queue_event_moved_new (first->file,
-                                                                     second->dest_file);
+                                                                     second->dest_file);
                        }
 
                        return (QUEUE_ACTION_DELETE_FIRST |
-                               QUEUE_ACTION_DELETE_SECOND);
+                               QUEUE_ACTION_DELETE_SECOND);
                } else if (second->type == TRACKER_MINER_FS_EVENT_DELETED &&
-                          first->dest_file == second->file) {
+                          first->dest_file == second->file) {
                        *replacement = queue_event_new (TRACKER_MINER_FS_EVENT_DELETED,
-                                                       first->file);
+                                                       first->file);
                        return (QUEUE_ACTION_DELETE_FIRST |
-                               QUEUE_ACTION_DELETE_SECOND);
+                               QUEUE_ACTION_DELETE_SECOND);
                }
        } else if (first->type == TRACKER_MINER_FS_EVENT_DELETED &&
-                  second->type == TRACKER_MINER_FS_EVENT_DELETED) {
+                  second->type == TRACKER_MINER_FS_EVENT_DELETED) {
                return QUEUE_ACTION_DELETE_SECOND;
        }
 
@@ -827,17 +827,17 @@ queue_event_coalesce (const QueueEvent  *first,
 
 static gboolean
 queue_event_is_descendant (QueueEvent *event,
-                          GFile      *prefix)
+                           GFile      *prefix)
 {
        return g_file_has_prefix (event->file, prefix);
 }
 
 static gboolean
 queue_event_is_equal_or_descendant (QueueEvent *event,
-                                   GFile      *prefix)
+                                    GFile      *prefix)
 {
        return (g_file_equal (event->file, prefix) ||
-               g_file_has_prefix (event->file, prefix));
+               g_file_has_prefix (event->file, prefix));
 }
 
 static void
@@ -874,8 +874,8 @@ fs_finalize (GObject *object)
        }
 
        tracker_priority_queue_foreach (priv->items,
-                                       (GFunc) queue_event_free,
-                                       NULL);
+                                       (GFunc) queue_event_free,
+                                       NULL);
        tracker_priority_queue_unref (priv->items);
 
        g_object_unref (priv->root);
@@ -1004,8 +1004,8 @@ fs_get_property (GObject    *object,
 
 static void
 task_pool_limit_reached_notify_cb (GObject    *object,
-                                  GParamSpec *pspec,
-                                  gpointer    user_data)
+                                   GParamSpec *pspec,
+                                   gpointer    user_data)
 {
        if (!tracker_task_pool_limit_reached (TRACKER_TASK_POOL (object))) {
                item_queue_handlers_set_up (TRACKER_MINER_FS (user_data));
@@ -1200,7 +1200,7 @@ process_stop (TrackerMinerFS *fs)
 
 static gboolean
 item_queue_is_blocked_by_file (TrackerMinerFS *fs,
-                               GFile *file)
+                               GFile          *file)
 {
        g_return_val_if_fail (G_IS_FILE (file), FALSE);
 
@@ -1223,7 +1223,7 @@ sparql_buffer_task_finished_cb (GObject      *object,
        TrackerTask *task;
        GFile *task_file;
        gboolean recursive;
-       GError *error = NULL;
+       GError  *error = NULL;
 
        fs = user_data;
        priv = fs->priv;
@@ -1240,7 +1240,7 @@ sparql_buffer_task_finished_cb (GObject      *object,
        task_file = tracker_task_get_file (task);
 
        recursive = GPOINTER_TO_INT (g_object_steal_qdata (G_OBJECT (task_file),
-                                                            priv->quark_recursive_removal));
+                                                          priv->quark_recursive_removal));
        tracker_file_notifier_invalidate_file_iri (priv->file_notifier, task_file, recursive);
 
        if (item_queue_is_blocked_by_file (fs, task_file)) {
@@ -1297,15 +1297,15 @@ update_processing_task_context_free (UpdateProcessingTaskContext *ctxt)
 
 static void
 on_signal_gtask_complete (GObject      *source,
-                         GAsyncResult *res,
-                         gpointer      user_data)
+                          GAsyncResult *res,
+                          gpointer      user_data)
 {
        TrackerMinerFS *fs = TRACKER_MINER_FS (source);
        TrackerTask *task, *sparql_task = NULL;
        UpdateProcessingTaskContext *ctxt;
        GError *error = NULL;
-       GFile *file = user_data;
-       gchar *uri, *sparql;
+       GFile  *file = user_data;
+       gchar  *uri, *sparql;
 
        sparql = g_task_propagate_pointer (G_TASK (res), &error);
        g_object_unref (res);
@@ -1442,8 +1442,8 @@ item_add_or_update (TrackerMinerFS *fs,
                GError *error;
 
                error = g_error_new (tracker_miner_fs_error_quark (),
-                                    TRACKER_MINER_FS_ERROR_INIT,
-                                    "TrackerMinerFS::process-file returned FALSE");
+                                    TRACKER_MINER_FS_ERROR_INIT,
+                                    "TrackerMinerFS::process-file returned FALSE");
                g_task_return_error (gtask, error);
        } else {
                fs->priv->total_files_processed++;
@@ -1463,7 +1463,7 @@ item_remove (TrackerMinerFS *fs,
              GString        *task_sparql)
 {
        gchar *uri, *sparql;
-       guint signal_num;
+       guint  signal_num;
 
        uri = g_file_get_uri (file);
 
@@ -1908,9 +1908,9 @@ miner_handle_next_item (TrackerMinerFS *fs)
                        g_free (uri);
 
                        tracker_priority_queue_foreach_remove (fs->priv->items,
-                                                              (GEqualFunc) 
queue_event_is_equal_or_descendant,
-                                                              parent,
-                                                              (GDestroyNotify) queue_event_free);
+                                                              (GEqualFunc) 
queue_event_is_equal_or_descendant,
+                                                              parent,
+                                                              (GDestroyNotify) queue_event_free);
                        keep_processing = TRUE;
                }
 
@@ -2025,7 +2025,7 @@ item_queue_handlers_set_up (TrackerMinerFS *fs)
        }
 
        if (!tracker_file_notifier_is_active (fs->priv->file_notifier)) {
-               gchar *status;
+               gchar  *status;
                gdouble progress;
 
                g_object_get (fs,
@@ -2071,22 +2071,22 @@ miner_fs_get_queue_priority (TrackerMinerFS *fs,
                                        file, &flags);
 
        return (flags & TRACKER_DIRECTORY_FLAG_PRIORITY) ?
-               G_PRIORITY_HIGH : G_PRIORITY_DEFAULT;
+              G_PRIORITY_HIGH : G_PRIORITY_DEFAULT;
 }
 
 static void
 miner_fs_queue_event (TrackerMinerFS *fs,
-                     QueueEvent     *event,
-                     guint           priority)
+                      QueueEvent     *event,
+                      guint           priority)
 {
        GList *old = NULL, *link = NULL;
 
        if (event->type == TRACKER_MINER_FS_EVENT_MOVED) {
                /* Remove all children of the dest location from being processed. */
                tracker_priority_queue_foreach_remove (fs->priv->items,
-                                                      (GEqualFunc) queue_event_is_equal_or_descendant,
-                                                      event->dest_file,
-                                                      (GDestroyNotify) queue_event_free);
+                                                      (GEqualFunc) queue_event_is_equal_or_descendant,
+                                                      event->dest_file,
+                                                      (GDestroyNotify) queue_event_free);
        }
 
        old = queue_event_get_last_event_node (event);
@@ -2100,7 +2100,7 @@ miner_fs_queue_event (TrackerMinerFS *fs,
                if (action & QUEUE_ACTION_DELETE_FIRST) {
                        queue_event_free (old->data);
                        tracker_priority_queue_remove_node (fs->priv->items,
-                                                           old);
+                                                           old);
                }
 
                if (action & QUEUE_ACTION_DELETE_SECOND) {
@@ -2116,14 +2116,14 @@ miner_fs_queue_event (TrackerMinerFS *fs,
                if (event->type == TRACKER_MINER_FS_EVENT_DELETED) {
                        /* Remove all children of this file from being processed. */
                        tracker_priority_queue_foreach_remove (fs->priv->items,
-                                                              (GEqualFunc) 
queue_event_is_equal_or_descendant,
-                                                              event->file,
-                                                              (GDestroyNotify) queue_event_free);
+                                                              (GEqualFunc) 
queue_event_is_equal_or_descendant,
+                                                              event->file,
+                                                              (GDestroyNotify) queue_event_free);
                }
 
                /* Ensure IRI is cached */
                tracker_file_notifier_get_file_iri (fs->priv->file_notifier,
-                                                   event->file, TRUE);
+                                                   event->file, TRUE);
 
                link = tracker_priority_queue_add (fs->priv->items, event, priority);
                queue_event_save_node (event, link);
@@ -2174,8 +2174,8 @@ file_notifier_file_deleted (TrackerFileNotifier  *notifier,
        if (tracker_file_notifier_get_file_type (notifier, file) == G_FILE_TYPE_DIRECTORY) {
                /* Cancel all pending tasks on files inside the path given by file */
                tracker_task_pool_foreach (fs->priv->task_pool,
-                                          task_pool_cancel_foreach,
-                                          file);
+                                          task_pool_cancel_foreach,
+                                          file);
        }
 
        event = queue_event_new (TRACKER_MINER_FS_EVENT_DELETED, file);
@@ -2227,13 +2227,13 @@ file_notifier_directory_started (TrackerFileNotifier *notifier,
 
        uri = g_file_get_uri (directory);
        tracker_indexing_tree_get_root (fs->priv->indexing_tree,
-                                       directory, &flags);
+                                       directory, &flags);
 
        if ((flags & TRACKER_DIRECTORY_FLAG_RECURSE) != 0) {
-                str = g_strdup_printf ("Crawling recursively directory '%s'", uri);
-        } else {
-                str = g_strdup_printf ("Crawling single directory '%s'", uri);
-        }
+               str = g_strdup_printf ("Crawling recursively directory '%s'", uri);
+       } else {
+               str = g_strdup_printf ("Crawling single directory '%s'", uri);
+       }
 
        if (fs->priv->timer_stopped) {
                g_timer_start (fs->priv->timer);
@@ -2246,13 +2246,13 @@ file_notifier_directory_started (TrackerFileNotifier *notifier,
        }
 
        /* Always set the progress here to at least 1%, and the remaining time
-         * to -1 as we cannot guess during crawling (we don't know how many directories
-         * we will find) */
-        g_object_set (fs,
-                      "progress", 0.01,
-                      "status", str,
-                      "remaining-time", -1,
-                      NULL);
+        * to -1 as we cannot guess during crawling (we don't know how many directories
+        * we will find) */
+       g_object_set (fs,
+                     "progress", 0.01,
+                     "status", str,
+                     "remaining-time", -1,
+                     NULL);
        g_free (str);
        g_free (uri);
 }
@@ -2278,11 +2278,11 @@ file_notifier_directory_finished (TrackerFileNotifier *notifier,
        uri = g_file_get_uri (directory);
        str = g_strdup_printf ("Crawl finished for directory '%s'", uri);
 
-        g_object_set (fs,
-                      "progress", 0.01,
-                      "status", str,
-                      "remaining-time", -1,
-                      NULL);
+       g_object_set (fs,
+                     "progress", 0.01,
+                     "status", str,
+                     "remaining-time", -1,
+                     NULL);
 
        g_free (str);
        g_free (uri);
@@ -2380,9 +2380,9 @@ indexing_tree_directory_removed (TrackerIndexingTree *indexing_tree,
         * from all relevant processing queues.
         */
        tracker_priority_queue_foreach_remove (priv->items,
-                                              (GEqualFunc) queue_event_is_equal_or_descendant,
-                                              directory,
-                                              (GDestroyNotify) queue_event_free);
+                                              (GEqualFunc) queue_event_is_equal_or_descendant,
+                                              directory,
+                                              (GDestroyNotify) queue_event_free);
 
        g_debug ("  Removed files at %f\n", g_timer_elapsed (timer, NULL));
        g_timer_destroy (timer);
@@ -2726,7 +2726,7 @@ tracker_miner_fs_get_data_provider (TrackerMinerFS *fs)
 
 static void
 trace_events_foreach (gpointer data,
-                     gpointer fs)
+                      gpointer fs)
 {
        QueueEvent *event = data;
        gchar *uri, *dest_uri = NULL;
@@ -2752,7 +2752,7 @@ miner_fs_queues_status_trace_timeout_cb (gpointer data)
                  queue_name,
                  tracker_priority_queue_get_length (queue));
        tracker_priority_queue_foreach (queue,
-                                       trace_events_foreach,
+                                       trace_events_foreach,
                                        fs);
 
        return G_SOURCE_CONTINUE;
diff --git a/src/libtracker-miner/tracker-miner-object.c b/src/libtracker-miner/tracker-miner-object.c
index dd6bc0d18..137db8355 100644
--- a/src/libtracker-miner/tracker-miner-object.c
+++ b/src/libtracker-miner/tracker-miner-object.c
@@ -64,7 +64,7 @@ struct _TrackerMinerPrivate {
        gboolean started;
        gint n_pauses;
        gchar *status;
-       gdouble progress;
+       gdouble  progress;
        gint remaining_time;
        gint availability_cookie;
        guint update_id;
@@ -391,9 +391,9 @@ miner_set_property (GObject      *object,
 
                new_progress = PROGRESS_ROUNDED (g_value_get_double (value));
                trace ("(Miner:'%s') Set property:'progress' to '%2.2f' (%2.2f before rounded)",
-                        G_OBJECT_TYPE_NAME (miner),
-                        new_progress,
-                        g_value_get_double (value));
+                      G_OBJECT_TYPE_NAME (miner),
+                      new_progress,
+                      g_value_get_double (value));
 
                /* NOTE: We don't round the current progress before
                 * comparison because we use the rounded value when
diff --git a/src/libtracker-miner/tracker-miner-online.c b/src/libtracker-miner/tracker-miner-online.c
index cf4733601..3806bd82c 100644
--- a/src/libtracker-miner/tracker-miner-online.c
+++ b/src/libtracker-miner/tracker-miner-online.c
@@ -54,7 +54,7 @@ struct _TrackerMinerOnlinePrivate {
        NMClient *client;
 #endif
        TrackerNetworkType network_type;
-       gboolean paused;
+       gboolean  paused;
 };
 
 enum {
@@ -297,7 +297,7 @@ _tracker_miner_online_set_network_type (TrackerMinerOnline *miner,
 {
        TrackerMinerOnlinePrivate *priv;
        gboolean cont = FALSE;
-       GError *error = NULL;
+       GError  *error = NULL;
 
        priv = tracker_miner_online_get_instance_private (miner);
 
@@ -349,7 +349,7 @@ miner_online_initable_init (GInitable     *initable,
 {
 #ifdef HAVE_NETWORK_MANAGER
        TrackerMinerOnlinePrivate *priv;
-       TrackerNetworkType network_type;
+       TrackerNetworkType  network_type;
        TrackerMinerOnline *miner;
 
        miner = TRACKER_MINER_ONLINE (initable);
diff --git a/src/libtracker-miner/tracker-miner-proxy.c b/src/libtracker-miner/tracker-miner-proxy.c
index 465d6103c..a52cc7702 100644
--- a/src/libtracker-miner/tracker-miner-proxy.c
+++ b/src/libtracker-miner/tracker-miner-proxy.c
@@ -46,7 +46,7 @@
 #include "tracker-miner-proxy.h"
 
 typedef struct {
-       TrackerMiner *miner;
+       TrackerMiner  *miner;
        GDBusConnection *d_connection;
        GDBusNodeInfo *introspection_data;
        gchar *dbus_path;
@@ -55,11 +55,11 @@ typedef struct {
 } TrackerMinerProxyPrivate;
 
 typedef struct {
-       gint cookie;
+       gint   cookie;
        gchar *application;
        gchar *reason;
        gchar *watch_name;
-       guint watch_name_id;
+       guint  watch_name_id;
 } PauseData;
 
 enum {
@@ -76,47 +76,47 @@ G_DEFINE_TYPE_WITH_CODE (TrackerMinerProxy, tracker_miner_proxy, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, tracker_miner_proxy_initable_iface_init))
 
 static const gchar introspection_xml[] =
-  "<node>"
-  "  <interface name='org.freedesktop.Tracker1.Miner'>"
-  "    <method name='Start'>"
-  "    </method>"
-  "    <method name='GetStatus'>"
-  "      <arg type='s' name='status' direction='out' />"
-  "    </method>"
-  "    <method name='GetProgress'>"
-  "      <arg type='d' name='progress' direction='out' />"
-  "    </method>"
-  "    <method name='GetRemainingTime'>"
-  "      <arg type='i' name='remaining_time' direction='out' />"
-  "    </method>"
-  "    <method name='GetPauseDetails'>"
-  "      <arg type='as' name='pause_applications' direction='out' />"
-  "      <arg type='as' name='pause_reasons' direction='out' />"
-  "    </method>"
-  "    <method name='Pause'>"
-  "      <arg type='s' name='application' direction='in' />"
-  "      <arg type='s' name='reason' direction='in' />"
-  "      <arg type='i' name='cookie' direction='out' />"
-  "    </method>"
-  "    <method name='PauseForProcess'>"
-  "      <arg type='s' name='application' direction='in' />"
-  "      <arg type='s' name='reason' direction='in' />"
-  "      <arg type='i' name='cookie' direction='out' />"
-  "    </method>"
-  "    <method name='Resume'>"
-  "      <arg type='i' name='cookie' direction='in' />"
-  "    </method>"
-  "    <signal name='Started' />"
-  "    <signal name='Stopped' />"
-  "    <signal name='Paused' />"
-  "    <signal name='Resumed' />"
-  "    <signal name='Progress'>"
-  "      <arg type='s' name='status' />"
-  "      <arg type='d' name='progress' />"
-  "      <arg type='i' name='remaining_time' />"
-  "    </signal>"
-  "  </interface>"
-  "</node>";
+       "<node>"
+       "  <interface name='org.freedesktop.Tracker1.Miner'>"
+       "    <method name='Start'>"
+       "    </method>"
+       "    <method name='GetStatus'>"
+       "      <arg type='s' name='status' direction='out' />"
+       "    </method>"
+       "    <method name='GetProgress'>"
+       "      <arg type='d' name='progress' direction='out' />"
+       "    </method>"
+       "    <method name='GetRemainingTime'>"
+       "      <arg type='i' name='remaining_time' direction='out' />"
+       "    </method>"
+       "    <method name='GetPauseDetails'>"
+       "      <arg type='as' name='pause_applications' direction='out' />"
+       "      <arg type='as' name='pause_reasons' direction='out' />"
+       "    </method>"
+       "    <method name='Pause'>"
+       "      <arg type='s' name='application' direction='in' />"
+       "      <arg type='s' name='reason' direction='in' />"
+       "      <arg type='i' name='cookie' direction='out' />"
+       "    </method>"
+       "    <method name='PauseForProcess'>"
+       "      <arg type='s' name='application' direction='in' />"
+       "      <arg type='s' name='reason' direction='in' />"
+       "      <arg type='i' name='cookie' direction='out' />"
+       "    </method>"
+       "    <method name='Resume'>"
+       "      <arg type='i' name='cookie' direction='in' />"
+       "    </method>"
+       "    <signal name='Started' />"
+       "    <signal name='Stopped' />"
+       "    <signal name='Paused' />"
+       "    <signal name='Resumed' />"
+       "    <signal name='Progress'>"
+       "      <arg type='s' name='status' />"
+       "      <arg type='d' name='progress' />"
+       "      <arg type='i' name='remaining_time' />"
+       "    </signal>"
+       "  </interface>"
+       "</node>";
 
 #define TRACKER_SERVICE "org.freedesktop.Tracker1"
 
@@ -126,7 +126,7 @@ pause_data_new (const gchar *application,
                 const gchar *watch_name,
                 guint        watch_name_id)
 {
-       PauseData *data;
+       PauseData  *data;
        static gint cookie = 1;
 
        data = g_slice_new0 (PauseData);
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index f87a5b672..ff07361a0 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -35,21 +35,21 @@
 /* The life time of an item in the cache */
 #define CACHE_LIFETIME_SECONDS 1
 
-typedef struct TrackerMonitorPrivate  TrackerMonitorPrivate;
+typedef struct TrackerMonitorPrivate TrackerMonitorPrivate;
 
 struct TrackerMonitorPrivate {
        GHashTable    *monitors;
 
-       gboolean       enabled;
+       gboolean enabled;
 
-       guint          monitor_limit;
-       gboolean       monitor_limit_warned;
-       guint          monitors_ignored;
+       guint monitor_limit;
+       gboolean monitor_limit_warned;
+       guint monitors_ignored;
 
        /* For FAM, the _CHANGES_DONE event is not signalled, so we
         * have to just use the _CHANGED event instead.
         */
-       gboolean       use_changed_event;
+       gboolean use_changed_event;
 
        GHashTable    *cached_events;
 
@@ -63,7 +63,7 @@ typedef struct {
        gchar    *other_file_uri;
        gboolean  is_directory;
        GTimeVal  start_time;
-       guint32   event_type;
+       guint32 event_type;
        gboolean  expirable;
 } EventData;
 
@@ -381,7 +381,7 @@ get_inotify_limit (void)
        GError      *error = NULL;
        const gchar *filename;
        gchar       *contents = NULL;
-       guint        limit;
+       guint limit;
 
        filename = "/proc/sys/fs/inotify/max_user_watches";
 
@@ -719,7 +719,7 @@ monitor_event_cb (GFileMonitor      *file_monitor,
                /* In any case, cached events are stale */
                g_hash_table_remove (priv->cached_events, file);
 
-               /* Fall through */
+       /* Fall through */
        case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
                emit_signal_for_event (monitor, event_type,
                                       is_directory, file, NULL);
@@ -988,7 +988,7 @@ remove_recursively (TrackerMonitor *monitor,
        TrackerMonitorPrivate *priv;
        GHashTableIter iter;
        gpointer iter_file, iter_file_monitor;
-       guint items_removed = 0;
+       guint  items_removed = 0;
        gchar *uri;
 
        g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
@@ -1088,7 +1088,7 @@ tracker_monitor_is_watched_by_string (TrackerMonitor *monitor,
 {
        TrackerMonitorPrivate *priv;
        GFile      *file;
-       gboolean    watched;
+       gboolean watched;
 
        g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
        g_return_val_if_fail (path != NULL, FALSE);
diff --git a/src/libtracker-miner/tracker-priority-queue.c b/src/libtracker-miner/tracker-priority-queue.c
index 85190cd31..41e9f39cd 100644
--- a/src/libtracker-miner/tracker-priority-queue.c
+++ b/src/libtracker-miner/tracker-priority-queue.c
@@ -34,7 +34,7 @@ struct PrioritySegment
 
 struct _TrackerPriorityQueue
 {
-       GQueue queue;
+       GQueue  queue;
        GArray *segments;
 
        gint ref_count;
diff --git a/src/libtracker-miner/tracker-task-pool.c b/src/libtracker-miner/tracker-task-pool.c
index b9bc6df2a..8fbd38da1 100644
--- a/src/libtracker-miner/tracker-task-pool.c
+++ b/src/libtracker-miner/tracker-task-pool.c
@@ -331,7 +331,7 @@ tracker_task_unref (TrackerTask *task)
 
                if (task->data &&
                    task->destroy_notify) {
-                       (task->destroy_notify) (task->data);
+                       (task->destroy_notify)(task->data);
                }
 
                g_slice_free (TrackerTask, task);
diff --git a/src/libtracker-sparql/tracker-namespace-manager.c 
b/src/libtracker-sparql/tracker-namespace-manager.c
index e24f68749..fff317add 100644
--- a/src/libtracker-sparql/tracker-namespace-manager.c
+++ b/src/libtracker-sparql/tracker-namespace-manager.c
@@ -274,7 +274,7 @@ tracker_namespace_manager_expand_uri (TrackerNamespaceManager *self,
 {
        TrackerNamespaceManagerPrivate *priv;
 
-       char prefix[MAX_PREFIX_LENGTH + 1] = { 0 };
+       char  prefix[MAX_PREFIX_LENGTH + 1] = { 0 };
        char *colon;
        char *namespace = NULL;
 
diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c
index 6fc319cb0..fcb196a83 100644
--- a/src/libtracker-sparql/tracker-notifier.c
+++ b/src/libtracker-sparql/tracker-notifier.c
@@ -110,13 +110,13 @@ struct _TrackerNotifierEventCache {
 };
 
 struct _TrackerNotifierEvent {
-       gint8 type;
-       guint delayed : 1;
+       gint8  type;
+       guint  delayed : 1;
        gint64 id;
        const gchar *rdf_type; /* Belongs to cache */
        gchar *urn;
        gchar *location;
-       guint ref_count;
+       guint  ref_count;
 };
 
 enum {
@@ -158,7 +158,7 @@ tracker_notifier_cache_id (TrackerNotifier *notifier,
                return;
 
        if (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
-               gint64 id = tracker_sparql_cursor_get_integer (cursor, 0);
+               gint64  id = tracker_sparql_cursor_get_integer (cursor, 0);
                gint64 *ptr = g_memdup (&id, sizeof (gint64));
 
                g_hash_table_insert (priv->cached_ids, g_strdup (urn), ptr);
@@ -464,7 +464,7 @@ tracker_notifier_query_extra_info (TrackerNotifier *notifier,
                                    GPtrArray       *events)
 {
        TrackerNotifierPrivate *priv;
-       TrackerSparqlCursor *cursor;
+       TrackerSparqlCursor  *cursor;
        TrackerNotifierEvent *event;
        gchar *sparql;
        gint idx = 0, col;
@@ -544,7 +544,7 @@ tracker_notifier_query_extra_deleted_info (TrackerNotifier *notifier,
                                            GPtrArray       *events)
 {
        TrackerNotifierPrivate *priv;
-       TrackerSparqlCursor *cursor;
+       TrackerSparqlCursor  *cursor;
        TrackerNotifierEvent *event;
        const gchar *urn;
        gchar *sparql;
@@ -642,7 +642,7 @@ expand_class_iris (TrackerNotifier  *notifier,
 {
        TrackerNotifierPrivate *priv;
        TrackerSparqlCursor *cursor;
-       GArray *expanded;
+       GArray  *expanded;
        GString *sparql;
        gint i, n_classes;
 
@@ -688,7 +688,7 @@ tracker_notifier_initable_init (GInitable     *initable,
                                 GError       **error)
 {
        TrackerNotifier *notifier = TRACKER_NOTIFIER (initable);
-       TrackerDomainOntology *domain_ontology;
+       TrackerDomainOntology  *domain_ontology;
        TrackerNotifierPrivate *priv;
        gchar *dbus_name;
 
@@ -874,8 +874,8 @@ tracker_notifier_init (TrackerNotifier *notifier)
 
        priv = tracker_notifier_get_instance_private (notifier);
        priv->cached_events = g_hash_table_new_full (g_str_hash,
-                                                    g_str_equal,
-                                                    NULL,
+                                                    g_str_equal,
+                                                    NULL,
                                                     (GDestroyNotify) tracker_notifier_event_cache_free);
        priv->cached_ids = g_hash_table_new_full (g_str_hash,
                                                  g_str_equal,
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index a5d006270..1c2cdb487 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -126,17 +126,17 @@ tracker_resource_init (TrackerResource *resource)
 
        /* Values of properties */
        priv->properties = g_hash_table_new_full (
-               g_str_hash,
-               g_str_equal,
-               g_free,
-               (GDestroyNotify) free_value);
+               g_str_hash,
+               g_str_equal,
+               g_free,
+               (GDestroyNotify) free_value);
 
        /* TRUE for any property where we should delete any existing values. */
        priv->overwrite = g_hash_table_new_full (
-               g_str_hash,
-               g_str_equal,
-               g_free,
-               NULL);
+               g_str_hash,
+               g_str_equal,
+               g_free,
+               NULL);
 }
 
 static void
@@ -146,7 +146,7 @@ constructed (GObject *object)
 
        priv = GET_PRIVATE (TRACKER_RESOURCE (object));
 
-       if (! priv->identifier) {
+       if (!priv->identifier) {
                priv->identifier = generate_blank_node_identifier ();
        }
 
@@ -536,7 +536,7 @@ tracker_resource_add_gvalue (TrackerResource *self,
                        array_holder = existing_value;                                  \
                } else {                                                                \
                        array = g_ptr_array_new_with_free_func (                        \
-                               (GDestroyNotify)free_value);                            \
+                               (GDestroyNotify)free_value);                            \
                        array_holder = g_slice_new0 (GValue);                           \
                        g_value_init (array_holder, G_TYPE_PTR_ARRAY);                  \
                        g_value_take_boxed (array_holder, array);                       \
@@ -1141,7 +1141,7 @@ generate_turtle_value (const GValue            *value,
                        g_string_append (string, g_value_get_string (&str_value));
                } else {
                        g_warning ("Cannot serialize value of type %s to Turtle/SPARQL",
-                                   G_VALUE_TYPE_NAME (value));
+                                  G_VALUE_TYPE_NAME (value));
                }
                g_value_unset (&str_value);
        }
@@ -1195,7 +1195,7 @@ generate_turtle (TrackerResource    *resource,
        g_hash_table_foreach (priv->properties, generate_turtle_resources_foreach, data);
 
        generate_turtle_uri_value (tracker_resource_get_identifier(resource),
-               data->string, data->all_namespaces, data->our_namespaces);
+                                  data->string, data->all_namespaces, data->our_namespaces);
        g_string_append (data->string, " ");
 
        g_hash_table_iter_init (&iter, priv->properties);
@@ -1340,11 +1340,11 @@ generate_sparql_relation_inserts_foreach (gpointer key,
 
                        /* We don't need to produce inserts for builtin classes */
                        if (is_builtin_class (tracker_resource_get_identifier (relation),
-                                             data->namespaces))
+                                             data->namespaces))
                                continue;
 
                        if (g_list_find_custom (data->done_list, relation,
-                                               (GCompareFunc) tracker_resource_compare) != NULL)
+                                               (GCompareFunc) tracker_resource_compare) != NULL)
                                continue;
 
                        data->done_list = g_list_prepend (data->done_list, relation);
@@ -1373,8 +1373,8 @@ generate_sparql_delete_queries (TrackerResource     *resource,
        g_hash_table_iter_init (&iter, priv->properties);
        while (g_hash_table_iter_next (&iter, (gpointer *)&property, (gpointer *)&value)) {
                /* Whether to generate the DELETE is based on whether set_value was ever
-               * called for this property. That's tracked in the overwrite_flags hash table.
-               */
+                * called for this property. That's tracked in the overwrite_flags hash table.
+                */
                if (g_hash_table_lookup (overwrite_flags, property)) {
                        char *variable_name = variable_name_for_property (property);
 
@@ -1404,7 +1404,7 @@ generate_sparql_deletes (TrackerResource    *resource,
 {
        TrackerResourcePrivate *priv = GET_PRIVATE (resource);
 
-       if (! is_blank_node (priv->identifier) && g_hash_table_size (priv->overwrite) > 0) {
+       if (!is_blank_node (priv->identifier) && g_hash_table_size (priv->overwrite) > 0) {
                generate_sparql_delete_queries (resource, priv->overwrite, data);
        }
 
diff --git a/src/libtracker-sparql/tracker-uri.c b/src/libtracker-sparql/tracker-uri.c
index 0b5c3f349..b93f020fd 100644
--- a/src/libtracker-sparql/tracker-uri.c
+++ b/src/libtracker-sparql/tracker-uri.c
@@ -182,7 +182,7 @@ tracker_sparql_escape_uri_vprintf (const gchar *format,
        gchar *output1 = NULL;
        gchar *output2 = NULL;
        const char *p;
-       gchar *op1, *op2;
+       gchar  *op1, *op2;
        va_list args2;
 
        format1 = g_string_new (NULL);
@@ -279,7 +279,7 @@ cleanup:
 gchar *
 tracker_sparql_escape_uri_printf (const gchar *format, ...)
 {
-       gchar *result;
+       gchar  *result;
        va_list args;
 
        va_start (args, format);
diff --git a/src/tracker-store/tracker-config.c b/src/tracker-store/tracker-config.c
index 883bf2582..fda432ee4 100644
--- a/src/tracker-store/tracker-config.c
+++ b/src/tracker-store/tracker-config.c
@@ -36,7 +36,7 @@
 #define CONFIG_SCHEMA "org.freedesktop.Tracker.Store"
 #define CONFIG_PATH   "/org/freedesktop/tracker/store/"
 
-#define GRAPHUPDATED_DELAY_DEFAULT     1000
+#define GRAPHUPDATED_DELAY_DEFAULT      1000
 
 static void config_set_property         (GObject       *object,
                                          guint          param_id,
@@ -94,9 +94,9 @@ tracker_config_init (TrackerConfig *object)
 }
 
 static void
-config_set_property (GObject      *object,
-                     guint         param_id,
-                     const GValue *value,
+config_set_property (GObject              *object,
+                     guint                 param_id,
+                     const GValue         *value,
                      GParamSpec           *pspec)
 {
        switch (param_id) {
@@ -126,7 +126,7 @@ config_get_property (GObject    *object,
                g_value_set_int (value, tracker_config_get_graphupdated_delay (TRACKER_CONFIG (object)));
                break;
 
-               /* General */
+       /* General */
        case PROP_VERBOSITY:
                g_value_set_enum (value, tracker_config_get_verbosity (TRACKER_CONFIG (object)));
                break;
diff --git a/src/tracker-store/tracker-events.c b/src/tracker-store/tracker-events.c
index 77de4c256..72d793a01 100644
--- a/src/tracker-store/tracker-events.c
+++ b/src/tracker-store/tracker-events.c
@@ -314,7 +314,7 @@ void
 tracker_events_transact (void)
 {
        TrackerEventBatch *prev_events, *events;
-       TrackerClass *rdf_type;
+       TrackerClass  *rdf_type;
        GHashTableIter iter;
 
        g_return_if_fail (private != NULL);
diff --git a/src/tracker-store/tracker-writeback.c b/src/tracker-store/tracker-writeback.c
index 32517d553..5eb81c861 100644
--- a/src/tracker-store/tracker-writeback.c
+++ b/src/tracker-store/tracker-writeback.c
@@ -151,7 +151,7 @@ tracker_writeback_init (TrackerDataManager                *data_manager,
 {
        TrackerOntologies *ontologies;
        GStrv predicates_to_signal;
-       gint i, count;
+       gint  i, count;
 
        g_return_if_fail (private == NULL);
 
diff --git a/src/tracker/tracker-config.c b/src/tracker/tracker-config.c
index 59d756132..c79428977 100644
--- a/src/tracker/tracker-config.c
+++ b/src/tracker/tracker-config.c
@@ -46,7 +46,7 @@ tracker_gsettings_get_all (gint *longest_name_length)
        GSList *valid_schemas = NULL;
        gchar **schemas;
        gint i, len = 0;
-       SchemaWithPath components[] = {
+       SchemaWithPath  components[] = {
                { "Store", "store" },
                { "Extract", "extract" },
                { "Writeback", "writeback" },
@@ -176,7 +176,7 @@ gboolean
 tracker_gsettings_set_all (GSList           *all,
                            TrackerVerbosity  verbosity)
 {
-       GSList *l;
+       GSList  *l;
        gboolean success = TRUE;
 
        for (l = all; l && success; l = l->next) {
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index 899541717..79c10713f 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -53,7 +53,7 @@ static gboolean parse_watch (const gchar  *option_name,
 
 static GDBusConnection *connection = NULL;
 static GDBusProxy *proxy = NULL;
-static GMainLoop *main_loop;
+static GMainLoop  *main_loop;
 static GHashTable *miners_progress;
 static GHashTable *miners_status;
 static gint longest_miner_name_length = 0;
@@ -215,7 +215,7 @@ signal_handler (gpointer user_data)
                in_loop = TRUE;
                g_main_loop_quit (main_loop);
 
-               /* Fall through */
+       /* Fall through */
        default:
                if (g_strsignal (signo)) {
                        g_print ("\n");
@@ -279,7 +279,7 @@ miner_print_state (TrackerMinerManager *manager,
 {
        const gchar *name;
        time_t now;
-       gchar time_str[64];
+       gchar  time_str[64];
        size_t len;
        struct tm *local_time;
 
@@ -427,7 +427,7 @@ store_get_and_print_state (void)
        const gchar *status = NULL;
        gdouble progress = -1.0;
        GError *error = NULL;
-       gchar *owner;
+       gchar  *owner;
 
        owner = g_dbus_proxy_get_name_owner (proxy);
        if (!owner) {
@@ -576,7 +576,7 @@ get_prefixes (TrackerSparqlConnection *connection)
 {
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
-       GHashTable *retval;
+       GHashTable  *retval;
        const gchar *query;
 
        retval = g_hash_table_new_full (g_str_hash,
@@ -599,8 +599,8 @@ get_prefixes (TrackerSparqlConnection *connection)
 
        if (error) {
                g_printerr ("%s, %s\n",
-                           _("Unable to retrieve namespace prefixes"),
-                           error->message);
+                           _("Unable to retrieve namespace prefixes"),
+                           error->message);
 
                g_error_free (error);
                return retval;
@@ -671,8 +671,8 @@ store_graph_update_interpret (WatchData  *wd,
                               gint        predicate)
 {
        TrackerSparqlCursor *cursor;
-       GError *error = NULL;
-       gchar *query, *key;
+       GError  *error = NULL;
+       gchar   *query, *key;
        gboolean ok = TRUE;
 
        query = g_strdup_printf ("SELECT tracker:uri (%d) tracker:uri(%d) {}",
@@ -776,7 +776,7 @@ store_graph_update_cb (GDBusConnection *connection,
                        gpointer         user_data)
 
 {
-       WatchData *wd;
+       WatchData  *wd;
        GHashTable *updates;
        GVariantIter *iter1, *iter2;
        gchar *class_name;
@@ -870,7 +870,7 @@ miner_pause (const gchar *miner,
 {
        TrackerMinerManager *manager;
        GError *error = NULL;
-       gchar *str;
+       gchar  *str;
        guint32 cookie;
 
        /* Don't auto-start the miners here */
@@ -929,7 +929,7 @@ miner_resume (const gchar *miner,
 {
        TrackerMinerManager *manager;
        GError *error = NULL;
-       gchar *str;
+       gchar  *str;
 
        /* Don't auto-start the miners here */
        manager = tracker_miner_manager_new_full (FALSE, &error);
@@ -978,7 +978,7 @@ miner_list (gboolean available,
 
        if (available) {
                GSList *miners_available;
-               gchar *str;
+               gchar  *str;
                GSList *l;
 
                miners_available = tracker_miner_manager_get_available (manager);
@@ -1001,7 +1001,7 @@ miner_list (gboolean available,
 
        if (running) {
                GSList *miners_running;
-               gchar *str;
+               gchar  *str;
                GSList *l;
 
                miners_running = tracker_miner_manager_get_running (manager);
@@ -1060,7 +1060,7 @@ miner_pause_details (void)
        for (l = miners_running; l; l = l->next) {
                const gchar *name;
                GStrv pause_applications, pause_reasons;
-               gint i;
+               gint  i;
 
                name = tracker_miner_manager_get_display_name (manager, l->data);
 
@@ -1132,19 +1132,19 @@ miner_pause_details (void)
 inline static const gchar *
 verbosity_to_string (TrackerVerbosity verbosity)
 {
-        GType type;
-        GEnumClass *enum_class;
-        GEnumValue *enum_value;
+       GType type;
+       GEnumClass *enum_class;
+       GEnumValue *enum_value;
 
-        type = tracker_verbosity_get_type ();
-        enum_class = G_ENUM_CLASS (g_type_class_peek (type));
-        enum_value = g_enum_get_value (enum_class, verbosity);
+       type = tracker_verbosity_get_type ();
+       enum_class = G_ENUM_CLASS (g_type_class_peek (type));
+       enum_value = g_enum_get_value (enum_class, verbosity);
 
-        if (!enum_value) {
-                return "unknown";
-        }
+       if (!enum_value) {
+               return "unknown";
+       }
 
-        return enum_value->value_nick;
+       return enum_value->value_nick;
 }
 
 inline static void
@@ -1359,7 +1359,7 @@ daemon_run (void)
 
                        if (is_running) {
                                GStrv pause_applications, pause_reasons;
-                               gchar *status = NULL;
+                               gchar  *status = NULL;
                                gdouble progress;
                                gint remaining_time;
                                gboolean is_paused;
@@ -1488,7 +1488,7 @@ daemon_run (void)
        }
 
        /* Processes */
-       GError *error = NULL;
+       GError  *error = NULL;
        gpointer verbosity_type_enum_class_pointer = NULL;
        TrackerVerbosity set_log_verbosity_value = TRACKER_VERBOSITY_ERRORS;
 
@@ -1540,7 +1540,7 @@ daemon_run (void)
 
        if (list_processes) {
                GSList *pids, *l;
-               gchar *str;
+               gchar  *str;
 
                pids = tracker_process_find_all ();
 
@@ -1602,7 +1602,7 @@ daemon_run (void)
 
        if (set_log_verbosity) {
                GSList *all;
-               gchar *str;
+               gchar  *str;
                gint longest = 0;
 
                all = tracker_gsettings_get_all (&longest);
diff --git a/src/tracker/tracker-extract.c b/src/tracker/tracker-extract.c
index 7a2a002e4..913949841 100644
--- a/src/tracker/tracker-extract.c
+++ b/src/tracker/tracker-extract.c
@@ -30,11 +30,11 @@
 #include "tracker-config.h"
 #include "tracker-extract.h"
 
-static gchar *verbosity;
-static gchar *output_format = "turtle";
+static gchar  *verbosity;
+static gchar  *output_format = "turtle";
 static gchar **filenames;
 
-#define EXTRACT_OPTIONS_ENABLED()        \
+#define EXTRACT_OPTIONS_ENABLED()         \
        ((filenames && g_strv_length (filenames) > 0))
 
 static GOptionEntry entries[] = {
@@ -56,7 +56,7 @@ extract_files (TrackerVerbosity  verbosity,
                char             *output_format)
 {
        char **p;
-       char *tracker_extract_path;
+       char  *tracker_extract_path;
        char verbosity_str[2];
        GError *error = NULL;
 
@@ -66,9 +66,9 @@ extract_files (TrackerVerbosity  verbosity,
 
        for (p = filenames; *p; p++) {
                char *argv[] = {tracker_extract_path,
-                               "--output-format", output_format,
-                               "--verbosity", verbosity_str,
-                               "--file", *p, NULL };
+                               "--output-format", output_format,
+                               "--verbosity", verbosity_str,
+                               "--file", *p, NULL };
 
                g_spawn_sync(NULL, argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, NULL, NULL, NULL, &error);
 
diff --git a/src/tracker/tracker-help.c b/src/tracker/tracker-help.c
index fef95e16e..aa95e95d8 100644
--- a/src/tracker/tracker-help.c
+++ b/src/tracker/tracker-help.c
@@ -40,7 +40,7 @@ setup_man_path (void)
        g_string_append_c (new_path, ':');
 
        if (old_path) {
-               g_string_append (new_path, old_path); 
+               g_string_append (new_path, old_path);
        }
 
        g_setenv ("MANPATH", new_path->str, TRUE);
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index a759c40c3..88919f507 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -36,14 +36,14 @@
 #include "tracker-index.h"
 #include "tracker-dbus.h"
 
-static gchar **reindex_mime_types;
+static gchar  **reindex_mime_types;
 static gboolean index_file;
 static gboolean backup;
 static gboolean restore;
 static gboolean import;
-static gchar **filenames;
+static gchar  **filenames;
 
-#define INDEX_OPTIONS_ENABLED()          \
+#define INDEX_OPTIONS_ENABLED()   \
        ((filenames && g_strv_length (filenames) > 0) || \
         (index_file || \
          backup || \
@@ -200,7 +200,7 @@ import_turtle_files (void)
 
        for (p = filenames; *p; p++) {
                GError *error = NULL;
-               GFile *file;
+               GFile  *file;
 
                g_print ("%s:'%s'\n",
                         _("Importing Turtle file"),
diff --git a/src/tracker/tracker-info.c b/src/tracker/tracker-info.c
index 897f8294d..c02d160a3 100644
--- a/src/tracker/tracker-info.c
+++ b/src/tracker/tracker-info.c
@@ -38,7 +38,7 @@
 #define INFO_OPTIONS_ENABLED() \
        (filenames && g_strv_length (filenames) > 0);
 
-static gchar **filenames;
+static gchar  **filenames;
 static gboolean full_namespaces;
 static gboolean plain_text_content;
 static gboolean resource_is_iri;
@@ -273,9 +273,9 @@ info_run (void)
        for (p = filenames; *p; p++) {
                TrackerSparqlCursor *cursor = NULL;
                GError *error = NULL;
-               gchar *uri = NULL;
-               gchar *query;
-               gchar *urn = NULL;
+               gchar  *uri = NULL;
+               gchar  *query;
+               gchar  *urn = NULL;
 
                if (!turtle && !resource_is_iri) {
                        g_print ("%s: '%s'\n", _("Querying information for entity"), *p);
diff --git a/src/tracker/tracker-main.c b/src/tracker/tracker-main.c
index 09dc12fa4..a213dc3a0 100644
--- a/src/tracker/tracker-main.c
+++ b/src/tracker/tracker-main.c
@@ -43,7 +43,7 @@
 const char usage_string[] =
        "tracker [--version] [--help]\n"
        "               <command> [<args>]";
- 
+
 const char usage_more_info_string[] =
        N_("See “tracker help <command>” to read about a specific subcommand.");
 
@@ -83,8 +83,8 @@ tracker_version (int argc, const char **argv)
  * require working tree to be present -- anything uses this needs
  * RUN_SETUP for reading from the configuration file.
  */
-#define NEED_NOTHING           (1<<0)
-#define NEED_WORK_TREE         (1<<1)
+#define NEED_NOTHING            (1<<0)
+#define NEED_WORK_TREE          (1<<1)
 
 struct cmd_struct {
        const char *cmd;
@@ -97,7 +97,7 @@ static struct cmd_struct commands[] = {
        { "daemon", tracker_daemon, NEED_WORK_TREE, N_("Start, stop, pause and list processes responsible for 
indexing content") },
        { "extract", tracker_extract, NEED_WORK_TREE, N_("Extract information from a file") },
        { "help", tracker_help, NEED_NOTHING, N_("Get help on how to use Tracker and any of these commands") 
},
-       { "info", tracker_info, NEED_WORK_TREE, N_("Show information known about local files or items 
indexed") }, 
+       { "info", tracker_info, NEED_WORK_TREE, N_("Show information known about local files or items 
indexed") },
        { "index", tracker_index, NEED_NOTHING, N_("Backup, restore, import and (re)index by MIME type or 
file name") },
        { "reset", tracker_reset, NEED_NOTHING,  N_("Reset or remove index and revert configurations to 
defaults") },
        { "search", tracker_search, NEED_WORK_TREE, N_("Search for content indexed or show content by type") 
},
diff --git a/src/tracker/tracker-process.c b/src/tracker/tracker-process.c
index ee02b02d1..4667c7376 100644
--- a/src/tracker/tracker-process.c
+++ b/src/tracker/tracker-process.c
@@ -109,8 +109,8 @@ tracker_process_get_uid_for_pid (const gchar  *pid_as_string,
        GFile *f;
        GFileInfo *info;
        GError *error = NULL;
-       gchar *fn;
-       gchar *proc_dir_name;
+       gchar  *fn;
+       gchar  *proc_dir_name;
        guint uid;
 
        proc_dir_name = g_build_filename ("/proc", pid_as_string, NULL);
@@ -158,7 +158,7 @@ tracker_process_find_all (void)
        GSList *found_pids = NULL;
        guint32 own_pid;
        guint32 own_uid;
-       gchar *own_pid_str;
+       gchar  *own_pid_str;
 
        /* Unless we are stopping processes or listing processes,
         * don't iterate them.
@@ -173,11 +173,11 @@ tracker_process_find_all (void)
 
        for (l = pids; l; l = l->next) {
                GError *error = NULL;
-               gchar *filename;
+               gchar  *filename;
 #ifdef __sun /* Solaris */
                psinfo_t psinfo = { 0 };
 #endif
-               gchar *contents = NULL;
+               gchar  *contents = NULL;
                gchar **strv;
                guint uid;
                pid_t pid;
@@ -244,9 +244,9 @@ tracker_process_find_all (void)
 #else /* ! __OpenBSD__ */
        GSList *found_pids = NULL;
        gchar **strv;
-       gchar *basename;
+       gchar  *basename;
        pid_t pid;
-       gint i, nproc;
+       gint  i, nproc;
        gchar buf[_POSIX2_LINE_MAX];
        struct kinfo_proc *plist, *kp;
        kvm_t *kd;
@@ -292,7 +292,7 @@ tracker_process_stop (TrackerProcessTypes daemons_to_term,
                       TrackerProcessTypes daemons_to_kill)
 {
        GSList *pids, *l;
-       gchar *str;
+       gchar  *str;
 
        if (daemons_to_kill == TRACKER_PROCESS_TYPE_NONE &&
            daemons_to_term == TRACKER_PROCESS_TYPE_NONE) {
@@ -317,7 +317,7 @@ tracker_process_stop (TrackerProcessTypes daemons_to_term,
                pd = l->data;
                basename = pd->cmd;
                pid = pd->pid;
-               
+
                if (daemons_to_term != TRACKER_PROCESS_TYPE_NONE) {
                        if ((daemons_to_term == TRACKER_PROCESS_TYPE_STORE &&
                             !g_str_has_suffix (basename, "tracker-store")) ||
@@ -328,7 +328,7 @@ tracker_process_stop (TrackerProcessTypes daemons_to_term,
 
                        if (kill (pid, SIGTERM) == -1) {
                                const gchar *errstr = g_strerror (errno);
-                                               
+
                                str = g_strdup_printf (_("Could not terminate process %d — “%s”"), pid, 
basename);
                                g_printerr ("  %s: %s\n",
                                            str,
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 576e73880..7bcbbf04e 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -96,7 +96,7 @@ delete_info_recursively (GFile *file)
        TrackerSparqlConnection *connection;
        TrackerMinerManager *miner_manager;
        TrackerSparqlCursor *cursor;
-       gchar *query, *uri;
+       gchar  *query, *uri;
        GError *error = NULL;
 
        connection = tracker_sparql_connection_get (NULL, &error);
@@ -218,7 +218,7 @@ reset_run (void)
        }
 
        if (hard_reset || soft_reset) {
-               guint log_handler_id;
+               guint  log_handler_id;
                GFile *cache_location, *data_location;
                gchar *dir;
                TrackerDBManager *db_manager;
@@ -226,7 +226,7 @@ reset_run (void)
                gchar *rotate_to;
                TrackerDBConfig *db_config;
                gsize chunk_size;
-               gint chunk_size_mb;
+               gint  chunk_size_mb;
                TrackerDBJournal *journal_writer;
 #endif /* DISABLE_JOURNAL */
 
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 0257a2370..b301569be 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -37,7 +37,7 @@
 
 static gint limit = -1;
 static gint offset;
-static gchar **terms;
+static gchar  **terms;
 static gboolean or_operator;
 static gboolean detailed;
 static gboolean all;
@@ -278,16 +278,16 @@ get_contacts_results (TrackerSparqlConnection *connection,
                while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
                        if (details) {
                                g_print ("  '%s%s%s', %s (%s)\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL),
-                                        disable_color ? "" : TITLE_END,
+                                        disable_color ? "" : TITLE_END,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
                                         tracker_sparql_cursor_get_string (cursor, 2, NULL));
                        } else {
                                g_print ("  '%s%s%s', %s\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL),
-                                        disable_color ? "" : TITLE_END,
+                                        disable_color ? "" : TITLE_END,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL));
                        }
 
@@ -330,8 +330,8 @@ get_contacts (TrackerSparqlConnection *connection,
                                         "ORDER BY ASC(nco:fullname(?contact)) 
ASC(nco:hasEmailAddress(?contact)) "
                                         "OFFSET %d "
                                         "LIMIT %d",
-                                         _("No name"),
-                                         _("No E-mail address"),
+                                        _("No name"),
+                                        _("No E-mail address"),
                                         fts,
                                         search_offset,
                                         search_limit);
@@ -343,8 +343,8 @@ get_contacts (TrackerSparqlConnection *connection,
                                         "ORDER BY ASC(nco:fullname(?contact)) 
ASC(nco:hasEmailAddress(?contact)) "
                                         "OFFSET %d "
                                         "LIMIT %d",
-                                         _("No name"),
-                                         _("No E-mail address"),
+                                        _("No name"),
+                                        _("No E-mail address"),
                                         search_offset,
                                         search_limit);
        }
@@ -489,16 +489,16 @@ get_files_results (TrackerSparqlConnection *connection,
                while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
                        if (details) {
                                g_print ("  %s%s%s (%s)\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
-                                        disable_color ? "" : TITLE_END,
+                                        disable_color ? "" : TITLE_END,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL));
 
                                if (tracker_sparql_cursor_get_n_columns (cursor) > 2)
                                        print_snippet (tracker_sparql_cursor_get_string (cursor, 2, NULL));
                        } else {
                                g_print ("  %s%s%s\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
                                         disable_color ? "" : TITLE_END);
 
@@ -803,13 +803,13 @@ get_music_artists (TrackerSparqlConnection *connection,
                while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
                        if (details) {
                                g_print ("  '%s%s%s' (%s)\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
-                                        disable_color ? "" : TITLE_END,
+                                        disable_color ? "" : TITLE_END,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL));
                        } else {
                                g_print ("  '%s%s%s'\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
                                         disable_color ? "" : TITLE_END);
                        }
@@ -892,13 +892,13 @@ get_music_albums (TrackerSparqlConnection *connection,
                while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
                        if (details) {
                                g_print ("  '%s%s%s' (%s)\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
-                                        disable_color ? "" : TITLE_END,
+                                        disable_color ? "" : TITLE_END,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL));
                        } else {
                                g_print ("  '%s%s%s'\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 1, NULL),
                                         disable_color ? "" : TITLE_END);
                        }
@@ -1467,7 +1467,7 @@ get_all_by_search (TrackerSparqlConnection *connection,
                                print_snippet (tracker_sparql_cursor_get_string (cursor, 3, NULL));
                        } else {
                                g_print ("  %s%s%s\n",
-                                        disable_color ? "" : TITLE_BEGIN,
+                                        disable_color ? "" : TITLE_BEGIN,
                                         tracker_sparql_cursor_get_string (cursor, 0, NULL),
                                         disable_color ? "" : TITLE_END);
                                print_snippet (tracker_sparql_cursor_get_string (cursor, 1, NULL));
@@ -1503,7 +1503,7 @@ search_run (void)
        if (terms) {
                TrackerLanguage *language;
                gboolean stop_words_found;
-               gchar **p;
+               gchar  **p;
 
                /* Check terms don't have additional quotes */
                for (p = terms; *p; p++) {
diff --git a/src/tracker/tracker-sparql.c b/src/tracker/tracker-sparql.c
index c0532365e..fe517ee4a 100644
--- a/src/tracker/tracker-sparql.c
+++ b/src/tracker/tracker-sparql.c
@@ -52,9 +52,9 @@ typedef struct _NodeFindData NodeFindData;
 typedef struct _NodePrintData NodePrintData;
 
 struct _NodeData {
-       gchar *class;
+       gchar  *class;
        GSList *properties;
-       guint parent_known:1;
+       guint parent_known : 1;
 };
 
 struct _NodeFindData {
@@ -64,7 +64,7 @@ struct _NodeFindData {
 };
 
 struct _NodePrintData {
-       GHashTable *prefixes;
+       GHashTable  *prefixes;
        GHashTable  *filter_parents;
        const gchar *highlight_text;
 };
@@ -149,7 +149,7 @@ tracker_sparql_get_prefixes (void)
        TrackerSparqlConnection *connection;
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
-       GHashTable *retval;
+       GHashTable  *retval;
        const gchar *query;
 
        connection = tracker_sparql_connection_get (NULL, &error);
@@ -184,8 +184,8 @@ tracker_sparql_get_prefixes (void)
 
        if (error) {
                g_printerr ("%s, %s\n",
-                           _("Unable to retrieve namespace prefixes"),
-                           error->message);
+                           _("Unable to retrieve namespace prefixes"),
+                           error->message);
 
                g_error_free (error);
                return retval;
@@ -228,10 +228,10 @@ get_class_from_prefix (TrackerSparqlConnection *connection,
        gchar *found = NULL;
 
        query = "SELECT ?prefix ?ns "
-               "WHERE {"
-               "  ?ns a tracker:Namespace ;"
-               "  tracker:prefix ?prefix "
-               "}";
+               "WHERE {"
+               "  ?ns a tracker:Namespace ;"
+               "  tracker:prefix ?prefix "
+               "}";
 
        /* We have namespace prefix, get full name */
        cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
@@ -395,7 +395,7 @@ get_shorthand_str_for_offsets (GHashTable  *prefixes,
                                const gchar *str)
 {
        GString *result = NULL;
-       gchar **properties;
+       gchar  **properties;
        gint i;
 
        if (!str) {
@@ -925,9 +925,9 @@ tree_get (TrackerSparqlConnection *connection,
        GHashTable *prefixes;
        GHashTable *filter_parents;
        GError *error = NULL;
-       gchar *query;
-       gchar *class_lookup_longhand;
-       GNode *root, *found_node, *node;
+       gchar  *query;
+       gchar  *class_lookup_longhand;
+       GNode  *root, *found_node, *node;
 
        root = tree_new ();
 
@@ -1337,7 +1337,7 @@ sparql_run (void)
 
        if (file) {
                gchar *path_in_utf8;
-               gsize size;
+               gsize  size;
 
                path_in_utf8 = g_filename_to_utf8 (file, -1, NULL, NULL, &error);
                if (error) {
@@ -1384,7 +1384,7 @@ sparql_run (void)
 
 #if 0
                        if (results) {
-                               GPtrArray *insert;
+                               GPtrArray  *insert;
                                GHashTable *solution;
                                GHashTableIter iter;
                                gpointer key, value;
diff --git a/src/tracker/tracker-sql.c b/src/tracker/tracker-sql.c
index 9415af83b..4d47c7e42 100644
--- a/src/tracker/tracker-sql.c
+++ b/src/tracker/tracker-sql.c
@@ -31,7 +31,7 @@
 
 #include "tracker-sql.h"
 
-#define SQL_OPTIONS_ENABLED()    \
+#define SQL_OPTIONS_ENABLED()     \
        (file || \
         query)
 
@@ -54,7 +54,7 @@ static int
 sql_by_file (void)
 {
        GError *error = NULL;
-       gchar *path_in_utf8;
+       gchar  *path_in_utf8;
        gsize size;
 
        path_in_utf8 = g_filename_to_utf8 (file, -1, NULL, NULL, &error);
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index c7ba20bac..6ecc268e7 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -36,13 +36,13 @@
 #include "tracker-status.h"
 #include "tracker-config.h"
 
-#define STATUS_OPTIONS_ENABLED()         \
+#define STATUS_OPTIONS_ENABLED()          \
        (show_stat || \
         collect_debug_info)
 
 static gboolean show_stat;
 static gboolean collect_debug_info;
-static gchar **terms;
+static gchar  **terms;
 
 static GOptionEntry entries[] = {
        { "stat", 'a', 0, G_OPTION_ARG_NONE, &show_stat,
@@ -158,7 +158,7 @@ collect_debug (void)
         * 5. Statistics about data (tracker-stats)
         */
 
-       GDir *d;
+       GDir  *d;
        gchar *data_dir;
        gchar *str;
 
@@ -191,7 +191,7 @@ collect_debug (void)
 
        for (d = g_dir_open (data_dir, 0, NULL); d != NULL;) {
                const gchar *f;
-               gchar *path;
+               gchar  *path;
                goffset size;
 
                f = g_dir_read_name (d);
@@ -447,9 +447,9 @@ static gboolean
 are_miners_finished (gint *max_remaining_time)
 {
        TrackerMinerManager *manager;
-       GError *error = NULL;
-       GSList *miners_running;
-       GSList *l;
+       GError  *error = NULL;
+       GSList  *miners_running;
+       GSList  *l;
        gboolean finished = TRUE;
        gint _max_remaining_time = 0;
 
@@ -466,7 +466,7 @@ are_miners_finished (gint *max_remaining_time)
        miners_running = tracker_miner_manager_get_running (manager);
 
        for (l = miners_running; l; l = l->next) {
-               gchar *status;
+               gchar  *status;
                gdouble progress;
                gint remaining_time;
 
@@ -499,8 +499,8 @@ are_miners_finished (gint *max_remaining_time)
 static int
 get_no_args (void)
 {
-       gchar *str;
-       gchar *data_dir;
+       gchar  *str;
+       gchar  *data_dir;
        guint64 remaining_bytes;
        gdouble remaining;
        gint remaining_time;
diff --git a/src/tracker/tracker-tag.c b/src/tracker/tracker-tag.c
index 2a6fe9ddf..d31da5c30 100644
--- a/src/tracker/tracker-tag.c
+++ b/src/tracker/tracker-tag.c
@@ -40,13 +40,13 @@
 
 static gint limit = 512;
 static gint offset;
-static gchar **resources;
+static gchar  **resources;
 static gboolean and_operator;
 static gchar *add_tag;
 static gchar *remove_tag;
 static gchar *description;
 static gboolean *list;
-static gboolean show_resources;
+static gboolean  show_resources;
 
 static GOptionEntry entries[] = {
        { "list", 't', 0, G_OPTION_ARG_NONE, &list,
@@ -186,7 +186,7 @@ static GStrv
 get_uris (GStrv resources)
 {
        GStrv uris;
-       gint len, i;
+       gint  len, i;
 
        if (!resources) {
                return NULL;
@@ -213,11 +213,11 @@ get_uris (GStrv resources)
 
 static TrackerSparqlCursor *
 get_file_urns (TrackerSparqlConnection *connection,
-              GStrv                    uris,
-              const gchar             *tag)
+               GStrv                    uris,
+               const gchar             *tag)
 {
        TrackerSparqlCursor *cursor;
-       gchar *query, *filter;
+       gchar  *query, *filter;
        GError *error = NULL;
 
        filter = get_filter_string (uris, "?f", FALSE, tag);
@@ -252,7 +252,7 @@ result_to_strv (TrackerSparqlCursor *cursor,
                 gint                 n_col)
 {
        GStrv strv;
-       gint count, i;
+       gint  count, i;
 
        if (!cursor) {
                return NULL;
@@ -288,7 +288,7 @@ get_all_tags_show_tag_id (TrackerSparqlConnection *connection,
 {
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
-       gchar *query;
+       gchar  *query;
 
        /* Get resources associated */
        query = g_strdup_printf ("SELECT ?uri WHERE {"
@@ -469,8 +469,8 @@ get_all_tags (TrackerSparqlConnection *connection,
 {
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
-       gchar *query;
-       gchar *filter = NULL;
+       gchar  *query;
+       gchar  *filter = NULL;
 
        if (resources && g_strv_length (resources) > 0) {
                filter = get_filter_in_for_strv (resources, "?label");
@@ -661,36 +661,36 @@ add_tag_for_urns (TrackerSparqlConnection *connection,
                description_escaped = get_escaped_sparql_string (description);
 
                query = g_strdup_printf ("INSERT { "
-                                        "  _:tag a nao:Tag;"
-                                        "  nao:prefLabel %s ;"
-                                        "  nao:description %s ."
-                                        "} "
-                                        "WHERE {"
-                                        "  OPTIONAL {"
-                                        "     ?tag a nao:Tag ;"
-                                        "     nao:prefLabel %s ."
-                                        "  } ."
-                                        "  FILTER (!bound(?tag)) "
-                                        "}",
-                                        tag_escaped,
-                                        description_escaped,
-                                        tag_escaped);
+                                        "  _:tag a nao:Tag;"
+                                        "  nao:prefLabel %s ;"
+                                        "  nao:description %s ."
+                                        "} "
+                                        "WHERE {"
+                                        "  OPTIONAL {"
+                                        "     ?tag a nao:Tag ;"
+                                        "     nao:prefLabel %s ."
+                                        "  } ."
+                                        "  FILTER (!bound(?tag)) "
+                                        "}",
+                                        tag_escaped,
+                                        description_escaped,
+                                        tag_escaped);
 
                g_free (description_escaped);
        } else {
                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);
        }
 
        tracker_sparql_connection_update (connection, query, 0, NULL, &error);
@@ -774,8 +774,8 @@ remove_tag_for_urns (TrackerSparqlConnection *connection,
 {
        TrackerSparqlCursor *urns_cursor = NULL;
        GError *error = NULL;
-       gchar *tag_escaped;
-       gchar *query;
+       gchar  *tag_escaped;
+       gchar  *query;
        GStrv uris;
 
        tag_escaped = get_escaped_sparql_string (tag);
@@ -901,7 +901,7 @@ get_tags_by_file (TrackerSparqlConnection *connection,
 {
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
-       gchar *query;
+       gchar  *query;
 
        query = g_strdup_printf ("SELECT ?tags ?labels "
                                 "WHERE {"
@@ -1004,12 +1004,12 @@ tag_run (void)
 
        if (resources) {
                gboolean success = TRUE;
-               gchar **p;
+               gchar  **p;
 
                for (p = resources; *p; p++) {
                        GFile *file;
                        gchar *uri;
-                       
+
                        file = g_file_new_for_commandline_arg (*p);
                        uri = g_file_get_uri (file);
                        g_object_unref (file);


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