[nautilus/wip/oholy/ci-style-check: 4/5] general: Run uncrustify script



commit f5e1d3534d4a30ca7fc050f422d2e018caf86600
Author: Ondrej Holy <oholy redhat com>
Date:   Tue Feb 4 08:44:40 2020 +0100

    general: Run uncrustify script
    
    There are some style issue since the last run. Let's run it again
    before enabling style-check CI job.

 eel/eel-graphic-effects.c                          |    6 +-
 eel/eel-string.c                                   |   50 +-
 .../bacon-video-widget-properties.c                |  421 ++++----
 .../audio-video-properties/test-properties-page.c  |   63 +-
 .../audio-video-properties/totem-gst-helpers.c     |   44 +-
 .../audio-video-properties/totem-properties-main.c |  166 +--
 .../audio-video-properties/totem-properties-view.c |  613 ++++++-----
 .../nautilus-image-properties-page-provider.c      |    2 +-
 libnautilus-extension/nautilus-file-info.c         |    3 +-
 src/animation/egg-animation.c                      | 1123 ++++++++++----------
 src/animation/egg-frame-source.c                   |  136 +--
 src/animation/ide-box-theatric.c                   |  581 +++++-----
 src/animation/ide-cairo.c                          |   92 +-
 src/nautilus-bookmark-list.c                       |    8 +-
 src/nautilus-canvas-container.c                    |    6 +-
 src/nautilus-canvas-item.c                         |    6 +-
 src/nautilus-clipboard.c                           |    1 -
 src/nautilus-dbus-manager.c                        |    4 +-
 src/nautilus-debug.c                               |    1 -
 src/nautilus-directory-async.c                     |    3 +-
 src/nautilus-file-name-widget-controller.c         |    4 +-
 src/nautilus-file-operations.c                     |   48 +-
 src/nautilus-file-undo-manager.c                   |    2 +-
 src/nautilus-file-undo-operations.c                |   10 +-
 src/nautilus-file-utilities.c                      |    6 +-
 src/nautilus-file.c                                |   11 +-
 src/nautilus-files-view.c                          |   57 +-
 src/nautilus-list-view.c                           |    4 +-
 src/nautilus-operations-ui-manager.c               |    1 -
 src/nautilus-previewer.c                           |    6 +-
 src/nautilus-program-choosing.c                    |   10 +-
 src/nautilus-properties-window.c                   |   58 +-
 src/nautilus-search-engine-recent.c                |   18 +-
 src/nautilus-search-engine-simple.c                |   36 +-
 src/nautilus-search-engine-tracker.c               |    2 +-
 src/nautilus-search-engine.c                       |   10 +-
 src/nautilus-shell-search-provider.c               |    2 +-
 src/nautilus-thumbnails.c                          |   14 +-
 src/nautilus-toolbar.c                             |   31 +-
 src/nautilus-trash-bar.c                           |    2 +-
 src/nautilus-trash-monitor.c                       |    4 +-
 src/nautilus-ui-utilities.c                        |    8 +-
 src/nautilus-view-icon-controller.c                |    6 +-
 src/nautilus-window-slot.c                         |   17 +-
 src/nautilus-window.c                              |   18 +-
 .../displayless/test-file-operations-copy-files.c  |    7 +-
 .../test-file-operations-dir-has-files.c           |    5 +-
 .../displayless/test-file-operations-move-files.c  |   15 +-
 .../test-file-operations-trash-or-delete.c         |   60 +-
 test/automated/displayless/test-file-utilities.c   |    7 +-
 .../test-nautilus-search-engine-model.c            |    2 +-
 .../test-nautilus-search-engine-simple.c           |    2 +-
 .../test-nautilus-search-engine-tracker.c          |    2 +-
 .../displayless/test-nautilus-search-engine.c      |    2 +-
 test/automated/displayless/test-utilities.c        |   19 +-
 55 files changed, 2005 insertions(+), 1830 deletions(-)
---
diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c
index 1a57bc768..6f24e17a1 100644
--- a/eel/eel-graphic-effects.c
+++ b/eel/eel-graphic-effects.c
@@ -149,11 +149,11 @@ eel_create_colorized_pixbuf (GdkPixbuf *src,
         pixsrc = original_pixels + i * src_row_stride;
         for (j = 0; j < width; j++)
         {
-            *pixdest = (*pixsrc++ * *pixdest) >> 8;
+            *pixdest = (*pixsrc++ **pixdest) >> 8;
             pixdest++;
-            *pixdest = (*pixsrc++ * *pixdest) >> 8;
+            *pixdest = (*pixsrc++ **pixdest) >> 8;
             pixdest++;
-            *pixdest = (*pixsrc++ * *pixdest) >> 8;
+            *pixdest = (*pixsrc++ **pixdest) >> 8;
             pixdest++;
             if (has_alpha)
             {
diff --git a/eel/eel-string.c b/eel/eel-string.c
index f6498fc9a..5d70089a8 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -110,14 +110,14 @@ eel_str_capitalize (const char *string)
 }
 
 /**
-* eel_str_middle_truncate:
-* @string: (not nullable): input string
-* truncate_length: length of the truncated string
-*
-* Returns: (transfer full): a newly-allocated copy of @string with its middle
-* truncated and replaced with ellipsis to fit into @truncate_length characters.
-* If length of @string is already small enough, returns a copy of @string.
-*/
+ * eel_str_middle_truncate:
+ * @string: (not nullable): input string
+ * truncate_length: length of the truncated string
+ *
+ * Returns: (transfer full): a newly-allocated copy of @string with its middle
+ * truncated and replaced with ellipsis to fit into @truncate_length characters.
+ * If length of @string is already small enough, returns a copy of @string.
+ */
 gchar *
 eel_str_middle_truncate (const gchar *string,
                          guint        truncate_length)
@@ -161,14 +161,14 @@ eel_str_middle_truncate (const gchar *string,
 }
 
 /**
-* eel_str_strip_substring_and_after:
-* @string: input string
-* @substring: (not nullable): substring to use in search
-*
-* Returns: (transfer full): a copy of @string with the first occurence of
-* @substring removed, along with any trailing characters.
-* If @string is %NULL, returns %NULL.
-*/
+ * eel_str_strip_substring_and_after:
+ * @string: input string
+ * @substring: (not nullable): substring to use in search
+ *
+ * Returns: (transfer full): a copy of @string with the first occurence of
+ * @substring removed, along with any trailing characters.
+ * If @string is %NULL, returns %NULL.
+ */
 char *
 eel_str_strip_substring_and_after (const char *string,
                                    const char *substring)
@@ -194,14 +194,14 @@ eel_str_strip_substring_and_after (const char *string,
 }
 
 /**
-* eel_str_replace_substring:
-* @string: input string
-* @substring: (not nullable): string to be replaced
-* @replacement: string used as replacement
-* 
-* Returns: (transfer full): a copy of @string with all occurences of @substring
-* replaced with @replacement.
-*/
+ * eel_str_replace_substring:
+ * @string: input string
+ * @substring: (not nullable): string to be replaced
+ * @replacement: string used as replacement
+ *
+ * Returns: (transfer full): a copy of @string with all occurences of @substring
+ * replaced with @replacement.
+ */
 char *
 eel_str_replace_substring (const char *string,
                            const char *substring,
@@ -320,7 +320,7 @@ get_common_prefix_length (char *str_a,
  * Returns: (transfer full): the common prefix for strings in @strs.
  * If no such prefix exists or if the common prefix is smaller than
  * @min_required_len, %NULL is returned.
-*/
+ */
 char *
 eel_str_get_common_prefix (GList *strs,
                            int    min_required_len)
diff --git a/extensions/audio-video-properties/bacon-video-widget-properties.c 
b/extensions/audio-video-properties/bacon-video-widget-properties.c
index b2b2aaf37..558fde383 100644
--- a/extensions/audio-video-properties/bacon-video-widget-properties.c
+++ b/extensions/audio-video-properties/bacon-video-widget-properties.c
@@ -1,23 +1,23 @@
 /* bacon-video-widget-properties.c
-
-   Copyright (C) 2002 Bastien Nocera
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301  USA.
-
-   Author: Bastien Nocera <hadess hadess net>
+ *
+ *  Copyright (C) 2002 Bastien Nocera
+ *
+ *  The Gnome Library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License as
+ *  published by the Free Software Foundation; either version 2 of the
+ *  License, or (at your option) any later version.
+ *
+ *  The Gnome Library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ *  write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301  USA.
+ *
+ *  Author: Bastien Nocera <hadess hadess net>
  */
 
 #include "config.h"
@@ -31,9 +31,10 @@
 
 static void bacon_video_widget_properties_dispose (GObject *object);
 
-struct BaconVideoWidgetPropertiesPrivate {
-       GtkBuilder *xml;
-       int time;
+struct BaconVideoWidgetPropertiesPrivate
+{
+    GtkBuilder *xml;
+    int time;
 };
 
 #define BACON_VIDEO_WIDGET_PROPERTIES_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), 
BACON_TYPE_VIDEO_WIDGET_PROPERTIES, BaconVideoWidgetPropertiesPrivate))
@@ -43,241 +44,259 @@ G_DEFINE_TYPE (BaconVideoWidgetProperties, bacon_video_widget_properties, GTK_TY
 static void
 bacon_video_widget_properties_class_init (BaconVideoWidgetPropertiesClass *klass)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (klass, sizeof (BaconVideoWidgetPropertiesPrivate));
+    g_type_class_add_private (klass, sizeof (BaconVideoWidgetPropertiesPrivate));
 
-       object_class->dispose = bacon_video_widget_properties_dispose;
+    object_class->dispose = bacon_video_widget_properties_dispose;
 }
 
 static void
 bacon_video_widget_properties_init (BaconVideoWidgetProperties *props)
 {
-       props->priv = G_TYPE_INSTANCE_GET_PRIVATE (props, BACON_TYPE_VIDEO_WIDGET_PROPERTIES, 
BaconVideoWidgetPropertiesPrivate);
+    props->priv = G_TYPE_INSTANCE_GET_PRIVATE (props, BACON_TYPE_VIDEO_WIDGET_PROPERTIES, 
BaconVideoWidgetPropertiesPrivate);
 
-       gtk_orientable_set_orientation (GTK_ORIENTABLE (props), GTK_ORIENTATION_VERTICAL);
+    gtk_orientable_set_orientation (GTK_ORIENTABLE (props), GTK_ORIENTATION_VERTICAL);
 }
 
 static void
 bacon_video_widget_properties_dispose (GObject *object)
 {
-       BaconVideoWidgetPropertiesPrivate *priv = BACON_VIDEO_WIDGET_PROPERTIES_GET_PRIVATE (object);
+    BaconVideoWidgetPropertiesPrivate *priv = BACON_VIDEO_WIDGET_PROPERTIES_GET_PRIVATE (object);
 
-       if (priv->xml != NULL)
-               g_object_unref (priv->xml);
-       priv->xml = NULL;
+    if (priv->xml != NULL)
+    {
+        g_object_unref (priv->xml);
+    }
+    priv->xml = NULL;
 
-       G_OBJECT_CLASS (bacon_video_widget_properties_parent_class)->dispose (object);
+    G_OBJECT_CLASS (bacon_video_widget_properties_parent_class)->dispose (object);
 }
 
 void
 bacon_video_widget_properties_set_label (BaconVideoWidgetProperties *props,
-                                        const char                 *name,
-                                        const char                 *text)
+                                         const char                 *name,
+                                         const char                 *text)
 {
-       GtkLabel *item;
+    GtkLabel *item;
 
-       g_return_if_fail (props != NULL);
-       g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
-       g_return_if_fail (name != NULL);
+    g_return_if_fail (props != NULL);
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
+    g_return_if_fail (name != NULL);
 
-       item = GTK_LABEL (gtk_builder_get_object (props->priv->xml, name));
-       g_return_if_fail (item != NULL);
-       gtk_label_set_text (item, text);
+    item = GTK_LABEL (gtk_builder_get_object (props->priv->xml, name));
+    g_return_if_fail (item != NULL);
+    gtk_label_set_text (item, text);
 }
 
 void
 bacon_video_widget_properties_reset (BaconVideoWidgetProperties *props)
 {
-       GtkWidget *item;
-
-       g_return_if_fail (props != NULL);
-       g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
-
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
-       gtk_widget_show (item);
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
-       gtk_widget_set_sensitive (item, FALSE);
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
-       gtk_widget_set_sensitive (item, FALSE);
-
-       /* Title */
-       bacon_video_widget_properties_set_label (props, "title", C_("Title", "Unknown"));
-       /* Artist */
-       bacon_video_widget_properties_set_label (props, "artist", C_("Artist", "Unknown"));
-       /* Album */
-       bacon_video_widget_properties_set_label (props, "album", C_("Album", "Unknown"));
-       /* Year */
-       bacon_video_widget_properties_set_label (props, "year", C_("Year", "Unknown"));
-       /* Duration */
-       bacon_video_widget_properties_set_duration (props, 0);
-       /* Comment */
-       bacon_video_widget_properties_set_label (props, "comment", "");
-       /* Container */
-       bacon_video_widget_properties_set_label (props, "container", C_("Media container", "Unknown"));
-
-       /* Dimensions */
-       bacon_video_widget_properties_set_label (props, "dimensions", C_("Dimensions", "N/A"));
-       /* Video Codec */
-       bacon_video_widget_properties_set_label (props, "vcodec", C_("Video codec", "N/A"));
-       /* Video Bitrate */
-       bacon_video_widget_properties_set_label (props, "video_bitrate",
-                       C_("Video bit rate", "N/A"));
-       /* Framerate */
-       bacon_video_widget_properties_set_label (props, "framerate",
-                       C_("Frame rate", "N/A"));
-
-       /* Audio Bitrate */
-       bacon_video_widget_properties_set_label (props, "audio_bitrate",
-                       C_("Audio bit rate", "N/A"));
-       /* Audio Codec */
-       bacon_video_widget_properties_set_label (props, "acodec", C_("Audio codec", "N/A"));
-       /* Sample rate */
-       bacon_video_widget_properties_set_label (props, "samplerate", _("0 Hz"));
-       /* Channels */
-       bacon_video_widget_properties_set_label (props, "channels", _("0 Channels"));
+    GtkWidget *item;
+
+    g_return_if_fail (props != NULL);
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
+
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
+    gtk_widget_show (item);
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
+    gtk_widget_set_sensitive (item, FALSE);
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
+    gtk_widget_set_sensitive (item, FALSE);
+
+    /* Title */
+    bacon_video_widget_properties_set_label (props, "title", C_("Title", "Unknown"));
+    /* Artist */
+    bacon_video_widget_properties_set_label (props, "artist", C_("Artist", "Unknown"));
+    /* Album */
+    bacon_video_widget_properties_set_label (props, "album", C_("Album", "Unknown"));
+    /* Year */
+    bacon_video_widget_properties_set_label (props, "year", C_("Year", "Unknown"));
+    /* Duration */
+    bacon_video_widget_properties_set_duration (props, 0);
+    /* Comment */
+    bacon_video_widget_properties_set_label (props, "comment", "");
+    /* Container */
+    bacon_video_widget_properties_set_label (props, "container", C_("Media container", "Unknown"));
+
+    /* Dimensions */
+    bacon_video_widget_properties_set_label (props, "dimensions", C_("Dimensions", "N/A"));
+    /* Video Codec */
+    bacon_video_widget_properties_set_label (props, "vcodec", C_("Video codec", "N/A"));
+    /* Video Bitrate */
+    bacon_video_widget_properties_set_label (props, "video_bitrate",
+                                             C_("Video bit rate", "N/A"));
+    /* Framerate */
+    bacon_video_widget_properties_set_label (props, "framerate",
+                                             C_("Frame rate", "N/A"));
+
+    /* Audio Bitrate */
+    bacon_video_widget_properties_set_label (props, "audio_bitrate",
+                                             C_("Audio bit rate", "N/A"));
+    /* Audio Codec */
+    bacon_video_widget_properties_set_label (props, "acodec", C_("Audio codec", "N/A"));
+    /* Sample rate */
+    bacon_video_widget_properties_set_label (props, "samplerate", _("0 Hz"));
+    /* Channels */
+    bacon_video_widget_properties_set_label (props, "channels", _("0 Channels"));
 }
 
 static char *
 time_to_string_text (gint64 msecs)
 {
-       char *secs, *mins, *hours, *string;
-       int sec, min, hour, _time;
-
-       _time = (int) (msecs / 1000);
-       sec = _time % 60;
-       _time = _time - sec;
-       min = (_time % (60*60)) / 60;
-       _time = _time - (min * 60);
-       hour = _time / (60*60);
-
-       hours = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d hour", "%d hours", hour), hour);
-
-       mins = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d minute",
-                                         "%d minutes", min), min);
-
-       secs = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d second",
-                                         "%d seconds", sec), sec);
-
-       if (hour > 0)
-       {
-               /* 5 hours 2 minutes 12 seconds */
-               string = g_strdup_printf (C_("time", "%s %s %s"), hours, mins, secs);
-       } else if (min > 0) {
-               /* 2 minutes 12 seconds */
-               string = g_strdup_printf (C_("time", "%s %s"), mins, secs);
-       } else if (sec > 0) {
-               /* 10 seconds */
-               string = g_strdup (secs);
-       } else {
-               /* 0 seconds */
-               string = g_strdup (_("0 seconds"));
-       }
-
-       g_free (hours);
-       g_free (mins);
-       g_free (secs);
-
-       return string;
+    char *secs, *mins, *hours, *string;
+    int sec, min, hour, _time;
+
+    _time = (int) (msecs / 1000);
+    sec = _time % 60;
+    _time = _time - sec;
+    min = (_time % (60 * 60)) / 60;
+    _time = _time - (min * 60);
+    hour = _time / (60 * 60);
+
+    hours = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d hour", "%d hours", hour), hour);
+
+    mins = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d minute",
+                                         "%d minutes", min), min);
+
+    secs = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d second",
+                                         "%d seconds", sec), sec);
+
+    if (hour > 0)
+    {
+        /* 5 hours 2 minutes 12 seconds */
+        string = g_strdup_printf (C_("time", "%s %s %s"), hours, mins, secs);
+    }
+    else if (min > 0)
+    {
+        /* 2 minutes 12 seconds */
+        string = g_strdup_printf (C_("time", "%s %s"), mins, secs);
+    }
+    else if (sec > 0)
+    {
+        /* 10 seconds */
+        string = g_strdup (secs);
+    }
+    else
+    {
+        /* 0 seconds */
+        string = g_strdup (_("0 seconds"));
+    }
+
+    g_free (hours);
+    g_free (mins);
+    g_free (secs);
+
+    return string;
 }
 
 void
 bacon_video_widget_properties_set_duration (BaconVideoWidgetProperties *props,
-                                           int _time)
+                                            int                         _time)
 {
-       char *string;
+    char *string;
 
-       g_return_if_fail (props != NULL);
-       g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
+    g_return_if_fail (props != NULL);
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
 
-       if (_time == props->priv->time)
-               return;
+    if (_time == props->priv->time)
+    {
+        return;
+    }
 
-       string = time_to_string_text (_time);
-       bacon_video_widget_properties_set_label (props, "duration", string);
-       g_free (string);
+    string = time_to_string_text (_time);
+    bacon_video_widget_properties_set_label (props, "duration", string);
+    g_free (string);
 
-       props->priv->time = _time;
+    props->priv->time = _time;
 }
 
 void
 bacon_video_widget_properties_set_has_type (BaconVideoWidgetProperties *props,
-                                           gboolean                    has_video,
-                                           gboolean                    has_audio)
+                                            gboolean                    has_video,
+                                            gboolean                    has_audio)
 {
-       GtkWidget *item;
+    GtkWidget *item;
 
-       g_return_if_fail (props != NULL);
-       g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
+    g_return_if_fail (props != NULL);
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
 
-       /* Video */
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
-       gtk_widget_set_sensitive (item, has_video);
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
-       gtk_widget_set_visible (item, has_video);
+    /* Video */
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
+    gtk_widget_set_sensitive (item, has_video);
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
+    gtk_widget_set_visible (item, has_video);
 
-       /* Audio */
-       item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
-       gtk_widget_set_sensitive (item, has_audio);
+    /* Audio */
+    item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
+    gtk_widget_set_sensitive (item, has_audio);
 }
 
 void
 bacon_video_widget_properties_set_framerate (BaconVideoWidgetProperties *props,
-                                            float                       framerate)
+                                             float                       framerate)
 {
-       gchar *temp;
-
-       g_return_if_fail (props != NULL);
-       g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
-
-       if (framerate > 1.0) {
-               temp = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%0.2f frame per second", "%0.2f frames 
per second", (int) (ceilf (framerate))), framerate);
-       } else {
-               temp = g_strdup (C_("Frame rate", "N/A"));
-       }
-       bacon_video_widget_properties_set_label (props, "framerate", temp);
-       g_free (temp);
+    gchar *temp;
+
+    g_return_if_fail (props != NULL);
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
+
+    if (framerate > 1.0)
+    {
+        temp = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%0.2f frame per second", "%0.2f frames per 
second", (int) (ceilf (framerate))), framerate);
+    }
+    else
+    {
+        temp = g_strdup (C_("Frame rate", "N/A"));
+    }
+    bacon_video_widget_properties_set_label (props, "framerate", temp);
+    g_free (temp);
 }
 
-GtkWidget*
+GtkWidget *
 bacon_video_widget_properties_new (void)
 {
-       BaconVideoWidgetProperties *props;
-       GtkBuilder *xml;
-       GtkWidget *vbox;
-       GtkSizeGroup *group;
-       const char *labels[] = { "title_label", "artist_label", "album_label",
-                       "year_label", "duration_label", "comment_label", "container_label",
-                       "dimensions_label", "vcodec_label", "framerate_label",
-                       "vbitrate_label", "abitrate_label", "acodec_label",
-                       "samplerate_label", "channels_label" };
-       guint i;
-
-       xml = gtk_builder_new ();
-       gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
-       if (gtk_builder_add_from_resource (xml, 
"/org/gnome/nautilus/audio-video-properties/ui/properties.ui", NULL) == 0) {
-               g_object_unref (xml);
-               return NULL;
-       }
-
-       props = BACON_VIDEO_WIDGET_PROPERTIES (g_object_new
-                       (BACON_TYPE_VIDEO_WIDGET_PROPERTIES, NULL));
-
-       props->priv->xml = xml;
-       vbox = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "vbox1"));
-       gtk_box_pack_start (GTK_BOX (props), vbox, FALSE, FALSE, 0);
-
-       bacon_video_widget_properties_reset (props);
-
-       group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-       for (i = 0; i < G_N_ELEMENTS (labels); i++)
-               gtk_size_group_add_widget (group, GTK_WIDGET (gtk_builder_get_object (xml, labels[i])));
-
-       g_object_unref (group);
-
-       gtk_widget_show_all (GTK_WIDGET (props));
-
-       return GTK_WIDGET (props);
+    BaconVideoWidgetProperties *props;
+    GtkBuilder *xml;
+    GtkWidget *vbox;
+    GtkSizeGroup *group;
+    const char *labels[] =
+    {
+        "title_label", "artist_label", "album_label",
+        "year_label", "duration_label", "comment_label", "container_label",
+        "dimensions_label", "vcodec_label", "framerate_label",
+        "vbitrate_label", "abitrate_label", "acodec_label",
+        "samplerate_label", "channels_label"
+    };
+    guint i;
+
+    xml = gtk_builder_new ();
+    gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
+    if (gtk_builder_add_from_resource (xml, "/org/gnome/nautilus/audio-video-properties/ui/properties.ui", 
NULL) == 0)
+    {
+        g_object_unref (xml);
+        return NULL;
+    }
+
+    props = BACON_VIDEO_WIDGET_PROPERTIES (g_object_new
+                                               (BACON_TYPE_VIDEO_WIDGET_PROPERTIES, NULL));
+
+    props->priv->xml = xml;
+    vbox = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "vbox1"));
+    gtk_box_pack_start (GTK_BOX (props), vbox, FALSE, FALSE, 0);
+
+    bacon_video_widget_properties_reset (props);
+
+    group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+    for (i = 0; i < G_N_ELEMENTS (labels); i++)
+    {
+        gtk_size_group_add_widget (group, GTK_WIDGET (gtk_builder_get_object (xml, labels[i])));
+    }
+
+    g_object_unref (group);
+
+    gtk_widget_show_all (GTK_WIDGET (props));
+
+    return GTK_WIDGET (props);
 }
-
diff --git a/extensions/audio-video-properties/test-properties-page.c 
b/extensions/audio-video-properties/test-properties-page.c
index 21be43a34..dbb0c7711 100644
--- a/extensions/audio-video-properties/test-properties-page.c
+++ b/extensions/audio-video-properties/test-properties-page.c
@@ -30,52 +30,53 @@ static GtkWidget *window, *props, *label;
 static void
 create_props (const char *url)
 {
-       label = gtk_label_new ("Audio/Video");
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       g_signal_connect (G_OBJECT (window), "destroy",
-                         G_CALLBACK (gtk_main_quit), NULL);
-       gtk_window_set_default_size (GTK_WINDOW (window), 450, 550);
-       props = totem_properties_view_new (url, label);
-       gtk_container_add (GTK_CONTAINER (window), props);
+    label = gtk_label_new ("Audio/Video");
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    g_signal_connect (G_OBJECT (window), "destroy",
+                      G_CALLBACK (gtk_main_quit), NULL);
+    gtk_window_set_default_size (GTK_WINDOW (window), 450, 550);
+    props = totem_properties_view_new (url, label);
+    gtk_container_add (GTK_CONTAINER (window), props);
 
-       gtk_widget_show_all (window);
+    gtk_widget_show_all (window);
 }
 
 static void
 destroy_props (void)
 {
-       gtk_widget_destroy (label);
+    gtk_widget_destroy (label);
 }
 
-int main (int argc, char **argv)
+int main (int    argc,
+          char **argv)
 {
-       GFile *file;
-       char *url;
+    GFile *file;
+    char *url;
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-       textdomain (GETTEXT_PACKAGE);
+    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
 
-       totem_gst_disable_display_decoders ();
-       gst_init (&argc, &argv);
-       gtk_init (&argc, &argv);
+    totem_gst_disable_display_decoders ();
+    gst_init (&argc, &argv);
+    gtk_init (&argc, &argv);
 
-       if (argc != 2) {
-               g_print ("Usage: %s [URI]\n", argv[0]);
-               return 1;
-       }
+    if (argc != 2)
+    {
+        g_print ("Usage: %s [URI]\n", argv[0]);
+        return 1;
+    }
 
-       file = g_file_new_for_commandline_arg (argv[1]);
-       url = g_file_get_uri (file);
-       g_object_unref (file);
+    file = g_file_new_for_commandline_arg (argv[1]);
+    url = g_file_get_uri (file);
+    g_object_unref (file);
 
-       create_props (url);
-       g_free (url);
+    create_props (url);
+    g_free (url);
 
-       gtk_main ();
+    gtk_main ();
 
-       destroy_props ();
+    destroy_props ();
 
-       return 0;
+    return 0;
 }
-
diff --git a/extensions/audio-video-properties/totem-gst-helpers.c 
b/extensions/audio-video-properties/totem-gst-helpers.c
index e01996daf..f90a516c4 100644
--- a/extensions/audio-video-properties/totem-gst-helpers.c
+++ b/extensions/audio-video-properties/totem-gst-helpers.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2003-2007 the GStreamer project
  *      Julien Moutte <julien moutte net>
  *      Ronald Bultje <rbultje ronald bitfreak net>
@@ -30,27 +30,31 @@
 void
 totem_gst_disable_display_decoders (void)
 {
-       GstRegistry *registry;
-       const char *blacklisted_plugins[] = {
-         "bmcdec",
-         "vaapi",
-         "video4linux2"
-       };
-       guint i;
+    GstRegistry *registry;
+    const char *blacklisted_plugins[] =
+    {
+        "bmcdec",
+        "vaapi",
+        "video4linux2"
+    };
+    guint i;
 
-       /* Disable the vaapi plugin as it will not work with the
-        * fakesink we use:
-        * See: https://bugzilla.gnome.org/show_bug.cgi?id=700186 and
-        * https://bugzilla.gnome.org/show_bug.cgi?id=749605 */
-       registry = gst_registry_get ();
+    /* Disable the vaapi plugin as it will not work with the
+     * fakesink we use:
+     * See: https://bugzilla.gnome.org/show_bug.cgi?id=700186 and
+     * https://bugzilla.gnome.org/show_bug.cgi?id=749605 */
+    registry = gst_registry_get ();
 
-       for (i = 0; i < G_N_ELEMENTS (blacklisted_plugins); i++) {
-               GstPlugin *plugin =
-                       gst_registry_find_plugin (registry,
-                                                 blacklisted_plugins[i]);
-               if (plugin)
-                       gst_registry_remove_plugin (registry, plugin);
-       }
+    for (i = 0; i < G_N_ELEMENTS (blacklisted_plugins); i++)
+    {
+        GstPlugin *plugin =
+            gst_registry_find_plugin (registry,
+                                      blacklisted_plugins[i]);
+        if (plugin)
+        {
+            gst_registry_remove_plugin (registry, plugin);
+        }
+    }
 }
 
 /*
diff --git a/extensions/audio-video-properties/totem-properties-main.c 
b/extensions/audio-video-properties/totem-properties-main.c
index 2bbd520c3..fa09db636 100644
--- a/extensions/audio-video-properties/totem-properties-main.c
+++ b/extensions/audio-video-properties/totem-properties-main.c
@@ -33,107 +33,114 @@
 #include "totem-mime-types.h"
 
 static GType tpp_type = 0;
-static void property_page_provider_iface_init
-       (NautilusPropertyPageProviderIface *iface);
-static GList *totem_properties_get_pages
-       (NautilusPropertyPageProvider *provider, GList *files);
+static void property_page_provider_iface_init (NautilusPropertyPageProviderIface *iface);
+static GList *totem_properties_get_pages (NautilusPropertyPageProvider *provider,
+                                          GList                        *files);
 
 static void
 totem_properties_plugin_register_type (GTypeModule *module)
 {
-       const GTypeInfo info = {
-               sizeof (GObjectClass),
-               (GBaseInitFunc) NULL,
-               (GBaseFinalizeFunc) NULL,
-               (GClassInitFunc) NULL,
-               NULL,
-               NULL,
-               sizeof (GObject),
-               0,
-               (GInstanceInitFunc) NULL
-       };
-       const GInterfaceInfo property_page_provider_iface_info = {
-               (GInterfaceInitFunc)property_page_provider_iface_init,
-               NULL,
-               NULL
-       };
-
-       tpp_type = g_type_module_register_type (module, G_TYPE_OBJECT,
-                       "TotemPropertiesPlugin",
-                       &info, 0);
-       g_type_module_add_interface (module,
-                       tpp_type,
-                       NAUTILUS_TYPE_PROPERTY_PAGE_PROVIDER,
-                       &property_page_provider_iface_info);
+    const GTypeInfo info =
+    {
+        sizeof (GObjectClass),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) NULL,
+        NULL,
+        NULL,
+        sizeof (GObject),
+        0,
+        (GInstanceInitFunc) NULL
+    };
+    const GInterfaceInfo property_page_provider_iface_info =
+    {
+        (GInterfaceInitFunc) property_page_provider_iface_init,
+        NULL,
+        NULL
+    };
+
+    tpp_type = g_type_module_register_type (module, G_TYPE_OBJECT,
+                                            "TotemPropertiesPlugin",
+                                            &info, 0);
+    g_type_module_add_interface (module,
+                                 tpp_type,
+                                 NAUTILUS_TYPE_PROPERTY_PAGE_PROVIDER,
+                                 &property_page_provider_iface_info);
 }
 
 static void
 property_page_provider_iface_init (NautilusPropertyPageProviderIface *iface)
 {
-       iface->get_pages = totem_properties_get_pages;
+    iface->get_pages = totem_properties_get_pages;
 }
 
 static gpointer
 init_backend (gpointer data)
 {
-       gst_init (NULL, NULL);
-       totem_gst_disable_display_decoders ();
-       return NULL;
+    gst_init (NULL, NULL);
+    totem_gst_disable_display_decoders ();
+    return NULL;
 }
 
 static GList *
 totem_properties_get_pages (NautilusPropertyPageProvider *provider,
-                            GList *files)
+                            GList                        *files)
 {
-       static GOnce backend_inited = G_ONCE_INIT;
-       NautilusFileInfo *file;
-       char *uri;
-       GtkWidget *page, *label;
-       NautilusPropertyPage *property_page;
-       guint i;
-       gboolean found;
-
-       /* only add properties page if a single file is selected */
-       if (files == NULL || files->next != NULL)
-               return NULL;
-       file = files->data;
-
-       /* only add the properties page to these mime types */
-       found = FALSE;
-       for (i = 0; mime_types[i] != NULL; i++) {
-               if (nautilus_file_info_is_mime_type (file, mime_types[i])) {
-                       found = TRUE;
-                       break;
-               }
-       }
-       if (found == FALSE)
-               return NULL;
-
-       /* okay, make the page, init'ing the backend first if necessary */
-       g_once (&backend_inited, init_backend, NULL);
-
-       uri = nautilus_file_info_get_uri (file);
-       label = gtk_label_new (_("Audio/Video"));
-       page = totem_properties_view_new (uri, label);
-       g_free (uri);
-
-       gtk_container_set_border_width (GTK_CONTAINER (page), 6);
-       property_page = nautilus_property_page_new ("video-properties",
-                       label, page);
-
-       return g_list_prepend (NULL, property_page);
+    static GOnce backend_inited = G_ONCE_INIT;
+    NautilusFileInfo *file;
+    char *uri;
+    GtkWidget *page, *label;
+    NautilusPropertyPage *property_page;
+    guint i;
+    gboolean found;
+
+    /* only add properties page if a single file is selected */
+    if (files == NULL || files->next != NULL)
+    {
+        return NULL;
+    }
+    file = files->data;
+
+    /* only add the properties page to these mime types */
+    found = FALSE;
+    for (i = 0; mime_types[i] != NULL; i++)
+    {
+        if (nautilus_file_info_is_mime_type (file, mime_types[i]))
+        {
+            found = TRUE;
+            break;
+        }
+    }
+    if (found == FALSE)
+    {
+        return NULL;
+    }
+
+    /* okay, make the page, init'ing the backend first if necessary */
+    g_once (&backend_inited, init_backend, NULL);
+
+    uri = nautilus_file_info_get_uri (file);
+    label = gtk_label_new (_("Audio/Video"));
+    page = totem_properties_view_new (uri, label);
+    g_free (uri);
+
+    gtk_container_set_border_width (GTK_CONTAINER (page), 6);
+    property_page = nautilus_property_page_new ("video-properties",
+                                                label, page);
+
+    return g_list_prepend (NULL, property_page);
 }
 
 /* --- extension interface --- */
 void
 nautilus_module_initialize (GTypeModule *module)
 {
-       /* set up translation catalog */
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    /* set up translation catalog */
+    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-       totem_properties_plugin_register_type (module);
-       totem_properties_view_register_type (module);
+    totem_properties_plugin_register_type (module);
+    totem_properties_view_register_type (module);
 }
 
 void
@@ -145,10 +152,9 @@ void
 nautilus_module_list_types (const GType **types,
                             int          *num_types)
 {
-       static GType type_list[1];
+    static GType type_list[1];
 
-       type_list[0] = tpp_type;
-       *types = type_list;
-       *num_types = G_N_ELEMENTS (type_list);
+    type_list[0] = tpp_type;
+    *types = type_list;
+    *num_types = G_N_ELEMENTS (type_list);
 }
-
diff --git a/extensions/audio-video-properties/totem-properties-view.c 
b/extensions/audio-video-properties/totem-properties-view.c
index f280fa2c5..9e0b03cc4 100644
--- a/extensions/audio-video-properties/totem-properties-view.c
+++ b/extensions/audio-video-properties/totem-properties-view.c
@@ -30,11 +30,12 @@
 #include "totem-properties-view.h"
 #include "bacon-video-widget-properties.h"
 
-struct TotemPropertiesViewPriv {
-       GtkWidget *label;
-       GtkWidget *vbox;
-       BaconVideoWidgetProperties *props;
-       GstDiscoverer *disco;
+struct TotemPropertiesViewPriv
+{
+    GtkWidget *label;
+    GtkWidget *vbox;
+    BaconVideoWidgetProperties *props;
+    GstDiscoverer *disco;
 };
 
 static GObjectClass *parent_class = NULL;
@@ -45,345 +46,393 @@ G_DEFINE_TYPE (TotemPropertiesView, totem_properties_view, GTK_TYPE_GRID)
 void
 totem_properties_view_register_type (GTypeModule *module)
 {
-       totem_properties_view_get_type ();
+    totem_properties_view_get_type ();
 }
 
 static void
 totem_properties_view_class_init (TotemPropertiesViewClass *class)
 {
-       parent_class = g_type_class_peek_parent (class);
-       G_OBJECT_CLASS (class)->finalize = totem_properties_view_finalize;
+    parent_class = g_type_class_peek_parent (class);
+    G_OBJECT_CLASS (class)->finalize = totem_properties_view_finalize;
 }
 
 static void
 update_general (TotemPropertiesView *props,
-               const GstTagList    *list)
+                const GstTagList    *list)
 {
-       struct {
-               const char *tag_name;
-               const char *widget;
-       } items[] = {
-               { GST_TAG_TITLE, "title" },
-               { GST_TAG_ARTIST, "artist" },
-               { GST_TAG_ALBUM, "album" },
-       };
-       guint i;
-        GDate *date;
-       GstDateTime *datetime;
-       gchar *comment;
-
-       for (i = 0; i < G_N_ELEMENTS(items); i++) {
-               char *string;
-
-               if (gst_tag_list_get_string_index (list, items[i].tag_name, 0, &string) != FALSE) {
-                       bacon_video_widget_properties_set_label (props->priv->props,
-                                                                items[i].widget,
-                                                                string);
-                       g_free (string);
-               }
-       }
-       
-       /* Comment else use Description defined by:
-        * http://xiph.org/vorbis/doc/v-comment.html */
-       if (gst_tag_list_get_string (list, GST_TAG_COMMENT, &comment) ||
-               gst_tag_list_get_string (list, GST_TAG_DESCRIPTION, &comment)) {
-
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "comment",
-                                                        comment);
-               g_free (comment);
+    struct
+    {
+        const char *tag_name;
+        const char *widget;
+    } items[] =
+    {
+        { GST_TAG_TITLE, "title" },
+        { GST_TAG_ARTIST, "artist" },
+        { GST_TAG_ALBUM, "album" },
+    };
+    guint i;
+    GDate *date;
+    GstDateTime *datetime;
+    gchar *comment;
+
+    for (i = 0; i < G_N_ELEMENTS (items); i++)
+    {
+        char *string;
+
+        if (gst_tag_list_get_string_index (list, items[i].tag_name, 0, &string) != FALSE)
+        {
+            bacon_video_widget_properties_set_label (props->priv->props,
+                                                     items[i].widget,
+                                                     string);
+            g_free (string);
         }
-       
-       /* Date */
-        if (gst_tag_list_get_date (list, GST_TAG_DATE, &date)) {
-               char *string;
-
-               string = g_strdup_printf ("%d", g_date_get_year (date));
-               g_date_free (date);
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "year",
-                                                        string);
-               g_free (string);
-        } else if (gst_tag_list_get_date_time (list, GST_TAG_DATE_TIME, &datetime)) {
-               char *string;
-
-               string = g_strdup_printf ("%d", gst_date_time_get_year (datetime));
-               gst_date_time_unref (datetime);
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "year",
-                                                        string);
-               g_free (string);
-       }
+    }
+
+    /* Comment else use Description defined by:
+     * http://xiph.org/vorbis/doc/v-comment.html */
+    if (gst_tag_list_get_string (list, GST_TAG_COMMENT, &comment) ||
+        gst_tag_list_get_string (list, GST_TAG_DESCRIPTION, &comment))
+    {
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "comment",
+                                                 comment);
+        g_free (comment);
+    }
+
+    /* Date */
+    if (gst_tag_list_get_date (list, GST_TAG_DATE, &date))
+    {
+        char *string;
+
+        string = g_strdup_printf ("%d", g_date_get_year (date));
+        g_date_free (date);
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "year",
+                                                 string);
+        g_free (string);
+    }
+    else if (gst_tag_list_get_date_time (list, GST_TAG_DATE_TIME, &datetime))
+    {
+        char *string;
+
+        string = g_strdup_printf ("%d", gst_date_time_get_year (datetime));
+        gst_date_time_unref (datetime);
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "year",
+                                                 string);
+        g_free (string);
+    }
 }
 
 static void
 set_codec (TotemPropertiesView     *props,
-          GstDiscovererStreamInfo *info,
-          const char              *widget)
+           GstDiscovererStreamInfo *info,
+           const char              *widget)
 {
-       GstCaps *caps;
-       const char *nick;
-
-       nick = gst_discoverer_stream_info_get_stream_type_nick (info);
-       if (g_str_equal (nick, "audio") == FALSE &&
-           g_str_equal (nick, "video") == FALSE &&
-           g_str_equal (nick, "container") == FALSE) {
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        widget,
-                                                        _("N/A"));
-               return;
-       }
-
-       caps = gst_discoverer_stream_info_get_caps (info);
-       if (caps) {
-               if (gst_caps_is_fixed (caps)) {
-                       char *string;
-
-                       string = gst_pb_utils_get_codec_description (caps);
-                       bacon_video_widget_properties_set_label (props->priv->props,
-                                                                widget,
-                                                                string);
-                       g_free (string);
-               }
-               gst_caps_unref (caps);
-       }
+    GstCaps *caps;
+    const char *nick;
+
+    nick = gst_discoverer_stream_info_get_stream_type_nick (info);
+    if (g_str_equal (nick, "audio") == FALSE &&
+        g_str_equal (nick, "video") == FALSE &&
+        g_str_equal (nick, "container") == FALSE)
+    {
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 widget,
+                                                 _("N/A"));
+        return;
+    }
+
+    caps = gst_discoverer_stream_info_get_caps (info);
+    if (caps)
+    {
+        if (gst_caps_is_fixed (caps))
+        {
+            char *string;
+
+            string = gst_pb_utils_get_codec_description (caps);
+            bacon_video_widget_properties_set_label (props->priv->props,
+                                                     widget,
+                                                     string);
+            g_free (string);
+        }
+        gst_caps_unref (caps);
+    }
 }
 
 static void
-set_bitrate (TotemPropertiesView    *props,
-            guint                   bitrate,
-            const char             *widget)
+set_bitrate (TotemPropertiesView *props,
+             guint                bitrate,
+             const char          *widget)
 {
-       char *string;
-
-       if (!bitrate) {
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        widget,
-                                                        C_("Stream bit rate", "N/A"));
-               return;
-       }
-       string = g_strdup_printf (_("%d kbps"), bitrate / 1000);
-       bacon_video_widget_properties_set_label (props->priv->props,
-                                                widget,
-                                                string);
-       g_free (string);
+    char *string;
+
+    if (!bitrate)
+    {
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 widget,
+                                                 C_("Stream bit rate", "N/A"));
+        return;
+    }
+    string = g_strdup_printf (_("%d kbps"), bitrate / 1000);
+    bacon_video_widget_properties_set_label (props->priv->props,
+                                             widget,
+                                             string);
+    g_free (string);
 }
 
 static void
 update_video (TotemPropertiesView    *props,
-             GstDiscovererVideoInfo *info)
+              GstDiscovererVideoInfo *info)
 {
-       guint width, height;
-       guint fps_n, fps_d;
-       char *string;
-
-       width = gst_discoverer_video_info_get_width (info);
-       height = gst_discoverer_video_info_get_height (info);
-       string = g_strdup_printf (N_("%d × %d"), width, height);
-       bacon_video_widget_properties_set_label (props->priv->props,
-                                                "dimensions",
-                                                string);
-       g_free (string);
-
-       set_codec (props, (GstDiscovererStreamInfo *) info, "vcodec");
-       set_bitrate (props, gst_discoverer_video_info_get_bitrate (info), "video_bitrate");
-
-       /* Round up/down to the nearest integer framerate */
-       fps_n = gst_discoverer_video_info_get_framerate_num (info);
-       fps_d = gst_discoverer_video_info_get_framerate_denom (info);
-       if (fps_d > 0.0)
-               bacon_video_widget_properties_set_framerate (props->priv->props,
-                                                            (float) fps_n / (float) fps_d);
-       else
-               bacon_video_widget_properties_set_framerate (props->priv->props, 0.0);
+    guint width, height;
+    guint fps_n, fps_d;
+    char *string;
+
+    width = gst_discoverer_video_info_get_width (info);
+    height = gst_discoverer_video_info_get_height (info);
+    string = g_strdup_printf (N_("%d × %d"), width, height);
+    bacon_video_widget_properties_set_label (props->priv->props,
+                                             "dimensions",
+                                             string);
+    g_free (string);
+
+    set_codec (props, (GstDiscovererStreamInfo *) info, "vcodec");
+    set_bitrate (props, gst_discoverer_video_info_get_bitrate (info), "video_bitrate");
+
+    /* Round up/down to the nearest integer framerate */
+    fps_n = gst_discoverer_video_info_get_framerate_num (info);
+    fps_d = gst_discoverer_video_info_get_framerate_denom (info);
+    if (fps_d > 0.0)
+    {
+        bacon_video_widget_properties_set_framerate (props->priv->props,
+                                                     (float) fps_n / (float) fps_d);
+    }
+    else
+    {
+        bacon_video_widget_properties_set_framerate (props->priv->props, 0.0);
+    }
 }
 
 static void
 update_audio (TotemPropertiesView    *props,
-             GstDiscovererAudioInfo *info)
+              GstDiscovererAudioInfo *info)
 {
-       guint samplerate, channels;
-
-       set_codec (props, (GstDiscovererStreamInfo *) info, "acodec");
-
-       set_bitrate (props, gst_discoverer_audio_info_get_bitrate (info), "audio_bitrate");
-
-       samplerate = gst_discoverer_audio_info_get_sample_rate (info);
-       if (samplerate) {
-               char *string;
-               string = g_strdup_printf (_("%d Hz"), samplerate);
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "samplerate",
-                                                        string);
-               g_free (string);
-       } else {
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "samplerate",
-                                                        C_("Sample rate", "N/A"));
-       }
-
-       channels = gst_discoverer_audio_info_get_channels (info);
-       if (channels) {
-               char *string;
-
-               if (channels > 2) {
-                       string = g_strdup_printf ("%s %d.1", _("Surround"), channels - 1);
-               } else if (channels == 1) {
-                       string = g_strdup (_("Mono"));
-               } else if (channels == 2) {
-                       string = g_strdup (_("Stereo"));
-               } else {
-                       string = g_strdup (""); //Should not happen
-               }
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "channels",
-                                                        string);
-               g_free (string);
-       } else {
-               bacon_video_widget_properties_set_label (props->priv->props,
-                                                        "channels",
-                                                        C_("Number of audio channels", "N/A"));
-       }
+    guint samplerate, channels;
+
+    set_codec (props, (GstDiscovererStreamInfo *) info, "acodec");
+
+    set_bitrate (props, gst_discoverer_audio_info_get_bitrate (info), "audio_bitrate");
+
+    samplerate = gst_discoverer_audio_info_get_sample_rate (info);
+    if (samplerate)
+    {
+        char *string;
+        string = g_strdup_printf (_("%d Hz"), samplerate);
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "samplerate",
+                                                 string);
+        g_free (string);
+    }
+    else
+    {
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "samplerate",
+                                                 C_("Sample rate", "N/A"));
+    }
+
+    channels = gst_discoverer_audio_info_get_channels (info);
+    if (channels)
+    {
+        char *string;
+
+        if (channels > 2)
+        {
+            string = g_strdup_printf ("%s %d.1", _("Surround"), channels - 1);
+        }
+        else if (channels == 1)
+        {
+            string = g_strdup (_("Mono"));
+        }
+        else if (channels == 2)
+        {
+            string = g_strdup (_("Stereo"));
+        }
+        else
+        {
+            string = g_strdup ("");             /*Should not happen */
+        }
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "channels",
+                                                 string);
+        g_free (string);
+    }
+    else
+    {
+        bacon_video_widget_properties_set_label (props->priv->props,
+                                                 "channels",
+                                                 C_("Number of audio channels", "N/A"));
+    }
 }
 
 static void
 discovered_cb (GstDiscoverer       *discoverer,
-              GstDiscovererInfo   *info,
-              GError              *error,
-              TotemPropertiesView *props)
+               GstDiscovererInfo   *info,
+               GError              *error,
+               TotemPropertiesView *props)
 {
-       GList *video_streams, *audio_streams;
-       const GstTagList *taglist;
-       gboolean has_audio, has_video;
-       const char *label;
-        GstClockTime duration;
-        GstDiscovererStreamInfo *sinfo;
-
-       if (error) {
-               g_warning ("Couldn't get information about '%s': %s",
-                          gst_discoverer_info_get_uri (info),
-                          error->message);
-               return;
-       }
-
-       video_streams = gst_discoverer_info_get_video_streams (info);
-       has_video = (video_streams != NULL);
-       audio_streams = gst_discoverer_info_get_audio_streams (info);
-       has_audio = (audio_streams != NULL);
-
-       if (has_audio == has_video)
-               label = N_("Audio/Video");
-       else if (has_audio)
-               label = N_("Audio");
-       else
-               label = N_("Video");
-
-       gtk_label_set_text (GTK_LABEL (props->priv->label), _(label));
-
-       /* Widgets */
-       bacon_video_widget_properties_set_has_type (props->priv->props,
-                                                   has_video,
-                                                   has_audio);
-
-       /* General */
-        duration = gst_discoverer_info_get_duration (info);
-        bacon_video_widget_properties_set_duration (props->priv->props, duration / GST_SECOND * 1000);
-
-        sinfo = gst_discoverer_info_get_stream_info (info);
-        if (sinfo) {
-               set_codec (props, sinfo, "container");
-               gst_discoverer_stream_info_unref (sinfo);
-       }
-
-       taglist = gst_discoverer_info_get_tags (info);
-       update_general (props, taglist);
-
-       /* Video and Audio */
-       if (video_streams)
-               update_video (props, video_streams->data);
-       if (audio_streams)
-               update_audio (props, audio_streams->data);
-
-       gst_discoverer_stream_info_list_free (video_streams);
-       gst_discoverer_stream_info_list_free (audio_streams);
+    GList *video_streams, *audio_streams;
+    const GstTagList *taglist;
+    gboolean has_audio, has_video;
+    const char *label;
+    GstClockTime duration;
+    GstDiscovererStreamInfo *sinfo;
+
+    if (error)
+    {
+        g_warning ("Couldn't get information about '%s': %s",
+                   gst_discoverer_info_get_uri (info),
+                   error->message);
+        return;
+    }
+
+    video_streams = gst_discoverer_info_get_video_streams (info);
+    has_video = (video_streams != NULL);
+    audio_streams = gst_discoverer_info_get_audio_streams (info);
+    has_audio = (audio_streams != NULL);
+
+    if (has_audio == has_video)
+    {
+        label = N_("Audio/Video");
+    }
+    else if (has_audio)
+    {
+        label = N_("Audio");
+    }
+    else
+    {
+        label = N_("Video");
+    }
+
+    gtk_label_set_text (GTK_LABEL (props->priv->label), _(label));
+
+    /* Widgets */
+    bacon_video_widget_properties_set_has_type (props->priv->props,
+                                                has_video,
+                                                has_audio);
+
+    /* General */
+    duration = gst_discoverer_info_get_duration (info);
+    bacon_video_widget_properties_set_duration (props->priv->props, duration / GST_SECOND * 1000);
+
+    sinfo = gst_discoverer_info_get_stream_info (info);
+    if (sinfo)
+    {
+        set_codec (props, sinfo, "container");
+        gst_discoverer_stream_info_unref (sinfo);
+    }
+
+    taglist = gst_discoverer_info_get_tags (info);
+    update_general (props, taglist);
+
+    /* Video and Audio */
+    if (video_streams)
+    {
+        update_video (props, video_streams->data);
+    }
+    if (audio_streams)
+    {
+        update_audio (props, audio_streams->data);
+    }
+
+    gst_discoverer_stream_info_list_free (video_streams);
+    gst_discoverer_stream_info_list_free (audio_streams);
 }
 
 static void
 totem_properties_view_init (TotemPropertiesView *props)
 {
-       GError *err = NULL;
+    GError *err = NULL;
 
-       props->priv = g_new0 (TotemPropertiesViewPriv, 1);
+    props->priv = g_new0 (TotemPropertiesViewPriv, 1);
 
-       props->priv->vbox = bacon_video_widget_properties_new ();
-       gtk_grid_attach (GTK_GRID (props), props->priv->vbox, 0, 0, 1, 1);
-       gtk_widget_show (GTK_WIDGET (props));
+    props->priv->vbox = bacon_video_widget_properties_new ();
+    gtk_grid_attach (GTK_GRID (props), props->priv->vbox, 0, 0, 1, 1);
+    gtk_widget_show (GTK_WIDGET (props));
 
-       props->priv->props = BACON_VIDEO_WIDGET_PROPERTIES (props->priv->vbox);
+    props->priv->props = BACON_VIDEO_WIDGET_PROPERTIES (props->priv->vbox);
 
-       props->priv->disco = gst_discoverer_new (GST_SECOND * 60, &err);
-       if (props->priv->disco == NULL) {
-               g_warning ("Could not create discoverer object: %s", err->message);
-               g_error_free (err);
-               return;
-       }
-       g_signal_connect (props->priv->disco, "discovered",
-                         G_CALLBACK (discovered_cb), props);
+    props->priv->disco = gst_discoverer_new (GST_SECOND * 60, &err);
+    if (props->priv->disco == NULL)
+    {
+        g_warning ("Could not create discoverer object: %s", err->message);
+        g_error_free (err);
+        return;
+    }
+    g_signal_connect (props->priv->disco, "discovered",
+                      G_CALLBACK (discovered_cb), props);
 }
 
 static void
 totem_properties_view_finalize (GObject *object)
 {
-       TotemPropertiesView *props;
-
-       props = TOTEM_PROPERTIES_VIEW (object);
-
-       if (props->priv != NULL) {
-               if (props->priv->disco) {
-                       g_signal_handlers_disconnect_by_func (props->priv->disco,
-                                                             discovered_cb,
-                                                             props);
-                       gst_discoverer_stop (props->priv->disco);
-                       g_clear_object (&props->priv->disco);
-               }
-               g_clear_object (&props->priv->label);
-               g_free (props->priv);
-       }
-       props->priv = NULL;
-
-       G_OBJECT_CLASS (parent_class)->finalize (object);
+    TotemPropertiesView *props;
+
+    props = TOTEM_PROPERTIES_VIEW (object);
+
+    if (props->priv != NULL)
+    {
+        if (props->priv->disco)
+        {
+            g_signal_handlers_disconnect_by_func (props->priv->disco,
+                                                  discovered_cb,
+                                                  props);
+            gst_discoverer_stop (props->priv->disco);
+            g_clear_object (&props->priv->disco);
+        }
+        g_clear_object (&props->priv->label);
+        g_free (props->priv);
+    }
+    props->priv = NULL;
+
+    G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
 totem_properties_view_set_location (TotemPropertiesView *props,
-                                   const char          *location)
+                                    const char          *location)
 {
-       g_assert (TOTEM_IS_PROPERTIES_VIEW (props));
+    g_assert (TOTEM_IS_PROPERTIES_VIEW (props));
 
-       if (props->priv->disco)
-               gst_discoverer_stop (props->priv->disco);
+    if (props->priv->disco)
+    {
+        gst_discoverer_stop (props->priv->disco);
+    }
 
-       bacon_video_widget_properties_reset (props->priv->props);
+    bacon_video_widget_properties_reset (props->priv->props);
 
-       if (location != NULL && props->priv->disco != NULL) {
-               gst_discoverer_start (props->priv->disco);
+    if (location != NULL && props->priv->disco != NULL)
+    {
+        gst_discoverer_start (props->priv->disco);
 
-               if (gst_discoverer_discover_uri_async (props->priv->disco, location) == FALSE) {
-                       g_warning ("Couldn't add %s to list", location);
-                       return;
-               }
-       }
+        if (gst_discoverer_discover_uri_async (props->priv->disco, location) == FALSE)
+        {
+            g_warning ("Couldn't add %s to list", location);
+            return;
+        }
+    }
 }
 
 GtkWidget *
-totem_properties_view_new (const char *location, GtkWidget *label)
+totem_properties_view_new (const char *location,
+                           GtkWidget  *label)
 {
-       TotemPropertiesView *self;
+    TotemPropertiesView *self;
 
-       self = g_object_new (TOTEM_TYPE_PROPERTIES_VIEW, NULL);
-       g_object_ref (label);
-       self->priv->label = label;
-       totem_properties_view_set_location (self, location);
+    self = g_object_new (TOTEM_TYPE_PROPERTIES_VIEW, NULL);
+    g_object_ref (label);
+    self->priv->label = label;
+    totem_properties_view_set_location (self, location);
 
-       return GTK_WIDGET (self);
+    return GTK_WIDGET (self);
 }
diff --git a/extensions/image-properties/nautilus-image-properties-page-provider.c 
b/extensions/image-properties/nautilus-image-properties-page-provider.c
index 99e495bb7..b270ea945 100644
--- a/extensions/image-properties/nautilus-image-properties-page-provider.c
+++ b/extensions/image-properties/nautilus-image-properties-page-provider.c
@@ -66,7 +66,7 @@ is_mime_type_supported (const char *mime_type)
             continue;
         }
 
-        if (g_strv_contains ((const char *const *) mime_types, mime_type))
+        if (g_strv_contains ((const char * const *) mime_types, mime_type))
         {
             return TRUE;
         }
diff --git a/libnautilus-extension/nautilus-file-info.c b/libnautilus-extension/nautilus-file-info.c
index 484e6c1c0..020cac3e2 100644
--- a/libnautilus-extension/nautilus-file-info.c
+++ b/libnautilus-extension/nautilus-file-info.c
@@ -24,7 +24,8 @@
 
 G_DEFINE_INTERFACE (NautilusFileInfo, nautilus_file_info, G_TYPE_OBJECT)
 
-NautilusFileInfo * (*nautilus_file_info_getter)(GFile * location, gboolean create);
+NautilusFileInfo * (*nautilus_file_info_getter)(GFile   *location,
+                                                gboolean create);
 
 GList *
 nautilus_file_info_list_copy (GList *files)
diff --git a/src/animation/egg-animation.c b/src/animation/egg-animation.c
index c8b025874..3b268cec7 100644
--- a/src/animation/egg-animation.c
+++ b/src/animation/egg-animation.c
@@ -28,53 +28,55 @@
 
 #define FALLBACK_FRAME_RATE 60
 
-typedef gdouble (*AlphaFunc) (gdouble       offset);
-typedef void    (*TweenFunc) (const GValue *begin,
-                              const GValue *end,
-                              GValue       *value,
-                              gdouble       offset);
+typedef gdouble (*AlphaFunc) (gdouble offset);
+typedef void (*TweenFunc) (const GValue *begin,
+                           const GValue *end,
+                           GValue       *value,
+                           gdouble       offset);
 
 typedef struct
 {
-  gboolean    is_child;  /* Does GParamSpec belong to parent widget */
-  GParamSpec *pspec;     /* GParamSpec of target property */
-  GValue      begin;     /* Begin value in animation */
-  GValue      end;       /* End value in animation */
+    gboolean is_child;   /* Does GParamSpec belong to parent widget */
+    GParamSpec *pspec;   /* GParamSpec of target property */
+    GValue begin;        /* Begin value in animation */
+    GValue end;          /* End value in animation */
 } Tween;
 
 
 struct _EggAnimation
 {
-  GInitiallyUnowned  parent_instance;
-
-  gpointer           target;              /* Target object to animate */
-  guint64            begin_msec;          /* Time in which animation started */
-  guint              duration_msec;       /* Duration of animation */
-  guint              mode;                /* Tween mode */
-  gulong             tween_handler;       /* GSource or signal handler */
-  gulong             after_paint_handler; /* signal handler */
-  gdouble            last_offset;         /* Track our last offset */
-  GArray            *tweens;              /* Array of tweens to perform */
-  GdkFrameClock     *frame_clock;         /* An optional frame-clock for sync. */
-  GDestroyNotify     notify;              /* Notify callback */
-  gpointer           notify_data;         /* Data for notify */
+    GInitiallyUnowned parent_instance;
+
+    gpointer target;                      /* Target object to animate */
+    guint64 begin_msec;                   /* Time in which animation started */
+    guint duration_msec;                  /* Duration of animation */
+    guint mode;                           /* Tween mode */
+    gulong tween_handler;                 /* GSource or signal handler */
+    gulong after_paint_handler;           /* signal handler */
+    gdouble last_offset;                  /* Track our last offset */
+    GArray *tweens;                       /* Array of tweens to perform */
+    GdkFrameClock *frame_clock;           /* An optional frame-clock for sync. */
+    GDestroyNotify notify;                /* Notify callback */
+    gpointer notify_data;                 /* Data for notify */
 };
 
 G_DEFINE_TYPE (EggAnimation, egg_animation, G_TYPE_INITIALLY_UNOWNED)
 
-enum {
-  PROP_0,
-  PROP_DURATION,
-  PROP_FRAME_CLOCK,
-  PROP_MODE,
-  PROP_TARGET,
-  LAST_PROP
+enum
+{
+    PROP_0,
+    PROP_DURATION,
+    PROP_FRAME_CLOCK,
+    PROP_MODE,
+    PROP_TARGET,
+    LAST_PROP
 };
 
 
-enum {
-  TICK,
-  LAST_SIGNAL
+enum
+{
+    TICK,
+    LAST_SIGNAL
 };
 
 
@@ -83,27 +85,27 @@ enum {
  */
 #define LAST_FUNDAMENTAL 64
 #define TWEEN(type)                                       \
-  static void                                             \
-  tween_ ## type (const GValue * begin,                   \
-                  const GValue * end,                     \
-                  GValue * value,                         \
-                  gdouble offset)                         \
-  {                                                       \
-    g ## type x = g_value_get_ ## type (begin);           \
-    g ## type y = g_value_get_ ## type (end);             \
-    g_value_set_ ## type (value, x + ((y - x) * offset)); \
-  }
+    static void                                             \
+    tween_ ## type (const GValue * begin,                   \
+                    const GValue * end,                     \
+                    GValue * value,                         \
+                    gdouble offset)                         \
+    {                                                       \
+        g ## type x = g_value_get_ ## type (begin);           \
+        g ## type y = g_value_get_ ## type (end);             \
+        g_value_set_ ## type (value, x + ((y - x) * offset)); \
+    }
 
 
 /*
  * Globals.
  */
-static AlphaFunc   alpha_funcs[EGG_ANIMATION_LAST];
-static gboolean    debug;
+static AlphaFunc alpha_funcs[EGG_ANIMATION_LAST];
+static gboolean debug;
 static GParamSpec *properties[LAST_PROP];
-static guint       signals[LAST_SIGNAL];
-static TweenFunc   tween_funcs[LAST_FUNDAMENTAL];
-static guint       slow_down_factor = 1;
+static guint signals[LAST_SIGNAL];
+static TweenFunc tween_funcs[LAST_FUNDAMENTAL];
+static guint slow_down_factor = 1;
 
 
 /*
@@ -128,25 +130,29 @@ TWEEN (double);
 static gdouble
 egg_animation_alpha_ease_in_cubic (gdouble offset)
 {
-  return offset * offset * offset;
+    return offset * offset * offset;
 }
 
 
 static gdouble
 egg_animation_alpha_ease_out_cubic (gdouble offset)
 {
-  gdouble p = offset - 1.0;
+    gdouble p = offset - 1.0;
 
-  return p * p * p + 1.0;
+    return p * p * p + 1.0;
 }
 
 static gdouble
 egg_animation_alpha_ease_in_out_cubic (gdouble offset)
 {
-  if (offset < .5)
-    return egg_animation_alpha_ease_in_cubic (offset * 2.0) / 2.0;
-  else
-    return .5 + egg_animation_alpha_ease_out_cubic ((offset - .5) * 2.0) / 2.0;
+    if (offset < .5)
+    {
+        return egg_animation_alpha_ease_in_cubic (offset * 2.0) / 2.0;
+    }
+    else
+    {
+        return .5 + egg_animation_alpha_ease_out_cubic ((offset - .5) * 2.0) / 2.0;
+    }
 }
 
 
@@ -163,7 +169,7 @@ egg_animation_alpha_ease_in_out_cubic (gdouble offset)
 static gdouble
 egg_animation_alpha_linear (gdouble offset)
 {
-  return offset;
+    return offset;
 }
 
 
@@ -181,7 +187,7 @@ egg_animation_alpha_linear (gdouble offset)
 static gdouble
 egg_animation_alpha_ease_in_quad (gdouble offset)
 {
-  return offset * offset;
+    return offset * offset;
 }
 
 
@@ -199,7 +205,7 @@ egg_animation_alpha_ease_in_quad (gdouble offset)
 static gdouble
 egg_animation_alpha_ease_out_quad (gdouble offset)
 {
-  return -1.0 * offset * (offset - 2.0);
+    return -1.0 * offset * (offset - 2.0);
 }
 
 
@@ -218,11 +224,13 @@ egg_animation_alpha_ease_out_quad (gdouble offset)
 static gdouble
 egg_animation_alpha_ease_in_out_quad (gdouble offset)
 {
-  offset *= 2.0;
-  if (offset < 1.0)
-    return 0.5 * offset * offset;
-  offset -= 1.0;
-  return -0.5 * (offset * (offset - 2.0) - 1.0);
+    offset *= 2.0;
+    if (offset < 1.0)
+    {
+        return 0.5 * offset * offset;
+    }
+    offset -= 1.0;
+    return -0.5 * (offset * (offset - 2.0) - 1.0);
 }
 
 
@@ -238,29 +246,29 @@ egg_animation_alpha_ease_in_out_quad (gdouble offset)
 static void
 egg_animation_load_begin_values (EggAnimation *animation)
 {
-  GtkContainer *container;
-  Tween *tween;
-  guint i;
+    GtkContainer *container;
+    Tween *tween;
+    guint i;
 
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
 
-  for (i = 0; i < animation->tweens->len; i++)
+    for (i = 0; i < animation->tweens->len; i++)
     {
-      tween = &g_array_index (animation->tweens, Tween, i);
-      g_value_reset (&tween->begin);
-      if (tween->is_child)
+        tween = &g_array_index (animation->tweens, Tween, i);
+        g_value_reset (&tween->begin);
+        if (tween->is_child)
         {
-          container = GTK_CONTAINER (gtk_widget_get_parent (animation->target));
-          gtk_container_child_get_property (container,
-                                            animation->target,
-                                            tween->pspec->name,
-                                            &tween->begin);
+            container = GTK_CONTAINER (gtk_widget_get_parent (animation->target));
+            gtk_container_child_get_property (container,
+                                              animation->target,
+                                              tween->pspec->name,
+                                              &tween->begin);
         }
-      else
+        else
         {
-          g_object_get_property (animation->target,
-                                 tween->pspec->name,
-                                 &tween->begin);
+            g_object_get_property (animation->target,
+                                   tween->pspec->name,
+                                   &tween->begin);
         }
     }
 }
@@ -278,15 +286,15 @@ egg_animation_load_begin_values (EggAnimation *animation)
 static void
 egg_animation_unload_begin_values (EggAnimation *animation)
 {
-  Tween *tween;
-  guint i;
+    Tween *tween;
+    guint i;
 
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
 
-  for (i = 0; i < animation->tweens->len; i++)
+    for (i = 0; i < animation->tweens->len; i++)
     {
-      tween = &g_array_index (animation->tweens, Tween, i);
-      g_value_reset (&tween->begin);
+        tween = &g_array_index (animation->tweens, Tween, i);
+        g_value_reset (&tween->begin);
     }
 }
 
@@ -306,25 +314,29 @@ static gdouble
 egg_animation_get_offset (EggAnimation *animation,
                           gint64        frame_time)
 {
-  gdouble offset;
-  gint64 frame_msec;
+    gdouble offset;
+    gint64 frame_msec;
 
-  g_return_val_if_fail (EGG_IS_ANIMATION (animation), 0.0);
+    g_return_val_if_fail (EGG_IS_ANIMATION (animation), 0.0);
 
-  if (frame_time == 0)
+    if (frame_time == 0)
     {
-      if (animation->frame_clock != NULL)
-        frame_time = gdk_frame_clock_get_frame_time (animation->frame_clock);
-      else
-        frame_time = g_get_monotonic_time ();
+        if (animation->frame_clock != NULL)
+        {
+            frame_time = gdk_frame_clock_get_frame_time (animation->frame_clock);
+        }
+        else
+        {
+            frame_time = g_get_monotonic_time ();
+        }
     }
 
-  frame_msec = frame_time / 1000L;
+    frame_msec = frame_time / 1000L;
 
-  offset = (gdouble) (frame_msec - animation->begin_msec) /
-           (gdouble) MAX (animation->duration_msec, 1);
+    offset = (gdouble) (frame_msec - animation->begin_msec) /
+             (gdouble) MAX (animation->duration_msec, 1);
 
-  return CLAMP (offset, 0.0, 1.0);
+    return CLAMP (offset, 0.0, 1.0);
 }
 
 
@@ -340,17 +352,17 @@ egg_animation_get_offset (EggAnimation *animation,
  * Side effects: The property of @target is updated.
  */
 static void
-egg_animation_update_property (EggAnimation  *animation,
-                              gpointer      target,
-                              Tween        *tween,
-                              const GValue *value)
+egg_animation_update_property (EggAnimation *animation,
+                               gpointer      target,
+                               Tween        *tween,
+                               const GValue *value)
 {
-  g_assert (EGG_IS_ANIMATION (animation));
-  g_assert (G_IS_OBJECT (target));
-  g_assert (tween);
-  g_assert (value);
+    g_assert (EGG_IS_ANIMATION (animation));
+    g_assert (G_IS_OBJECT (target));
+    g_assert (tween);
+    g_assert (value);
 
-  g_object_set_property (target, tween->pspec->name, value);
+    g_object_set_property (target, tween->pspec->name, value);
 }
 
 
@@ -371,18 +383,18 @@ egg_animation_update_child_property (EggAnimation *animation,
                                      Tween        *tween,
                                      const GValue *value)
 {
-  GtkWidget *parent;
-
-  g_assert (EGG_IS_ANIMATION (animation));
-  g_assert (G_IS_OBJECT (target));
-  g_assert (tween);
-  g_assert (value);
-
-  parent = gtk_widget_get_parent (GTK_WIDGET (target));
-  gtk_container_child_set_property (GTK_CONTAINER (parent),
-                                    target,
-                                    tween->pspec->name,
-                                    value);
+    GtkWidget *parent;
+
+    g_assert (EGG_IS_ANIMATION (animation));
+    g_assert (G_IS_OBJECT (target));
+    g_assert (tween);
+    g_assert (value);
+
+    parent = gtk_widget_get_parent (GTK_WIDGET (target));
+    gtk_container_child_set_property (GTK_CONTAINER (parent),
+                                      target,
+                                      tween->pspec->name,
+                                      value);
 }
 
 
@@ -403,27 +415,29 @@ egg_animation_get_value_at_offset (EggAnimation *animation,
                                    Tween        *tween,
                                    GValue       *value)
 {
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
-  g_return_if_fail (tween != NULL);
-  g_return_if_fail (value != NULL);
-  g_return_if_fail (value->g_type == tween->pspec->value_type);
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (tween != NULL);
+    g_return_if_fail (value != NULL);
+    g_return_if_fail (value->g_type == tween->pspec->value_type);
 
-  if (value->g_type < LAST_FUNDAMENTAL)
+    if (value->g_type < LAST_FUNDAMENTAL)
     {
-      /*
-       * If you hit the following assertion, you need to add a function
-       * to create the new value at the given offset.
-       */
-      g_assert (tween_funcs[value->g_type]);
-      tween_funcs[value->g_type](&tween->begin, &tween->end, value, offset);
+        /*
+         * If you hit the following assertion, you need to add a function
+         * to create the new value at the given offset.
+         */
+        g_assert (tween_funcs[value->g_type]);
+        tween_funcs[value->g_type](&tween->begin, &tween->end, value, offset);
     }
-  else
+    else
     {
-      /*
-       * TODO: Support complex transitions.
-       */
-      if (offset >= 1.0)
-        g_value_copy (&tween->end, value);
+        /*
+         * TODO: Support complex transitions.
+         */
+        if (offset >= 1.0)
+        {
+            g_value_copy (&tween->end, value);
+        }
     }
 }
 
@@ -431,10 +445,10 @@ static void
 egg_animation_set_frame_clock (EggAnimation  *animation,
                                GdkFrameClock *frame_clock)
 {
-  if (animation->frame_clock != frame_clock)
+    if (animation->frame_clock != frame_clock)
     {
-      g_clear_object (&animation->frame_clock);
-      animation->frame_clock = frame_clock ? g_object_ref (frame_clock) : NULL;
+        g_clear_object (&animation->frame_clock);
+        animation->frame_clock = frame_clock ? g_object_ref (frame_clock) : NULL;
     }
 }
 
@@ -442,13 +456,15 @@ static void
 egg_animation_set_target (EggAnimation *animation,
                           gpointer      target)
 {
-  g_assert (!animation->target);
+    g_assert (!animation->target);
 
-  animation->target = g_object_ref (target);
+    animation->target = g_object_ref (target);
 
-  if (GTK_IS_WIDGET (animation->target))
-    egg_animation_set_frame_clock (animation,
-                                  gtk_widget_get_frame_clock (animation->target));
+    if (GTK_IS_WIDGET (animation->target))
+    {
+        egg_animation_set_frame_clock (animation,
+                                       gtk_widget_get_frame_clock (animation->target));
+    }
 }
 
 
@@ -465,64 +481,68 @@ static gboolean
 egg_animation_tick (EggAnimation *animation,
                     gdouble       offset)
 {
-  gdouble alpha;
-  GValue value = { 0 };
-  Tween *tween;
-  guint i;
+    gdouble alpha;
+    GValue value = { 0 };
+    Tween *tween;
+    guint i;
 
-  g_return_val_if_fail (EGG_IS_ANIMATION (animation), FALSE);
+    g_return_val_if_fail (EGG_IS_ANIMATION (animation), FALSE);
 
-  if (offset == animation->last_offset)
-    return offset < 1.0;
+    if (offset == animation->last_offset)
+    {
+        return offset < 1.0;
+    }
 
-  alpha = alpha_funcs[animation->mode](offset);
+    alpha = alpha_funcs[animation->mode](offset);
 
-  /*
-   * Update property values.
-   */
-  for (i = 0; i < animation->tweens->len; i++)
+    /*
+     * Update property values.
+     */
+    for (i = 0; i < animation->tweens->len; i++)
     {
-      tween = &g_array_index (animation->tweens, Tween, i);
-      g_value_init (&value, tween->pspec->value_type);
-      egg_animation_get_value_at_offset (animation, alpha, tween, &value);
-      if (!tween->is_child)
+        tween = &g_array_index (animation->tweens, Tween, i);
+        g_value_init (&value, tween->pspec->value_type);
+        egg_animation_get_value_at_offset (animation, alpha, tween, &value);
+        if (!tween->is_child)
         {
-          egg_animation_update_property (animation,
-                                        animation->target,
-                                        tween,
-                                        &value);
+            egg_animation_update_property (animation,
+                                           animation->target,
+                                           tween,
+                                           &value);
         }
-      else
+        else
         {
-          egg_animation_update_child_property (animation,
-                                              animation->target,
-                                              tween,
-                                              &value);
+            egg_animation_update_child_property (animation,
+                                                 animation->target,
+                                                 tween,
+                                                 &value);
         }
-      g_value_unset (&value);
+        g_value_unset (&value);
     }
 
-  /*
-   * Notify anyone interested in the tick signal.
-   */
-  g_signal_emit (animation, signals[TICK], 0);
+    /*
+     * Notify anyone interested in the tick signal.
+     */
+    g_signal_emit (animation, signals[TICK], 0);
 
-  /*
-   * Flush any outstanding events to the graphics server (in the case of X).
-   */
+    /*
+     * Flush any outstanding events to the graphics server (in the case of X).
+     */
 #if !GTK_CHECK_VERSION (3, 13, 0)
-  if (GTK_IS_WIDGET (animation->target))
+    if (GTK_IS_WIDGET (animation->target))
     {
-      GdkWindow *window;
+        GdkWindow *window;
 
-      if ((window = gtk_widget_get_window (GTK_WIDGET (animation->target))))
-        gdk_window_flush (window);
+        if ((window = gtk_widget_get_window (GTK_WIDGET (animation->target))))
+        {
+            gdk_window_flush (window);
+        }
     }
 #endif
 
-  animation->last_offset = offset;
+    animation->last_offset = offset;
 
-  return offset < 1.0;
+    return offset < 1.0;
 }
 
 
@@ -538,16 +558,18 @@ egg_animation_tick (EggAnimation *animation,
 static gboolean
 egg_animation_timeout_cb (gpointer user_data)
 {
-  EggAnimation *animation = user_data;
-  gboolean ret;
-  gdouble offset;
+    EggAnimation *animation = user_data;
+    gboolean ret;
+    gdouble offset;
 
-  offset = egg_animation_get_offset (animation, 0);
+    offset = egg_animation_get_offset (animation, 0);
 
-  if (!(ret = egg_animation_tick (animation, offset)))
-    egg_animation_stop (animation);
+    if (!(ret = egg_animation_tick (animation, offset)))
+    {
+        egg_animation_stop (animation);
+    }
 
-  return ret;
+    return ret;
 }
 
 
@@ -555,22 +577,24 @@ static gboolean
 egg_animation_widget_tick_cb (GdkFrameClock *frame_clock,
                               EggAnimation  *animation)
 {
-  gboolean ret = G_SOURCE_REMOVE;
+    gboolean ret = G_SOURCE_REMOVE;
 
-  g_assert (GDK_IS_FRAME_CLOCK (frame_clock));
-  g_assert (EGG_IS_ANIMATION (animation));
+    g_assert (GDK_IS_FRAME_CLOCK (frame_clock));
+    g_assert (EGG_IS_ANIMATION (animation));
 
-  if (animation->tween_handler)
+    if (animation->tween_handler)
     {
-      gdouble offset;
+        gdouble offset;
 
-      offset = egg_animation_get_offset (animation, 0);
+        offset = egg_animation_get_offset (animation, 0);
 
-      if (!(ret = egg_animation_tick (animation, offset)))
-        egg_animation_stop (animation);
+        if (!(ret = egg_animation_tick (animation, offset)))
+        {
+            egg_animation_stop (animation);
+        }
     }
 
-  return ret;
+    return ret;
 }
 
 
@@ -578,20 +602,20 @@ static void
 egg_animation_widget_after_paint_cb (GdkFrameClock *frame_clock,
                                      EggAnimation  *animation)
 {
-  gint64 base_time;
-  gint64 interval;
-  gint64 next_frame_time;
-  gdouble offset;
+    gint64 base_time;
+    gint64 interval;
+    gint64 next_frame_time;
+    gdouble offset;
 
-  g_assert (GDK_IS_FRAME_CLOCK (frame_clock));
-  g_assert (EGG_IS_ANIMATION (animation));
+    g_assert (GDK_IS_FRAME_CLOCK (frame_clock));
+    g_assert (EGG_IS_ANIMATION (animation));
 
-  base_time = gdk_frame_clock_get_frame_time (frame_clock);
-  gdk_frame_clock_get_refresh_info (frame_clock, base_time, &interval, &next_frame_time);
+    base_time = gdk_frame_clock_get_frame_time (frame_clock);
+    gdk_frame_clock_get_refresh_info (frame_clock, base_time, &interval, &next_frame_time);
 
-  offset = egg_animation_get_offset (animation, next_frame_time);
+    offset = egg_animation_get_offset (animation, next_frame_time);
 
-  egg_animation_tick (animation, offset);
+    egg_animation_tick (animation, offset);
 }
 
 
@@ -607,33 +631,33 @@ egg_animation_widget_after_paint_cb (GdkFrameClock *frame_clock,
 void
 egg_animation_start (EggAnimation *animation)
 {
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
-  g_return_if_fail (!animation->tween_handler);
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (!animation->tween_handler);
 
-  g_object_ref_sink (animation);
-  egg_animation_load_begin_values (animation);
+    g_object_ref_sink (animation);
+    egg_animation_load_begin_values (animation);
 
-  if (animation->frame_clock)
+    if (animation->frame_clock)
     {
-      animation->begin_msec = gdk_frame_clock_get_frame_time (animation->frame_clock) / 1000UL;
-      animation->tween_handler =
-        g_signal_connect (animation->frame_clock,
-                          "update",
-                          G_CALLBACK (egg_animation_widget_tick_cb),
-                          animation);
-      animation->after_paint_handler =
-        g_signal_connect (animation->frame_clock,
-                          "after-paint",
-                          G_CALLBACK (egg_animation_widget_after_paint_cb),
-                          animation);
-      gdk_frame_clock_begin_updating (animation->frame_clock);
+        animation->begin_msec = gdk_frame_clock_get_frame_time (animation->frame_clock) / 1000UL;
+        animation->tween_handler =
+            g_signal_connect (animation->frame_clock,
+                              "update",
+                              G_CALLBACK (egg_animation_widget_tick_cb),
+                              animation);
+        animation->after_paint_handler =
+            g_signal_connect (animation->frame_clock,
+                              "after-paint",
+                              G_CALLBACK (egg_animation_widget_after_paint_cb),
+                              animation);
+        gdk_frame_clock_begin_updating (animation->frame_clock);
     }
-  else
+    else
     {
-      animation->begin_msec = g_get_monotonic_time () / 1000UL;
-      animation->tween_handler = egg_frame_source_add (FALLBACK_FRAME_RATE,
-                                                       egg_animation_timeout_cb,
-                                                       animation);
+        animation->begin_msec = g_get_monotonic_time () / 1000UL;
+        animation->tween_handler = egg_frame_source_add (FALLBACK_FRAME_RATE,
+                                                         egg_animation_timeout_cb,
+                                                         animation);
     }
 }
 
@@ -641,17 +665,17 @@ egg_animation_start (EggAnimation *animation)
 static void
 egg_animation_notify (EggAnimation *self)
 {
-  g_assert (EGG_IS_ANIMATION (self));
+    g_assert (EGG_IS_ANIMATION (self));
 
-  if (self->notify != NULL)
+    if (self->notify != NULL)
     {
-      GDestroyNotify notify = self->notify;
-      gpointer data = self->notify_data;
+        GDestroyNotify notify = self->notify;
+        gpointer data = self->notify_data;
 
-      self->notify = NULL;
-      self->notify_data = NULL;
+        self->notify = NULL;
+        self->notify_data = NULL;
 
-      notify (data);
+        notify (data);
     }
 }
 
@@ -668,25 +692,25 @@ egg_animation_notify (EggAnimation *self)
 void
 egg_animation_stop (EggAnimation *animation)
 {
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
 
-  if (animation->tween_handler)
+    if (animation->tween_handler)
     {
-      if (animation->frame_clock)
+        if (animation->frame_clock)
         {
-          gdk_frame_clock_end_updating (animation->frame_clock);
-          g_signal_handler_disconnect (animation->frame_clock, animation->tween_handler);
-          g_signal_handler_disconnect (animation->frame_clock, animation->after_paint_handler);
-          animation->tween_handler = 0;
+            gdk_frame_clock_end_updating (animation->frame_clock);
+            g_signal_handler_disconnect (animation->frame_clock, animation->tween_handler);
+            g_signal_handler_disconnect (animation->frame_clock, animation->after_paint_handler);
+            animation->tween_handler = 0;
         }
-      else
+        else
         {
-          g_source_remove (animation->tween_handler);
-          animation->tween_handler = 0;
+            g_source_remove (animation->tween_handler);
+            animation->tween_handler = 0;
         }
-      egg_animation_unload_begin_values (animation);
-      egg_animation_notify (animation);
-      g_object_unref (animation);
+        egg_animation_unload_begin_values (animation);
+        egg_animation_notify (animation);
+        g_object_unref (animation);
     }
 }
 
@@ -707,33 +731,33 @@ egg_animation_add_property (EggAnimation *animation,
                             GParamSpec   *pspec,
                             const GValue *value)
 {
-  Tween tween = { 0 };
-  GType type;
-
-  g_return_if_fail (EGG_IS_ANIMATION (animation));
-  g_return_if_fail (pspec != NULL);
-  g_return_if_fail (value != NULL);
-  g_return_if_fail (value->g_type);
-  g_return_if_fail (animation->target);
-  g_return_if_fail (!animation->tween_handler);
-
-  type = G_TYPE_FROM_INSTANCE (animation->target);
-  tween.is_child = !g_type_is_a (type, pspec->owner_type);
-  if (tween.is_child)
+    Tween tween = { 0 };
+    GType type;
+
+    g_return_if_fail (EGG_IS_ANIMATION (animation));
+    g_return_if_fail (pspec != NULL);
+    g_return_if_fail (value != NULL);
+    g_return_if_fail (value->g_type);
+    g_return_if_fail (animation->target);
+    g_return_if_fail (!animation->tween_handler);
+
+    type = G_TYPE_FROM_INSTANCE (animation->target);
+    tween.is_child = !g_type_is_a (type, pspec->owner_type);
+    if (tween.is_child)
     {
-      if (!GTK_IS_WIDGET (animation->target))
+        if (!GTK_IS_WIDGET (animation->target))
         {
-          g_critical (_("Cannot locate property %s in class %s"),
-                      pspec->name, g_type_name (type));
-          return;
+            g_critical (_("Cannot locate property %s in class %s"),
+                        pspec->name, g_type_name (type));
+            return;
         }
     }
 
-  tween.pspec = g_param_spec_ref (pspec);
-  g_value_init (&tween.begin, pspec->value_type);
-  g_value_init (&tween.end, pspec->value_type);
-  g_value_copy (value, &tween.end);
-  g_array_append_val (animation->tweens, tween);
+    tween.pspec = g_param_spec_ref (pspec);
+    g_value_init (&tween.begin, pspec->value_type);
+    g_value_init (&tween.end, pspec->value_type);
+    g_value_copy (value, &tween.end);
+    g_array_append_val (animation->tweens, tween);
 }
 
 
@@ -748,12 +772,12 @@ egg_animation_add_property (EggAnimation *animation,
 static void
 egg_animation_dispose (GObject *object)
 {
-  EggAnimation *self = EGG_ANIMATION (object);
+    EggAnimation *self = EGG_ANIMATION (object);
 
-  g_clear_object (&self->target);
-  g_clear_object (&self->frame_clock);
+    g_clear_object (&self->target);
+    g_clear_object (&self->frame_clock);
 
-  G_OBJECT_CLASS (egg_animation_parent_class)->dispose (object);
+    G_OBJECT_CLASS (egg_animation_parent_class)->dispose (object);
 }
 
 
@@ -768,21 +792,21 @@ egg_animation_dispose (GObject *object)
 static void
 egg_animation_finalize (GObject *object)
 {
-  EggAnimation *self = EGG_ANIMATION (object);
-  Tween *tween;
-  guint i;
+    EggAnimation *self = EGG_ANIMATION (object);
+    Tween *tween;
+    guint i;
 
-  for (i = 0; i < self->tweens->len; i++)
+    for (i = 0; i < self->tweens->len; i++)
     {
-      tween = &g_array_index (self->tweens, Tween, i);
-      g_value_unset (&tween->begin);
-      g_value_unset (&tween->end);
-      g_param_spec_unref (tween->pspec);
+        tween = &g_array_index (self->tweens, Tween, i);
+        g_value_unset (&tween->begin);
+        g_value_unset (&tween->end);
+        g_param_spec_unref (tween->pspec);
     }
 
-  g_array_unref (self->tweens);
+    g_array_unref (self->tweens);
 
-  G_OBJECT_CLASS (egg_animation_parent_class)->finalize (object);
+    G_OBJECT_CLASS (egg_animation_parent_class)->finalize (object);
 }
 
 
@@ -801,28 +825,36 @@ egg_animation_set_property (GObject      *object,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
-  EggAnimation *animation = EGG_ANIMATION (object);
+    EggAnimation *animation = EGG_ANIMATION (object);
 
-  switch (prop_id)
+    switch (prop_id)
     {
-    case PROP_DURATION:
-      animation->duration_msec = g_value_get_uint (value) * slow_down_factor;
-      break;
+        case PROP_DURATION:
+        {
+            animation->duration_msec = g_value_get_uint (value) * slow_down_factor;
+        }
+        break;
 
-    case PROP_FRAME_CLOCK:
-      egg_animation_set_frame_clock (animation, g_value_get_object (value));
-      break;
+        case PROP_FRAME_CLOCK:
+        {
+            egg_animation_set_frame_clock (animation, g_value_get_object (value));
+        }
+        break;
 
-    case PROP_MODE:
-      animation->mode = g_value_get_enum (value);
-      break;
+        case PROP_MODE:
+        {
+            animation->mode = g_value_get_enum (value);
+        }
+        break;
 
-    case PROP_TARGET:
-      egg_animation_set_target (animation, g_value_get_object (value));
-      break;
+        case PROP_TARGET:
+        {
+            egg_animation_set_target (animation, g_value_get_object (value));
+        }
+        break;
 
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
@@ -838,116 +870,118 @@ egg_animation_set_property (GObject      *object,
 static void
 egg_animation_class_init (EggAnimationClass *klass)
 {
-  GObjectClass *object_class;
-  const gchar *slow_down_factor_env;
-
-  debug = !!g_getenv ("EGG_ANIMATION_DEBUG");
-  slow_down_factor_env = g_getenv ("EGG_ANIMATION_SLOW_DOWN_FACTOR");
-
-  if (slow_down_factor_env)
-    slow_down_factor = MAX (1, atoi (slow_down_factor_env));
-
-  object_class = G_OBJECT_CLASS (klass);
-  object_class->dispose = egg_animation_dispose;
-  object_class->finalize = egg_animation_finalize;
-  object_class->set_property = egg_animation_set_property;
-
-  /**
-   * EggAnimation:duration:
-   *
-   * The "duration" property is the total number of milliseconds that the
-   * animation should run before being completed.
-   */
-  properties[PROP_DURATION] =
-    g_param_spec_uint ("duration",
-                       "Duration",
-                       "The duration of the animation",
-                       0,
-                       G_MAXUINT,
-                       250,
-                       (G_PARAM_WRITABLE |
-                        G_PARAM_CONSTRUCT_ONLY |
-                        G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_FRAME_CLOCK] =
-    g_param_spec_object ("frame-clock",
-                         "Frame Clock",
-                         "An optional frame-clock to synchronize with.",
-                         GDK_TYPE_FRAME_CLOCK,
-                         (G_PARAM_WRITABLE |
-                          G_PARAM_CONSTRUCT_ONLY |
-                          G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EggAnimation:mode:
-   *
-   * The "mode" property is the Alpha function that should be used to
-   * determine the offset within the animation based on the current
-   * offset in the animations duration.
-   */
-  properties[PROP_MODE] =
-    g_param_spec_enum ("mode",
-                       "Mode",
-                       "The animation mode",
-                       EGG_TYPE_ANIMATION_MODE,
-                       EGG_ANIMATION_LINEAR,
-                       (G_PARAM_WRITABLE |
-                        G_PARAM_CONSTRUCT_ONLY |
-                        G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EggAnimation:target:
-   *
-   * The "target" property is the #GObject that should have its properties
-   * animated.
-   */
-  properties[PROP_TARGET] =
-    g_param_spec_object ("target",
-                         "Target",
-                         "The target of the animation",
-                         G_TYPE_OBJECT,
-                         (G_PARAM_WRITABLE |
-                          G_PARAM_CONSTRUCT_ONLY |
-                          G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_properties (object_class, LAST_PROP, properties);
-
-  /**
-   * EggAnimation::tick:
-   *
-   * The "tick" signal is emitted on each frame in the animation.
-   */
-  signals[TICK] = g_signal_new ("tick",
-                                 EGG_TYPE_ANIMATION,
-                                 G_SIGNAL_RUN_FIRST,
-                                 0,
-                                 NULL, NULL, NULL,
-                                 G_TYPE_NONE,
-                                 0);
+    GObjectClass *object_class;
+    const gchar *slow_down_factor_env;
+
+    debug = !!g_getenv ("EGG_ANIMATION_DEBUG");
+    slow_down_factor_env = g_getenv ("EGG_ANIMATION_SLOW_DOWN_FACTOR");
+
+    if (slow_down_factor_env)
+    {
+        slow_down_factor = MAX (1, atoi (slow_down_factor_env));
+    }
+
+    object_class = G_OBJECT_CLASS (klass);
+    object_class->dispose = egg_animation_dispose;
+    object_class->finalize = egg_animation_finalize;
+    object_class->set_property = egg_animation_set_property;
+
+    /**
+     * EggAnimation:duration:
+     *
+     * The "duration" property is the total number of milliseconds that the
+     * animation should run before being completed.
+     */
+    properties[PROP_DURATION] =
+        g_param_spec_uint ("duration",
+                           "Duration",
+                           "The duration of the animation",
+                           0,
+                           G_MAXUINT,
+                           250,
+                           (G_PARAM_WRITABLE |
+                            G_PARAM_CONSTRUCT_ONLY |
+                            G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_FRAME_CLOCK] =
+        g_param_spec_object ("frame-clock",
+                             "Frame Clock",
+                             "An optional frame-clock to synchronize with.",
+                             GDK_TYPE_FRAME_CLOCK,
+                             (G_PARAM_WRITABLE |
+                              G_PARAM_CONSTRUCT_ONLY |
+                              G_PARAM_STATIC_STRINGS));
+
+    /**
+     * EggAnimation:mode:
+     *
+     * The "mode" property is the Alpha function that should be used to
+     * determine the offset within the animation based on the current
+     * offset in the animations duration.
+     */
+    properties[PROP_MODE] =
+        g_param_spec_enum ("mode",
+                           "Mode",
+                           "The animation mode",
+                           EGG_TYPE_ANIMATION_MODE,
+                           EGG_ANIMATION_LINEAR,
+                           (G_PARAM_WRITABLE |
+                            G_PARAM_CONSTRUCT_ONLY |
+                            G_PARAM_STATIC_STRINGS));
+
+    /**
+     * EggAnimation:target:
+     *
+     * The "target" property is the #GObject that should have its properties
+     * animated.
+     */
+    properties[PROP_TARGET] =
+        g_param_spec_object ("target",
+                             "Target",
+                             "The target of the animation",
+                             G_TYPE_OBJECT,
+                             (G_PARAM_WRITABLE |
+                              G_PARAM_CONSTRUCT_ONLY |
+                              G_PARAM_STATIC_STRINGS));
+
+    g_object_class_install_properties (object_class, LAST_PROP, properties);
+
+    /**
+     * EggAnimation::tick:
+     *
+     * The "tick" signal is emitted on each frame in the animation.
+     */
+    signals[TICK] = g_signal_new ("tick",
+                                  EGG_TYPE_ANIMATION,
+                                  G_SIGNAL_RUN_FIRST,
+                                  0,
+                                  NULL, NULL, NULL,
+                                  G_TYPE_NONE,
+                                  0);
 
 #define SET_ALPHA(_T, _t) \
-  alpha_funcs[EGG_ANIMATION_ ## _T] = egg_animation_alpha_ ## _t
+    alpha_funcs[EGG_ANIMATION_ ## _T] = egg_animation_alpha_ ## _t
 
-  SET_ALPHA (LINEAR, linear);
-  SET_ALPHA (EASE_IN_QUAD, ease_in_quad);
-  SET_ALPHA (EASE_OUT_QUAD, ease_out_quad);
-  SET_ALPHA (EASE_IN_OUT_QUAD, ease_in_out_quad);
-  SET_ALPHA (EASE_IN_CUBIC, ease_in_cubic);
-  SET_ALPHA (EASE_OUT_CUBIC, ease_out_cubic);
-  SET_ALPHA (EASE_IN_OUT_CUBIC, ease_in_out_cubic);
+    SET_ALPHA (LINEAR, linear);
+    SET_ALPHA (EASE_IN_QUAD, ease_in_quad);
+    SET_ALPHA (EASE_OUT_QUAD, ease_out_quad);
+    SET_ALPHA (EASE_IN_OUT_QUAD, ease_in_out_quad);
+    SET_ALPHA (EASE_IN_CUBIC, ease_in_cubic);
+    SET_ALPHA (EASE_OUT_CUBIC, ease_out_cubic);
+    SET_ALPHA (EASE_IN_OUT_CUBIC, ease_in_out_cubic);
 
 #define SET_TWEEN(_T, _t) \
-  G_STMT_START { \
-    guint idx = G_TYPE_ ## _T; \
-    tween_funcs[idx] = tween_ ## _t; \
-  } G_STMT_END
-
-  SET_TWEEN (INT, int);
-  SET_TWEEN (UINT, uint);
-  SET_TWEEN (LONG, long);
-  SET_TWEEN (ULONG, ulong);
-  SET_TWEEN (FLOAT, float);
-  SET_TWEEN (DOUBLE, double);
+    G_STMT_START { \
+        guint idx = G_TYPE_ ## _T; \
+        tween_funcs[idx] = tween_ ## _t; \
+    } G_STMT_END
+
+    SET_TWEEN (INT, int);
+    SET_TWEEN (UINT, uint);
+    SET_TWEEN (LONG, long);
+    SET_TWEEN (ULONG, ulong);
+    SET_TWEEN (FLOAT, float);
+    SET_TWEEN (DOUBLE, double);
 }
 
 
@@ -962,10 +996,10 @@ egg_animation_class_init (EggAnimationClass *klass)
 static void
 egg_animation_init (EggAnimation *animation)
 {
-  animation->duration_msec = 250;
-  animation->mode = EGG_ANIMATION_EASE_IN_OUT_QUAD;
-  animation->tweens = g_array_new (FALSE, FALSE, sizeof (Tween));
-  animation->last_offset = -G_MINDOUBLE;
+    animation->duration_msec = 250;
+    animation->mode = EGG_ANIMATION_EASE_IN_OUT_QUAD;
+    animation->tweens = g_array_new (FALSE, FALSE, sizeof (Tween));
+    animation->last_offset = -G_MINDOUBLE;
 }
 
 
@@ -980,21 +1014,24 @@ egg_animation_init (EggAnimation *animation)
 GType
 egg_animation_mode_get_type (void)
 {
-  static GType type_id = 0;
-  static const GEnumValue values[] = {
-    { EGG_ANIMATION_LINEAR, "EGG_ANIMATION_LINEAR", "linear" },
-    { EGG_ANIMATION_EASE_IN_QUAD, "EGG_ANIMATION_EASE_IN_QUAD", "ease-in-quad" },
-    { EGG_ANIMATION_EASE_IN_OUT_QUAD, "EGG_ANIMATION_EASE_IN_OUT_QUAD", "ease-in-out-quad" },
-    { EGG_ANIMATION_EASE_OUT_QUAD, "EGG_ANIMATION_EASE_OUT_QUAD", "ease-out-quad" },
-    { EGG_ANIMATION_EASE_IN_CUBIC, "EGG_ANIMATION_EASE_IN_CUBIC", "ease-in-cubic" },
-    { EGG_ANIMATION_EASE_OUT_CUBIC, "EGG_ANIMATION_EASE_OUT_CUBIC", "ease-out-cubic" },
-    { EGG_ANIMATION_EASE_IN_OUT_CUBIC, "EGG_ANIMATION_EASE_IN_OUT_CUBIC", "ease-in-out-cubic" },
-    { 0 }
-  };
-
-  if (G_UNLIKELY (!type_id))
-    type_id = g_enum_register_static ("EggAnimationMode", values);
-  return type_id;
+    static GType type_id = 0;
+    static const GEnumValue values[] =
+    {
+        { EGG_ANIMATION_LINEAR, "EGG_ANIMATION_LINEAR", "linear" },
+        { EGG_ANIMATION_EASE_IN_QUAD, "EGG_ANIMATION_EASE_IN_QUAD", "ease-in-quad" },
+        { EGG_ANIMATION_EASE_IN_OUT_QUAD, "EGG_ANIMATION_EASE_IN_OUT_QUAD", "ease-in-out-quad" },
+        { EGG_ANIMATION_EASE_OUT_QUAD, "EGG_ANIMATION_EASE_OUT_QUAD", "ease-out-quad" },
+        { EGG_ANIMATION_EASE_IN_CUBIC, "EGG_ANIMATION_EASE_IN_CUBIC", "ease-in-cubic" },
+        { EGG_ANIMATION_EASE_OUT_CUBIC, "EGG_ANIMATION_EASE_OUT_CUBIC", "ease-out-cubic" },
+        { EGG_ANIMATION_EASE_IN_OUT_CUBIC, "EGG_ANIMATION_EASE_IN_OUT_CUBIC", "ease-in-out-cubic" },
+        { 0 }
+    };
+
+    if (G_UNLIKELY (!type_id))
+    {
+        type_id = g_enum_register_static ("EggAnimationMode", values);
+    }
+    return type_id;
 }
 
 /**
@@ -1016,102 +1053,106 @@ egg_object_animatev (gpointer          object,
                      const gchar      *first_property,
                      va_list           args)
 {
-  EggAnimation *animation;
-  GObjectClass *klass;
-  GObjectClass *pklass;
-  const gchar *name;
-  GParamSpec *pspec;
-  GtkWidget *parent;
-  GValue value = { 0 };
-  gchar *error = NULL;
-  GType type;
-  GType ptype;
-  gboolean enable_animations;
-
-  g_return_val_if_fail (first_property != NULL, NULL);
-  g_return_val_if_fail (mode < EGG_ANIMATION_LAST, NULL);
-
-  if ((frame_clock == NULL) && GTK_IS_WIDGET (object))
-    frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (object));
-
-  /*
-   * If we have a frame clock, then we must be in the gtk thread and we
-   * should check GtkSettings for disabled animations. If we are disabled,
-   * we will just make the timeout immediate.
-   */
-  if (frame_clock != NULL)
+    EggAnimation *animation;
+    GObjectClass *klass;
+    GObjectClass *pklass;
+    const gchar *name;
+    GParamSpec *pspec;
+    GtkWidget *parent;
+    GValue value = { 0 };
+    gchar *error = NULL;
+    GType type;
+    GType ptype;
+    gboolean enable_animations;
+
+    g_return_val_if_fail (first_property != NULL, NULL);
+    g_return_val_if_fail (mode < EGG_ANIMATION_LAST, NULL);
+
+    if ((frame_clock == NULL) && GTK_IS_WIDGET (object))
     {
-      g_object_get (gtk_settings_get_default (),
-                    "gtk-enable-animations", &enable_animations,
-                    NULL);
+        frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (object));
+    }
 
-      if (enable_animations == FALSE)
-        duration_msec = 0;
+    /*
+     * If we have a frame clock, then we must be in the gtk thread and we
+     * should check GtkSettings for disabled animations. If we are disabled,
+     * we will just make the timeout immediate.
+     */
+    if (frame_clock != NULL)
+    {
+        g_object_get (gtk_settings_get_default (),
+                      "gtk-enable-animations", &enable_animations,
+                      NULL);
+
+        if (enable_animations == FALSE)
+        {
+            duration_msec = 0;
+        }
     }
 
-  name = first_property;
-  type = G_TYPE_FROM_INSTANCE (object);
-  klass = G_OBJECT_GET_CLASS (object);
-  animation = g_object_new (EGG_TYPE_ANIMATION,
-                            "duration", duration_msec,
-                            "frame-clock", frame_clock,
-                            "mode", mode,
-                            "target", object,
-                            NULL);
-
-  do
+    name = first_property;
+    type = G_TYPE_FROM_INSTANCE (object);
+    klass = G_OBJECT_GET_CLASS (object);
+    animation = g_object_new (EGG_TYPE_ANIMATION,
+                              "duration", duration_msec,
+                              "frame-clock", frame_clock,
+                              "mode", mode,
+                              "target", object,
+                              NULL);
+
+    do
     {
-      /*
-       * First check for the property on the object. If that does not exist
-       * then check if the object has a parent and look at its child
-       * properties (if it's a GtkWidget).
-       */
-      if (!(pspec = g_object_class_find_property (klass, name)))
+        /*
+         * First check for the property on the object. If that does not exist
+         * then check if the object has a parent and look at its child
+         * properties (if it's a GtkWidget).
+         */
+        if (!(pspec = g_object_class_find_property (klass, name)))
         {
-          if (!g_type_is_a (type, GTK_TYPE_WIDGET))
+            if (!g_type_is_a (type, GTK_TYPE_WIDGET))
             {
-              g_critical (_("Failed to find property %s in %s"),
-                          name, g_type_name (type));
-              goto failure;
+                g_critical (_("Failed to find property %s in %s"),
+                            name, g_type_name (type));
+                goto failure;
             }
-          if (!(parent = gtk_widget_get_parent (object)))
+            if (!(parent = gtk_widget_get_parent (object)))
             {
-              g_critical (_("Failed to find property %s in %s"),
-                          name, g_type_name (type));
-              goto failure;
+                g_critical (_("Failed to find property %s in %s"),
+                            name, g_type_name (type));
+                goto failure;
             }
-          pklass = G_OBJECT_GET_CLASS (parent);
-          ptype = G_TYPE_FROM_INSTANCE (parent);
-          if (!(pspec = gtk_container_class_find_child_property (pklass, name)))
+            pklass = G_OBJECT_GET_CLASS (parent);
+            ptype = G_TYPE_FROM_INSTANCE (parent);
+            if (!(pspec = gtk_container_class_find_child_property (pklass, name)))
             {
-              g_critical (_("Failed to find property %s in %s or parent %s"),
-                          name, g_type_name (type), g_type_name (ptype));
-              goto failure;
+                g_critical (_("Failed to find property %s in %s or parent %s"),
+                            name, g_type_name (type), g_type_name (ptype));
+                goto failure;
             }
         }
 
-      g_value_init (&value, pspec->value_type);
-      G_VALUE_COLLECT (&value, args, 0, &error);
-      if (error != NULL)
+        g_value_init (&value, pspec->value_type);
+        G_VALUE_COLLECT (&value, args, 0, &error);
+        if (error != NULL)
         {
-          g_critical (_("Failed to retrieve va_list value: %s"), error);
-          g_free (error);
-          goto failure;
+            g_critical (_("Failed to retrieve va_list value: %s"), error);
+            g_free (error);
+            goto failure;
         }
 
-      egg_animation_add_property (animation, pspec, &value);
-      g_value_unset (&value);
+        egg_animation_add_property (animation, pspec, &value);
+        g_value_unset (&value);
     }
-  while ((name = va_arg (args, const gchar *)));
+    while ((name = va_arg (args, const gchar *)));
 
-  egg_animation_start (animation);
+    egg_animation_start (animation);
 
-  return animation;
+    return animation;
 
 failure:
-  g_object_ref_sink (animation);
-  g_object_unref (animation);
-  return NULL;
+    g_object_ref_sink (animation);
+    g_object_unref (animation);
+    return NULL;
 }
 
 /**
@@ -1127,27 +1168,27 @@ failure:
  * Return value: (transfer none): A #EggAnimation.
  * Side effects: None.
  */
-EggAnimation*
-egg_object_animate (gpointer        object,
+EggAnimation *
+egg_object_animate (gpointer         object,
                     EggAnimationMode mode,
-                    guint           duration_msec,
-                    GdkFrameClock  *frame_clock,
-                    const gchar    *first_property,
+                    guint            duration_msec,
+                    GdkFrameClock   *frame_clock,
+                    const gchar     *first_property,
                     ...)
 {
-  EggAnimation *animation;
-  va_list args;
-
-  va_start (args, first_property);
-  animation = egg_object_animatev (object,
-                                   mode,
-                                   duration_msec,
-                                   frame_clock,
-                                   first_property,
-                                   args);
-  va_end (args);
-
-  return animation;
+    EggAnimation *animation;
+    va_list args;
+
+    va_start (args, first_property);
+    animation = egg_object_animatev (object,
+                                     mode,
+                                     duration_msec,
+                                     frame_clock,
+                                     first_property,
+                                     args);
+    va_end (args);
+
+    return animation;
 }
 
 /**
@@ -1155,30 +1196,30 @@ egg_object_animate (gpointer        object,
  *
  * Return value: (transfer none): A #EggAnimation.
  */
-EggAnimation*
-egg_object_animate_full (gpointer        object,
+EggAnimation *
+egg_object_animate_full (gpointer         object,
                          EggAnimationMode mode,
-                         guint           duration_msec,
-                         GdkFrameClock  *frame_clock,
-                         GDestroyNotify  notify,
-                         gpointer        notify_data,
-                         const gchar    *first_property,
+                         guint            duration_msec,
+                         GdkFrameClock   *frame_clock,
+                         GDestroyNotify   notify,
+                         gpointer         notify_data,
+                         const gchar     *first_property,
                          ...)
 {
-  EggAnimation *animation;
-  va_list args;
-
-  va_start (args, first_property);
-  animation = egg_object_animatev (object,
-                                   mode,
-                                   duration_msec,
-                                   frame_clock,
-                                   first_property,
-                                   args);
-  va_end (args);
-
-  animation->notify = notify;
-  animation->notify_data = notify_data;
-
-  return animation;
+    EggAnimation *animation;
+    va_list args;
+
+    va_start (args, first_property);
+    animation = egg_object_animatev (object,
+                                     mode,
+                                     duration_msec,
+                                     frame_clock,
+                                     first_property,
+                                     args);
+    va_end (args);
+
+    animation->notify = notify;
+    animation->notify_data = notify_data;
+
+    return animation;
 }
diff --git a/src/animation/egg-frame-source.c b/src/animation/egg-frame-source.c
index 5672a05e0..2689378c2 100644
--- a/src/animation/egg-frame-source.c
+++ b/src/animation/egg-frame-source.c
@@ -20,56 +20,61 @@
 
 typedef struct
 {
-   GSource parent;
-   guint   fps;
-   guint   frame_count;
-   gint64  start_time;
+    GSource parent;
+    guint fps;
+    guint frame_count;
+    gint64 start_time;
 } EggFrameSource;
 
 static gboolean
 egg_frame_source_prepare (GSource *source,
                           gint    *timeout_)
 {
-   EggFrameSource *fsource = (EggFrameSource *)(gpointer)source;
-   gint64 current_time;
-   guint elapsed_time;
-   guint new_frame_num;
-   guint frame_time;
-
-   current_time = g_source_get_time(source) / 1000;
-   elapsed_time = current_time - fsource->start_time;
-   new_frame_num = elapsed_time * fsource->fps / 1000;
-
-   /* If time has gone backwards or the time since the last frame is
-    * greater than the two frames worth then reset the time and do a
-    * frame now */
-   if (new_frame_num < fsource->frame_count ||
-       new_frame_num - fsource->frame_count > 2) {
-      /* Get the frame time rounded up to the nearest ms */
-      frame_time = (1000 + fsource->fps - 1) / fsource->fps;
-
-      /* Reset the start time */
-      fsource->start_time = current_time;
-
-      /* Move the start time as if one whole frame has elapsed */
-      fsource->start_time -= frame_time;
-      fsource->frame_count = 0;
-      *timeout_ = 0;
-      return TRUE;
-   } else if (new_frame_num > fsource->frame_count) {
-      *timeout_ = 0;
-      return TRUE;
-   } else {
-      *timeout_ = (fsource->frame_count + 1) * 1000 / fsource->fps - elapsed_time;
-      return FALSE;
-   }
+    EggFrameSource *fsource = (EggFrameSource *) (gpointer) source;
+    gint64 current_time;
+    guint elapsed_time;
+    guint new_frame_num;
+    guint frame_time;
+
+    current_time = g_source_get_time (source) / 1000;
+    elapsed_time = current_time - fsource->start_time;
+    new_frame_num = elapsed_time * fsource->fps / 1000;
+
+    /* If time has gone backwards or the time since the last frame is
+     * greater than the two frames worth then reset the time and do a
+     * frame now */
+    if (new_frame_num < fsource->frame_count ||
+        new_frame_num - fsource->frame_count > 2)
+    {
+        /* Get the frame time rounded up to the nearest ms */
+        frame_time = (1000 + fsource->fps - 1) / fsource->fps;
+
+        /* Reset the start time */
+        fsource->start_time = current_time;
+
+        /* Move the start time as if one whole frame has elapsed */
+        fsource->start_time -= frame_time;
+        fsource->frame_count = 0;
+        *timeout_ = 0;
+        return TRUE;
+    }
+    else if (new_frame_num > fsource->frame_count)
+    {
+        *timeout_ = 0;
+        return TRUE;
+    }
+    else
+    {
+        *timeout_ = (fsource->frame_count + 1) * 1000 / fsource->fps - elapsed_time;
+        return FALSE;
+    }
 }
 
 static gboolean
 egg_frame_source_check (GSource *source)
 {
-   gint timeout_;
-   return egg_frame_source_prepare(source, &timeout_);
+    gint timeout_;
+    return egg_frame_source_prepare (source, &timeout_);
 }
 
 static gboolean
@@ -77,18 +82,21 @@ egg_frame_source_dispatch (GSource     *source,
                            GSourceFunc  source_func,
                            gpointer     user_data)
 {
-   EggFrameSource *fsource = (EggFrameSource *)(gpointer)source;
-   gboolean ret;
-
-   if ((ret = source_func(user_data)))
-      fsource->frame_count++;
-   return ret;
+    EggFrameSource *fsource = (EggFrameSource *) (gpointer) source;
+    gboolean ret;
+
+    if ((ret = source_func (user_data)))
+    {
+        fsource->frame_count++;
+    }
+    return ret;
 }
 
-static GSourceFuncs source_funcs = {
-   egg_frame_source_prepare,
-   egg_frame_source_check,
-   egg_frame_source_dispatch,
+static GSourceFuncs source_funcs =
+{
+    egg_frame_source_prepare,
+    egg_frame_source_check,
+    egg_frame_source_dispatch,
 };
 
 /**
@@ -108,23 +116,23 @@ egg_frame_source_add (guint       frames_per_sec,
                       GSourceFunc callback,
                       gpointer    user_data)
 {
-   EggFrameSource *fsource;
-   GSource *source;
-   guint ret;
+    EggFrameSource *fsource;
+    GSource *source;
+    guint ret;
 
-   g_return_val_if_fail (frames_per_sec > 0, 0);
-   g_return_val_if_fail (frames_per_sec <= 120, 0);
+    g_return_val_if_fail (frames_per_sec > 0, 0);
+    g_return_val_if_fail (frames_per_sec <= 120, 0);
 
-   source = g_source_new(&source_funcs, sizeof(EggFrameSource));
-   fsource = (EggFrameSource *)(gpointer)source;
-   fsource->fps = frames_per_sec;
-   fsource->frame_count = 0;
-   fsource->start_time = g_get_monotonic_time() / 1000;
-   g_source_set_callback(source, callback, user_data, NULL);
-   g_source_set_name(source, "EggFrameSource");
+    source = g_source_new (&source_funcs, sizeof (EggFrameSource));
+    fsource = (EggFrameSource *) (gpointer) source;
+    fsource->fps = frames_per_sec;
+    fsource->frame_count = 0;
+    fsource->start_time = g_get_monotonic_time () / 1000;
+    g_source_set_callback (source, callback, user_data, NULL);
+    g_source_set_name (source, "EggFrameSource");
 
-   ret = g_source_attach(source, NULL);
-   g_source_unref(source);
+    ret = g_source_attach (source, NULL);
+    g_source_unref (source);
 
-   return ret;
+    return ret;
 }
diff --git a/src/animation/ide-box-theatric.c b/src/animation/ide-box-theatric.c
index cad8d4a44..1f2faebb5 100644
--- a/src/animation/ide-box-theatric.c
+++ b/src/animation/ide-box-theatric.c
@@ -26,37 +26,38 @@
 
 struct _IdeBoxTheatric
 {
-  GObject          parent_instance;
+    GObject parent_instance;
 
-  GtkWidget       *target;
-  GtkWidget       *toplevel;
+    GtkWidget *target;
+    GtkWidget *toplevel;
 
-  GIcon           *icon;
-  cairo_surface_t *icon_surface;
-  guint            icon_surface_size;
+    GIcon *icon;
+    cairo_surface_t *icon_surface;
+    guint icon_surface_size;
 
-  GdkRectangle     area;
-  GdkRectangle     last_area;
-  GdkRGBA          background_rgba;
-  gdouble          alpha;
+    GdkRectangle area;
+    GdkRectangle last_area;
+    GdkRGBA background_rgba;
+    gdouble alpha;
 
-  guint            draw_handler;
+    guint draw_handler;
 
-  guint            background_set : 1;
-  guint            pixbuf_failed : 1;
+    guint background_set : 1;
+    guint pixbuf_failed : 1;
 };
 
-enum {
-  PROP_0,
-  PROP_ALPHA,
-  PROP_BACKGROUND,
-  PROP_HEIGHT,
-  PROP_ICON,
-  PROP_TARGET,
-  PROP_WIDTH,
-  PROP_X,
-  PROP_Y,
-  LAST_PROP
+enum
+{
+    PROP_0,
+    PROP_ALPHA,
+    PROP_BACKGROUND,
+    PROP_HEIGHT,
+    PROP_ICON,
+    PROP_TARGET,
+    PROP_WIDTH,
+    PROP_X,
+    PROP_Y,
+    LAST_PROP
 };
 
 G_DEFINE_TYPE (IdeBoxTheatric, ide_box_theatric, G_TYPE_OBJECT)
@@ -65,14 +66,14 @@ static GParamSpec *properties[LAST_PROP];
 
 static void
 get_toplevel_rect (IdeBoxTheatric *theatric,
-                   GdkRectangle  *area)
+                   GdkRectangle   *area)
 {
-  gtk_widget_translate_coordinates (theatric->target, theatric->toplevel,
-                                    theatric->area.x, theatric->area.y,
-                                    &area->x, &area->y);
+    gtk_widget_translate_coordinates (theatric->target, theatric->toplevel,
+                                      theatric->area.x, theatric->area.y,
+                                      &area->x, &area->y);
 
-  area->width = theatric->area.width;
-  area->height = theatric->area.height;
+    area->width = theatric->area.width;
+    area->height = theatric->area.height;
 }
 
 static gboolean
@@ -80,109 +81,111 @@ on_toplevel_draw (GtkWidget      *widget,
                   cairo_t        *cr,
                   IdeBoxTheatric *self)
 {
-  GdkRectangle area;
+    GdkRectangle area;
 
-  g_assert (IDE_IS_BOX_THEATRIC (self));
+    g_assert (IDE_IS_BOX_THEATRIC (self));
 
-  get_toplevel_rect (self, &area);
+    get_toplevel_rect (self, &area);
 
 #if 0
-  g_print ("Drawing on %s at %d,%d %dx%d\n",
-           g_type_name (G_TYPE_FROM_INSTANCE (widget)),
-           area.x, area.y, area.width, area.height);
+    g_print ("Drawing on %s at %d,%d %dx%d\n",
+             g_type_name (G_TYPE_FROM_INSTANCE (widget)),
+             area.x, area.y, area.width, area.height);
 #endif
 
-  if (self->background_set)
+    if (self->background_set)
     {
-      GdkRGBA bg;
+        GdkRGBA bg;
 
-      bg = self->background_rgba;
-      bg.alpha = self->alpha;
+        bg = self->background_rgba;
+        bg.alpha = self->alpha;
 
-      ide_cairo_rounded_rectangle (cr, &area, 3, 3);
-      gdk_cairo_set_source_rgba (cr, &bg);
-      cairo_fill (cr);
+        ide_cairo_rounded_rectangle (cr, &area, 3, 3);
+        gdk_cairo_set_source_rgba (cr, &bg);
+        cairo_fill (cr);
     }
 
-  /* Load an icon if necessary and cache the surface */
-  if (self->icon != NULL && self->icon_surface == NULL && !self->pixbuf_failed)
+    /* Load an icon if necessary and cache the surface */
+    if (self->icon != NULL && self->icon_surface == NULL && !self->pixbuf_failed)
     {
-      g_autoptr(GtkIconInfo) icon_info = NULL;
-      GtkIconTheme *icon_theme;
-      gint width;
-
-      width = area.width * 4;
-      icon_theme = gtk_icon_theme_get_default ();
-      icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
-                                                  self->icon,
-                                                  width,
-                                                  GTK_ICON_LOOKUP_FORCE_SIZE);
-
-      if (icon_info != NULL)
+        g_autoptr (GtkIconInfo) icon_info = NULL;
+        GtkIconTheme *icon_theme;
+        gint width;
+
+        width = area.width * 4;
+        icon_theme = gtk_icon_theme_get_default ();
+        icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+                                                    self->icon,
+                                                    width,
+                                                    GTK_ICON_LOOKUP_FORCE_SIZE);
+
+        if (icon_info != NULL)
         {
-          GdkWindow *window = gtk_widget_get_window (widget);
-          g_autoptr(GdkPixbuf) pixbuf = NULL;
-          GtkStyleContext *context;
+            GdkWindow *window = gtk_widget_get_window (widget);
+            g_autoptr (GdkPixbuf) pixbuf = NULL;
+            GtkStyleContext *context;
 
-          context = gtk_widget_get_style_context (self->target);
-          pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, context, NULL, NULL);
+            context = gtk_widget_get_style_context (self->target);
+            pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, context, NULL, NULL);
 
-          if (pixbuf != NULL)
+            if (pixbuf != NULL)
             {
-              self->icon_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 0, window);
-              self->icon_surface_size = width;
-              self->pixbuf_failed = FALSE;
+                self->icon_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 0, window);
+                self->icon_surface_size = width;
+                self->pixbuf_failed = FALSE;
             }
-          else
+            else
             {
-              self->pixbuf_failed = TRUE;
+                self->pixbuf_failed = TRUE;
             }
         }
     }
 
-  if (self->icon_surface != NULL)
+    if (self->icon_surface != NULL)
     {
-      cairo_translate (cr, area.x, area.y);
-      cairo_rectangle (cr, 0, 0, area.width, area.height);
-      cairo_scale (cr,
-                   area.width / (gdouble)self->icon_surface_size,
-                   area.height / (gdouble)self->icon_surface_size);
-      cairo_set_source_surface (cr, self->icon_surface, 0, 0);
-      cairo_paint_with_alpha (cr, self->alpha);
+        cairo_translate (cr, area.x, area.y);
+        cairo_rectangle (cr, 0, 0, area.width, area.height);
+        cairo_scale (cr,
+                     area.width / (gdouble) self->icon_surface_size,
+                     area.height / (gdouble) self->icon_surface_size);
+        cairo_set_source_surface (cr, self->icon_surface, 0, 0);
+        cairo_paint_with_alpha (cr, self->alpha);
     }
 
-  self->last_area = area;
+    self->last_area = area;
 
-  return FALSE;
+    return FALSE;
 }
 
 static void
 ide_box_theatric_notify (GObject    *object,
-                        GParamSpec *pspec)
+                         GParamSpec *pspec)
 {
-  IdeBoxTheatric *self = IDE_BOX_THEATRIC (object);
+    IdeBoxTheatric *self = IDE_BOX_THEATRIC (object);
 
-  if (G_OBJECT_CLASS (ide_box_theatric_parent_class)->notify)
-    G_OBJECT_CLASS (ide_box_theatric_parent_class)->notify (object, pspec);
+    if (G_OBJECT_CLASS (ide_box_theatric_parent_class)->notify)
+    {
+        G_OBJECT_CLASS (ide_box_theatric_parent_class)->notify (object, pspec);
+    }
 
-  if (self->target && self->toplevel)
+    if (self->target && self->toplevel)
     {
-      GdkWindow *window;
-      GdkRectangle area;
+        GdkWindow *window;
+        GdkRectangle area;
 
-      get_toplevel_rect (IDE_BOX_THEATRIC (object), &area);
+        get_toplevel_rect (IDE_BOX_THEATRIC (object), &area);
 
 #if 0
-      g_print ("  Invalidate : %d,%d %dx%d\n",
-               area.x, area.y, area.width, area.height);
+        g_print ("  Invalidate : %d,%d %dx%d\n",
+                 area.x, area.y, area.width, area.height);
 #endif
 
-      window = gtk_widget_get_window (self->toplevel);
+        window = gtk_widget_get_window (self->toplevel);
 
-      if (window != NULL)
+        if (window != NULL)
         {
-          gdk_window_invalidate_rect (window, &self->last_area, TRUE);
-          gdk_window_invalidate_rect (window, &area, TRUE);
+            gdk_window_invalidate_rect (window, &self->last_area, TRUE);
+            gdk_window_invalidate_rect (window, &area, TRUE);
         }
     }
 }
@@ -190,24 +193,24 @@ ide_box_theatric_notify (GObject    *object,
 static void
 ide_box_theatric_dispose (GObject *object)
 {
-  IdeBoxTheatric *self =  IDE_BOX_THEATRIC (object);
+    IdeBoxTheatric *self = IDE_BOX_THEATRIC (object);
 
-  if (self->target)
+    if (self->target)
     {
-      if (self->draw_handler && self->toplevel)
+        if (self->draw_handler && self->toplevel)
         {
-          g_signal_handler_disconnect (self->toplevel, self->draw_handler);
-          self->draw_handler = 0;
+            g_signal_handler_disconnect (self->toplevel, self->draw_handler);
+            self->draw_handler = 0;
         }
-      g_object_remove_weak_pointer (G_OBJECT (self->target),
-                                    (gpointer *) &self->target);
-      self->target = NULL;
+        g_object_remove_weak_pointer (G_OBJECT (self->target),
+                                      (gpointer *) &self->target);
+        self->target = NULL;
     }
 
-  g_clear_pointer (&self->icon_surface, cairo_surface_destroy);
-  g_clear_object (&self->icon);
+    g_clear_pointer (&self->icon_surface, cairo_surface_destroy);
+    g_clear_object (&self->icon);
 
-  G_OBJECT_CLASS (ide_box_theatric_parent_class)->dispose (object);
+    G_OBJECT_CLASS (ide_box_theatric_parent_class)->dispose (object);
 }
 
 static void
@@ -216,202 +219,232 @@ ide_box_theatric_get_property (GObject    *object,
                                GValue     *value,
                                GParamSpec *pspec)
 {
-  IdeBoxTheatric *theatric = IDE_BOX_THEATRIC (object);
+    IdeBoxTheatric *theatric = IDE_BOX_THEATRIC (object);
 
-  switch (prop_id)
+    switch (prop_id)
     {
-    case PROP_ALPHA:
-      g_value_set_double (value, theatric->alpha);
-      break;
+        case PROP_ALPHA:
+        {
+            g_value_set_double (value, theatric->alpha);
+        }
+        break;
 
-    case PROP_BACKGROUND:
-      g_value_take_string (value,
-                           gdk_rgba_to_string (&theatric->background_rgba));
-      break;
+        case PROP_BACKGROUND:
+        {
+            g_value_take_string (value,
+                                 gdk_rgba_to_string (&theatric->background_rgba));
+        }
+        break;
 
-    case PROP_HEIGHT:
-      g_value_set_int (value, theatric->area.height);
-      break;
+        case PROP_HEIGHT:
+        {
+            g_value_set_int (value, theatric->area.height);
+        }
+        break;
 
-    case PROP_ICON:
-      g_value_set_object (value, theatric->icon);
-      break;
+        case PROP_ICON:
+        {
+            g_value_set_object (value, theatric->icon);
+        }
+        break;
 
-    case PROP_TARGET:
-      g_value_set_object (value, theatric->target);
-      break;
+        case PROP_TARGET:
+        {
+            g_value_set_object (value, theatric->target);
+        }
+        break;
 
-    case PROP_WIDTH:
-      g_value_set_int (value, theatric->area.width);
-      break;
+        case PROP_WIDTH:
+        {
+            g_value_set_int (value, theatric->area.width);
+        }
+        break;
 
-    case PROP_X:
-      g_value_set_int (value, theatric->area.x);
-      break;
+        case PROP_X:
+        {
+            g_value_set_int (value, theatric->area.x);
+        }
+        break;
 
-    case PROP_Y:
-      g_value_set_int (value, theatric->area.y);
-      break;
+        case PROP_Y:
+        {
+            g_value_set_int (value, theatric->area.y);
+        }
+        break;
 
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
 static void
 ide_box_theatric_set_property (GObject      *object,
-                              guint         prop_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
 {
-  IdeBoxTheatric *theatric = IDE_BOX_THEATRIC (object);
+    IdeBoxTheatric *theatric = IDE_BOX_THEATRIC (object);
 
-  switch (prop_id)
+    switch (prop_id)
     {
-    case PROP_ALPHA:
-      theatric->alpha = g_value_get_double (value);
-      break;
-
-    case PROP_BACKGROUND:
-      {
-        const gchar *str = g_value_get_string (value);
-
-        if (str == NULL)
-          {
-            gdk_rgba_parse (&theatric->background_rgba, "#000000");
-            theatric->background_rgba.alpha = 0;
-            theatric->background_set = FALSE;
-          }
-        else
-          {
-            gdk_rgba_parse (&theatric->background_rgba, str);
-            theatric->background_set = TRUE;
-          }
-      }
-      break;
-
-    case PROP_HEIGHT:
-      theatric->area.height = g_value_get_int (value);
-      break;
-
-    case PROP_ICON:
-      g_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
-      g_clear_object (&theatric->icon);
-      theatric->icon = g_value_dup_object (value);
-      theatric->pixbuf_failed = FALSE;
-      break;
-
-    case PROP_TARGET:
-      theatric->target = g_value_get_object (value);
-      theatric->toplevel = gtk_widget_get_toplevel (theatric->target);
-      g_object_add_weak_pointer (G_OBJECT (theatric->target),
-                                 (gpointer *) &theatric->target);
-      theatric->draw_handler =
-        g_signal_connect_after (theatric->toplevel,
-                                "draw",
-                                G_CALLBACK (on_toplevel_draw),
-                                theatric);
-      break;
-
-    case PROP_WIDTH:
-      theatric->area.width = g_value_get_int (value);
-      break;
-
-    case PROP_X:
-      theatric->area.x = g_value_get_int (value);
-      break;
-
-    case PROP_Y:
-      theatric->area.y = g_value_get_int (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        case PROP_ALPHA:
+        {
+            theatric->alpha = g_value_get_double (value);
+        }
+        break;
+
+        case PROP_BACKGROUND:
+        {
+            const gchar *str = g_value_get_string (value);
+
+            if (str == NULL)
+            {
+                gdk_rgba_parse (&theatric->background_rgba, "#000000");
+                theatric->background_rgba.alpha = 0;
+                theatric->background_set = FALSE;
+            }
+            else
+            {
+                gdk_rgba_parse (&theatric->background_rgba, str);
+                theatric->background_set = TRUE;
+            }
+        }
+        break;
+
+        case PROP_HEIGHT:
+        {
+            theatric->area.height = g_value_get_int (value);
+        }
+        break;
+
+        case PROP_ICON:
+        {
+            g_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
+            g_clear_object (&theatric->icon);
+            theatric->icon = g_value_dup_object (value);
+            theatric->pixbuf_failed = FALSE;
+        }
+        break;
+
+        case PROP_TARGET:
+        {
+            theatric->target = g_value_get_object (value);
+            theatric->toplevel = gtk_widget_get_toplevel (theatric->target);
+            g_object_add_weak_pointer (G_OBJECT (theatric->target),
+                                       (gpointer *) &theatric->target);
+            theatric->draw_handler =
+                g_signal_connect_after (theatric->toplevel,
+                                        "draw",
+                                        G_CALLBACK (on_toplevel_draw),
+                                        theatric);
+        }
+        break;
+
+        case PROP_WIDTH:
+        {
+            theatric->area.width = g_value_get_int (value);
+        }
+        break;
+
+        case PROP_X:
+        {
+            theatric->area.x = g_value_get_int (value);
+        }
+        break;
+
+        case PROP_Y:
+        {
+            theatric->area.y = g_value_get_int (value);
+        }
+        break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 
-  g_object_notify_by_pspec (object, pspec);
+    g_object_notify_by_pspec (object, pspec);
 }
 
 static void
 ide_box_theatric_class_init (IdeBoxTheatricClass *klass)
 {
-  GObjectClass *object_class;
-
-  object_class = G_OBJECT_CLASS (klass);
-  object_class->dispose = ide_box_theatric_dispose;
-  object_class->notify = ide_box_theatric_notify;
-  object_class->get_property = ide_box_theatric_get_property;
-  object_class->set_property = ide_box_theatric_set_property;
-
-  properties[PROP_ALPHA] =
-    g_param_spec_double ("alpha",
-                         "Alpha",
-                         "Alpha",
-                         0.0,
-                         1.0,
-                         1.0,
-                         (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_BACKGROUND] =
-    g_param_spec_string ("background",
-                         "background",
-                         "background",
-                         "#000000",
-                         (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_HEIGHT] =
-    g_param_spec_int ("height",
-                      "height",
-                      "height",
-                      0,
-                      G_MAXINT,
-                      0,
-                      (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties [PROP_ICON] =
-    g_param_spec_object ("icon",
-                         "Icon",
-                         "The GIcon to render over the background",
-                         G_TYPE_ICON,
-                         (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_TARGET] =
-    g_param_spec_object ("target",
-                         "Target",
-                         "Target",
-                         GTK_TYPE_WIDGET,
-                         (G_PARAM_READWRITE |
-                          G_PARAM_CONSTRUCT_ONLY |
-                          G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_WIDTH] =
-    g_param_spec_int ("width",
-                      "width",
-                      "width",
-                      0,
-                      G_MAXINT,
-                      0,
-                      (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_X] =
-    g_param_spec_int ("x",
-                      "x",
-                      "x",
-                      G_MININT,
-                      G_MAXINT,
-                      0,
-                      (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  properties[PROP_Y] =
-    g_param_spec_int ("y",
-                      "y",
-                      "y",
-                      G_MININT,
-                      G_MAXINT,
-                      0,
-                      (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_properties (object_class, LAST_PROP, properties);
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (klass);
+    object_class->dispose = ide_box_theatric_dispose;
+    object_class->notify = ide_box_theatric_notify;
+    object_class->get_property = ide_box_theatric_get_property;
+    object_class->set_property = ide_box_theatric_set_property;
+
+    properties[PROP_ALPHA] =
+        g_param_spec_double ("alpha",
+                             "Alpha",
+                             "Alpha",
+                             0.0,
+                             1.0,
+                             1.0,
+                             (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_BACKGROUND] =
+        g_param_spec_string ("background",
+                             "background",
+                             "background",
+                             "#000000",
+                             (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_HEIGHT] =
+        g_param_spec_int ("height",
+                          "height",
+                          "height",
+                          0,
+                          G_MAXINT,
+                          0,
+                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties [PROP_ICON] =
+        g_param_spec_object ("icon",
+                             "Icon",
+                             "The GIcon to render over the background",
+                             G_TYPE_ICON,
+                             (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_TARGET] =
+        g_param_spec_object ("target",
+                             "Target",
+                             "Target",
+                             GTK_TYPE_WIDGET,
+                             (G_PARAM_READWRITE |
+                              G_PARAM_CONSTRUCT_ONLY |
+                              G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_WIDTH] =
+        g_param_spec_int ("width",
+                          "width",
+                          "width",
+                          0,
+                          G_MAXINT,
+                          0,
+                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_X] =
+        g_param_spec_int ("x",
+                          "x",
+                          "x",
+                          G_MININT,
+                          G_MAXINT,
+                          0,
+                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    properties[PROP_Y] =
+        g_param_spec_int ("y",
+                          "y",
+                          "y",
+                          G_MININT,
+                          G_MAXINT,
+                          0,
+                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
 static void
diff --git a/src/animation/ide-cairo.c b/src/animation/ide-cairo.c
index a4fba52a9..abf0f03ba 100644
--- a/src/animation/ide-cairo.c
+++ b/src/animation/ide-cairo.c
@@ -21,64 +21,64 @@
 cairo_region_t *
 ide_cairo_region_create_from_clip_extents (cairo_t *cr)
 {
-  cairo_rectangle_int_t crect;
-  GdkRectangle rect;
+    cairo_rectangle_int_t crect;
+    GdkRectangle rect;
 
-  g_return_val_if_fail (cr, NULL);
+    g_return_val_if_fail (cr, NULL);
 
-  gdk_cairo_get_clip_rectangle (cr, &rect);
-  crect.x = rect.x;
-  crect.y = rect.y;
-  crect.width = rect.width;
-  crect.height = rect.height;
+    gdk_cairo_get_clip_rectangle (cr, &rect);
+    crect.x = rect.x;
+    crect.y = rect.y;
+    crect.width = rect.width;
+    crect.height = rect.height;
 
-  return cairo_region_create_rectangle (&crect);
+    return cairo_region_create_rectangle (&crect);
 }
 
 void
 ide_cairo_rounded_rectangle (cairo_t            *cr,
-                            const GdkRectangle *rect,
-                            gint                x_radius,
-                            gint                y_radius)
+                             const GdkRectangle *rect,
+                             gint                x_radius,
+                             gint                y_radius)
 {
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-  gint x1, x2;
-  gint y1, y2;
-  gint xr1, xr2;
-  gint yr1, yr2;
+    gint x;
+    gint y;
+    gint width;
+    gint height;
+    gint x1, x2;
+    gint y1, y2;
+    gint xr1, xr2;
+    gint yr1, yr2;
 
-  g_return_if_fail (cr);
-  g_return_if_fail (rect);
+    g_return_if_fail (cr);
+    g_return_if_fail (rect);
 
-  x = rect->x;
-  y = rect->y;
-  width = rect->width;
-  height = rect->height;
+    x = rect->x;
+    y = rect->y;
+    width = rect->width;
+    height = rect->height;
 
-  x1 = x;
-  x2 = x1 + width;
-  y1 = y;
-  y2 = y1 + height;
+    x1 = x;
+    x2 = x1 + width;
+    y1 = y;
+    y2 = y1 + height;
 
-  x_radius = MIN (x_radius, width / 2.0);
-  y_radius = MIN (y_radius, width / 2.0);
+    x_radius = MIN (x_radius, width / 2.0);
+    y_radius = MIN (y_radius, width / 2.0);
 
-  xr1 = x_radius;
-  xr2 = x_radius / 2.0;
-  yr1 = y_radius;
-  yr2 = y_radius / 2.0;
+    xr1 = x_radius;
+    xr2 = x_radius / 2.0;
+    yr1 = y_radius;
+    yr2 = y_radius / 2.0;
 
-  cairo_move_to (cr, x1 + xr1, y1);
-  cairo_line_to (cr, x2 - xr1, y1);
-  cairo_curve_to (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
-  cairo_line_to (cr, x2, y2 - yr1);
-  cairo_curve_to (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
-  cairo_line_to (cr, x1 + xr1, y2);
-  cairo_curve_to (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
-  cairo_line_to (cr, x1, y1 + yr1);
-  cairo_curve_to (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
-  cairo_close_path (cr);
+    cairo_move_to (cr, x1 + xr1, y1);
+    cairo_line_to (cr, x2 - xr1, y1);
+    cairo_curve_to (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
+    cairo_line_to (cr, x2, y2 - yr1);
+    cairo_curve_to (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
+    cairo_line_to (cr, x1 + xr1, y2);
+    cairo_curve_to (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
+    cairo_line_to (cr, x1, y1 + yr1);
+    cairo_curve_to (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
+    cairo_close_path (cr);
 }
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 0f8526ba6..dc7e36a69 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -55,7 +55,7 @@ enum
 static guint signals[LAST_SIGNAL];
 
 /* forward declarations */
-#define NAUTILUS_BOOKMARK_LIST_ERROR (nautilus_bookmark_list_error_quark())
+#define NAUTILUS_BOOKMARK_LIST_ERROR (nautilus_bookmark_list_error_quark ())
 static GQuark      nautilus_bookmark_list_error_quark (void);
 
 static void        nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks);
@@ -70,7 +70,8 @@ nautilus_bookmark_list_error_quark (void)
 }
 
 static NautilusBookmark *
-new_bookmark_from_uri (const char *uri, const char *label)
+new_bookmark_from_uri (const char *uri,
+                       const char *label)
 {
     NautilusBookmark *new_bookmark = NULL;
     g_autoptr (GFile) location = NULL;
@@ -469,7 +470,8 @@ save_io_thread (GTask        *task,
     parent = g_file_get_parent (file);
     path = g_file_get_path (parent);
 
-    if (g_mkdir_with_parents (path, 0700) == -1) {
+    if (g_mkdir_with_parents (path, 0700) == -1)
+    {
         int saved_errno = errno;
 
         g_set_error (&error, NAUTILUS_BOOKMARK_LIST_ERROR, 0,
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 932439ffe..71bcf1904 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -1220,7 +1220,7 @@ lay_down_icons_horizontal (NautilusCanvasContainer *container,
         double unused_width = available_width - used_width;
 
         double max_extra_fraction = (unused_width / num_icons) / min_grid_width;
-        double extra_fraction = pow(max_extra_fraction + 1.0, 1.0 / 4.0) - 1.0;
+        double extra_fraction = pow (max_extra_fraction + 1.0, 1.0 / 4.0) - 1.0;
 
         grid_width = min_grid_width * (1 + extra_fraction);
     }
@@ -4968,7 +4968,7 @@ finish_adding_new_icons (NautilusCanvasContainer *container)
     new_icons = container->details->new_icons;
     container->details->new_icons = NULL;
     container->details->is_populating_container = g_list_length (new_icons) ==
-        g_hash_table_size (container->details->icon_set);
+                                                  g_hash_table_size (container->details->icon_set);
 
     /* Position most icons (not unpositioned manual-layout icons). */
     new_icons = g_list_reverse (new_icons);
@@ -5928,7 +5928,9 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
 
     /* We don't want to emit children_changed signals during any type of load. */
     if (!container->details->in_layout_now || container->details->is_populating_container)
+    {
         return;
+    }
 
     icon = g_hash_table_lookup (container->details->icon_set, icon_data);
     if (icon)
diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
index 4d33d119b..4babdae53 100644
--- a/src/nautilus-canvas-item.c
+++ b/src/nautilus-canvas-item.c
@@ -296,7 +296,9 @@ nautilus_canvas_item_set_property (GObject      *object,
                 details->text = g_string_assign (details->text, details->editable_text);
 
                 if (is_rename)
+                {
                     g_object_notify (G_OBJECT (accessible), "accessible-name");
+                }
             }
 
             nautilus_canvas_item_invalidate_label_size (item);
@@ -1206,11 +1208,11 @@ real_map_surface (NautilusCanvasItem *canvas_item)
         widget = GTK_WIDGET (canvas);
         style = gtk_widget_get_style_context (widget);
         has_focus = gtk_widget_has_focus (widget);
-        state = has_focus? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_ACTIVE;
+        state = has_focus ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_ACTIVE;
         width = gdk_pixbuf_get_width (temp_pixbuf);
         height = gdk_pixbuf_get_height (temp_pixbuf);
         has_alpha = gdk_pixbuf_get_has_alpha (temp_pixbuf);
-        format = has_alpha? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
+        format = has_alpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
         surface = cairo_image_surface_create (format, width, height);
         cr = cairo_create (surface);
 
diff --git a/src/nautilus-clipboard.c b/src/nautilus-clipboard.c
index 5a5b0a9e1..477ffa4b9 100644
--- a/src/nautilus-clipboard.c
+++ b/src/nautilus-clipboard.c
@@ -327,4 +327,3 @@ nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard,
                                  clipboard_info);
     gtk_target_table_free (targets, n_targets);
 }
-
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 43f27e10a..2a6d9e9e6 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -72,7 +72,7 @@ handle_redo (NautilusDBusFileOperations *object,
              GDBusMethodInvocation      *invocation)
 {
     NautilusFileUndoManager *undo_manager = NULL;
-    gint *handler_id = g_new0(int, 1);
+    gint *handler_id = g_new0 (int, 1);
 
     g_application_hold (g_application_get_default ());
 
@@ -91,7 +91,7 @@ handle_undo (NautilusDBusFileOperations *object,
              GDBusMethodInvocation      *invocation)
 {
     NautilusFileUndoManager *undo_manager = NULL;
-    gint *handler_id = g_new0(int, 1);
+    gint *handler_id = g_new0 (int, 1);
 
     g_application_hold (g_application_get_default ());
 
diff --git a/src/nautilus-debug.c b/src/nautilus-debug.c
index 84c247327..adb7535e0 100644
--- a/src/nautilus-debug.c
+++ b/src/nautilus-debug.c
@@ -64,7 +64,6 @@ nautilus_debug_set_flags_from_env (void)
 
     for (nkeys = 0; keys[nkeys].value; nkeys++)
     {
-        ;
     }
 
     flags_string = g_getenv ("NAUTILUS_DEBUG");
diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c
index 9f3033157..d5b93b5ac 100644
--- a/src/nautilus-directory-async.c
+++ b/src/nautilus-directory-async.c
@@ -2421,7 +2421,8 @@ monitor_includes_file (const Monitor *monitor,
 static gboolean
 is_wanted_by_monitor (NautilusFile *file,
                       GList        *monitors,
-                      RequestType   request_type_wanted) {
+                      RequestType   request_type_wanted)
+{
     GList *node;
 
     for (node = monitors; node; node = node->next)
diff --git a/src/nautilus-file-name-widget-controller.c b/src/nautilus-file-name-widget-controller.c
index dfcdfbe7c..308ab51f2 100644
--- a/src/nautilus-file-name-widget-controller.c
+++ b/src/nautilus-file-name-widget-controller.c
@@ -73,8 +73,8 @@ nautilus_file_name_widget_controller_set_containing_directory (NautilusFileNameW
 }
 
 gboolean
-nautilus_file_name_widget_controller_is_name_too_long (NautilusFileNameWidgetController  *self,
-                                                       gchar                             *name)
+nautilus_file_name_widget_controller_is_name_too_long (NautilusFileNameWidgetController *self,
+                                                       gchar                            *name)
 {
     NautilusFileNameWidgetControllerPrivate *priv;
     size_t name_length;
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index e288a9afe..36b991aa6 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -256,11 +256,11 @@ static void empty_trash_task_done (GObject      *source_object,
 
 static char *query_fs_type (GFile        *file,
                             GCancellable *cancellable);
-static CopyMoveJob *copy_job_setup (GList *files,
-                                    GFile *target_dir,
-                                    GtkWindow *parent_window,
+static CopyMoveJob *copy_job_setup (GList               *files,
+                                    GFile               *target_dir,
+                                    GtkWindow           *parent_window,
                                     NautilusCopyCallback done_callback,
-                                    gpointer done_callback_data);
+                                    gpointer             done_callback_data);
 
 static void nautilus_file_operations_copy (GTask        *task,
                                            gpointer      source_object,
@@ -2529,9 +2529,9 @@ setup_delete_job (GList                  *files,
 }
 
 static void
-trash_or_delete_internal_sync (GList                  *files,
-                               GtkWindow              *parent_window,
-                               gboolean                try_trash)
+trash_or_delete_internal_sync (GList     *files,
+                               GtkWindow *parent_window,
+                               gboolean   try_trash)
 {
     GTask *task;
     DeleteJob *job;
@@ -2575,13 +2575,13 @@ trash_or_delete_internal_async (GList                  *files,
 }
 
 void
-nautilus_file_operations_trash_or_delete_sync (GList                  *files)
+nautilus_file_operations_trash_or_delete_sync (GList *files)
 {
     trash_or_delete_internal_sync (files, NULL, TRUE);
 }
 
 void
-nautilus_file_operations_delete_sync (GList                  *files)
+nautilus_file_operations_delete_sync (GList *files)
 {
     trash_or_delete_internal_sync (files, NULL, FALSE);
 }
@@ -5674,11 +5674,11 @@ copy_task_done (GObject      *source_object,
 }
 
 static CopyMoveJob *
-copy_job_setup (GList *files,
-                GFile *target_dir,
-                GtkWindow *parent_window,
-                NautilusCopyCallback done_callback,
-                gpointer done_callback_data)
+copy_job_setup (GList                *files,
+                GFile                *target_dir,
+                GtkWindow            *parent_window,
+                NautilusCopyCallback  done_callback,
+                gpointer              done_callback_data)
 {
     CopyMoveJob *job;
 
@@ -5781,10 +5781,10 @@ nautilus_file_operations_copy_sync (GList *files,
     CopyMoveJob *job;
 
     job = copy_job_setup (files,
-                           target_dir,
-                           NULL,
-                           NULL,
-                           NULL);
+                          target_dir,
+                          NULL,
+                          NULL,
+                          NULL);
 
     task = g_task_new (NULL, job->common.cancellable, NULL, job);
     g_task_set_task_data (task, job, NULL);
@@ -5807,10 +5807,10 @@ nautilus_file_operations_copy_async (GList                *files,
     CopyMoveJob *job;
 
     job = copy_job_setup (files,
-                           target_dir,
-                           parent_window,
-                           done_callback,
-                           done_callback_data);
+                          target_dir,
+                          parent_window,
+                          done_callback,
+                          done_callback_data);
 
     task = g_task_new (NULL, job->common.cancellable, copy_task_done, job);
     g_task_set_task_data (task, job, NULL);
@@ -6298,8 +6298,8 @@ move_job_setup (GList                *files,
 }
 
 void
-nautilus_file_operations_move_sync (GList                *files,
-                                    GFile                *target_dir)
+nautilus_file_operations_move_sync (GList *files,
+                                    GFile *target_dir)
 {
     GTask *task;
     CopyMoveJob *job;
diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
index 4dc26c64a..ef6f2a1c8 100644
--- a/src/nautilus-file-undo-manager.c
+++ b/src/nautilus-file-undo-manager.c
@@ -56,7 +56,7 @@ struct _NautilusFileUndoManager
 
 G_DEFINE_TYPE (NautilusFileUndoManager, nautilus_file_undo_manager, G_TYPE_OBJECT)
 
-static NautilusFileUndoManager * undo_singleton = NULL;
+static NautilusFileUndoManager *undo_singleton = NULL;
 
 NautilusFileUndoManager *
 nautilus_file_undo_manager_new (void)
diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
index 1b5998344..236b9eb1a 100644
--- a/src/nautilus-file-undo-operations.c
+++ b/src/nautilus-file-undo-operations.c
@@ -755,9 +755,9 @@ nautilus_file_undo_info_ext_new (NautilusFileUndoOp  op_type,
     NautilusFileUndoInfoExt *self;
 
     self = g_object_new (NAUTILUS_TYPE_FILE_UNDO_INFO_EXT,
-                           "op-type", op_type,
-                           "item-count", item_count,
-                           NULL);
+                         "op-type", op_type,
+                         "item-count", item_count,
+                         NULL);
 
     self->src_dir = g_object_ref (src_dir);
     self->dest_dir = g_object_ref (target_dir);
@@ -2432,8 +2432,8 @@ nautilus_file_undo_info_extract_new (GList *sources,
                          NULL);
 
     self->sources = g_list_copy_deep (sources,
-                                            (GCopyFunc) g_object_ref,
-                                            NULL);
+                                      (GCopyFunc) g_object_ref,
+                                      NULL);
     self->destination_directory = g_object_ref (destination_directory);
 
     return NAUTILUS_FILE_UNDO_INFO (self);
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index f8afabbfe..db56dd9c3 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -1452,16 +1452,16 @@ location_settings_search_get_recursive (void)
             return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
         }
         break;
-        
+
         case NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY:
         {
             return NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY;
         }
         break;
-        
+
         case NAUTILUS_SPEED_TRADEOFF_NEVER:
         {
-             return NAUTILUS_QUERY_RECURSIVE_NEVER;
+            return NAUTILUS_QUERY_RECURSIVE_NEVER;
         }
         break;
     }
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 45603af08..9681335a2 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -2547,7 +2547,6 @@ update_info_internal (NautilusFile *file,
 
     has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE);
     permissions = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
-    ;
     if (file->details->has_permissions != has_permissions ||
         file->details->permissions != permissions)
     {
@@ -4961,9 +4960,9 @@ prepend_icon_name (const char  *name,
 }
 
 static void
-apply_emblems_to_icon (NautilusFile          *file,
-                       GIcon                **icon,
-                       NautilusFileIconFlags  flags)
+apply_emblems_to_icon (NautilusFile           *file,
+                       GIcon                 **icon,
+                       NautilusFileIconFlags   flags)
 {
     GIcon *emblemed_icon = NULL;
     g_autolist (GIcon) emblems = NULL;
@@ -7052,7 +7051,7 @@ nautilus_file_get_deep_count_as_string_internal (NautilusFile *file,
 
             default:
             {}
-             break;
+            break;
         }
     }
 
@@ -7656,7 +7655,6 @@ nautilus_file_get_file_type (NautilusFile *file)
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), G_FILE_TYPE_UNKNOWN);
 
     return nautilus_file_info_get_file_type (NAUTILUS_FILE_INFO (file));
-    ;
 }
 
 /**
@@ -9070,7 +9068,6 @@ thumbnail_limit_changed_callback (gpointer user_data)
 
     /*Converts the obtained limit in MB to bytes */
     cached_thumbnail_limit *= MEGA_TO_BASE_RATE;
-    ;
 
     /* Tell the world that icons might have changed. We could invent a narrower-scope
      * signal to mean only "thumbnails might have changed" if this ends up being slow
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 18b714a71..b273d5544 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -708,7 +708,7 @@ nautilus_files_view_get_toolbar_menu_sections (NautilusView *view)
     return priv->toolbar_menu_sections;
 }
 
-static GMenu*
+static GMenu *
 nautilus_files_view_get_templates_menu (NautilusView *self)
 {
     GMenu *menu;
@@ -718,7 +718,7 @@ nautilus_files_view_get_templates_menu (NautilusView *self)
     return menu;
 }
 
-static GMenu*
+static GMenu *
 nautilus_files_view_get_extensions_background_menu (NautilusView *self)
 {
     GMenu *menu;
@@ -728,7 +728,7 @@ nautilus_files_view_get_extensions_background_menu (NautilusView *self)
     return menu;
 }
 
-static GMenu*
+static GMenu *
 real_get_extensions_background_menu (NautilusView *view)
 {
     NautilusFilesViewPrivate *priv;
@@ -740,7 +740,7 @@ real_get_extensions_background_menu (NautilusView *view)
     return priv->extensions_background_menu;
 }
 
-static GMenu*
+static GMenu *
 real_get_templates_menu (NautilusView *view)
 {
     NautilusFilesViewPrivate *priv;
@@ -1230,7 +1230,8 @@ get_view_directory (NautilusFilesView *view)
     return path;
 }
 
-typedef struct {
+typedef struct
+{
     gchar *uri;
     gboolean is_update;
 } PreviewExportData;
@@ -1251,7 +1252,7 @@ on_window_handle_export (NautilusWindow *window,
                          guint           xid,
                          gpointer        user_data)
 {
-    g_autoptr(PreviewExportData) data = user_data;
+    g_autoptr (PreviewExportData) data = user_data;
     nautilus_previewer_call_show_file (data->uri, handle, xid, !data->is_update);
 }
 
@@ -2690,9 +2691,9 @@ paste_clipboard_data (NautilusFilesView *view,
 }
 
 static void
-paste_clipboard_text_received_callback (GtkClipboard     *clipboard,
-                                        const gchar      *selection_data,
-                                        gpointer          data)
+paste_clipboard_text_received_callback (GtkClipboard *clipboard,
+                                        const gchar  *selection_data,
+                                        gpointer      data)
 {
     NautilusFilesView *view;
     NautilusFilesViewPrivate *priv;
@@ -3121,25 +3122,25 @@ slot_active_changed (NautilusWindowSlot *slot,
 
     if (priv->active)
     {
-      /* Avoid updating the toolbar withouth making sure the toolbar
-       * zoom slider has the correct adjustment that changes when the
-       * view mode changes
-       */
-      nautilus_files_view_update_context_menus (view);
-      nautilus_files_view_update_toolbar_menus (view);
+        /* Avoid updating the toolbar withouth making sure the toolbar
+         * zoom slider has the correct adjustment that changes when the
+         * view mode changes
+         */
+        nautilus_files_view_update_context_menus (view);
+        nautilus_files_view_update_toolbar_menus (view);
 
-      schedule_update_context_menus (view);
+        schedule_update_context_menus (view);
 
-      gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
-                                      "view",
-                                      G_ACTION_GROUP (priv->view_action_group));
+        gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
+                                        "view",
+                                        G_ACTION_GROUP (priv->view_action_group));
     }
     else
     {
-      remove_update_context_menus_timeout_callback (view);
-      gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
-                                      "view",
-                                      NULL);
+        remove_update_context_menus_timeout_callback (view);
+        gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
+                                        "view",
+                                        NULL);
     }
 }
 
@@ -8562,9 +8563,9 @@ finish_loading (NautilusFilesView *view)
 
     /* Connect handlers to learn about loading progress. */
     priv->done_loading_handler_id = g_signal_connect (priv->model, "done-loading",
-                                        G_CALLBACK (done_loading_callback), view);
+                                                      G_CALLBACK (done_loading_callback), view);
     priv->load_error_handler_id = g_signal_connect (priv->model, "load-error",
-                                      G_CALLBACK (load_error_callback), view);
+                                                    G_CALLBACK (load_error_callback), view);
 
     /* Monitor the things needed to get the right icon. Also
      * monitor a directory's item count because the "size"
@@ -8863,9 +8864,9 @@ nautilus_files_view_move_copy_items (NautilusFilesView *view,
 
     target_file = nautilus_file_get_existing_by_uri (target_uri);
     if (copy_action == GDK_ACTION_COPY &&
-             nautilus_is_file_roller_installed () &&
-             target_file != NULL &&
-             nautilus_file_is_archive (target_file))
+        nautilus_is_file_roller_installed () &&
+        target_file != NULL &&
+        nautilus_file_is_archive (target_file))
     {
         char *command, *quoted_uri, *tmp;
         const GList *l;
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index fc92917c3..bce65ec53 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -614,8 +614,8 @@ on_tree_view_multi_press_gesture_pressed (GtkGestureMultiPress *gesture,
 
         gtk_tree_view_get_cell_area (tree_view, path, column, &cell_area);
 
-        /* We assume that the cell area excludes the expander itself. 
-         * Explanatory link for future reference: 
+        /* We assume that the cell area excludes the expander itself.
+         * Explanatory link for future reference:
          * https://gitlab.gnome.org/GNOME/nautilus/merge_requests/97#note_58649 */
 
         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c
index 43dbaf053..a932a2d77 100644
--- a/src/nautilus-operations-ui-manager.c
+++ b/src/nautilus-operations-ui-manager.c
@@ -28,7 +28,6 @@ invoke_main_context_source_func_wrapper (gpointer user_data)
 
     while (data->source_func (data->user_data))
     {
-        ;
     }
 
     data->completed = TRUE;
diff --git a/src/nautilus-previewer.c b/src/nautilus-previewer.c
index 40a02522e..66074ab93 100644
--- a/src/nautilus-previewer.c
+++ b/src/nautilus-previewer.c
@@ -44,7 +44,7 @@ ensure_previewer_v2_proxy (void)
 {
     if (previewer_v2_proxy == NULL)
     {
-        g_autoptr(GError) error = NULL;
+        g_autoptr (GError) error = NULL;
         GDBusConnection *connection = g_application_get_dbus_connection (g_application_get_default ());
 
         previewer_v2_proxy = g_dbus_proxy_new_sync (connection,
@@ -72,7 +72,7 @@ previewer2_method_ready_cb (GObject      *source,
                             gpointer      user_data)
 {
     GDBusProxy *proxy = G_DBUS_PROXY (source);
-    g_autoptr(GError) error = NULL;
+    g_autoptr (GError) error = NULL;
 
     g_dbus_proxy_call_finish (proxy, res, &error);
 
@@ -190,7 +190,7 @@ nautilus_previewer_disconnect_selection_event (GDBusConnection *connection,
 gboolean
 nautilus_previewer_is_visible (void)
 {
-    g_autoptr(GVariant) variant = NULL;
+    g_autoptr (GVariant) variant = NULL;
 
     if (!ensure_previewer_v2_proxy ())
     {
diff --git a/src/nautilus-program-choosing.c b/src/nautilus-program-choosing.c
index 047a78c2b..47362a3f7 100644
--- a/src/nautilus-program-choosing.c
+++ b/src/nautilus-program-choosing.c
@@ -432,7 +432,7 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
             /* some files are non-local */
             show_dialog (_("This drop target only supports local files."),
                          _("To open non-local files copy them to a local folder and then"
-                         " drop them again. The local files you dropped have already been opened."),
+                           " drop them again. The local files you dropped have already been opened."),
                          parent_window,
                          GTK_MESSAGE_WARNING);
         }
@@ -526,10 +526,10 @@ on_launch_default_for_uri (GObject      *source,
 }
 
 static void
-on_window_handle_export (NautilusWindow  *window,
-                         const char *handle_str,
-                         guint       xid,
-                         gpointer    user_data)
+on_window_handle_export (NautilusWindow *window,
+                         const char     *handle_str,
+                         guint           xid,
+                         gpointer        user_data)
 {
     GTask *task = user_data;
     GAppLaunchContext *context = g_task_get_task_data (task);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 9250adbe3..cfe169bb5 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -578,9 +578,9 @@ set_name_field (NautilusPropertiesWindow *window,
         if (use_label)
         {
             window->name_field = GTK_WIDGET
-                                              (attach_ellipsizing_value_label (window->basic_grid,
-                                                                               GTK_WIDGET 
(window->name_label),
-                                                                               name));
+                                     (attach_ellipsizing_value_label (window->basic_grid,
+                                                                      GTK_WIDGET (window->name_label),
+                                                                      name));
         }
         else
         {
@@ -868,7 +868,7 @@ name_field_activate (GtkWidget *name_field,
     if (window->select_idle_id == 0)
     {
         window->select_idle_id = g_idle_add (select_all_at_idle,
-                                                      window);
+                                             window);
     }
 }
 
@@ -1462,7 +1462,7 @@ attach_value_field_internal (NautilusPropertiesWindow *window,
     g_object_set_data (G_OBJECT (value_field), "show_original", GINT_TO_POINTER (show_original));
 
     window->value_fields = g_list_prepend (window->value_fields,
-                                                    value_field);
+                                           value_field);
     return GTK_WIDGET (value_field);
 }
 
@@ -2675,7 +2675,7 @@ should_show_accessed_date (NautilusPropertiesWindow *window)
      * consider whether it's useful for "trash:".
      */
     if (file_list_all_directories (window->target_files)
-       || is_multi_file_window (window))
+        || is_multi_file_window (window))
     {
         return FALSE;
     }
@@ -3129,9 +3129,9 @@ open_in_disks (GtkButton                *button,
     g_autoptr (GAppInfo) app_info = NULL;
 
     app_info = g_app_info_create_from_commandline ("gnome-disks",
-                                                    NULL,
-                                                    G_APP_INFO_CREATE_NONE,
-                                                    NULL);
+                                                   NULL,
+                                                   G_APP_INFO_CREATE_NONE,
+                                                   NULL);
 
     g_app_info_launch (app_info, NULL, NULL, &error);
 
@@ -3260,7 +3260,7 @@ create_basic_page (NautilusPropertiesWindow *window)
     }
 
     if (should_show_accessed_date (window)
-       || should_show_modified_date (window))
+        || should_show_modified_date (window))
     {
         append_blank_row (grid);
     }
@@ -3303,14 +3303,14 @@ create_basic_page (NautilusPropertiesWindow *window)
                                                NULL);
         }
 
-       /*Translators: Here Disks mean the name of application GNOME Disks.*/
-       button = gtk_button_new_with_label (_("Open in Disks"));
-       g_signal_connect (button, "clicked", G_CALLBACK (open_in_disks), NULL);
-       gtk_container_add_with_properties (GTK_CONTAINER (grid),
-                                          button,
-                                          "width", 3,
-                                          NULL);
-       gtk_widget_show_all (GTK_WIDGET (grid));
+        /*Translators: Here Disks mean the name of application GNOME Disks.*/
+        button = gtk_button_new_with_label (_("Open in Disks"));
+        g_signal_connect (button, "clicked", G_CALLBACK (open_in_disks), NULL);
+        gtk_container_add_with_properties (GTK_CONTAINER (grid),
+                                           button,
+                                           "width", 3,
+                                           NULL);
+        gtk_widget_show_all (GTK_WIDGET (grid));
     }
 }
 
@@ -4230,7 +4230,7 @@ add_permissions_combo_box (NautilusPropertiesWindow *window,
     combo = create_permissions_combo_box (type, is_folder);
 
     window->permission_combos = g_list_prepend (window->permission_combos,
-                                                         combo);
+                                                combo);
 
     g_signal_connect (combo, "changed", G_CALLBACK (permission_combo_changed), window);
 
@@ -4658,12 +4658,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_grid_attach (grid, label, 0, 1, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_USER, FALSE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_USER, FALSE);
     gtk_grid_attach (grid, combo, 1, 1, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_USER, TRUE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_USER, TRUE);
     gtk_grid_attach (grid, combo, 2, 1, 1, 1);
 
@@ -4672,12 +4672,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_grid_attach (grid, label, 0, 2, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_GROUP, FALSE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_GROUP, FALSE);
     gtk_grid_attach (grid, combo, 1, 2, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_GROUP, TRUE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_GROUP, TRUE);
     gtk_grid_attach (grid, combo, 2, 2, 1, 1);
 
@@ -4686,12 +4686,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_grid_attach (grid, label, 0, 3, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_OTHER, FALSE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_OTHER, FALSE);
     gtk_grid_attach (grid, combo, 1, 3, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_OTHER, TRUE);
     window->change_permission_combos = g_list_prepend (window->change_permission_combos,
-                                                                combo);
+                                                       combo);
     set_active_from_umask (combo, PERMISSION_OTHER, TRUE);
     gtk_grid_attach (grid, combo, 2, 3, 1, 1);
 
@@ -5340,8 +5340,8 @@ is_directory_ready_callback (NautilusFile *file,
         remove_pending (startup_data, FALSE, TRUE);
 
         gtk_window_present (GTK_WINDOW (new_window));
-        g_signal_connect(GTK_WIDGET (new_window), "destroy",
-                         G_CALLBACK (widget_on_destroy), startup_data);
+        g_signal_connect (GTK_WIDGET (new_window), "destroy",
+                          G_CALLBACK (widget_on_destroy), startup_data);
     }
 }
 
@@ -5391,8 +5391,8 @@ nautilus_properties_window_present (GList                            *original_f
         gtk_window_present (GTK_WINDOW (existing_window));
         startup_data = startup_data_new (NULL, NULL, NULL, NULL, NULL, NULL,
                                          callback, callback_data, existing_window);
-        g_signal_connect(GTK_WIDGET (existing_window), "destroy",
-                         G_CALLBACK (widget_on_destroy), startup_data);
+        g_signal_connect (GTK_WIDGET (existing_window), "destroy",
+                          G_CALLBACK (widget_on_destroy), startup_data);
         return;
     }
 
diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
index 11a810608..dd535873e 100644
--- a/src/nautilus-search-engine-recent.c
+++ b/src/nautilus-search-engine-recent.c
@@ -32,8 +32,8 @@
 #include <gio/gio.h>
 
 #define FILE_ATTRIBS G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "," \
-                     G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "," \
-                     G_FILE_ATTRIBUTE_ACCESS_CAN_READ ","
+    G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "," \
+    G_FILE_ATTRIBUTE_ACCESS_CAN_READ ","
 
 struct _NautilusSearchEngineRecent
 {
@@ -56,9 +56,9 @@ G_DEFINE_TYPE_WITH_CODE (NautilusSearchEngineRecent,
 
 enum
 {
-  PROP_0,
-  PROP_RUNNING,
-  LAST_PROP
+    PROP_0,
+    PROP_RUNNING,
+    LAST_PROP
 };
 
 
@@ -136,9 +136,9 @@ search_add_hits_idle (NautilusSearchEngineRecent *self,
 }
 
 static gboolean
-is_file_valid_recursive (NautilusSearchEngineRecent *self,
-                         GFile                      *file,
-                         GError                    **error)
+is_file_valid_recursive (NautilusSearchEngineRecent  *self,
+                         GFile                       *file,
+                         GError                     **error)
 {
     g_autofree gchar *path = NULL;
     g_autoptr (GFileInfo) file_info = NULL;
@@ -295,7 +295,7 @@ recent_thread_func (gpointer user_data)
                 end_date = g_ptr_array_index (date_range, 1);
                 type = nautilus_query_get_search_type (self->query);
                 target_time = (type == NAUTILUS_QUERY_SEARCH_TYPE_LAST_ACCESS) ?
-                               visited : modified;
+                              visited : modified;
 
                 if (!nautilus_file_date_in_between (target_time,
                                                     initial_date, end_date))
diff --git a/src/nautilus-search-engine-simple.c b/src/nautilus-search-engine-simple.c
index 1687d218a..294b1d41a 100644
--- a/src/nautilus-search-engine-simple.c
+++ b/src/nautilus-search-engine-simple.c
@@ -61,8 +61,8 @@ typedef struct
 
     gint processing_id;
     GMutex idle_mutex;
-    // The following data can be accessed from different threads
-    // and needs to lock the mutex
+    /* The following data can be accessed from different threads */
+    /* and needs to lock the mutex */
     GQueue *idle_queue;
     gboolean finished;
 } SearchThreadData;
@@ -170,7 +170,8 @@ search_thread_done (SearchThreadData *data)
 }
 
 static void
-search_thread_process_hits_idle (SearchThreadData *data, GList *hits)
+search_thread_process_hits_idle (SearchThreadData *data,
+                                 GList            *hits)
 {
     if (!g_cancellable_is_cancelled (data->cancellable))
     {
@@ -190,26 +191,25 @@ search_thread_process_idle (gpointer user_data)
 
     g_mutex_lock (&thread_data->idle_mutex);
     hits = g_queue_pop_head (thread_data->idle_queue);
-    // Even if the cancellable is cancelled, we need to make sure the search
-    // thread has aknowledge it, and therefore not using the thread data after
-    // freeing it. The search thread will mark as finished whenever the search
-    // is finished or cancelled.
-    // Nonetheless, we should stop yielding results if the search was cancelled
+    /* Even if the cancellable is cancelled, we need to make sure the search */
+    /* thread has aknowledge it, and therefore not using the thread data after */
+    /* freeing it. The search thread will mark as finished whenever the search */
+    /* is finished or cancelled. */
+    /* Nonetheless, we should stop yielding results if the search was cancelled */
     if (thread_data->finished)
     {
         if (hits == NULL || g_cancellable_is_cancelled (thread_data->cancellable))
         {
-          g_mutex_unlock (&thread_data->idle_mutex);
+            g_mutex_unlock (&thread_data->idle_mutex);
 
-          if (hits)
-          {
-              g_list_free_full (hits, g_object_unref);
-          }
-          search_thread_done (thread_data);
+            if (hits)
+            {
+                g_list_free_full (hits, g_object_unref);
+            }
+            search_thread_done (thread_data);
 
-          return G_SOURCE_REMOVE;
+            return G_SOURCE_REMOVE;
         }
-
     }
 
     g_mutex_unlock (&thread_data->idle_mutex);
@@ -230,8 +230,8 @@ finish_search_thread (SearchThreadData *thread_data)
     thread_data->finished = TRUE;
     g_mutex_unlock (&thread_data->idle_mutex);
 
-    // If no results were processed, direclty finish the search, in the main
-    // thread.
+    /* If no results were processed, direclty finish the search, in the main */
+    /* thread. */
     if (thread_data->processing_id == 0)
     {
         g_idle_add (G_SOURCE_FUNC (search_thread_done), thread_data);
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
index 32b6039a9..d575ba875 100644
--- a/src/nautilus-search-engine-tracker.c
+++ b/src/nautilus-search-engine-tracker.c
@@ -481,7 +481,7 @@ static void
 nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
                                           NautilusQuery          *query)
 {
-    g_autoptr(GFile) location = NULL;
+    g_autoptr (GFile) location = NULL;
     NautilusSearchEngineTracker *tracker;
 
     tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
index b5a67b730..4923a118a 100644
--- a/src/nautilus-search-engine.c
+++ b/src/nautilus-search-engine.c
@@ -106,7 +106,7 @@ search_engine_start_real_tracker (NautilusSearchEngine *engine)
     NautilusSearchEnginePrivate *priv;
 
     priv = nautilus_search_engine_get_instance_private (engine);
-    
+
     priv->providers_running++;
     nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
 }
@@ -117,7 +117,7 @@ search_engine_start_real_recent (NautilusSearchEngine *engine)
     NautilusSearchEnginePrivate *priv;
 
     priv = nautilus_search_engine_get_instance_private (engine);
-    
+
     priv->providers_running++;
     nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->recent));
 }
@@ -553,13 +553,19 @@ is_recursive_search (NautilusSearchEngineType  engine_type,
     switch (recursive)
     {
         case NAUTILUS_QUERY_RECURSIVE_NEVER:
+        {
             return FALSE;
+        }
 
         case NAUTILUS_QUERY_RECURSIVE_ALWAYS:
+        {
             return TRUE;
+        }
 
         case NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY:
+        {
             return engine_type == NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED;
+        }
 
         case NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY:
         {
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index e9cd5003b..c0da9298a 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -426,7 +426,7 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
     g_object_unref (volume_monitor);
 }
 
-static NautilusQuery*
+static NautilusQuery *
 shell_query_new (gchar **terms)
 {
     NautilusQuery *query;
diff --git a/src/nautilus-thumbnails.c b/src/nautilus-thumbnails.c
index 991bfb6f6..8b532f260 100644
--- a/src/nautilus-thumbnails.c
+++ b/src/nautilus-thumbnails.c
@@ -398,7 +398,7 @@ nautilus_create_thumbnail (NautilusFile *file)
     {
         /* Add the thumbnail to the list. */
         DEBUG ("(Main Thread) Adding thumbnail: %s\n",
-                 info->image_uri);
+               info->image_uri);
         g_queue_push_tail ((GQueue *) &thumbnails_to_make, info);
         node = g_queue_peek_tail_link ((GQueue *) &thumbnails_to_make);
         g_hash_table_insert (thumbnails_to_make_hash,
@@ -417,7 +417,7 @@ nautilus_create_thumbnail (NautilusFile *file)
     else
     {
         DEBUG ("(Main Thread) Updating non-current mtime: %s\n",
-                 info->image_uri);
+               info->image_uri);
 
         /* The file in the queue might need a new original mtime */
         existing_info = existing->data;
@@ -452,7 +452,7 @@ thumbnail_thread_func (GTask        *task,
 
     /* We loop until there are no more thumbails to make, at which point
      *  we exit the thread. */
-    for (;; )
+    for (;;)
     {
         DEBUG ("(Thumbnail Thread) Locking mutex\n");
 
@@ -515,7 +515,7 @@ thumbnail_thread_func (GTask        *task,
             current_time >= current_orig_mtime)
         {
             DEBUG ("(Thumbnail Thread) Skipping: %s\n",
-                     info->image_uri);
+                   info->image_uri);
 
             /* Reschedule thumbnailing via a change notification */
             g_timeout_add_seconds (1, thumbnail_thread_notify_file_changed,
@@ -525,7 +525,7 @@ thumbnail_thread_func (GTask        *task,
 
         /* Create the thumbnail. */
         DEBUG ("(Thumbnail Thread) Creating thumbnail: %s\n",
-                 info->image_uri);
+               info->image_uri);
 
         pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory,
                                                                      info->image_uri,
@@ -534,7 +534,7 @@ thumbnail_thread_func (GTask        *task,
         if (pixbuf)
         {
             DEBUG ("(Thumbnail Thread) Saving thumbnail: %s\n",
-                     info->image_uri);
+                   info->image_uri);
 
             gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory,
                                                             pixbuf,
@@ -545,7 +545,7 @@ thumbnail_thread_func (GTask        *task,
         else
         {
             DEBUG ("(Thumbnail Thread) Thumbnail failed: %s\n",
-                     info->image_uri);
+                   info->image_uri);
 
             gnome_desktop_thumbnail_factory_create_failed_thumbnail (thumbnail_factory,
                                                                      info->image_uri,
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index d14f17867..a551aa6d0 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -131,7 +131,7 @@ G_DEFINE_TYPE (NautilusToolbar, nautilus_toolbar, GTK_TYPE_HEADER_BAR);
 
 static void nautilus_toolbar_set_window_slot_real (NautilusToolbar    *self,
                                                    NautilusWindowSlot *slot);
-static void update_operations                     (NautilusToolbar    *self);
+static void update_operations (NautilusToolbar *self);
 
 static void
 toolbar_update_appearance (NautilusToolbar *self)
@@ -195,7 +195,7 @@ fill_menu (NautilusToolbar *self,
     GList *list;
 
     list = back ? nautilus_window_slot_get_back_history (self->window_slot) :
-                  nautilus_window_slot_get_forward_history (self->window_slot);
+           nautilus_window_slot_get_forward_history (self->window_slot);
 
     index = 0;
     while (list != NULL)
@@ -1231,19 +1231,19 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     properties [PROP_WINDOW_SLOT] =
-      g_param_spec_object ("window-slot",
-                           "Window slot currently active",
-                           "Window slot currently acive",
-                           NAUTILUS_TYPE_WINDOW_SLOT,
-                           (G_PARAM_READWRITE |
-                            G_PARAM_STATIC_STRINGS));
+        g_param_spec_object ("window-slot",
+                             "Window slot currently active",
+                             "Window slot currently acive",
+                             NAUTILUS_TYPE_WINDOW_SLOT,
+                             (G_PARAM_READWRITE |
+                              G_PARAM_STATIC_STRINGS));
 
     properties [PROP_SEARCHING] =
-      g_param_spec_boolean ("searching",
-                            "Current view is searching",
-                            "Whether the current view is searching or not",
-                            FALSE,
-                            G_PARAM_READWRITE);
+        g_param_spec_boolean ("searching",
+                              "Current view is searching",
+                              "Whether the current view is searching or not",
+                              FALSE,
+                              G_PARAM_READWRITE);
 
     g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
 
@@ -1370,8 +1370,8 @@ on_slot_toolbar_menu_sections_changed (NautilusToolbar    *self,
     }
 
     gtk_widget_set_sensitive (self->view_button, new_sections->extended_section != NULL ||
-                                                 new_sections->zoom_section != NULL ||
-                                                 new_sections->supports_undo_redo);
+                              new_sections->zoom_section != NULL ||
+                              new_sections->supports_undo_redo);
 }
 
 
@@ -1446,7 +1446,6 @@ nautilus_toolbar_set_window_slot_real (NautilusToolbar    *self,
                                   G_CALLBACK (slot_on_templates_menu_changed), self);
         g_signal_connect_swapped (self->window_slot, "notify::searching",
                                   G_CALLBACK (toolbar_update_appearance), self);
-
     }
 
     children = gtk_container_get_children (GTK_CONTAINER (self->search_container));
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index 1256963a4..b68eb8c31 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -160,7 +160,7 @@ trash_bar_response_cb (GtkInfoBar *infobar,
 {
     NautilusTrashBar *bar;
     GtkWidget *window;
-    
+
     bar = NAUTILUS_TRASH_BAR (infobar);
     window = gtk_widget_get_toplevel (GTK_WIDGET (bar));
 
diff --git a/src/nautilus-trash-monitor.c b/src/nautilus-trash-monitor.c
index 356fa6041..2e2beaa65 100644
--- a/src/nautilus-trash-monitor.c
+++ b/src/nautilus-trash-monitor.c
@@ -174,8 +174,8 @@ schedule_update_info (NautilusTrashMonitor *trash_monitor)
                              trash_query_info_cb, g_object_ref (trash_monitor));
 
     trash_monitor->timeout_id = g_timeout_add_seconds (UPDATE_RATE_SECONDS,
-                                                                schedule_update_info_cb,
-                                                                trash_monitor);
+                                                       schedule_update_info_cb,
+                                                       trash_monitor);
     g_object_unref (location);
 }
 
diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index 1c84ee113..174adb321 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -370,10 +370,10 @@ get_text_for_date_range (GPtrArray *date_range,
 }
 
 GtkDialog *
-show_dialog (const gchar *primary_text,
-             const gchar *secondary_text,
-             GtkWindow   *parent,
-             GtkMessageType type)
+show_dialog (const gchar    *primary_text,
+             const gchar    *secondary_text,
+             GtkWindow      *parent,
+             GtkMessageType  type)
 {
     GtkWidget *dialog;
 
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index 6dbdf1e3e..2ca22ad4a 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -909,7 +909,7 @@ real_select_first (NautilusFilesView *files_view)
 
 static void
 real_preview_selection_event (NautilusFilesView *files_view,
-                              GtkDirectionType direction)
+                              GtkDirectionType   direction)
 {
     NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view);
     GtkMovementStep step;
@@ -917,9 +917,9 @@ real_preview_selection_event (NautilusFilesView *files_view,
     gboolean handled;
 
     step = (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN) ?
-        GTK_MOVEMENT_DISPLAY_LINES : GTK_MOVEMENT_VISUAL_POSITIONS;
+           GTK_MOVEMENT_DISPLAY_LINES : GTK_MOVEMENT_VISUAL_POSITIONS;
     count = (direction == GTK_DIR_RIGHT || direction == GTK_DIR_DOWN) ?
-        1 : -1;
+            1 : -1;
 
     g_signal_emit_by_name (self->view_ui, "move-cursor", step, count, &handled);
 }
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index ee15f4c68..4a97c2106 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -170,10 +170,10 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor,
 static void update_search_information (NautilusWindowSlot *self);
 static void real_set_extensions_background_menu (NautilusWindowSlot *self,
                                                  GMenu              *menu);
-static GMenu* real_get_extensions_background_menu (NautilusWindowSlot *self);
+static GMenu *real_get_extensions_background_menu (NautilusWindowSlot *self);
 static void real_set_templates_menu (NautilusWindowSlot *self,
                                      GMenu              *menu);
-static GMenu* real_get_templates_menu (NautilusWindowSlot *self);
+static GMenu *real_get_templates_menu (NautilusWindowSlot *self);
 static void nautilus_window_slot_setup_extra_location_widgets (NautilusWindowSlot *self);
 
 void
@@ -442,7 +442,7 @@ query_editor_activated_callback (NautilusQueryEditor *editor,
 
 static void
 query_editor_focus_view_callback (NautilusQueryEditor *editor,
-                                   NautilusWindowSlot  *self)
+                                  NautilusWindowSlot  *self)
 {
     NautilusWindowSlotPrivate *priv;
 
@@ -842,7 +842,7 @@ nautilus_window_slot_set_property (GObject      *object,
     }
 }
 
-static GMenu*
+static GMenu *
 real_get_extensions_background_menu (NautilusWindowSlot *self)
 {
     NautilusWindowSlotPrivate *priv;
@@ -851,7 +851,7 @@ real_get_extensions_background_menu (NautilusWindowSlot *self)
     return priv->extensions_background_menu;
 }
 
-GMenu*
+GMenu *
 nautilus_window_slot_get_extensions_background_menu (NautilusWindowSlot *self)
 {
     GMenu *menu = NULL;
@@ -861,7 +861,7 @@ nautilus_window_slot_get_extensions_background_menu (NautilusWindowSlot *self)
     return menu;
 }
 
-static GMenu*
+static GMenu *
 real_get_templates_menu (NautilusWindowSlot *self)
 {
     NautilusWindowSlotPrivate *priv;
@@ -870,7 +870,7 @@ real_get_templates_menu (NautilusWindowSlot *self)
     return priv->templates_menu;
 }
 
-GMenu*
+GMenu *
 nautilus_window_slot_get_templates_menu (NautilusWindowSlot *self)
 {
     GMenu *menu = NULL;
@@ -965,7 +965,7 @@ nautilus_window_slot_get_searching (NautilusWindowSlot *self)
     return priv->searching;
 }
 
-GList*
+GList *
 nautilus_window_slot_get_selection (NautilusWindowSlot *self)
 {
     NautilusWindowSlotPrivate *priv;
@@ -1172,7 +1172,6 @@ update_search_information (NautilusWindowSlot *self)
         gtk_revealer_set_reveal_child (priv->search_info_label_revealer,
                                        label != NULL);
     }
-
 }
 
 static void
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 056c75c7a..cf6b5205d 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1721,8 +1721,8 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager,
             gtk_revealer_set_reveal_child (GTK_REVEALER (window->in_app_notification_undo),
                                            TRUE);
             window->in_app_notification_undo_timeout_id = g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
-                                                                               (GSourceFunc) 
on_in_app_notification_undo_timeout,
-                                                                               window);
+                                                                                 (GSourceFunc) 
on_in_app_notification_undo_timeout,
+                                                                                 window);
         }
     }
     else
@@ -1805,8 +1805,8 @@ nautilus_window_show_operation_notification (NautilusWindow *window,
 
         gtk_revealer_set_reveal_child (GTK_REVEALER (window->notification_operation), TRUE);
         window->notification_operation_timeout_id = g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
-                                                                         (GSourceFunc) 
on_notification_operation_timeout,
-                                                                         window);
+                                                                           (GSourceFunc) 
on_notification_operation_timeout,
+                                                                           window);
     }
 }
 
@@ -2585,9 +2585,9 @@ wayland_window_handle_exported (GdkWindow  *window,
 #endif
 
 gboolean
-nautilus_window_export_handle (NautilusWindow          *window,
-                               NautilusWindowHandleExported callback,
-                               gpointer                 user_data)
+nautilus_window_export_handle (NautilusWindow               *window,
+                               NautilusWindowHandleExported  callback,
+                               gpointer                      user_data)
 {
     guint xid = get_window_xid (window);
 
@@ -2804,8 +2804,8 @@ nautilus_window_init (NautilusWindow *window)
     window->tab_data_queue = g_queue_new ();
 
     window->pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
-                                                   G_ACTION_GROUP (window),
-                                                   NULL);
+                                                     G_ACTION_GROUP (window),
+                                                     NULL);
     gtk_pad_controller_set_action_entries (window->pad_controller,
                                            pad_actions, G_N_ELEMENTS (pad_actions));
 
diff --git a/test/automated/displayless/test-file-operations-copy-files.c 
b/test/automated/displayless/test-file-operations-copy-files.c
index 8147adf8a..1a7d80201 100644
--- a/test/automated/displayless/test-file-operations-copy-files.c
+++ b/test/automated/displayless/test-file-operations-copy-files.c
@@ -1300,16 +1300,17 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     undo_manager = nautilus_file_undo_manager_new ();
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-operations-dir-has-files.c 
b/test/automated/displayless/test-file-operations-dir-has-files.c
index f5a7f1dcc..06c7df20e 100644
--- a/test/automated/displayless/test-file-operations-dir-has-files.c
+++ b/test/automated/displayless/test-file-operations-dir-has-files.c
@@ -74,11 +74,12 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
diff --git a/test/automated/displayless/test-file-operations-move-files.c 
b/test/automated/displayless/test-file-operations-move-files.c
index 6b476e7fa..5ad8ccb51 100644
--- a/test/automated/displayless/test-file-operations-move-files.c
+++ b/test/automated/displayless/test-file-operations-move-files.c
@@ -158,7 +158,7 @@ test_move_one_empty_directory_undo (void)
     g_autolist (GFile) files = NULL;
 
     create_one_empty_directory ("move");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
@@ -1185,7 +1185,7 @@ test_move_first_hierarchy (void)
     g_assert_false (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_false (g_file_query_exists (file, NULL));    
+    g_assert_false (g_file_query_exists (file, NULL));
 
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
@@ -1236,7 +1236,7 @@ test_move_first_hierarchy_undo (void)
     g_assert_true (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_true (g_file_query_exists (file, NULL));    
+    g_assert_true (g_file_query_exists (file, NULL));
 
     g_assert_true (g_file_query_exists (first_dir, NULL));
 
@@ -1287,7 +1287,7 @@ test_move_first_hierarchy_undo_redo (void)
     g_assert_false (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_false (g_file_query_exists (file, NULL));    
+    g_assert_false (g_file_query_exists (file, NULL));
 
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
@@ -1931,16 +1931,17 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     undo_manager = nautilus_file_undo_manager_new ();
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-operations-trash-or-delete.c 
b/test/automated/displayless/test-file-operations-trash-or-delete.c
index 21a451340..b1f410949 100644
--- a/test/automated/displayless/test-file-operations-trash-or-delete.c
+++ b/test/automated/displayless/test-file-operations-trash-or-delete.c
@@ -35,23 +35,23 @@ test_trash_more_files_func (gint files_to_trash)
     g_autolist (GFile) files = NULL;
 
     create_multiple_files ("trash_or_delete", files_to_trash);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < files_to_trash; i++)
     {
         gchar *file_name;
- 
+
         file_name = g_strdup_printf ("trash_or_delete_file_%i", i);
         file = g_file_get_child (root, file_name);
         g_free (file_name);
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
- 
+
     for (int i = 0; i < files_to_trash; i++)
     {
         gchar *file_name;
@@ -106,23 +106,23 @@ test_delete_more_files_func (gint files_to_delete)
     g_autolist (GFile) files = NULL;
 
     create_multiple_files ("trash_or_delete", files_to_delete);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < files_to_delete; i++)
     {
         gchar *file_name;
- 
+
         file_name = g_strdup_printf ("trash_or_delete_file_%i", i);
         file = g_file_get_child (root, file_name);
         g_free (file_name);
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
- 
+
     for (int i = 0; i < files_to_delete; i++)
     {
         gchar *file_name;
@@ -179,10 +179,10 @@ test_trash_more_empty_directories_func (gint directories_to_trash)
     g_autolist (GFile) files = NULL;
 
     create_multiple_directories ("trash_or_delete", directories_to_trash);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < directories_to_trash; i++)
     {
         gchar *file_name;
@@ -193,7 +193,7 @@ test_trash_more_empty_directories_func (gint directories_to_trash)
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
 
     for (int i = 0; i < directories_to_trash; i++)
@@ -252,10 +252,10 @@ test_delete_more_empty_directories_func (gint directories_to_delete)
     g_autolist (GFile) files = NULL;
 
     create_multiple_directories ("trash_or_delete", directories_to_delete);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < directories_to_delete; i++)
     {
         gchar *file_name;
@@ -266,7 +266,7 @@ test_delete_more_empty_directories_func (gint directories_to_delete)
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
 
 
@@ -322,7 +322,7 @@ test_trash_full_directory (void)
 
     empty_directory_by_prefix (root, "trash_or_delete");
 }
- 
+
 /* The hierarchy looks like this:
  * /tmp/first_dir/first_child
  * /tmp/first_dir/second_child
@@ -337,14 +337,14 @@ test_trash_first_hierarchy (void)
     g_autolist (GFile) files = NULL;
 
     create_first_hierarchy ("trash_or_delete");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
     first_dir = g_file_get_child (root, "trash_or_delete_first_dir");
     files = g_list_prepend (files, g_object_ref (first_dir));
     g_assert_true (first_dir != NULL);
- 
+
     file = g_file_get_child (first_dir, "trash_or_delete_first_child");
     g_assert_true (file != NULL);
     file = g_file_get_child (first_dir, "trash_or_delete_second_child");
@@ -361,7 +361,7 @@ test_trash_first_hierarchy (void)
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
     empty_directory_by_prefix (root, "trash_or_delete");
- }
+}
 
 /* We're creating 50 directories each containing one file
  * and trashing all of the directories.
@@ -389,7 +389,7 @@ test_trash_third_hierarchy (void)
         g_free (file_name);
         files = g_list_prepend (files, g_object_ref (directory));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
 
     for (int i = 0; i < 50; i++)
@@ -443,7 +443,7 @@ test_delete_full_directory (void)
 
     empty_directory_by_prefix (root, "trash_or_delete");
 }
- 
+
 /* The hierarchy looks like this:
  * /tmp/first_dir/first_child
  * /tmp/first_dir/second_child
@@ -458,14 +458,14 @@ test_delete_first_hierarchy (void)
     g_autolist (GFile) files = NULL;
 
     create_first_hierarchy ("trash_or_delete");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
     first_dir = g_file_get_child (root, "trash_or_delete_first_dir");
     files = g_list_prepend (files, g_object_ref (first_dir));
     g_assert_true (first_dir != NULL);
- 
+
     file = g_file_get_child (first_dir, "trash_or_delete_first_child");
     g_assert_true (file != NULL);
     file = g_file_get_child (first_dir, "trash_or_delete_second_child");
@@ -482,7 +482,7 @@ test_delete_first_hierarchy (void)
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
     empty_directory_by_prefix (root, "trash_or_delete");
- }
+}
 
 /* We're creating 50 directories each containing one file
  * and deleting all of the directories.
@@ -510,7 +510,7 @@ test_delete_third_hierarchy (void)
         g_free (file_name);
         files = g_list_prepend (files, g_object_ref (directory));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
 
     for (int i = 0; i < 50; i++)
@@ -563,20 +563,20 @@ setup_test_suite (void)
                      test_delete_first_hierarchy);
     g_test_add_func ("/test-delete-more-full-directories/1.6",
                      test_delete_third_hierarchy);
-
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
     undo_manager = nautilus_file_undo_manager_new ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-utilities.c 
b/test/automated/displayless/test-file-utilities.c
index ca61870ee..17a7c921e 100644
--- a/test/automated/displayless/test-file-utilities.c
+++ b/test/automated/displayless/test-file-utilities.c
@@ -227,13 +227,14 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-nautilus-search-engine-model.c 
b/test/automated/displayless/test-nautilus-search-engine-model.c
index 05086f8b7..af1a9b4bb 100644
--- a/test/automated/displayless/test-nautilus-search-engine-model.c
+++ b/test/automated/displayless/test-nautilus-search-engine-model.c
@@ -39,7 +39,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine-simple.c 
b/test/automated/displayless/test-nautilus-search-engine-simple.c
index 82eb865b3..728c7ce32 100644
--- a/test/automated/displayless/test-nautilus-search-engine-simple.c
+++ b/test/automated/displayless/test-nautilus-search-engine-simple.c
@@ -38,7 +38,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine-tracker.c 
b/test/automated/displayless/test-nautilus-search-engine-tracker.c
index c1f495327..0de2d404b 100644
--- a/test/automated/displayless/test-nautilus-search-engine-tracker.c
+++ b/test/automated/displayless/test-nautilus-search-engine-tracker.c
@@ -51,7 +51,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine.c 
b/test/automated/displayless/test-nautilus-search-engine.c
index d80f1fa20..28c02efb0 100644
--- a/test/automated/displayless/test-nautilus-search-engine.c
+++ b/test/automated/displayless/test-nautilus-search-engine.c
@@ -39,7 +39,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-utilities.c b/test/automated/displayless/test-utilities.c
index 7b38c6849..f86783317 100644
--- a/test/automated/displayless/test-utilities.c
+++ b/test/automated/displayless/test-utilities.c
@@ -90,7 +90,7 @@ delete_search_file_hierarchy (gchar *search_engine)
     g_autoptr (GFile) file = NULL;
     gchar *file_name;
 
-    location = g_file_new_for_path (g_get_tmp_dir ()); 
+    location = g_file_new_for_path (g_get_tmp_dir ());
 
     file_name = g_strdup_printf ("engine_%s", search_engine);
     file = g_file_get_child (location, file_name);
@@ -165,7 +165,7 @@ test_operation_undo (void)
     nautilus_file_undo_manager_undo (NULL);
 
     g_main_loop_run (loop);
-    
+
     g_main_context_pop_thread_default (context);
 
     g_signal_handler_disconnect (nautilus_file_undo_manager_get (),
@@ -178,7 +178,7 @@ test_operation_undo_redo (void)
 {
     g_autoptr (GMainLoop) loop = NULL;
     g_autoptr (GMainContext) context = NULL;
-    gulong handler_id;    
+    gulong handler_id;
 
     test_operation_undo ();
 
@@ -194,7 +194,7 @@ test_operation_undo_redo (void)
     nautilus_file_undo_manager_redo (NULL);
 
     g_main_loop_run (loop);
-    
+
     g_main_context_pop_thread_default (context);
 
     g_signal_handler_disconnect (nautilus_file_undo_manager_get (),
@@ -277,7 +277,8 @@ create_one_empty_directory (gchar *prefix)
 }
 
 void
-create_multiple_files (gchar *prefix, gint number_of_files)
+create_multiple_files (gchar *prefix,
+                       gint   number_of_files)
 {
     g_autoptr (GFile) root = NULL;
     g_autoptr (GFile) file = NULL;
@@ -309,7 +310,8 @@ create_multiple_files (gchar *prefix, gint number_of_files)
 }
 
 void
-create_multiple_directories (gchar *prefix, gint number_of_directories)
+create_multiple_directories (gchar *prefix,
+                             gint   number_of_directories)
 {
     g_autoptr (GFile) root = NULL;
     g_autoptr (GFile) file = NULL;
@@ -526,7 +528,8 @@ create_fourth_hierarchy (gchar *prefix)
 }
 
 void
-create_multiple_full_directories (gchar *prefix, gint number_of_directories)
+create_multiple_full_directories (gchar *prefix,
+                                  gint   number_of_directories)
 {
     g_autoptr (GFile) root = NULL;
 
@@ -552,4 +555,4 @@ create_multiple_full_directories (gchar *prefix, gint number_of_directories)
 
         g_file_make_directory (file, NULL, NULL);
     }
-}
\ No newline at end of file
+}


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