Merge branch 'feature/upstream' into develop

1 files changed, 3071 insertions, 2762 deletions

diff --git a/src/MediaPage.c b/src/MediaPage.c
index ae79f6f..ba4e472 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.36.6, the Vala compiler
+/* MediaPage.c generated by valac 0.40.4, the Vala compiler
  * generated from MediaPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -110,6 +111,11 @@ typedef struct _Dimensions Dimensions;
 typedef struct _MediaSourceItem MediaSourceItem;
 typedef struct _MediaSourceItemClass MediaSourceItemClass;
 typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate;
+enum  {
+	MEDIA_SOURCE_ITEM_0_PROPERTY,
+	MEDIA_SOURCE_ITEM_NUM_PROPERTIES
+};
+static GParamSpec* media_source_item_properties[MEDIA_SOURCE_ITEM_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ())
@@ -266,6 +272,11 @@ typedef struct _DragAndDropHandlerClass DragAndDropHandlerClass;
 
 typedef struct _MediaViewTracker MediaViewTracker;
 typedef struct _MediaViewTrackerClass MediaViewTrackerClass;
+enum  {
+	MEDIA_PAGE_0_PROPERTY,
+	MEDIA_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* media_page_properties[MEDIA_PAGE_NUM_PROPERTIES];
 
 #define MEDIA_PAGE_TYPE_SORT_BY (media_page_sort_by_get_type ())
 #define _drag_and_drop_handler_unref0(var) ((var == NULL) ? NULL : (var = (drag_and_drop_handler_unref (var), NULL)))
@@ -650,10 +661,15 @@ typedef struct _CheckerboardLayout CheckerboardLayout;
 typedef struct _CheckerboardLayoutClass CheckerboardLayoutClass;
 typedef struct _MediaPageZoomSliderAssemblyPrivate MediaPageZoomSliderAssemblyPrivate;
 enum  {
+	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_0_PROPERTY,
+	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_PROPERTIES
+};
+static GParamSpec* media_page_zoom_slider_assembly_properties[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_PROPERTIES];
+enum  {
 	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL,
-	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL
+	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_SIGNALS
 };
-static guint media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL] = {0};
+static guint media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_SIGNALS] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -954,16 +970,28 @@ static gpointer media_page_zoom_slider_assembly_parent_class = NULL;
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType data_view_get_type (void) G_GNUC_CONST;
@@ -975,25 +1003,60 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 GType media_source_item_get_type (void) G_GNUC_CONST;
 #define MEDIA_SOURCE_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemPrivate))
-enum  {
-	MEDIA_SOURCE_ITEM_DUMMY_PROPERTY
-};
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
-MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment);
-MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment);
-CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment);
-GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
-static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
-void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset);
+MediaSourceItem* media_source_item_new (ThumbnailSource* source,
+                                        Dimensions* initial_pixbuf_dim,
+                                        const gchar* title,
+                                        const gchar* comment,
+                                        gboolean marked_up,
+                                        PangoAlignment alignment);
+MediaSourceItem* media_source_item_construct (GType object_type,
+                                              ThumbnailSource* source,
+                                              Dimensions* initial_pixbuf_dim,
+                                              const gchar* title,
+                                              const gchar* comment,
+                                              gboolean marked_up,
+                                              PangoAlignment alignment);
+CheckerboardItem* checkerboard_item_construct (GType object_type,
+                                               ThumbnailSource* source,
+                                               Dimensions* initial_pixbuf_dim,
+                                               const gchar* title,
+                                               const gchar* comment,
+                                               gboolean marked_up,
+                                               PangoAlignment alignment);
+GdkPixbuf* resources_load_icon (const gchar* name,
+                                gint scale);
+static void media_source_item_real_paint_image (CheckerboardItem* base,
+                                         cairo_t* ctx,
+                                         GdkPixbuf* pixbuf,
+                                         GdkPoint* origin);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+                            Dimensions* result);
+void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self,
+                                                      gint horizontal_trinket_offset);
 gint dimensions_major_axis (Dimensions *self);
 GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
-void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin);
-void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, GdkPoint* item_origin, Dimensions* item_dimensions);
-void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, GdkPoint* origin);
-void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets);
-void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
-void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
+void checkerboard_item_paint_image (CheckerboardItem* self,
+                                    cairo_t* ctx,
+                                    GdkPixbuf* pixbuf,
+                                    GdkPoint* origin);
+void media_source_item_paint_sprockets (MediaSourceItem* self,
+                                        cairo_t* ctx,
+                                        GdkPoint* item_origin,
+                                        Dimensions* item_dimensions);
+void media_source_item_paint_one_sprocket (MediaSourceItem* self,
+                                           cairo_t* ctx,
+                                           GdkPoint* origin);
+void media_source_item_set_enable_sprockets (MediaSourceItem* self,
+                                             gboolean enable_sprockets);
+void media_source_item_set_title (MediaSourceItem* self,
+                                  const gchar* text,
+                                  gboolean marked_up,
+                                  PangoAlignment alignment);
+void checkerboard_item_set_title (CheckerboardItem* self,
+                                  const gchar* text,
+                                  gboolean marked_up,
+                                  PangoAlignment alignment);
 gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self);
 gchar* natural_collate_collate_key (gchar* str);
 gchar* checkerboard_item_get_title (CheckerboardItem* self);
@@ -1003,9 +1066,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
 void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_injection_group (GValue* value,
+                                gpointer v_object);
+void value_take_injection_group (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_injection_group (const GValue* value);
 GType injection_group_get_type (void) G_GNUC_CONST;
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -1015,17 +1084,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 GType search_view_filter_get_type (void) G_GNUC_CONST;
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+                             gpointer v_object);
+void core_value_take_tracker (GValue* value,
+                              gpointer v_object);
 gpointer core_value_get_tracker (const GValue* value);
 GType core_tracker_get_type (void) G_GNUC_CONST;
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
@@ -1035,89 +1116,174 @@ GType raw_developer_get_type (void) G_GNUC_CONST;
 GType media_page_zoom_slider_assembly_get_type (void) G_GNUC_CONST;
 gpointer drag_and_drop_handler_ref (gpointer instance);
 void drag_and_drop_handler_unref (gpointer instance);
-GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_drag_and_drop_handler (GValue* value, gpointer v_object);
-void value_take_drag_and_drop_handler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_drag_and_drop_handler (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags);
+void value_set_drag_and_drop_handler (GValue* value,
+                                      gpointer v_object);
+void value_take_drag_and_drop_handler (GValue* value,
+                                       gpointer v_object);
 gpointer value_get_drag_and_drop_handler (const GValue* value);
 GType drag_and_drop_handler_get_type (void) G_GNUC_CONST;
 GType media_view_tracker_get_type (void) G_GNUC_CONST;
 #define MEDIA_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_PAGE, MediaPagePrivate))
-enum  {
-	MEDIA_PAGE_DUMMY_PROPERTY
-};
 GType media_page_sort_by_get_type (void) G_GNUC_CONST;
 #define MEDIA_PAGE_SORT_ORDER_ASCENDING 0
 #define MEDIA_PAGE_SORT_ORDER_DESCENDING 1
 #define MEDIA_PAGE_MANUAL_STEPPING 16
 #define MEDIA_PAGE_SLIDER_STEPPING 4
 void media_page_on_export (MediaPage* self);
-static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self);
 static void media_page_on_send_to (MediaPage* self);
-static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self);
 static void media_page_on_remove_from_library (MediaPage* self);
-static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self);
 void media_page_on_move_to_trash (MediaPage* self);
-static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
 static void media_page_on_new_event (MediaPage* self);
-static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self);
 static void media_page_on_add_tags (MediaPage* self);
-static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self);
 static void media_page_on_modify_tags (MediaPage* self);
-static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self);
 void media_page_on_increase_size (MediaPage* self);
-static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
 void media_page_on_decrease_size (MediaPage* self);
-static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
 static void media_page_on_flag_unflag (MediaPage* self);
-static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self);
 void media_page_on_increase_rating (MediaPage* self);
-static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 void media_page_on_decrease_rating (MediaPage* self);
-static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 void media_page_on_rate_rejected (MediaPage* self);
-static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
 void media_page_on_rate_unrated (MediaPage* self);
-static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self);
 void media_page_on_rate_one (MediaPage* self);
-static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self);
 void media_page_on_rate_two (MediaPage* self);
-static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self);
 void media_page_on_rate_three (MediaPage* self);
-static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self);
 void media_page_on_rate_four (MediaPage* self);
-static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self);
 void media_page_on_rate_five (MediaPage* self);
-static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self);
 void media_page_on_edit_title (MediaPage* self);
-static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self);
 void media_page_on_edit_comment (MediaPage* self);
-static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self);
 void media_page_on_play_video (MediaPage* self);
-static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-void page_on_action_radio (Page* self, GAction* action, GVariant* value);
-static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-MediaPage* media_page_construct (GType object_type, const gchar* page_name);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
+static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self);
+void page_on_action_toggle (Page* self,
+                            GAction* action,
+                            GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self);
+void media_page_on_display_titles (MediaPage* self,
+                                   GSimpleAction* action,
+                                   GVariant* value);
+static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                         GVariant* value,
+                                                                         gpointer self);
+void media_page_on_display_comments (MediaPage* self,
+                                     GSimpleAction* action,
+                                     GVariant* value);
+static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                           GVariant* value,
+                                                                           gpointer self);
+void media_page_on_display_ratings (MediaPage* self,
+                                    GSimpleAction* action,
+                                    GVariant* value);
+static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                          GVariant* value,
+                                                                          gpointer self);
+void media_page_on_display_tags (MediaPage* self,
+                                 GSimpleAction* action,
+                                 GVariant* value);
+static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                       GVariant* value,
+                                                                       gpointer self);
+void page_on_action_radio (Page* self,
+                           GAction* action,
+                           GVariant* value);
+static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self);
+void media_page_on_sort_changed (MediaPage* self,
+                                 GSimpleAction* action,
+                                 GVariant* value);
+static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                       GVariant* value,
+                                                                       gpointer self);
+MediaPage* media_page_construct (GType object_type,
+                                 const gchar* page_name);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+                                               const gchar* page_name);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
-static void media_page_on_media_altered (MediaPage* self, GeeMap* altered);
-static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+                                                ViewCollection* collection);
+static void media_page_on_media_altered (MediaPage* self,
+                                  GeeMap* altered);
+static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                 GeeMap* items,
+                                                                 gpointer self);
 void data_collection_freeze_notifications (DataCollection* self);
-void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target);
+void data_collection_set_property (DataCollection* self,
+                                   const gchar* name,
+                                   GValue* val,
+                                   ValueEqualFunc value_equals,
+                                   void* value_equals_target);
 #define CHECKERBOARD_ITEM_PROP_SHOW_TITLES "show-titles"
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
@@ -1134,17 +1300,25 @@ gint media_page_get_thumb_size (MediaPage* self);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
 void data_collection_thaw_notifications (DataCollection* self);
 DragAndDropHandler* drag_and_drop_handler_new (Page* page);
-DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page);
+DragAndDropHandler* drag_and_drop_handler_construct (GType object_type,
+                                                     Page* page);
 static gint media_page_compute_zoom_scale_increase (gint current_scale);
 gint thumbnail_get_MIN_SCALE (void);
 gint thumbnail_get_MAX_SCALE (void);
 static gint media_page_compute_zoom_scale_decrease (gint current_scale);
-static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void media_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by);
-GAction* page_get_action (Page* self, const gchar* name);
+static void media_page_real_init_collect_ui_filenames (Page* base,
+                                                GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void media_page_real_add_actions (Page* base,
+                                  GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+void media_page_get_config_photos_sort (MediaPage* self,
+                                        gboolean* sort_order,
+                                        gint* sort_by);
+GAction* page_get_action (Page* self,
+                          const gchar* name);
 static GVariant* _variant_new23 (gboolean value);
 static GVariant* _variant_new24 (gboolean value);
 static GVariant* _variant_new25 (gboolean value);
@@ -1153,24 +1327,41 @@ static GVariant* _variant_new27 (gchar* value);
 static GVariant* _variant_new28 (const gchar* value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 static GVariant* _variant_new29 (const gchar* value);
-static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
-static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self);
-static void media_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-static void media_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
+static void media_page_on_raw_developer_changed (MediaPage* self,
+                                          GSimpleAction* action,
+                                          GVariant* value);
+static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender,
+                                                                        GVariant* value,
+                                                                        gpointer self);
+static void media_page_real_remove_actions (Page* base,
+                                     GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
+static void media_page_real_update_actions (Page* base,
+                                     gint selected_count,
+                                     gint count);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
 gboolean desktop_integration_is_send_to_installed (void);
 static void media_page_update_rating_sensitivities (MediaPage* self);
 static void media_page_update_development_menu_item_sensitivity (MediaPage* self);
-DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
+DataSource* view_collection_get_selected_source_at (ViewCollection* self,
+                                                    gint index);
 GType media_source_get_type (void) G_GNUC_CONST;
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-static void media_page_update_flag_action (MediaPage* self, gint selected_count);
-void page_update_actions (Page* self, gint selected_count, gint count);
-gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
+static void media_page_update_flag_action (MediaPage* self,
+                                    gint selected_count);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
+gboolean alteration_has_detail (Alteration* self,
+                                const gchar* subject,
+                                const gchar* detail);
 gint view_collection_get_selected_count (ViewCollection* self);
-static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating);
+static gboolean media_page_can_rate_selected (MediaPage* self,
+                                       Rating rating);
 static gboolean media_page_can_increase_selected_rating (MediaPage* self);
 static gboolean media_page_can_decrease_selected_rating (MediaPage* self);
 GeeList* view_collection_get_selected (ViewCollection* self);
@@ -1181,118 +1372,184 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base);
-void media_page_set_display_ratings (MediaPage* self, gboolean display);
-void page_set_action_active (Page* self, const gchar* name, gboolean active);
+void media_page_set_display_ratings (MediaPage* self,
+                                     gboolean display);
+void page_set_action_active (Page* self,
+                             const gchar* name,
+                             gboolean active);
 Rating media_source_get_rating (MediaSource* self);
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
 MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self);
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void);
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType object_type);
-static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event);
+static gboolean media_page_real_on_mousewheel_up (Page* base,
+                                           GdkEventScroll* event);
 void media_page_increase_zoom_level (MediaPage* self);
-gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event);
-static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event);
+gboolean page_on_mousewheel_up (Page* self,
+                                GdkEventScroll* event);
+static gboolean media_page_real_on_mousewheel_down (Page* base,
+                                             GdkEventScroll* event);
 void media_page_decrease_zoom_level (MediaPage* self);
-gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event);
+gboolean page_on_mousewheel_down (Page* self,
+                                  GdkEventScroll* event);
 void desktop_integration_send_to (GeeCollection* media);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
+DataView* view_collection_get_selected_at (ViewCollection* self,
+                                           gint index);
 DataSource* data_view_get_source (DataView* self);
 GFile* media_source_get_file (MediaSource* self);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
-static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* event);
-void page_activate_action (Page* self, const gchar* name);
-gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
+static gboolean media_page_real_on_app_key_pressed (Page* base,
+                                             GdkEventKey* event);
+void page_activate_action (Page* self,
+                           const gchar* name);
+gboolean page_on_app_key_pressed (Page* self,
+                                  GdkEventKey* event);
 static void media_page_real_switched_to (Page* base);
 void page_switched_to (Page* self);
-void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display);
-void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display);
-static void media_page_set_display_tags (MediaPage* self, gboolean display);
-void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* item);
+void checkerboard_page_set_display_titles (CheckerboardPage* self,
+                                           gboolean display);
+void checkerboard_page_set_display_comments (CheckerboardPage* self,
+                                             gboolean display);
+static void media_page_set_display_tags (MediaPage* self,
+                                  gboolean display);
+void checkerboard_page_cursor_to_item (CheckerboardPage* self,
+                                       CheckerboardItem* item);
 void media_page_sync_sort (MediaPage* self);
 static void media_page_real_switching_from (Page* base);
 void media_page_disconnect_slider (MediaPage* self);
 void page_switching_from (Page* self);
-void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider);
+void media_page_connect_slider (MediaPage* self,
+                                MediaPageZoomSliderAssembly* slider);
 void media_page_on_zoom_changed (MediaPage* self);
-static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self);
+static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender,
+                                                                               gpointer self);
 static void media_page_load_persistent_thumbnail_scale (MediaPage* self);
 static void media_page_save_persistent_thumbnail_scale (MediaPage* self);
-void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale);
+void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self,
+                                                     gint scale);
 gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self);
 gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self);
-void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, gint scale);
-void media_page_set_thumb_size (MediaPage* self, gint new_scale);
+void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self,
+                                                gint scale);
+void media_page_set_thumb_size (MediaPage* self,
+                                gint new_scale);
 static void media_page_real_on_zoom_changed (MediaPage* self);
 static void media_page_real_on_export (MediaPage* self);
 static void media_page_real_on_increase_size (MediaPage* self);
 static void media_page_real_on_decrease_size (MediaPage* self);
 gpointer text_entry_dialog_mediator_ref (gpointer instance);
 void text_entry_dialog_mediator_unref (gpointer instance);
-GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object);
-void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object);
+GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void value_set_text_entry_dialog_mediator (GValue* value,
+                                           gpointer v_object);
+void value_take_text_entry_dialog_mediator (GValue* value,
+                                            gpointer v_object);
 gpointer value_get_text_entry_dialog_mediator (const GValue* value);
 GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST;
 GType tags_dialog_get_type (void) G_GNUC_CONST;
 GType add_tags_dialog_get_type (void) G_GNUC_CONST;
 AddTagsDialog* add_tags_dialog_new (void);
 AddTagsDialog* add_tags_dialog_construct (GType object_type);
-gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1);
+gchar** add_tags_dialog_execute (AddTagsDialog* self,
+                                 int* result_length1);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* page_get_command_manager (Page* self);
 GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 gpointer hierarchical_tag_index_ref (gpointer instance);
 void hierarchical_tag_index_unref (gpointer instance);
-GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_hierarchical_tag_index (GValue* value, gpointer v_object);
-void value_take_hierarchical_tag_index (GValue* value, gpointer v_object);
+GParamSpec* param_spec_hierarchical_tag_index (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void value_set_hierarchical_tag_index (GValue* value,
+                                       gpointer v_object);
+void value_take_hierarchical_tag_index (GValue* value,
+                                        gpointer v_object);
 gpointer value_get_hierarchical_tag_index (const GValue* value);
 GType hierarchical_tag_index_get_type (void) G_GNUC_CONST;
 HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void);
-gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
-AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources);
-AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources);
+gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self,
+                                                          gchar** names,
+                                                          int names_length1,
+                                                          int* result_length1);
+AddTagsCommand* add_tags_command_new (gchar** paths,
+                                      int paths_length1,
+                                      GeeCollection* sources);
+AddTagsCommand* add_tags_command_construct (GType object_type,
+                                            gchar** paths,
+                                            int paths_length1,
+                                            GeeCollection* sources);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType add_tags_command_get_type (void) G_GNUC_CONST;
 GType modify_tags_dialog_get_type (void) G_GNUC_CONST;
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source);
-ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source);
+ModifyTagsDialog* modify_tags_dialog_construct (GType object_type,
+                                                MediaSource* source);
 GType tag_get_type (void) G_GNUC_CONST;
 GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self);
-ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list);
-ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list);
+ModifyTagsCommand* modify_tags_command_new (MediaSource* media,
+                                            GeeCollection* new_tag_list);
+ModifyTagsCommand* modify_tags_command_construct (GType object_type,
+                                                  MediaSource* media,
+                                                  GeeCollection* new_tag_list);
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType modify_tags_command_get_type (void) G_GNUC_CONST;
 NewEventCommand* new_event_command_new (GeeIterable* iter);
-NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter);
+NewEventCommand* new_event_command_construct (GType object_type,
+                                              GeeIterable* iter);
 GType move_photos_command_get_type (void) G_GNUC_CONST;
 GType new_event_command_get_type (void) G_GNUC_CONST;
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+                                                       GType t);
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag);
-FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag);
+FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources,
+                                            gboolean flag);
+FlagUnflagCommand* flag_unflag_command_construct (GType object_type,
+                                                  GeeCollection* sources,
+                                                  gboolean flag);
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
 static void media_page_real_on_increase_rating (MediaPage* self);
 GType multiple_data_source_command_get_type (void) G_GNUC_CONST;
 GType set_rating_command_get_type (void) G_GNUC_CONST;
-SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing);
-SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing);
+SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter,
+                                                  gboolean is_incrementing);
+SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type,
+                                                        GeeIterable* iter,
+                                                        gboolean is_incrementing);
 static void media_page_real_on_decrease_rating (MediaPage* self);
-void media_page_on_set_rating (MediaPage* self, Rating rating);
-static void media_page_real_on_set_rating (MediaPage* self, Rating rating);
-SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating);
-SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating);
+void media_page_on_set_rating (MediaPage* self,
+                               Rating rating);
+static void media_page_real_on_set_rating (MediaPage* self,
+                                    Rating rating);
+SetRatingCommand* set_rating_command_new (GeeIterable* iter,
+                                          Rating rating);
+SetRatingCommand* set_rating_command_construct (GType object_type,
+                                                GeeIterable* iter,
+                                                Rating rating);
 static void media_page_real_on_rate_rejected (MediaPage* self);
 static void media_page_real_on_rate_unrated (MediaPage* self);
 static void media_page_real_on_rate_one (MediaPage* self);
@@ -1303,139 +1560,250 @@ static void media_page_real_on_rate_five (MediaPage* self);
 GType library_photo_get_type (void) G_GNUC_CONST;
 void remove_photos_from_library (GeeCollection* photos);
 static void media_page_real_on_move_to_trash (MediaPage* self);
-DataView* view_collection_get_next (ViewCollection* self, DataView* view);
-gboolean data_collection_contains (DataCollection* self, DataObject* object);
-void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
+DataView* view_collection_get_next (ViewCollection* self,
+                                    DataView* view);
+gboolean data_collection_contains (DataCollection* self,
+                                   DataObject* object);
+void checkerboard_page_set_cursor (CheckerboardPage* self,
+                                   CheckerboardItem* item);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources,
+                                                             gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type,
+                                                                   GeeCollection* sources,
+                                                                   gboolean to_trash);
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
 static void media_page_real_on_edit_title (MediaPage* self);
 GType edit_title_dialog_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_title (MediaSource* self);
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title);
-EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title);
+EditTitleDialog* edit_title_dialog_construct (GType object_type,
+                                              const gchar* photo_title);
 gchar* edit_title_dialog_execute (EditTitleDialog* self);
-EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title);
-EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title);
+EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources,
+                                                             const gchar* new_title);
+EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type,
+                                                                   GeeCollection* media_sources,
+                                                                   const gchar* new_title);
 GType edit_multiple_titles_command_get_type (void) G_GNUC_CONST;
 static void media_page_real_on_edit_comment (MediaPage* self);
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance);
 void multi_text_entry_dialog_mediator_unref (gpointer instance);
-GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
-void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
+GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name,
+                                                         const gchar* nick,
+                                                         const gchar* blurb,
+                                                         GType object_type,
+                                                         GParamFlags flags);
+void value_set_multi_text_entry_dialog_mediator (GValue* value,
+                                                 gpointer v_object);
+void value_take_multi_text_entry_dialog_mediator (GValue* value,
+                                                  gpointer v_object);
 gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value);
 GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST;
 GType edit_comment_dialog_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_comment (MediaSource* self);
-EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event);
-EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event);
+EditCommentDialog* edit_comment_dialog_new (const gchar* comment,
+                                            gboolean is_event);
+EditCommentDialog* edit_comment_dialog_construct (GType object_type,
+                                                  const gchar* comment,
+                                                  gboolean is_event);
 gchar* edit_comment_dialog_execute (EditCommentDialog* self);
-EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment);
-EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment);
+EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources,
+                                                                 const gchar* new_comment);
+EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type,
+                                                                       GeeCollection* media_sources,
+                                                                       const gchar* new_comment);
 GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST;
-static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value);
-void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value);
-void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value);
-void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value);
-void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display);
-static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by);
-void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by);
-static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by);
-static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void media_page_real_on_display_titles (MediaPage* self,
+                                        GSimpleAction* action,
+                                        GVariant* value);
+void configuration_facade_set_display_photo_titles (ConfigurationFacade* self,
+                                                    gboolean display);
+static void media_page_real_on_display_comments (MediaPage* self,
+                                          GSimpleAction* action,
+                                          GVariant* value);
+void configuration_facade_set_display_photo_comments (ConfigurationFacade* self,
+                                                      gboolean display);
+static void media_page_real_on_display_ratings (MediaPage* self,
+                                         GSimpleAction* action,
+                                         GVariant* value);
+void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self,
+                                                     gboolean display);
+static void media_page_real_on_display_tags (MediaPage* self,
+                                      GSimpleAction* action,
+                                      GVariant* value);
+void configuration_facade_set_display_photo_tags (ConfigurationFacade* self,
+                                                  gboolean display);
+static void media_page_real_get_config_photos_sort (MediaPage* self,
+                                             gboolean* sort_order,
+                                             gint* sort_by);
+void media_page_set_config_photos_sort (MediaPage* self,
+                                        gboolean sort_order,
+                                        gint sort_by);
+static void media_page_real_set_config_photos_sort (MediaPage* self,
+                                             gboolean sort_order,
+                                             gint sort_by);
+static void media_page_real_on_sort_changed (MediaPage* self,
+                                      GSimpleAction* action,
+                                      GVariant* value);
 gint media_page_get_menu_sort_by (MediaPage* self);
 gboolean media_page_get_menu_sort_order (MediaPage* self);
-static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gboolean ascending);
-void media_page_developer_changed (MediaPage* self, RawDeveloper rd);
-static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd);
-gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d);
+static void media_page_set_view_comparator (MediaPage* self,
+                                     gint sort_by,
+                                     gboolean ascending);
+void media_page_developer_changed (MediaPage* self,
+                                   RawDeveloper rd);
+static void media_page_real_developer_changed (MediaPage* self,
+                                        RawDeveloper rd);
+gboolean raw_developer_is_equivalent (RawDeveloper self,
+                                      RawDeveloper d);
 RawDeveloper photo_get_raw_developer (Photo* self);
 gboolean photo_has_transformations (Photo* self);
 gboolean dialogs_confirm_warn_developer_changed (gint number);
 GType set_raw_developer_command_get_type (void) G_GNUC_CONST;
-SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer);
-SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer);
-static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display);
-static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display);
+SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter,
+                                                       RawDeveloper developer);
+SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type,
+                                                             GeeIterable* iter,
+                                                             RawDeveloper developer);
+static void media_page_real_set_display_titles (CheckerboardPage* base,
+                                         gboolean display);
+static void media_page_real_set_display_comments (CheckerboardPage* base,
+                                           gboolean display);
 static GAction* media_page_sort_by_title_action (MediaPage* self);
 static GAction* media_page_sort_ascending_action (MediaPage* self);
-void media_page_set_menu_sort_by (MediaPage* self, gint val);
+void media_page_set_menu_sort_by (MediaPage* self,
+                                  gint val);
 static GVariant* _variant_new30 (const gchar* value);
-void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending);
+void media_page_set_menu_sort_order (MediaPage* self,
+                                     gboolean ascending);
 static GVariant* _variant_new31 (const gchar* value);
-gint64 thumbnail_title_ascending_comparator (void* a, void* b);
-static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self);
-gint64 thumbnail_title_descending_comparator (void* a, void* b);
-static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self);
-gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration);
-static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
-gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b);
-static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self);
-gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b);
-static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self);
-gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration);
-static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
-gint64 thumbnail_rating_ascending_comparator (void* a, void* b);
-static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self);
-gint64 thumbnail_rating_descending_comparator (void* a, void* b);
-static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self);
-gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration);
-static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
-gint64 thumbnail_filename_ascending_comparator (void* a, void* b);
-static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self);
-gint64 thumbnail_filename_descending_comparator (void* a, void* b);
-static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self);
-gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration);
-static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
-void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
+gint64 thumbnail_title_ascending_comparator (void* a,
+                                             void* b);
+static gint64 _thumbnail_title_ascending_comparator_comparator (void* a,
+                                                         void* b,
+                                                         gpointer self);
+gint64 thumbnail_title_descending_comparator (void* a,
+                                              void* b);
+static gint64 _thumbnail_title_descending_comparator_comparator (void* a,
+                                                          void* b,
+                                                          gpointer self);
+gboolean thumbnail_title_comparator_predicate (DataObject* object,
+                                               Alteration* alteration);
+static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object,
+                                                                     Alteration* alteration,
+                                                                     gpointer self);
+gint64 thumbnail_exposure_time_ascending_comparator (void* a,
+                                                     void* b);
+static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a,
+                                                                 void* b,
+                                                                 gpointer self);
+gint64 thumbnail_exposure_time_desending_comparator (void* a,
+                                                     void* b);
+static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a,
+                                                                 void* b,
+                                                                 gpointer self);
+gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object,
+                                                       Alteration* alteration);
+static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object,
+                                                                             Alteration* alteration,
+                                                                             gpointer self);
+gint64 thumbnail_rating_ascending_comparator (void* a,
+                                              void* b);
+static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a,
+                                                          void* b,
+                                                          gpointer self);
+gint64 thumbnail_rating_descending_comparator (void* a,
+                                               void* b);
+static gint64 _thumbnail_rating_descending_comparator_comparator (void* a,
+                                                           void* b,
+                                                           gpointer self);
+gboolean thumbnail_rating_comparator_predicate (DataObject* object,
+                                                Alteration* alteration);
+static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object,
+                                                                      Alteration* alteration,
+                                                                      gpointer self);
+gint64 thumbnail_filename_ascending_comparator (void* a,
+                                                void* b);
+static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a,
+                                                            void* b,
+                                                            gpointer self);
+gint64 thumbnail_filename_descending_comparator (void* a,
+                                                 void* b);
+static gint64 _thumbnail_filename_descending_comparator_comparator (void* a,
+                                                             void* b,
+                                                             gpointer self);
+gboolean thumbnail_filename_comparator_predicate (DataObject* object,
+                                                  Alteration* alteration);
+static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object,
+                                                                        Alteration* alteration,
+                                                                        gpointer self);
+void data_collection_set_comparator (DataCollection* self,
+                                     Comparator comparator,
+                                     void* comparator_target,
+                                     ComparatorPredicate predicate,
+                                     void* predicate_target);
 static void media_page_real_destroy (GtkWidget* base);
 void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self);
 void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self);
-DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source);
-static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* source);
-Thumbnail* thumbnail_new (MediaSource* media, gint scale);
-Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale);
+DataView* media_page_create_thumbnail (MediaPage* self,
+                                       DataSource* source);
+static DataView* media_page_real_create_thumbnail (MediaPage* self,
+                                            DataSource* source);
+Thumbnail* thumbnail_new (MediaSource* media,
+                          gint scale);
+Thumbnail* thumbnail_construct (GType object_type,
+                                MediaSource* media,
+                                gint scale);
 gboolean page_is_in_view (Page* self);
 GType checkerboard_layout_get_type (void) G_GNUC_CONST;
 CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* self);
-void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale);
+void checkerboard_layout_set_scale (CheckerboardLayout* self,
+                                    gint scale);
 gint checkerboard_layout_get_scale (CheckerboardLayout* self);
 #define MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, MediaPageZoomSliderAssemblyPrivate))
-enum  {
-	MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_DUMMY_PROPERTY
-};
 #define RESOURCES_ICON_ZOOM_OUT "zoom-out.png"
 #define RESOURCES_ICON_ZOOM_SCALE 16
-static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event);
-static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self,
+                                                              GdkEventButton* event);
+static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                             GdkEventButton* event,
+                                                                                             gpointer self);
 gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value);
 static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self);
-static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
+static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                                 gpointer self);
 #define RESOURCES_ICON_ZOOM_IN "zoom-in.png"
-static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event);
-static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self,
+                                                             GdkEventButton* event);
+static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                            GdkEventButton* event,
+                                                                                            gpointer self);
 gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value);
 void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self);
 void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self);
 static void media_page_zoom_slider_assembly_finalize (GObject * obj);
 static void media_page_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 
 static const GActionEntry MEDIA_PAGE_entries[29] = {{"Export", _media_page_on_export_gsimple_action_activate_callback}, {"SendTo", _media_page_on_send_to_gsimple_action_activate_callback}, {"SendToContextMenu", _media_page_on_send_to_gsimple_action_activate_callback}, {"RemoveFromLibrary", _media_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _media_page_on_move_to_trash_gsimple_action_activate_callback}, {"NewEvent", _media_page_on_new_event_gsimple_action_activate_callback}, {"AddTags", _media_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _media_page_on_modify_tags_gsimple_action_activate_callback}, {"IncreaseSize", _media_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _media_page_on_decrease_size_gsimple_action_activate_callback}, {"Flag", _media_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _media_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _media_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _media_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _media_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _media_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _media_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _media_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _media_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _media_page_on_rate_five_gsimple_action_activate_callback}, {"EditTitle", _media_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _media_page_on_edit_comment_gsimple_action_activate_callback}, {"PlayVideo", _media_page_on_play_video_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_titles_gsimple_action_change_state_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_comments_gsimple_action_change_state_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_ratings_gsimple_action_change_state_callback}, {"ViewTags", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_tags_gsimple_action_change_state_callback}, {"SortBy", _page_on_action_radio_gsimple_action_activate_callback, "s", "'1'", _media_page_on_sort_changed_gsimple_action_change_state_callback}, {"Sort", _page_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _media_page_on_sort_changed_gsimple_action_change_state_callback}};
 
-MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
+MediaSourceItem*
+media_source_item_construct (GType object_type,
+                             ThumbnailSource* source,
+                             Dimensions* initial_pixbuf_dim,
+                             const gchar* title,
+                             const gchar* comment,
+                             gboolean marked_up,
+                             PangoAlignment alignment)
+{
 	MediaSourceItem * self = NULL;
-	ThumbnailSource* _tmp0_;
-	Dimensions _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gboolean _tmp4_;
-	PangoAlignment _tmp5_;
-	GdkPixbuf* _tmp6_;
+	Dimensions _tmp0_;
+	GdkPixbuf* _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL);
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1443,56 +1811,55 @@ MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (title != NULL, NULL);
 #line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = source;
-#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = *initial_pixbuf_dim;
-#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = title;
+	_tmp0_ = *initial_pixbuf_dim;
 #line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = comment;
-#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = marked_up;
-#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = alignment;
-#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self = (MediaSourceItem*) checkerboard_item_construct (object_type, _tmp0_, &_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
+	self = (MediaSourceItem*) checkerboard_item_construct (object_type, source, &_tmp0_, title, comment, marked_up, alignment);
 #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = media_source_item_basis_sprocket_pixbuf;
+	_tmp1_ = media_source_item_basis_sprocket_pixbuf;
 #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp6_ == NULL) {
-#line 1464 "MediaPage.c"
-		GdkPixbuf* _tmp7_;
+	if (_tmp1_ == NULL) {
+#line 1822 "MediaPage.c"
+		GdkPixbuf* _tmp2_;
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp7_ = resources_load_icon ("sprocket.png", 0);
+		_tmp2_ = resources_load_icon ("sprocket.png", 0);
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (media_source_item_basis_sprocket_pixbuf);
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		media_source_item_basis_sprocket_pixbuf = _tmp7_;
-#line 1472 "MediaPage.c"
+		media_source_item_basis_sprocket_pixbuf = _tmp2_;
+#line 1830 "MediaPage.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 1476 "MediaPage.c"
+#line 1834 "MediaPage.c"
 }
 
 
-MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
+MediaSourceItem*
+media_source_item_new (ThumbnailSource* source,
+                       Dimensions* initial_pixbuf_dim,
+                       const gchar* title,
+                       const gchar* comment,
+                       gboolean marked_up,
+                       PangoAlignment alignment)
+{
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_source_item_construct (TYPE_MEDIA_SOURCE_ITEM, source, initial_pixbuf_dim, title, comment, marked_up, alignment);
-#line 1483 "MediaPage.c"
+#line 1848 "MediaPage.c"
 }
 
 
-static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
+static void
+media_source_item_real_paint_image (CheckerboardItem* base,
+                                    cairo_t* ctx,
+                                    GdkPixbuf* pixbuf,
+                                    GdkPoint* origin)
+{
 	MediaSourceItem * self;
 	Dimensions pixbuf_dim = {0};
-	GdkPixbuf* _tmp0_;
-	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_;
-	cairo_t* _tmp21_;
-	GdkPixbuf* _tmp22_;
-	GdkPoint _tmp23_;
-	gboolean _tmp24_;
+	Dimensions _tmp0_ = {0};
+	gboolean _tmp1_;
+	GdkPoint _tmp19_;
+	gboolean _tmp20_;
 #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem);
 #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1502,139 +1869,127 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (origin != NULL);
 #line 25 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = pixbuf;
-#line 25 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
+	dimensions_for_pixbuf (pixbuf, &_tmp0_);
 #line 25 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	pixbuf_dim = _tmp1_;
+	pixbuf_dim = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = self->priv->enable_sprockets;
+	_tmp1_ = self->priv->enable_sprockets;
 #line 30 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (!_tmp2_) {
+	if (!_tmp1_) {
 #line 31 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), 0);
-#line 1517 "MediaPage.c"
+#line 1882 "MediaPage.c"
 	} else {
 		gdouble reduction_factor = 0.0;
-		gint _tmp3_;
 		gint reduced_size = 0;
-		gdouble _tmp4_;
-		GdkPixbuf* _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		gboolean _tmp8_ = FALSE;
-		GdkPixbuf* _tmp9_;
-		GdkPixbuf* _tmp18_;
-		gint _tmp19_;
-		gint _tmp20_;
-#line 33 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = dimensions_major_axis (&pixbuf_dim);
+		gdouble _tmp2_;
+		GdkPixbuf* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		gboolean _tmp6_ = FALSE;
+		GdkPixbuf* _tmp7_;
+		GdkPixbuf* _tmp16_;
+		gint _tmp17_;
+		gint _tmp18_;
 #line 33 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		reduction_factor = ((gdouble) _tmp3_) / ((gdouble) THUMBNAIL_CACHE_SIZE_LARGEST);
+		reduction_factor = ((gdouble) dimensions_major_axis (&pixbuf_dim)) / ((gdouble) THUMBNAIL_CACHE_SIZE_LARGEST);
 #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = reduction_factor;
+		_tmp2_ = reduction_factor;
 #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = media_source_item_basis_sprocket_pixbuf;
+		_tmp3_ = media_source_item_basis_sprocket_pixbuf;
 #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = gdk_pixbuf_get_width (_tmp5_);
+		_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
 #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		reduced_size = (gint) (_tmp4_ * _tmp7_);
+		reduced_size = (gint) (_tmp2_ * _tmp5_);
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = media_source_item_current_sprocket_pixbuf;
+		_tmp7_ = media_source_item_current_sprocket_pixbuf;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		if (_tmp9_ == NULL) {
+		if (_tmp7_ == NULL) {
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp8_ = TRUE;
-#line 1551 "MediaPage.c"
+			_tmp6_ = TRUE;
+#line 1913 "MediaPage.c"
 		} else {
+			gint _tmp8_;
+			GdkPixbuf* _tmp9_;
 			gint _tmp10_;
-			GdkPixbuf* _tmp11_;
-			gint _tmp12_;
-			gint _tmp13_;
+			gint _tmp11_;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp10_ = reduced_size;
+			_tmp8_ = reduced_size;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp11_ = media_source_item_current_sprocket_pixbuf;
+			_tmp9_ = media_source_item_current_sprocket_pixbuf;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
+			_tmp10_ = gdk_pixbuf_get_width (_tmp9_);
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp13_ = _tmp12_;
+			_tmp11_ = _tmp10_;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp8_ = _tmp10_ != _tmp13_;
-#line 1567 "MediaPage.c"
+			_tmp6_ = _tmp8_ != _tmp11_;
+#line 1929 "MediaPage.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		if (_tmp8_) {
-#line 1571 "MediaPage.c"
-			GdkPixbuf* _tmp14_;
-			gint _tmp15_;
-			gint _tmp16_;
-			GdkPixbuf* _tmp17_;
+		if (_tmp6_) {
+#line 1933 "MediaPage.c"
+			GdkPixbuf* _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
+			GdkPixbuf* _tmp15_;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp14_ = media_source_item_basis_sprocket_pixbuf;
+			_tmp12_ = media_source_item_basis_sprocket_pixbuf;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp15_ = reduced_size;
+			_tmp13_ = reduced_size;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp16_ = reduced_size;
+			_tmp14_ = reduced_size;
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = gdk_pixbuf_scale_simple (_tmp14_, _tmp15_, _tmp16_, GDK_INTERP_HYPER);
+			_tmp15_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp13_, _tmp14_, GDK_INTERP_HYPER);
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (media_source_item_current_sprocket_pixbuf);
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			media_source_item_current_sprocket_pixbuf = _tmp17_;
-#line 1588 "MediaPage.c"
+			media_source_item_current_sprocket_pixbuf = _tmp15_;
+#line 1950 "MediaPage.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = media_source_item_current_sprocket_pixbuf;
+		_tmp16_ = media_source_item_current_sprocket_pixbuf;
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = gdk_pixbuf_get_width (_tmp18_);
+		_tmp17_ = gdk_pixbuf_get_width (_tmp16_);
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp18_ = _tmp17_;
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp20_);
-#line 1598 "MediaPage.c"
+		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp18_);
+#line 1960 "MediaPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = ctx;
-#line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = pixbuf;
+	_tmp19_ = *origin;
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = *origin;
-#line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	CHECKERBOARD_ITEM_CLASS (media_source_item_parent_class)->paint_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_, _tmp22_, &_tmp23_);
+	CHECKERBOARD_ITEM_CLASS (media_source_item_parent_class)->paint_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), ctx, pixbuf, &_tmp19_);
 #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = self->priv->enable_sprockets;
+	_tmp20_ = self->priv->enable_sprockets;
 #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp24_) {
-#line 1612 "MediaPage.c"
-		cairo_t* _tmp25_;
-		GdkPoint _tmp26_;
-		Dimensions _tmp27_;
-#line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp25_ = ctx;
+	if (_tmp20_) {
+#line 1970 "MediaPage.c"
+		GdkPoint _tmp21_;
+		Dimensions _tmp22_;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp26_ = *origin;
+		_tmp21_ = *origin;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp27_ = pixbuf_dim;
+		_tmp22_ = pixbuf_dim;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		media_source_item_paint_sprockets (self, _tmp25_, &_tmp26_, &_tmp27_);
-#line 1624 "MediaPage.c"
+		media_source_item_paint_sprockets (self, ctx, &_tmp21_, &_tmp22_);
+#line 1979 "MediaPage.c"
 	}
 }
 
 
-void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, GdkPoint* origin) {
-	cairo_t* _tmp0_;
-	cairo_t* _tmp1_;
-	GdkPixbuf* _tmp2_;
+void
+media_source_item_paint_one_sprocket (MediaSourceItem* self,
+                                      cairo_t* ctx,
+                                      GdkPoint* origin)
+{
+	GdkPixbuf* _tmp0_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
 	GdkPoint _tmp3_;
 	gint _tmp4_;
-	GdkPoint _tmp5_;
-	gint _tmp6_;
-	cairo_t* _tmp7_;
-	cairo_t* _tmp8_;
 #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1642,36 +1997,33 @@ void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx,
 #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (origin != NULL);
 #line 53 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = ctx;
-#line 53 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	cairo_save (_tmp0_);
+	cairo_save (ctx);
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = ctx;
+	_tmp0_ = media_source_item_current_sprocket_pixbuf;
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_source_item_current_sprocket_pixbuf;
+	_tmp1_ = *origin;
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = *origin;
-#line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_.x;
+	_tmp2_ = _tmp1_.x;
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = *origin;
+	_tmp3_ = *origin;
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_.y;
+	_tmp4_ = _tmp3_.y;
 #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gdk_cairo_set_source_pixbuf (_tmp1_, _tmp2_, (gdouble) _tmp4_, (gdouble) _tmp6_);
+	gdk_cairo_set_source_pixbuf (ctx, _tmp0_, (gdouble) _tmp2_, (gdouble) _tmp4_);
 #line 55 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = ctx;
-#line 55 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	cairo_paint (_tmp7_);
-#line 56 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = ctx;
+	cairo_paint (ctx);
 #line 56 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	cairo_restore (_tmp8_);
-#line 1671 "MediaPage.c"
+	cairo_restore (ctx);
+#line 2018 "MediaPage.c"
 }
 
 
-void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, GdkPoint* item_origin, Dimensions* item_dimensions) {
+void
+media_source_item_paint_sprockets (MediaSourceItem* self,
+                                   cairo_t* ctx,
+                                   GdkPoint* item_origin,
+                                   Dimensions* item_dimensions)
+{
 	gint num_sprockets = 0;
 	Dimensions _tmp0_;
 	gint _tmp1_;
@@ -1689,12 +2041,12 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	gint _tmp11_;
 	gint _tmp12_;
 	gint straggler_pixels = 0;
-	Dimensions _tmp29_;
+	Dimensions _tmp27_;
+	gint _tmp28_;
+	GdkPixbuf* _tmp29_;
 	gint _tmp30_;
-	GdkPixbuf* _tmp31_;
+	gint _tmp31_;
 	gint _tmp32_;
-	gint _tmp33_;
-	gint _tmp34_;
 #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -1737,42 +2089,40 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	_tmp12_ = _tmp11_;
 #line 65 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	right_paint_location.x = _tmp7_ + (_tmp9_ - _tmp12_);
-#line 1741 "MediaPage.c"
+#line 2093 "MediaPage.c"
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		i = 0;
-#line 1746 "MediaPage.c"
+#line 2098 "MediaPage.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			while (TRUE) {
-#line 1753 "MediaPage.c"
+#line 2105 "MediaPage.c"
 				gint _tmp15_;
 				gint _tmp16_;
-				cairo_t* _tmp17_;
+				GdkPoint _tmp17_;
 				GdkPoint _tmp18_;
-				cairo_t* _tmp19_;
-				GdkPoint _tmp20_;
+				gint _tmp19_;
+				GdkPixbuf* _tmp20_;
 				gint _tmp21_;
-				GdkPixbuf* _tmp22_;
+				gint _tmp22_;
 				gint _tmp23_;
-				gint _tmp24_;
+				GdkPixbuf* _tmp24_;
 				gint _tmp25_;
-				GdkPixbuf* _tmp26_;
-				gint _tmp27_;
-				gint _tmp28_;
+				gint _tmp26_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (!_tmp13_) {
-#line 1770 "MediaPage.c"
+#line 2120 "MediaPage.c"
 					gint _tmp14_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = i;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					i = _tmp14_ + 1;
-#line 1776 "MediaPage.c"
+#line 2126 "MediaPage.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp13_ = FALSE;
@@ -1784,215 +2134,179 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				if (!(_tmp15_ < _tmp16_)) {
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					break;
-#line 1788 "MediaPage.c"
+#line 2138 "MediaPage.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp17_ = ctx;
+				_tmp17_ = left_paint_location;
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp18_ = left_paint_location;
-#line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				media_source_item_paint_one_sprocket (self, _tmp17_, &_tmp18_);
-#line 68 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp19_ = ctx;
+				media_source_item_paint_one_sprocket (self, ctx, &_tmp17_);
 #line 68 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp20_ = right_paint_location;
+				_tmp18_ = right_paint_location;
 #line 68 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				media_source_item_paint_one_sprocket (self, _tmp19_, &_tmp20_);
+				media_source_item_paint_one_sprocket (self, ctx, &_tmp18_);
 #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp21_ = left_paint_location.y;
+				_tmp19_ = left_paint_location.y;
 #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp22_ = media_source_item_current_sprocket_pixbuf;
+				_tmp20_ = media_source_item_current_sprocket_pixbuf;
 #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp23_ = gdk_pixbuf_get_height (_tmp22_);
+				_tmp21_ = gdk_pixbuf_get_height (_tmp20_);
 #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp24_ = _tmp23_;
+				_tmp22_ = _tmp21_;
 #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				left_paint_location.y = _tmp21_ + _tmp24_;
+				left_paint_location.y = _tmp19_ + _tmp22_;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp25_ = right_paint_location.y;
+				_tmp23_ = right_paint_location.y;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp26_ = media_source_item_current_sprocket_pixbuf;
+				_tmp24_ = media_source_item_current_sprocket_pixbuf;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp27_ = gdk_pixbuf_get_height (_tmp26_);
+				_tmp25_ = gdk_pixbuf_get_height (_tmp24_);
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp28_ = _tmp27_;
+				_tmp26_ = _tmp25_;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				right_paint_location.y = _tmp25_ + _tmp28_;
-#line 1822 "MediaPage.c"
+				right_paint_location.y = _tmp23_ + _tmp26_;
+#line 2168 "MediaPage.c"
 			}
 		}
 	}
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_ = *item_dimensions;
+	_tmp27_ = *item_dimensions;
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = _tmp29_.height;
+	_tmp28_ = _tmp27_.height;
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = media_source_item_current_sprocket_pixbuf;
+	_tmp29_ = media_source_item_current_sprocket_pixbuf;
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = gdk_pixbuf_get_height (_tmp31_);
+	_tmp30_ = gdk_pixbuf_get_height (_tmp29_);
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _tmp32_;
+	_tmp31_ = _tmp30_;
 #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	straggler_pixels = _tmp30_ % _tmp33_;
+	straggler_pixels = _tmp28_ % _tmp31_;
 #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_ = straggler_pixels;
+	_tmp32_ = straggler_pixels;
 #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp34_ > 0) {
-#line 1842 "MediaPage.c"
-		cairo_t* _tmp35_;
-		cairo_t* _tmp36_;
-		GdkPixbuf* _tmp37_;
+	if (_tmp32_ > 0) {
+#line 2188 "MediaPage.c"
+		GdkPixbuf* _tmp33_;
+		GdkPoint _tmp34_;
+		gint _tmp35_;
+		GdkPoint _tmp36_;
+		gint _tmp37_;
 		GdkPoint _tmp38_;
 		gint _tmp39_;
 		GdkPoint _tmp40_;
 		gint _tmp41_;
-		cairo_t* _tmp42_;
-		GdkPoint _tmp43_;
-		gint _tmp44_;
+		GdkPixbuf* _tmp42_;
+		gint _tmp43_;
+		GdkPixbuf* _tmp44_;
 		GdkPoint _tmp45_;
 		gint _tmp46_;
-		GdkPixbuf* _tmp47_;
+		GdkPoint _tmp47_;
 		gint _tmp48_;
-		gint _tmp49_;
-		cairo_t* _tmp50_;
-		cairo_t* _tmp51_;
-		GdkPixbuf* _tmp52_;
-		GdkPoint _tmp53_;
+		GdkPoint _tmp49_;
+		gint _tmp50_;
+		GdkPoint _tmp51_;
+		gint _tmp52_;
+		GdkPixbuf* _tmp53_;
 		gint _tmp54_;
-		GdkPoint _tmp55_;
-		gint _tmp56_;
-		cairo_t* _tmp57_;
-		GdkPoint _tmp58_;
-		gint _tmp59_;
-		GdkPoint _tmp60_;
-		gint _tmp61_;
-		GdkPixbuf* _tmp62_;
-		gint _tmp63_;
-		gint _tmp64_;
-		cairo_t* _tmp65_;
-		cairo_t* _tmp66_;
-#line 76 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp35_ = ctx;
 #line 76 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_save (_tmp35_);
+		cairo_save (ctx);
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp36_ = ctx;
+		_tmp33_ = media_source_item_current_sprocket_pixbuf;
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp37_ = media_source_item_current_sprocket_pixbuf;
+		_tmp34_ = left_paint_location;
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp38_ = left_paint_location;
+		_tmp35_ = _tmp34_.x;
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp39_ = _tmp38_.x;
+		_tmp36_ = left_paint_location;
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp40_ = left_paint_location;
-#line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp41_ = _tmp40_.y;
+		_tmp37_ = _tmp36_.y;
 #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp36_, _tmp37_, (gdouble) _tmp39_, (gdouble) _tmp41_);
+		gdk_cairo_set_source_pixbuf (ctx, _tmp33_, (gdouble) _tmp35_, (gdouble) _tmp37_);
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp42_ = ctx;
-#line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp43_ = left_paint_location;
-#line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp44_ = _tmp43_.x;
+		_tmp38_ = left_paint_location;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp45_ = left_paint_location;
+		_tmp39_ = _tmp38_.x;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp46_ = _tmp45_.y;
+		_tmp40_ = left_paint_location;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp47_ = media_source_item_current_sprocket_pixbuf;
+		_tmp41_ = _tmp40_.y;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp48_ = gdk_pixbuf_get_width (_tmp47_);
+		_tmp42_ = media_source_item_current_sprocket_pixbuf;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp49_ = straggler_pixels;
+		_tmp43_ = straggler_pixels;
 #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_rectangle (_tmp42_, (gdouble) _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_, (gdouble) _tmp49_);
+		cairo_rectangle (ctx, (gdouble) _tmp39_, (gdouble) _tmp41_, (gdouble) gdk_pixbuf_get_width (_tmp42_), (gdouble) _tmp43_);
 #line 82 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp50_ = ctx;
-#line 82 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_fill (_tmp50_);
-#line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp51_ = ctx;
+		cairo_fill (ctx);
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp52_ = media_source_item_current_sprocket_pixbuf;
+		_tmp44_ = media_source_item_current_sprocket_pixbuf;
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp53_ = right_paint_location;
+		_tmp45_ = right_paint_location;
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp54_ = _tmp53_.x;
+		_tmp46_ = _tmp45_.x;
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp55_ = right_paint_location;
+		_tmp47_ = right_paint_location;
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp56_ = _tmp55_.y;
+		_tmp48_ = _tmp47_.y;
 #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp51_, _tmp52_, (gdouble) _tmp54_, (gdouble) _tmp56_);
+		gdk_cairo_set_source_pixbuf (ctx, _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_);
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp57_ = ctx;
+		_tmp49_ = right_paint_location;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp58_ = right_paint_location;
+		_tmp50_ = _tmp49_.x;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp59_ = _tmp58_.x;
+		_tmp51_ = right_paint_location;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp60_ = right_paint_location;
+		_tmp52_ = _tmp51_.y;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp61_ = _tmp60_.y;
+		_tmp53_ = media_source_item_current_sprocket_pixbuf;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp62_ = media_source_item_current_sprocket_pixbuf;
+		_tmp54_ = straggler_pixels;
 #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp63_ = gdk_pixbuf_get_width (_tmp62_);
-#line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp64_ = straggler_pixels;
-#line 86 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_rectangle (_tmp57_, (gdouble) _tmp59_, (gdouble) _tmp61_, (gdouble) _tmp63_, (gdouble) _tmp64_);
+		cairo_rectangle (ctx, (gdouble) _tmp50_, (gdouble) _tmp52_, (gdouble) gdk_pixbuf_get_width (_tmp53_), (gdouble) _tmp54_);
 #line 88 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp65_ = ctx;
-#line 88 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_fill (_tmp65_);
-#line 90 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp66_ = ctx;
+		cairo_fill (ctx);
 #line 90 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		cairo_restore (_tmp66_);
-#line 1955 "MediaPage.c"
+		cairo_restore (ctx);
+#line 2271 "MediaPage.c"
 	}
 }
 
 
-void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets) {
-	gboolean _tmp0_;
+void
+media_source_item_set_enable_sprockets (MediaSourceItem* self,
+                                        gboolean enable_sprockets)
+{
 #line 94 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 95 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = enable_sprockets;
-#line 95 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->enable_sprockets = _tmp0_;
-#line 1968 "MediaPage.c"
+	self->priv->enable_sprockets = enable_sprockets;
+#line 2284 "MediaPage.c"
 }
 
 
-void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) {
-	const gchar* _tmp0_;
-	gboolean _tmp1_;
-	PangoAlignment _tmp2_;
+void
+media_source_item_set_title (MediaSourceItem* self,
+                             const gchar* text,
+                             gboolean marked_up,
+                             PangoAlignment alignment)
+{
 #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self));
 #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (text != NULL);
 #line 100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = text;
-#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = marked_up;
-#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = alignment;
-#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp0_, _tmp1_, _tmp2_);
+	checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), text, marked_up, alignment);
 #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (self->priv->natural_collation_key);
 #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 1992 "MediaPage.c"
+#line 2304 "MediaPage.c"
 }
 
 
-gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
+gchar*
+media_source_item_get_natural_collation_key (MediaSourceItem* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	const gchar* _tmp3_;
@@ -2003,7 +2317,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	_tmp0_ = self->priv->natural_collation_key;
 #line 105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2007 "MediaPage.c"
+#line 2321 "MediaPage.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2014,7 +2328,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 		_g_free0 (self->priv->natural_collation_key);
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		self->priv->natural_collation_key = _tmp2_;
-#line 2018 "MediaPage.c"
+#line 2332 "MediaPage.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->natural_collation_key;
@@ -2024,11 +2338,13 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	result = _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2028 "MediaPage.c"
+#line 2342 "MediaPage.c"
 }
 
 
-static void media_source_item_class_init (MediaSourceItemClass * klass) {
+static void
+media_source_item_class_init (MediaSourceItemClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_source_item_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2037,22 +2353,26 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) {
 	((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) media_source_item_real_paint_image;
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_source_item_finalize;
-#line 2041 "MediaPage.c"
+#line 2357 "MediaPage.c"
 }
 
 
-static void media_source_item_instance_init (MediaSourceItem * self) {
+static void
+media_source_item_instance_init (MediaSourceItem * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_SOURCE_ITEM_GET_PRIVATE (self);
 #line 11 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->enable_sprockets = FALSE;
 #line 12 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 2052 "MediaPage.c"
+#line 2370 "MediaPage.c"
 }
 
 
-static void media_source_item_finalize (GObject * obj) {
+static void
+media_source_item_finalize (GObject * obj)
+{
 	MediaSourceItem * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem);
@@ -2060,11 +2380,13 @@ static void media_source_item_finalize (GObject * obj) {
 	_g_free0 (self->priv->natural_collation_key);
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_source_item_parent_class)->finalize (obj);
-#line 2064 "MediaPage.c"
+#line 2384 "MediaPage.c"
 }
 
 
-GType media_source_item_get_type (void) {
+GType
+media_source_item_get_type (void)
+{
 	static volatile gsize media_source_item_type_id__volatile = 0;
 	if (g_once_init_enter (&media_source_item_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MediaSourceItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSourceItem), 0, (GInstanceInitFunc) media_source_item_instance_init, NULL };
@@ -2076,7 +2398,9 @@ GType media_source_item_get_type (void) {
 }
 
 
-GType media_page_sort_by_get_type (void) {
+GType
+media_page_sort_by_get_type (void)
+{
 	static volatile gsize media_page_sort_by_type_id__volatile = 0;
 	if (g_once_init_enter (&media_page_sort_by_type_id__volatile)) {
 		static const GEnumValue values[] = {{MEDIA_PAGE_SORT_BY_MIN, "MEDIA_PAGE_SORT_BY_MIN", "min"}, {MEDIA_PAGE_SORT_BY_TITLE, "MEDIA_PAGE_SORT_BY_TITLE", "title"}, {MEDIA_PAGE_SORT_BY_EXPOSURE_DATE, "MEDIA_PAGE_SORT_BY_EXPOSURE_DATE", "exposure-date"}, {MEDIA_PAGE_SORT_BY_RATING, "MEDIA_PAGE_SORT_BY_RATING", "rating"}, {MEDIA_PAGE_SORT_BY_FILENAME, "MEDIA_PAGE_SORT_BY_FILENAME", "filename"}, {MEDIA_PAGE_SORT_BY_MAX, "MEDIA_PAGE_SORT_BY_MAX", "max"}, {0, NULL, NULL}};
@@ -2088,813 +2412,904 @@ GType media_page_sort_by_get_type (void) {
 }
 
 
-static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action,
+                                                        GVariant* parameter,
+                                                        gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_export ((MediaPage*) self);
-#line 2095 "MediaPage.c"
+#line 2423 "MediaPage.c"
 }
 
 
-static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+                                                         GVariant* parameter,
+                                                         gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_send_to ((MediaPage*) self);
-#line 2102 "MediaPage.c"
+#line 2434 "MediaPage.c"
 }
 
 
-static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_remove_from_library ((MediaPage*) self);
-#line 2109 "MediaPage.c"
+#line 2445 "MediaPage.c"
 }
 
 
-static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_move_to_trash ((MediaPage*) self);
-#line 2116 "MediaPage.c"
+#line 2456 "MediaPage.c"
 }
 
 
-static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action,
+                                                           GVariant* parameter,
+                                                           gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_new_event ((MediaPage*) self);
-#line 2123 "MediaPage.c"
+#line 2467 "MediaPage.c"
 }
 
 
-static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                          GVariant* parameter,
+                                                          gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_add_tags ((MediaPage*) self);
-#line 2130 "MediaPage.c"
+#line 2478 "MediaPage.c"
 }
 
 
-static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_modify_tags ((MediaPage*) self);
-#line 2137 "MediaPage.c"
+#line 2489 "MediaPage.c"
 }
 
 
-static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_increase_size ((MediaPage*) self);
-#line 2144 "MediaPage.c"
+#line 2500 "MediaPage.c"
 }
 
 
-static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_decrease_size ((MediaPage*) self);
-#line 2151 "MediaPage.c"
+#line 2511 "MediaPage.c"
 }
 
 
-static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_flag_unflag ((MediaPage*) self);
-#line 2158 "MediaPage.c"
+#line 2522 "MediaPage.c"
 }
 
 
-static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_increase_rating ((MediaPage*) self);
-#line 2165 "MediaPage.c"
+#line 2533 "MediaPage.c"
 }
 
 
-static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_decrease_rating ((MediaPage*) self);
-#line 2172 "MediaPage.c"
+#line 2544 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_rejected ((MediaPage*) self);
-#line 2179 "MediaPage.c"
+#line 2555 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_unrated ((MediaPage*) self);
-#line 2186 "MediaPage.c"
+#line 2566 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action,
+                                                          GVariant* parameter,
+                                                          gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_one ((MediaPage*) self);
-#line 2193 "MediaPage.c"
+#line 2577 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action,
+                                                          GVariant* parameter,
+                                                          gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_two ((MediaPage*) self);
-#line 2200 "MediaPage.c"
+#line 2588 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action,
+                                                            GVariant* parameter,
+                                                            gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_three ((MediaPage*) self);
-#line 2207 "MediaPage.c"
+#line 2599 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action,
+                                                           GVariant* parameter,
+                                                           gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_four ((MediaPage*) self);
-#line 2214 "MediaPage.c"
+#line 2610 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action,
+                                                           GVariant* parameter,
+                                                           gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_rate_five ((MediaPage*) self);
-#line 2221 "MediaPage.c"
+#line 2621 "MediaPage.c"
 }
 
 
-static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action,
+                                                            GVariant* parameter,
+                                                            gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_edit_title ((MediaPage*) self);
-#line 2228 "MediaPage.c"
+#line 2632 "MediaPage.c"
 }
 
 
-static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_edit_comment ((MediaPage*) self);
-#line 2235 "MediaPage.c"
+#line 2643 "MediaPage.c"
 }
 
 
-static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action,
+                                                            GVariant* parameter,
+                                                            gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_play_video ((MediaPage*) self);
-#line 2242 "MediaPage.c"
+#line 2654 "MediaPage.c"
 }
 
 
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                         GVariant* parameter,
+                                                         gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 2249 "MediaPage.c"
+#line 2665 "MediaPage.c"
 }
 
 
-static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                    GVariant* value,
+                                                                    gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_titles ((MediaPage*) self, action, value);
-#line 2256 "MediaPage.c"
+#line 2676 "MediaPage.c"
 }
 
 
-static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                      GVariant* value,
+                                                                      gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_comments ((MediaPage*) self, action, value);
-#line 2263 "MediaPage.c"
+#line 2687 "MediaPage.c"
 }
 
 
-static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                     GVariant* value,
+                                                                     gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_ratings ((MediaPage*) self, action, value);
-#line 2270 "MediaPage.c"
+#line 2698 "MediaPage.c"
 }
 
 
-static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                  GVariant* value,
+                                                                  gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_display_tags ((MediaPage*) self, action, value);
-#line 2277 "MediaPage.c"
+#line 2709 "MediaPage.c"
 }
 
 
-static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+                                                        GVariant* parameter,
+                                                        gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_on_action_radio ((Page*) self, action, parameter);
-#line 2284 "MediaPage.c"
+#line 2720 "MediaPage.c"
 }
 
 
-static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                  GVariant* value,
+                                                                  gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_sort_changed ((MediaPage*) self, action, value);
-#line 2291 "MediaPage.c"
+#line 2731 "MediaPage.c"
 }
 
 
-static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+                                                            GeeMap* items,
+                                                            gpointer self)
+{
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_media_altered ((MediaPage*) self, items);
-#line 2298 "MediaPage.c"
+#line 2742 "MediaPage.c"
 }
 
 
-MediaPage* media_page_construct (GType object_type, const gchar* page_name) {
+MediaPage*
+media_page_construct (GType object_type,
+                      const gchar* page_name)
+{
 	MediaPage * self = NULL;
-	const gchar* _tmp0_;
+	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	ViewCollection* _tmp2_;
-	MediaViewTracker* _tmp3_;
+	MediaViewTracker* _tmp2_;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
 	ViewCollection* _tmp8_;
-	ViewCollection* _tmp9_;
+	ConfigFacade* _tmp9_;
 	ConfigFacade* _tmp10_;
-	ConfigFacade* _tmp11_;
-	gboolean _tmp12_;
-	GValue _tmp13_ = {0};
-	ViewCollection* _tmp14_;
-	ViewCollection* _tmp15_;
-	ConfigFacade* _tmp16_;
-	ConfigFacade* _tmp17_;
-	gboolean _tmp18_;
-	GValue _tmp19_ = {0};
-	ViewCollection* _tmp20_;
-	ViewCollection* _tmp21_;
-	ConfigFacade* _tmp22_;
-	ConfigFacade* _tmp23_;
-	gboolean _tmp24_;
-	GValue _tmp25_ = {0};
+	GValue _tmp11_ = {0};
+	ViewCollection* _tmp12_;
+	ViewCollection* _tmp13_;
+	ConfigFacade* _tmp14_;
+	ConfigFacade* _tmp15_;
+	GValue _tmp16_ = {0};
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	ConfigFacade* _tmp19_;
+	ConfigFacade* _tmp20_;
+	GValue _tmp21_ = {0};
+	ViewCollection* _tmp22_;
+	ViewCollection* _tmp23_;
+	GValue _tmp24_ = {0};
+	ViewCollection* _tmp25_;
 	ViewCollection* _tmp26_;
-	ViewCollection* _tmp27_;
-	gint _tmp28_;
+	ConfigFacade* _tmp27_;
+	ConfigFacade* _tmp28_;
 	GValue _tmp29_ = {0};
 	ViewCollection* _tmp30_;
 	ViewCollection* _tmp31_;
-	ConfigFacade* _tmp32_;
-	ConfigFacade* _tmp33_;
-	gboolean _tmp34_;
-	GValue _tmp35_ = {0};
-	ViewCollection* _tmp36_;
-	ViewCollection* _tmp37_;
-	DragAndDropHandler* _tmp38_;
+	DragAndDropHandler* _tmp32_;
 #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = page_name;
-#line 248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self = (MediaPage*) checkerboard_page_construct (object_type, _tmp0_);
+	self = (MediaPage*) checkerboard_page_construct (object_type, page_name);
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_view_tracker_new (_tmp2_);
+	_tmp2_ = media_view_tracker_new (_tmp1_);
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->tracker = _tmp3_;
+	self->priv->tracker = _tmp2_;
 #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp2_);
+	_data_collection_unref0 (_tmp1_);
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _media_page_on_media_altered_data_collection_items_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _media_page_on_media_altered_data_collection_items_altered, self, 0);
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
 #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp7_);
-#line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_data_collection_unref0 (_tmp6_);
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = config_facade_get_instance ();
+	_tmp8_ = _tmp7_;
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = config_facade_get_instance ();
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp10_ = _tmp9_;
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp13_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp11_, G_TYPE_BOOLEAN);
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp13_, _tmp12_);
+	g_value_set_boolean (&_tmp11_, configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp13_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp11_, NULL, NULL);
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp13_) ? (g_value_unset (&_tmp13_), NULL) : NULL;
+	G_IS_VALUE (&_tmp11_) ? (g_value_unset (&_tmp11_), NULL) : NULL;
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp10_);
 #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp9_);
+	_data_collection_unref0 (_tmp8_);
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _tmp14_;
-#line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = config_facade_get_instance ();
+	_tmp13_ = _tmp12_;
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = _tmp16_;
+	_tmp14_ = config_facade_get_instance ();
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp15_ = _tmp14_;
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp19_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp16_, G_TYPE_BOOLEAN);
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp19_, _tmp18_);
+	g_value_set_boolean (&_tmp16_, configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp19_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp16_, NULL, NULL);
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp19_) ? (g_value_unset (&_tmp19_), NULL) : NULL;
+	G_IS_VALUE (&_tmp16_) ? (g_value_unset (&_tmp16_), NULL) : NULL;
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp17_);
+	_g_object_unref0 (_tmp15_);
 #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp15_);
+	_data_collection_unref0 (_tmp13_);
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = _tmp20_;
+	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = config_facade_get_instance ();
+	_tmp18_ = _tmp17_;
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp19_ = config_facade_get_instance ();
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp20_ = _tmp19_;
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp25_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp21_, G_TYPE_BOOLEAN);
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp25_, _tmp24_);
+	g_value_set_boolean (&_tmp21_, configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp25_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp21_, NULL, NULL);
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp25_) ? (g_value_unset (&_tmp25_), NULL) : NULL;
+	G_IS_VALUE (&_tmp21_) ? (g_value_unset (&_tmp21_), NULL) : NULL;
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp23_);
+	_g_object_unref0 (_tmp20_);
 #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp21_);
-#line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_data_collection_unref0 (_tmp18_);
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = _tmp26_;
+	_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = media_page_get_thumb_size (self);
+	_tmp23_ = _tmp22_;
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp29_, G_TYPE_INT);
+	g_value_init (&_tmp24_, G_TYPE_INT);
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_int (&_tmp29_, _tmp28_);
+	g_value_set_int (&_tmp24_, media_page_get_thumb_size (self));
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp29_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp24_, NULL, NULL);
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp29_) ? (g_value_unset (&_tmp29_), NULL) : NULL;
+	G_IS_VALUE (&_tmp24_) ? (g_value_unset (&_tmp24_), NULL) : NULL;
 #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp27_);
+	_data_collection_unref0 (_tmp23_);
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = _tmp30_;
+	_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = config_facade_get_instance ();
+	_tmp26_ = _tmp25_;
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _tmp32_;
+	_tmp27_ = config_facade_get_instance ();
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp28_ = _tmp27_;
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp35_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp29_, G_TYPE_BOOLEAN);
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp35_, _tmp34_);
+	g_value_set_boolean (&_tmp29_, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp35_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp29_, NULL, NULL);
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp35_) ? (g_value_unset (&_tmp35_), NULL) : NULL;
+	G_IS_VALUE (&_tmp29_) ? (g_value_unset (&_tmp29_), NULL) : NULL;
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp33_);
+	_g_object_unref0 (_tmp28_);
 #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp31_);
+	_data_collection_unref0 (_tmp26_);
 #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp37_ = _tmp36_;
+	_tmp31_ = _tmp30_;
 #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection));
 #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp37_);
+	_data_collection_unref0 (_tmp31_);
 #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp38_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp32_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->dnd_handler = _tmp38_;
+	self->priv->dnd_handler = _tmp32_;
 #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 2497 "MediaPage.c"
+#line 2926 "MediaPage.c"
 }
 
 
-static gint media_page_compute_zoom_scale_increase (gint current_scale) {
+static gint
+media_page_compute_zoom_scale_increase (gint current_scale)
+{
 	gint result = 0;
 	gint new_scale = 0;
 	gint _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
 #line 271 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = current_scale;
-#line 271 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_scale = _tmp0_ + MEDIA_PAGE_MANUAL_STEPPING;
-#line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = thumbnail_get_MIN_SCALE ();
+	new_scale = current_scale + MEDIA_PAGE_MANUAL_STEPPING;
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = thumbnail_get_MIN_SCALE ();
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = thumbnail_get_MAX_SCALE ();
+	_tmp1_ = _tmp0_;
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = thumbnail_get_MAX_SCALE ();
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = CLAMP (new_scale, _tmp2_, _tmp4_);
+	_tmp3_ = _tmp2_;
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp5_;
+	result = CLAMP (new_scale, _tmp1_, _tmp3_);
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2528 "MediaPage.c"
+#line 2953 "MediaPage.c"
 }
 
 
-static gint media_page_compute_zoom_scale_decrease (gint current_scale) {
+static gint
+media_page_compute_zoom_scale_decrease (gint current_scale)
+{
 	gint result = 0;
 	gint new_scale = 0;
 	gint _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
 #line 276 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = current_scale;
-#line 276 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_scale = _tmp0_ - MEDIA_PAGE_MANUAL_STEPPING;
+	new_scale = current_scale - MEDIA_PAGE_MANUAL_STEPPING;
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = thumbnail_get_MIN_SCALE ();
+	_tmp0_ = thumbnail_get_MIN_SCALE ();
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = thumbnail_get_MAX_SCALE ();
+	_tmp2_ = thumbnail_get_MAX_SCALE ();
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = CLAMP (new_scale, _tmp2_, _tmp4_);
-#line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp5_;
+	result = CLAMP (new_scale, _tmp1_, _tmp3_);
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2559 "MediaPage.c"
+#line 2980 "MediaPage.c"
 }
 
 
-static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+media_page_real_init_collect_ui_filenames (Page* base,
+                                           GeeList* ui_filenames)
+{
 	MediaPage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 281 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = ui_filenames;
-#line 281 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	PAGE_CLASS (media_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (media_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames);
 #line 283 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = ui_filenames;
-#line 283 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "media.ui");
-#line 2579 "MediaPage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "media.ui");
+#line 2997 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new23 (gboolean value) {
+static GVariant*
+_variant_new23 (gboolean value)
+{
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2586 "MediaPage.c"
+#line 3006 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new24 (gboolean value) {
+static GVariant*
+_variant_new24 (gboolean value)
+{
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2593 "MediaPage.c"
+#line 3015 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new25 (gboolean value) {
+static GVariant*
+_variant_new25 (gboolean value)
+{
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2600 "MediaPage.c"
+#line 3024 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new26 (gboolean value) {
+static GVariant*
+_variant_new26 (gboolean value)
+{
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2607 "MediaPage.c"
+#line 3033 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new27 (gchar* value) {
+static GVariant*
+_variant_new27 (gchar* value)
+{
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2614 "MediaPage.c"
+#line 3042 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new28 (const gchar* value) {
+static GVariant*
+_variant_new28 (const gchar* value)
+{
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2621 "MediaPage.c"
+#line 3051 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new29 (const gchar* value) {
+static GVariant*
+_variant_new29 (const gchar* value)
+{
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2628 "MediaPage.c"
+#line 3060 "MediaPage.c"
 }
 
 
-static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
+static void
+_media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender,
+                                                                   GVariant* value,
+                                                                   gpointer self)
+{
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_raw_developer_changed ((MediaPage*) self, _sender, value);
-#line 2635 "MediaPage.c"
+#line 3071 "MediaPage.c"
 }
 
 
-static void media_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+media_page_real_add_actions (Page* base,
+                             GActionMap* map)
+{
 	MediaPage * self;
-	GActionMap* _tmp0_;
 	gboolean sort_order = FALSE;
 	gint sort_by = 0;
-	gboolean _tmp1_ = FALSE;
-	gint _tmp2_ = 0;
-	GActionMap* _tmp3_;
-	GAction* _tmp4_;
-	GAction* _tmp5_;
-	ConfigFacade* _tmp6_;
-	ConfigFacade* _tmp7_;
-	gboolean _tmp8_;
-	GVariant* _tmp9_;
-	GAction* _tmp10_;
-	GAction* _tmp11_;
-	ConfigFacade* _tmp12_;
-	ConfigFacade* _tmp13_;
-	gboolean _tmp14_;
-	GVariant* _tmp15_;
-	GAction* _tmp16_;
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+	GAction* _tmp2_;
+	GAction* _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	GVariant* _tmp6_;
+	GAction* _tmp7_;
+	GAction* _tmp8_;
+	ConfigFacade* _tmp9_;
+	ConfigFacade* _tmp10_;
+	GVariant* _tmp11_;
+	GAction* _tmp12_;
+	GAction* _tmp13_;
+	ConfigFacade* _tmp14_;
+	ConfigFacade* _tmp15_;
+	GVariant* _tmp16_;
 	GAction* _tmp17_;
-	ConfigFacade* _tmp18_;
+	GAction* _tmp18_;
 	ConfigFacade* _tmp19_;
-	gboolean _tmp20_;
+	ConfigFacade* _tmp20_;
 	GVariant* _tmp21_;
 	GAction* _tmp22_;
 	GAction* _tmp23_;
-	ConfigFacade* _tmp24_;
-	ConfigFacade* _tmp25_;
-	gboolean _tmp26_;
+	gint _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
 	GVariant* _tmp27_;
-	GAction* _tmp28_;
-	GAction* _tmp29_;
-	gint _tmp30_;
-	gchar* _tmp31_;
-	gchar* _tmp32_;
-	GVariant* _tmp33_;
-	const gchar* _tmp34_ = NULL;
-	gboolean _tmp35_;
-	GAction* _tmp36_;
-	GAction* _tmp37_;
-	GVariant* _tmp38_;
+	const gchar* _tmp28_ = NULL;
+	gboolean _tmp29_;
+	GAction* _tmp30_;
+	GAction* _tmp31_;
+	GVariant* _tmp32_;
 	RawDeveloper d = 0;
-	ConfigFacade* _tmp39_;
-	ConfigFacade* _tmp40_;
-	RawDeveloper _tmp41_;
-	RawDeveloper _tmp42_;
-	const gchar* _tmp43_ = NULL;
-	RawDeveloper _tmp44_;
+	ConfigFacade* _tmp33_;
+	ConfigFacade* _tmp34_;
+	RawDeveloper _tmp35_;
+	const gchar* _tmp36_ = NULL;
+	RawDeveloper _tmp37_;
 	GSimpleAction* action = NULL;
-	const GVariantType* _tmp45_;
-	GVariant* _tmp46_;
-	GSimpleAction* _tmp47_;
-	GSimpleAction* _tmp48_;
-	GActionMap* _tmp49_;
+	const GVariantType* _tmp38_;
+	GVariant* _tmp39_;
+	GSimpleAction* _tmp40_;
+	GSimpleAction* _tmp41_;
 #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = map;
-#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	PAGE_CLASS (media_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (media_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
 #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_get_config_photos_sort (self, &_tmp1_, &_tmp2_);
+	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
 #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order = _tmp1_;
+	sort_order = _tmp0_;
 #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_by = _tmp2_;
-#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = map;
+	sort_by = _tmp1_;
 #line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_map_add_action_entries (_tmp3_, MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self);
-#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	g_action_map_add_action_entries (map, MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self);
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = config_facade_get_instance ();
+	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp4_ = config_facade_get_instance ();
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _variant_new23 (_tmp8_);
+	_tmp5_ = _tmp4_;
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp5_, _tmp9_);
+	_tmp6_ = _variant_new23 (configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp9_);
+	g_action_change_state (_tmp3_, _tmp6_);
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_variant_unref0 (_tmp6_);
 #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp5_);
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp3_);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp7_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = config_facade_get_instance ();
+	_tmp8_ = _tmp7_;
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp9_ = config_facade_get_instance ();
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp10_ = _tmp9_;
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _variant_new24 (_tmp14_);
+	_tmp11_ = _variant_new24 (configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp11_, _tmp15_);
+	g_action_change_state (_tmp8_, _tmp11_);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp15_);
+	_g_variant_unref0 (_tmp11_);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp13_);
+	_g_object_unref0 (_tmp10_);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp8_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
+	_tmp12_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = _tmp16_;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = config_facade_get_instance ();
+	_tmp13_ = _tmp12_;
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = _tmp18_;
+	_tmp14_ = config_facade_get_instance ();
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp15_ = _tmp14_;
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = _variant_new25 (_tmp20_);
+	_tmp16_ = _variant_new25 (configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp17_, _tmp21_);
+	g_action_change_state (_tmp13_, _tmp16_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp21_);
+	_g_variant_unref0 (_tmp16_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp19_);
+	_g_object_unref0 (_tmp15_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp17_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
+	_g_object_unref0 (_tmp13_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp17_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = config_facade_get_instance ();
+	_tmp18_ = _tmp17_;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = _tmp24_;
+	_tmp19_ = config_facade_get_instance ();
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp20_ = _tmp19_;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = _variant_new26 (_tmp26_);
+	_tmp21_ = _variant_new26 (configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp23_, _tmp27_);
+	g_action_change_state (_tmp18_, _tmp21_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp27_);
+	_g_variant_unref0 (_tmp21_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp25_);
+	_g_object_unref0 (_tmp20_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp23_);
+	_g_object_unref0 (_tmp18_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
+	_tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp23_ = _tmp22_;
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = sort_by;
+	_tmp24_ = sort_by;
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = g_strdup_printf ("%d", _tmp30_);
+	_tmp25_ = g_strdup_printf ("%d", _tmp24_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = _tmp31_;
+	_tmp26_ = _tmp25_;
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _variant_new27 (_tmp32_);
+	_tmp27_ = _variant_new27 (_tmp26_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp29_, _tmp33_);
+	g_action_change_state (_tmp23_, _tmp27_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp33_);
+	_g_variant_unref0 (_tmp27_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_free0 (_tmp32_);
+	_g_free0 (_tmp26_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp29_);
+	_g_object_unref0 (_tmp23_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35_ = sort_order;
+	_tmp29_ = sort_order;
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp35_) {
+	if (_tmp29_) {
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp34_ = "ascending";
-#line 2819 "MediaPage.c"
+		_tmp28_ = "ascending";
+#line 3238 "MediaPage.c"
 	} else {
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp34_ = "descending";
-#line 2823 "MediaPage.c"
+		_tmp28_ = "descending";
+#line 3242 "MediaPage.c"
 	}
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
+	_tmp30_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp37_ = _tmp36_;
+	_tmp31_ = _tmp30_;
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp38_ = _variant_new28 (_tmp34_);
+	_tmp32_ = _variant_new28 (_tmp28_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp37_, _tmp38_);
+	g_action_change_state (_tmp31_, _tmp32_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp38_);
+	_g_variant_unref0 (_tmp32_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp37_);
+	_g_object_unref0 (_tmp31_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_ = config_facade_get_instance ();
+	_tmp33_ = config_facade_get_instance ();
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40_ = _tmp39_;
+	_tmp34_ = _tmp33_;
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp41_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp35_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_ = _tmp41_;
+	_g_object_unref0 (_tmp34_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp40_);
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	d = _tmp42_;
+	d = _tmp35_;
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp44_ = d;
+	_tmp37_ = d;
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) {
+	if (_tmp37_ == RAW_DEVELOPER_SHOTWELL) {
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp43_ = "Shotwell";
-#line 2855 "MediaPage.c"
+		_tmp36_ = "Shotwell";
+#line 3272 "MediaPage.c"
 	} else {
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp43_ = "Camera";
-#line 2859 "MediaPage.c"
+		_tmp36_ = "Camera";
+#line 3276 "MediaPage.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_ = G_VARIANT_TYPE_STRING;
+	_tmp38_ = G_VARIANT_TYPE_STRING;
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp46_ = _variant_new29 (_tmp43_);
+	_tmp39_ = _variant_new29 (_tmp36_);
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp47_ = g_simple_action_new_stateful ("RawDeveloper", _tmp45_, _tmp46_);
+	_tmp40_ = g_simple_action_new_stateful ("RawDeveloper", _tmp38_, _tmp39_);
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_ = _tmp47_;
+	_tmp41_ = _tmp40_;
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp46_);
+	_g_variant_unref0 (_tmp39_);
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp48_;
+	action = _tmp41_;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_connect_object (action, "change-state", (GCallback) _media_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
 #line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_enabled (action, TRUE);
 #line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp49_ = map;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_map_add_action (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
+	g_action_map_add_action (map, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
 #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (action);
-#line 2883 "MediaPage.c"
+#line 3298 "MediaPage.c"
 }
 
 
-static void media_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+media_page_real_remove_actions (Page* base,
+                                GActionMap* map)
+{
 	MediaPage * self;
-	GActionMap* _tmp0_;
 #line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = map;
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 2898 "MediaPage.c"
+	PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
+#line 3313 "MediaPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -2906,317 +3321,240 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (MEDIA_PAGE_entries);
 #line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (MEDIA_PAGE_entries); entry_it = entry_it + 1) {
-#line 2910 "MediaPage.c"
+#line 3325 "MediaPage.c"
 			GActionEntry entry = {0};
 #line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			entry = entry_collection[entry_it];
-#line 2914 "MediaPage.c"
+#line 3329 "MediaPage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp1_ = map;
+				_tmp0_ = entry;
 #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp2_ = entry;
+				_tmp1_ = _tmp0_.name;
 #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp3_ = _tmp2_.name;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2927 "MediaPage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 3339 "MediaPage.c"
 			}
 		}
 	}
 }
 
 
-static void media_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+media_page_real_update_actions (Page* base,
+                                gint selected_count,
+                                gint count)
+{
 	MediaPage * self;
 	gint _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	gint _tmp10_;
-	gboolean _tmp11_;
-	gint _tmp13_;
-	gboolean _tmp14_ = FALSE;
-	gint _tmp15_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
+	gboolean _tmp4_ = FALSE;
 #line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = selected_count;
-#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", _tmp0_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", selected_count > 0);
 #line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = selected_count;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", _tmp1_ > 0);
-#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = selected_count;
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", selected_count > 0);
 #line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", selected_count > 0);
 #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_page_get_thumb_size (self);
+	_tmp0_ = thumbnail_get_MAX_SCALE ();
 #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp1_ = _tmp0_;
 #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp3_ < _tmp5_);
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = media_page_get_thumb_size (self);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", media_page_get_thumb_size (self) < _tmp1_);
 #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = thumbnail_get_MIN_SCALE ();
+	_tmp2_ = thumbnail_get_MIN_SCALE ();
 #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp3_ = _tmp2_;
 #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp6_ > _tmp8_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", media_page_get_thumb_size (self) > _tmp3_);
 #line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = selected_count;
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp9_ > 0);
-#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = selected_count;
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", selected_count > 0);
 #line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", _tmp10_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", selected_count > 0);
 #line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = desktop_integration_is_send_to_installed ();
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp11_) {
-#line 2996 "MediaPage.c"
-		gint _tmp12_;
+	if (desktop_integration_is_send_to_installed ()) {
 #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp12_ = selected_count;
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 3002 "MediaPage.c"
+		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", selected_count > 0);
+#line 3385 "MediaPage.c"
 	} else {
 #line 364 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
-#line 3006 "MediaPage.c"
+#line 3389 "MediaPage.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = selected_count;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", _tmp13_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", selected_count > 0);
 #line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
 #line 369 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_development_menu_item_sensitivity (self);
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = selected_count;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp15_ == 1) {
-#line 3020 "MediaPage.c"
-		ViewCollection* _tmp16_;
-		ViewCollection* _tmp17_;
-		DataSource* _tmp18_;
-		DataSource* _tmp19_;
+	if (selected_count == 1) {
+#line 3399 "MediaPage.c"
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		DataSource* _tmp7_;
+		DataSource* _tmp8_;
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp17_ = _tmp16_;
+		_tmp6_ = _tmp5_;
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = view_collection_get_selected_source_at (_tmp17_, 0);
+		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp8_ = _tmp7_;
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO);
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp19_);
+		_g_object_unref0 (_tmp8_);
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp17_);
-#line 3039 "MediaPage.c"
+		_data_collection_unref0 (_tmp6_);
+#line 3418 "MediaPage.c"
 	} else {
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp14_ = FALSE;
-#line 3043 "MediaPage.c"
+		_tmp4_ = FALSE;
+#line 3422 "MediaPage.c"
 	}
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp4_);
 #line 374 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = selected_count;
-#line 374 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_update_flag_action (self, _tmp20_);
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = selected_count;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = count;
+	media_page_update_flag_action (self, selected_count);
 #line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_);
-#line 3057 "MediaPage.c"
+	PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count);
+#line 3430 "MediaPage.c"
 }
 
 
-static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
+static void
+media_page_on_media_altered (MediaPage* self,
+                             GeeMap* altered)
+{
 #line 379 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 379 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3066 "MediaPage.c"
+#line 3442 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_;
+		GeeSet* _tmp0_;
 		GeeSet* _tmp1_;
 		GeeSet* _tmp2_;
-		GeeSet* _tmp3_;
+		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-		GeeIterator* _tmp5_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = altered;
+		_tmp0_ = gee_map_get_keys (altered);
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp1_ = gee_map_get_keys (_tmp0_);
+		_tmp1_ = _tmp0_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = _tmp2_;
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp3_);
+		_g_object_unref0 (_tmp2_);
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_object_it = _tmp5_;
+		_object_it = _tmp4_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3093 "MediaPage.c"
-			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
+#line 3466 "MediaPage.c"
+			GeeIterator* _tmp5_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			DataObject* _tmp8_;
 			gpointer _tmp9_;
-			GeeMap* _tmp10_;
-			DataObject* _tmp11_;
-			gpointer _tmp12_;
-			Alteration* _tmp13_;
-			gboolean _tmp14_;
-			gboolean _tmp15_;
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp6_ = _object_it;
+			Alteration* _tmp10_;
+			gboolean _tmp11_;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
+			_tmp5_ = _object_it;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp5_)) {
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3113 "MediaPage.c"
+#line 3481 "MediaPage.c"
 			}
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp8_ = _object_it;
+			_tmp6_ = _object_it;
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp7_ = gee_iterator_get (_tmp6_);
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			object = (DataObject*) _tmp9_;
+			object = (DataObject*) _tmp7_;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp10_ = altered;
+			_tmp8_ = object;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp11_ = object;
+			_tmp9_ = gee_map_get (altered, _tmp8_);
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
+			_tmp10_ = (Alteration*) _tmp9_;
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp13_ = (Alteration*) _tmp12_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp14_ = alteration_has_detail (_tmp13_, "metadata", "flagged");
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp15_ = _tmp14_;
+			_tmp11_ = alteration_has_detail (_tmp10_, "metadata", "flagged");
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_alteration_unref0 (_tmp13_);
+			_alteration_unref0 (_tmp10_);
 #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp15_) {
-#line 3137 "MediaPage.c"
-				ViewCollection* _tmp16_;
-				ViewCollection* _tmp17_;
-				gint _tmp18_;
+			if (_tmp11_) {
+#line 3501 "MediaPage.c"
+				ViewCollection* _tmp12_;
+				ViewCollection* _tmp13_;
 #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp17_ = _tmp16_;
+				_tmp13_ = _tmp12_;
 #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp18_ = view_collection_get_selected_count (_tmp17_);
+				media_page_update_flag_action (self, view_collection_get_selected_count (_tmp13_));
 #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				media_page_update_flag_action (self, _tmp18_);
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_data_collection_unref0 (_tmp17_);
+				_data_collection_unref0 (_tmp13_);
 #line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (object);
 #line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3155 "MediaPage.c"
+#line 3516 "MediaPage.c"
 			}
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 3159 "MediaPage.c"
+#line 3520 "MediaPage.c"
 		}
 #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3163 "MediaPage.c"
+#line 3524 "MediaPage.c"
 	}
 }
 
 
-static void media_page_update_rating_sensitivities (MediaPage* self) {
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-	gboolean _tmp8_;
+static void
+media_page_update_rating_sensitivities (MediaPage* self)
+{
 #line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_can_rate_selected (self, RATING_REJECTED);
-#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp0_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", media_page_can_rate_selected (self, RATING_REJECTED));
 #line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_can_rate_selected (self, RATING_UNRATED);
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp1_);
-#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_can_rate_selected (self, RATING_ONE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", media_page_can_rate_selected (self, RATING_UNRATED));
 #line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp2_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", media_page_can_rate_selected (self, RATING_ONE));
 #line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_page_can_rate_selected (self, RATING_TWO);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp3_);
-#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = media_page_can_rate_selected (self, RATING_THREE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", media_page_can_rate_selected (self, RATING_TWO));
 #line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp4_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", media_page_can_rate_selected (self, RATING_THREE));
 #line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = media_page_can_rate_selected (self, RATING_FOUR);
-#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp5_);
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = media_page_can_rate_selected (self, RATING_FIVE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", media_page_can_rate_selected (self, RATING_FOUR));
 #line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp6_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", media_page_can_rate_selected (self, RATING_FIVE));
 #line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = media_page_can_increase_selected_rating (self);
-#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp7_);
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = media_page_can_decrease_selected_rating (self);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", media_page_can_increase_selected_rating (self));
 #line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_);
-#line 3216 "MediaPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", media_page_can_decrease_selected_rating (self));
+#line 3552 "MediaPage.c"
 }
 
 
-static void media_page_update_development_menu_item_sensitivity (MediaPage* self) {
+static void
+media_page_update_development_menu_item_sensitivity (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
@@ -3225,7 +3563,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 	gint _tmp5_;
 	gboolean _tmp6_;
 	gboolean is_raw = FALSE;
-	gboolean _tmp27_;
+	gboolean _tmp26_;
 #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3252,11 +3590,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
 #line 404 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3256 "MediaPage.c"
+#line 3594 "MediaPage.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 3260 "MediaPage.c"
+#line 3598 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp7_;
@@ -3292,7 +3630,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		_view_index = -1;
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3296 "MediaPage.c"
+#line 3634 "MediaPage.c"
 			gint _tmp14_;
 			gint _tmp15_;
 			gint _tmp16_;
@@ -3318,7 +3656,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (!(_tmp15_ < _tmp16_)) {
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3322 "MediaPage.c"
+#line 3660 "MediaPage.c"
 			}
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
@@ -3338,7 +3676,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (_tmp22_ == NULL) {
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3342 "MediaPage.c"
+#line 3680 "MediaPage.c"
 			}
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
@@ -3346,20 +3684,17 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			_tmp24_ = photo;
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 3350 "MediaPage.c"
+#line 3688 "MediaPage.c"
 				Photo* _tmp25_;
-				PhotoFileFormat _tmp26_;
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo;
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp26_ = photo_get_master_file_format (_tmp25_);
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 3359 "MediaPage.c"
+				_tmp23_ = photo_get_master_file_format (_tmp25_) == PHOTO_FILE_FORMAT_RAW;
+#line 3694 "MediaPage.c"
 			} else {
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 3363 "MediaPage.c"
+#line 3698 "MediaPage.c"
 			}
 #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
@@ -3371,46 +3706,50 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 				_g_object_unref0 (view);
 #line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3375 "MediaPage.c"
+#line 3710 "MediaPage.c"
 			}
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3381 "MediaPage.c"
+#line 3716 "MediaPage.c"
 		}
 #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3385 "MediaPage.c"
+#line 3720 "MediaPage.c"
 	}
 #line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = is_raw;
+	_tmp26_ = is_raw;
 #line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
-#line 3391 "MediaPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp26_);
+#line 3726 "MediaPage.c"
 }
 
 
-static void media_page_update_flag_action (MediaPage* self, gint selected_count) {
-	gint _tmp0_;
+static void
+media_page_update_flag_action (MediaPage* self,
+                               gint selected_count)
+{
 #line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = selected_count;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 3403 "MediaPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", selected_count > 0);
+#line 3738 "MediaPage.c"
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static gpointer
+_core_tracker_ref0 (gpointer self)
+{
 #line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3410 "MediaPage.c"
+#line 3747 "MediaPage.c"
 }
 
 
-static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+media_page_real_get_view_tracker (CheckerboardPage* base)
+{
 	MediaPage * self;
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_;
@@ -3425,20 +3764,21 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3429 "MediaPage.c"
+#line 3768 "MediaPage.c"
 }
 
 
-void media_page_set_display_ratings (MediaPage* self, gboolean display) {
+void
+media_page_set_display_ratings (MediaPage* self,
+                                gboolean display)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
-	gboolean _tmp4_;
-	GValue _tmp5_ = {0};
+	GValue _tmp4_ = {0};
+	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	gboolean _tmp8_;
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3454,38 +3794,37 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = display;
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp4_, G_TYPE_BOOLEAN);
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp5_, _tmp4_);
+	g_value_set_boolean (&_tmp4_, display);
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp5_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp4_, NULL, NULL);
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
+	G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL;
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
 #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
 #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp6_);
 #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = display;
-#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
-#line 3481 "MediaPage.c"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", display);
+#line 3817 "MediaPage.c"
 }
 
 
-static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
+static gboolean
+media_page_can_rate_selected (MediaPage* self,
+                              Rating rating)
+{
 	gboolean result = FALSE;
 #line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3489 "MediaPage.c"
+#line 3828 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3521,7 +3860,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		_view_index = -1;
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3525 "MediaPage.c"
+#line 3864 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3532,9 +3871,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			DataView* _tmp13_;
 			MediaSource* _tmp14_;
 			MediaSource* _tmp15_;
-			Rating _tmp16_;
-			Rating _tmp17_;
-			gboolean _tmp18_;
+			gboolean _tmp16_;
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3547,7 +3884,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3551 "MediaPage.c"
+#line 3888 "MediaPage.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3564,15 +3901,11 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = rating;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp18_ = _tmp16_ != _tmp17_;
+			_tmp16_ = media_source_get_rating (_tmp15_) != rating;
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
 #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp18_) {
+			if (_tmp16_) {
 #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
 #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3581,29 +3914,31 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 				_g_object_unref0 (_view_list);
 #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3585 "MediaPage.c"
+#line 3918 "MediaPage.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3589 "MediaPage.c"
+#line 3922 "MediaPage.c"
 		}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3593 "MediaPage.c"
+#line 3926 "MediaPage.c"
 	}
 #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3599 "MediaPage.c"
+#line 3932 "MediaPage.c"
 }
 
 
-static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
+static gboolean
+media_page_can_increase_selected_rating (MediaPage* self)
+{
 	gboolean result = FALSE;
 #line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3607 "MediaPage.c"
+#line 3942 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3639,7 +3974,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3643 "MediaPage.c"
+#line 3978 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3650,9 +3985,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			DataView* _tmp13_;
 			MediaSource* _tmp14_;
 			MediaSource* _tmp15_;
-			Rating _tmp16_;
-			gboolean _tmp17_;
-			gboolean _tmp18_;
+			gboolean _tmp16_;
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3665,7 +3998,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3669 "MediaPage.c"
+#line 4002 "MediaPage.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3682,15 +4015,11 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = rating_can_increase (_tmp16_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp18_ = _tmp17_;
+			_tmp16_ = rating_can_increase (media_source_get_rating (_tmp15_));
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
 #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp18_) {
+			if (_tmp16_) {
 #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
 #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3699,29 +4028,31 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3703 "MediaPage.c"
+#line 4032 "MediaPage.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3707 "MediaPage.c"
+#line 4036 "MediaPage.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3711 "MediaPage.c"
+#line 4040 "MediaPage.c"
 	}
 #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3717 "MediaPage.c"
+#line 4046 "MediaPage.c"
 }
 
 
-static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
+static gboolean
+media_page_can_decrease_selected_rating (MediaPage* self)
+{
 	gboolean result = FALSE;
 #line 456 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3725 "MediaPage.c"
+#line 4056 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3757,7 +4088,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3761 "MediaPage.c"
+#line 4092 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3768,9 +4099,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			DataView* _tmp13_;
 			MediaSource* _tmp14_;
 			MediaSource* _tmp15_;
-			Rating _tmp16_;
-			gboolean _tmp17_;
-			gboolean _tmp18_;
+			gboolean _tmp16_;
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3783,7 +4112,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3787 "MediaPage.c"
+#line 4116 "MediaPage.c"
 			}
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3800,15 +4129,11 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = rating_can_decrease (_tmp16_);
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp18_ = _tmp17_;
+			_tmp16_ = rating_can_decrease (media_source_get_rating (_tmp15_));
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
 #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp18_) {
+			if (_tmp16_) {
 #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
 #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3817,25 +4142,27 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3821 "MediaPage.c"
+#line 4146 "MediaPage.c"
 			}
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3825 "MediaPage.c"
+#line 4150 "MediaPage.c"
 		}
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3829 "MediaPage.c"
+#line 4154 "MediaPage.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3835 "MediaPage.c"
+#line 4160 "MediaPage.c"
 }
 
 
-MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) {
+MediaPageZoomSliderAssembly*
+media_page_create_zoom_slider_assembly (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* result = NULL;
 	MediaPageZoomSliderAssembly* _tmp0_;
 #line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3848,87 +4175,77 @@ MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage*
 	result = _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3852 "MediaPage.c"
+#line 4179 "MediaPage.c"
 }
 
 
-static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event) {
+static gboolean
+media_page_real_on_mousewheel_up (Page* base,
+                                  GdkEventScroll* event)
+{
 	MediaPage * self;
 	gboolean result = FALSE;
-	GdkEventScroll* _tmp0_;
-	GdkModifierType _tmp1_;
+	GdkModifierType _tmp0_;
 #line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->state;
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = _tmp0_->state;
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
+	if ((_tmp0_ & GDK_CONTROL_MASK) != 0) {
 #line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_increase_zoom_level (self);
 #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
 #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3877 "MediaPage.c"
+#line 4204 "MediaPage.c"
 	} else {
-		GdkEventScroll* _tmp2_;
-		gboolean _tmp3_;
-#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp2_ = event;
-#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_);
 #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		result = _tmp3_;
+		result = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event);
 #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3889 "MediaPage.c"
+#line 4210 "MediaPage.c"
 	}
 }
 
 
-static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event) {
+static gboolean
+media_page_real_on_mousewheel_down (Page* base,
+                                    GdkEventScroll* event)
+{
 	MediaPage * self;
 	gboolean result = FALSE;
-	GdkEventScroll* _tmp0_;
-	GdkModifierType _tmp1_;
+	GdkModifierType _tmp0_;
 #line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->state;
 #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = _tmp0_->state;
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
+	if ((_tmp0_ & GDK_CONTROL_MASK) != 0) {
 #line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_decrease_zoom_level (self);
 #line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
 #line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3915 "MediaPage.c"
+#line 4236 "MediaPage.c"
 	} else {
-		GdkEventScroll* _tmp2_;
-		gboolean _tmp3_;
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp2_ = event;
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_down (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_);
 #line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		result = _tmp3_;
+		result = PAGE_CLASS (media_page_parent_class)->on_mousewheel_down (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event);
 #line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3927 "MediaPage.c"
+#line 4242 "MediaPage.c"
 	}
 }
 
 
-static void media_page_on_send_to (MediaPage* self) {
+static void
+media_page_on_send_to (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
@@ -3949,24 +4266,25 @@ static void media_page_on_send_to (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3953 "MediaPage.c"
+#line 4270 "MediaPage.c"
 }
 
 
-void media_page_on_play_video (MediaPage* self) {
+void
+media_page_on_play_video (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	Video* video = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	DataView* _tmp5_;
 	DataView* _tmp6_;
-	DataView* _tmp7_;
-	DataSource* _tmp8_;
+	DataSource* _tmp7_;
+	Video* _tmp8_;
 	Video* _tmp9_;
 	Video* _tmp10_;
-	Video* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
@@ -3975,78 +4293,76 @@ void media_page_on_play_video (MediaPage* self) {
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ != 1;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3988 "MediaPage.c"
+#line 4304 "MediaPage.c"
 	}
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
+	_tmp5_ = view_collection_get_selected_at (_tmp4_, 0);
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = data_view_get_source (_tmp7_);
+	_tmp7_ = data_view_get_source (_tmp6_);
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO) ? ((Video*) _tmp8_) : NULL;
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_VIDEO) ? ((Video*) _tmp7_) : NULL;
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp9_ == NULL) {
+	if (_tmp8_ == NULL) {
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 4006 "MediaPage.c"
+		_g_object_unref0 (_tmp7_);
+#line 4322 "MediaPage.c"
 	}
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	video = _tmp10_;
+	video = _tmp9_;
 #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = video;
+	_tmp10_ = video;
 #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp11_ == NULL) {
+	if (_tmp10_ == NULL) {
 #line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
 #line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4024 "MediaPage.c"
+#line 4340 "MediaPage.c"
 	}
 	{
-		Video* _tmp12_;
+		Video* _tmp11_;
+		GFile* _tmp12_;
 		GFile* _tmp13_;
-		GFile* _tmp14_;
+		gchar* _tmp14_;
 		gchar* _tmp15_;
-		gchar* _tmp16_;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp12_ = video;
+		_tmp11_ = video;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp12_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp15_ = g_file_get_uri (_tmp14_);
+		_tmp14_ = g_file_get_uri (_tmp13_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		g_app_info_launch_default_for_uri (_tmp16_, NULL, &_inner_error_);
+		g_app_info_launch_default_for_uri (_tmp15_, NULL, &_inner_error_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_free0 (_tmp16_);
+		_g_free0 (_tmp15_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp13_);
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4050 "MediaPage.c"
+#line 4366 "MediaPage.c"
 			goto __catch570_g_error;
 		}
 	}
@@ -4054,29 +4370,29 @@ void media_page_on_play_video (MediaPage* self) {
 	__catch570_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp17_;
-		const gchar* _tmp18_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
+		gchar* _tmp18_;
 		gchar* _tmp19_;
-		gchar* _tmp20_;
 #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		e = _inner_error_;
 #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_inner_error_ = NULL;
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp17_ = e;
+		_tmp16_ = e;
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = _tmp17_->message;
+		_tmp17_ = _tmp16_->message;
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp18_);
+		_tmp18_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp17_);
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		app_window_error_message (_tmp20_, NULL);
+		app_window_error_message (_tmp19_, NULL);
 #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_free0 (_tmp20_);
+		_g_free0 (_tmp19_);
 #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 4080 "MediaPage.c"
+#line 4396 "MediaPage.c"
 	}
 	__finally570:
 #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4089,58 +4405,60 @@ void media_page_on_play_video (MediaPage* self) {
 		g_clear_error (&_inner_error_);
 #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4093 "MediaPage.c"
+#line 4409 "MediaPage.c"
 	}
 #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 4097 "MediaPage.c"
+#line 4413 "MediaPage.c"
 }
 
 
-static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+media_page_real_on_app_key_pressed (Page* base,
+                                    GdkEventKey* event)
+{
 	MediaPage * self;
 	gboolean result = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	GQuark _tmp5_ = 0U;
+	GQuark _tmp4_ = 0U;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label0 = 0;
+	static GQuark _tmp3_label0 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label1 = 0;
+	static GQuark _tmp3_label1 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label2 = 0;
+	static GQuark _tmp3_label2 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label3 = 0;
+	static GQuark _tmp3_label3 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label4 = 0;
+	static GQuark _tmp3_label4 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label5 = 0;
+	static GQuark _tmp3_label5 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label6 = 0;
+	static GQuark _tmp3_label6 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label7 = 0;
+	static GQuark _tmp3_label7 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label8 = 0;
+	static GQuark _tmp3_label8 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label9 = 0;
+	static GQuark _tmp3_label9 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label10 = 0;
+	static GQuark _tmp3_label10 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label11 = 0;
+	static GQuark _tmp3_label11 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label12 = 0;
+	static GQuark _tmp3_label12 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label13 = 0;
+	static GQuark _tmp3_label13 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label14 = 0;
+	static GQuark _tmp3_label14 = 0;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label15 = 0;
-#line 4142 "MediaPage.c"
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_;
+	static GQuark _tmp3_label15 = 0;
+#line 4460 "MediaPage.c"
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_;
 #line 507 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 507 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4148,234 +4466,223 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 #line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	handled = TRUE;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->keyval;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
+	if (((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("equal")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("plus"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4165 "MediaPage.c"
+#line 4481 "MediaPage.c"
 			default:
 			{
 #line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4172 "MediaPage.c"
+#line 4488 "MediaPage.c"
 			}
 		}
-	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
+	} else if (((_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("minus")))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4178 "MediaPage.c"
+#line 4494 "MediaPage.c"
 			default:
 			{
 #line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 520 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4185 "MediaPage.c"
+#line 4501 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("period")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4191 "MediaPage.c"
+#line 4507 "MediaPage.c"
 			default:
 			{
 #line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 524 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4198 "MediaPage.c"
+#line 4514 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("comma")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4204 "MediaPage.c"
+#line 4520 "MediaPage.c"
 			default:
 			{
 #line 527 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4211 "MediaPage.c"
+#line 4527 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4217 "MediaPage.c"
+#line 4533 "MediaPage.c"
 			default:
 			{
 #line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4224 "MediaPage.c"
+#line 4540 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4230 "MediaPage.c"
+#line 4546 "MediaPage.c"
 			default:
 			{
 #line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4237 "MediaPage.c"
+#line 4553 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label10) ? _tmp3_label10 : (_tmp3_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4243 "MediaPage.c"
+#line 4559 "MediaPage.c"
 			default:
 			{
 #line 539 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4250 "MediaPage.c"
+#line 4566 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label11) ? _tmp3_label11 : (_tmp3_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4256 "MediaPage.c"
+#line 4572 "MediaPage.c"
 			default:
 			{
 #line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 544 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4263 "MediaPage.c"
+#line 4579 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label12) ? _tmp3_label12 : (_tmp3_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4269 "MediaPage.c"
+#line 4585 "MediaPage.c"
 			default:
 			{
 #line 547 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4276 "MediaPage.c"
+#line 4592 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label13) ? _tmp3_label13 : (_tmp3_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4282 "MediaPage.c"
+#line 4598 "MediaPage.c"
 			default:
 			{
 #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4289 "MediaPage.c"
+#line 4605 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label14) ? _tmp3_label14 : (_tmp3_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4295 "MediaPage.c"
+#line 4611 "MediaPage.c"
 			default:
 			{
 #line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4302 "MediaPage.c"
+#line 4618 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("slash")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label15) ? _tmp3_label15 : (_tmp3_label15 = g_quark_from_static_string ("slash")))) {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4308 "MediaPage.c"
+#line 4624 "MediaPage.c"
 			default:
 			{
 #line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4315 "MediaPage.c"
+#line 4631 "MediaPage.c"
 			}
 		}
 	} else {
 #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4321 "MediaPage.c"
+#line 4637 "MediaPage.c"
 			default:
 			{
 #line 563 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
 #line 564 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4328 "MediaPage.c"
+#line 4644 "MediaPage.c"
 			}
 		}
 	}
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = handled;
+	_tmp6_ = handled;
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp7_) {
+	if (_tmp6_) {
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = TRUE;
-#line 4338 "MediaPage.c"
+		_tmp5_ = TRUE;
+#line 4654 "MediaPage.c"
 	} else {
-		GdkEventKey* _tmp8_;
-		gboolean _tmp9_;
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp8_ = event;
-#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp8_);
-#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = _tmp9_;
-#line 4348 "MediaPage.c"
+		_tmp5_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event);
+#line 4658 "MediaPage.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 4354 "MediaPage.c"
+#line 4664 "MediaPage.c"
 }
 
 
-static void media_page_real_switched_to (Page* base) {
+static void
+media_page_real_switched_to (Page* base)
+{
 	MediaPage * self;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
-	gboolean _tmp4_;
+	ConfigFacade* _tmp4_;
 	ConfigFacade* _tmp5_;
 	ConfigFacade* _tmp6_;
-	gboolean _tmp7_;
+	ConfigFacade* _tmp7_;
 	ConfigFacade* _tmp8_;
 	ConfigFacade* _tmp9_;
-	gboolean _tmp10_;
-	ConfigFacade* _tmp11_;
-	ConfigFacade* _tmp12_;
-	gboolean _tmp13_;
-	ViewCollection* _tmp14_;
-	ViewCollection* _tmp15_;
-	ViewCollection* _tmp16_;
-	ViewCollection* _tmp17_;
-	gint _tmp18_;
-	gboolean _tmp19_;
+	ViewCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	ViewCollection* _tmp12_;
+	ViewCollection* _tmp13_;
+	gboolean _tmp14_;
 #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4393,103 +4700,95 @@ static void media_page_real_switched_to (Page* base) {
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp4_);
+	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = config_facade_get_instance ();
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = config_facade_get_instance ();
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp5_ = _tmp4_;
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp7_);
+	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp6_);
-#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = config_facade_get_instance ();
+	_g_object_unref0 (_tmp5_);
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = config_facade_get_instance ();
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp7_ = _tmp6_;
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_set_display_ratings (self, _tmp10_);
+	media_page_set_display_ratings (self, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp9_);
-#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = config_facade_get_instance ();
+	_g_object_unref0 (_tmp7_);
 #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp8_ = config_facade_get_instance ();
 #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp9_ = _tmp8_;
 #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_set_display_tags (self, _tmp13_);
+	media_page_set_display_tags (self, configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp9_);
 #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _tmp14_;
+	_tmp11_ = _tmp10_;
 #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
 #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp15_);
-#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_data_collection_unref0 (_tmp11_);
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = _tmp16_;
+	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = view_collection_get_selected_count (_tmp17_);
+	_tmp13_ = _tmp12_;
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = _tmp18_ > 0;
+	_tmp14_ = view_collection_get_selected_count (_tmp13_) > 0;
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp17_);
+	_data_collection_unref0 (_tmp13_);
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp19_) {
-#line 4452 "MediaPage.c"
+	if (_tmp14_) {
+#line 4749 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
-		ViewCollection* _tmp20_;
-		ViewCollection* _tmp21_;
-		DataView* _tmp22_;
-		CheckerboardItem* _tmp23_;
-		CheckerboardItem* _tmp24_;
+		ViewCollection* _tmp15_;
+		ViewCollection* _tmp16_;
+		DataView* _tmp17_;
+		CheckerboardItem* _tmp18_;
+		CheckerboardItem* _tmp19_;
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp16_ = _tmp15_;
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = view_collection_get_selected_at (_tmp21_, 0);
+		_tmp17_ = view_collection_get_selected_at (_tmp16_, 0);
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
+		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp21_);
+		_data_collection_unref0 (_tmp16_);
 #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		selected = _tmp23_;
+		selected = _tmp18_;
 #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp24_ = selected;
+		_tmp19_ = selected;
 #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		if (_tmp24_ != NULL) {
-#line 4475 "MediaPage.c"
-			CheckerboardItem* _tmp25_;
+		if (_tmp19_ != NULL) {
+#line 4772 "MediaPage.c"
+			CheckerboardItem* _tmp20_;
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp25_ = selected;
+			_tmp20_ = selected;
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 4481 "MediaPage.c"
+			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp20_);
+#line 4778 "MediaPage.c"
 		}
 #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 4485 "MediaPage.c"
+#line 4782 "MediaPage.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 4489 "MediaPage.c"
+#line 4786 "MediaPage.c"
 }
 
 
-static void media_page_real_switching_from (Page* base) {
+static void
+media_page_real_switching_from (Page* base)
+{
 	MediaPage * self;
 #line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
@@ -4497,56 +4796,62 @@ static void media_page_real_switching_from (Page* base) {
 	media_page_disconnect_slider (self);
 #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 4501 "MediaPage.c"
+#line 4800 "MediaPage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4508 "MediaPage.c"
+#line 4809 "MediaPage.c"
 }
 
 
-static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
+static void
+_media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender,
+                                                                          gpointer self)
+{
 #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 4515 "MediaPage.c"
+#line 4819 "MediaPage.c"
 }
 
 
-void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider) {
+void
+media_page_connect_slider (MediaPage* self,
+                           MediaPageZoomSliderAssembly* slider)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 	MediaPageZoomSliderAssembly* _tmp1_;
-	MediaPageZoomSliderAssembly* _tmp2_;
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (slider));
 #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = slider;
-#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (slider);
 #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
 #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->connected_slider = _tmp1_;
+	self->priv->connected_slider = _tmp0_;
 #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = self->priv->connected_slider;
+	_tmp1_ = self->priv->connected_slider;
 #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0);
+	g_signal_connect_object (_tmp1_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0);
 #line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 4541 "MediaPage.c"
+#line 4845 "MediaPage.c"
 }
 
 
-static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
+static void
+media_page_save_persistent_thumbnail_scale (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
 	MediaPageZoomSliderAssembly* _tmp3_;
-	gint _tmp4_;
 #line 604 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4555,7 +4860,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4559 "MediaPage.c"
+#line 4864 "MediaPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4564,25 +4869,24 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->connected_slider;
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = media_page_zoom_slider_assembly_get_scale (_tmp3_);
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
+	configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), media_page_zoom_slider_assembly_get_scale (_tmp3_));
 #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 4573 "MediaPage.c"
+#line 4876 "MediaPage.c"
 }
 
 
-static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
+static void
+media_page_load_persistent_thumbnail_scale (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 	gint persistent_scale = 0;
 	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	MediaPageZoomSliderAssembly* _tmp5_;
+	MediaPageZoomSliderAssembly* _tmp4_;
+	gint _tmp5_;
 	gint _tmp6_;
-	gint _tmp7_;
 #line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 612 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4591,7 +4895,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 613 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4595 "MediaPage.c"
+#line 4899 "MediaPage.c"
 	}
 #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4600,26 +4904,26 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
 #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	persistent_scale = _tmp4_;
+	persistent_scale = _tmp3_;
 #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = self->priv->connected_slider;
+	_tmp4_ = self->priv->connected_slider;
 #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = persistent_scale;
+	_tmp5_ = persistent_scale;
 #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_zoom_slider_assembly_set_scale (_tmp5_, _tmp6_);
+	media_page_zoom_slider_assembly_set_scale (_tmp4_, _tmp5_);
 #line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = persistent_scale;
+	_tmp6_ = persistent_scale;
 #line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_set_thumb_size (self, _tmp7_);
-#line 4619 "MediaPage.c"
+	media_page_set_thumb_size (self, _tmp6_);
+#line 4921 "MediaPage.c"
 }
 
 
-void media_page_disconnect_slider (MediaPage* self) {
+void
+media_page_disconnect_slider (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 	MediaPageZoomSliderAssembly* _tmp1_;
 	guint _tmp2_;
@@ -4631,7 +4935,7 @@ void media_page_disconnect_slider (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4635 "MediaPage.c"
+#line 4939 "MediaPage.c"
 	}
 #line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
@@ -4643,107 +4947,121 @@ void media_page_disconnect_slider (MediaPage* self) {
 	_g_object_unref0 (self->priv->connected_slider);
 #line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 4647 "MediaPage.c"
+#line 4951 "MediaPage.c"
 }
 
 
-static void media_page_real_on_zoom_changed (MediaPage* self) {
+static void
+media_page_real_on_zoom_changed (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
 #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4657 "MediaPage.c"
+#line 4963 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
-		gint _tmp2_;
 #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
-#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		media_page_set_thumb_size (self, _tmp2_);
-#line 4666 "MediaPage.c"
+		media_page_set_thumb_size (self, media_page_zoom_slider_assembly_get_scale (_tmp1_));
+#line 4969 "MediaPage.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 4670 "MediaPage.c"
+#line 4973 "MediaPage.c"
 }
 
 
-void media_page_on_zoom_changed (MediaPage* self) {
+void
+media_page_on_zoom_changed (MediaPage* self)
+{
 #line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 4679 "MediaPage.c"
+#line 4984 "MediaPage.c"
 }
 
 
-static void media_page_real_on_export (MediaPage* self) {
+static void
+media_page_real_on_export (MediaPage* self)
+{
 #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 4688 "MediaPage.c"
+#line 4995 "MediaPage.c"
 }
 
 
-void media_page_on_export (MediaPage* self) {
+void
+media_page_on_export (MediaPage* self)
+{
 #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 4697 "MediaPage.c"
+#line 5006 "MediaPage.c"
 }
 
 
-static void media_page_real_on_increase_size (MediaPage* self) {
+static void
+media_page_real_on_increase_size (MediaPage* self)
+{
 #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 4704 "MediaPage.c"
+#line 5015 "MediaPage.c"
 }
 
 
-void media_page_on_increase_size (MediaPage* self) {
+void
+media_page_on_increase_size (MediaPage* self)
+{
 #line 638 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 638 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 4713 "MediaPage.c"
+#line 5026 "MediaPage.c"
 }
 
 
-static void media_page_real_on_decrease_size (MediaPage* self) {
+static void
+media_page_real_on_decrease_size (MediaPage* self)
+{
 #line 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 4720 "MediaPage.c"
+#line 5035 "MediaPage.c"
 }
 
 
-void media_page_on_decrease_size (MediaPage* self) {
+void
+media_page_on_decrease_size (MediaPage* self)
+{
 #line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 4729 "MediaPage.c"
+#line 5046 "MediaPage.c"
 }
 
 
-static void media_page_on_add_tags (MediaPage* self) {
+static void
+media_page_on_add_tags (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	AddTagsDialog* dialog = NULL;
-	AddTagsDialog* _tmp4_;
+	AddTagsDialog* _tmp3_;
 	gchar** names = NULL;
-	AddTagsDialog* _tmp5_;
-	gint _tmp6_;
-	gchar** _tmp7_;
+	AddTagsDialog* _tmp4_;
+	gint _tmp5_;
+	gchar** _tmp6_;
 	gint names_length1;
 	gint _names_size_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4751,133 +5069,132 @@ static void media_page_on_add_tags (MediaPage* self) {
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4764 "MediaPage.c"
+#line 5080 "MediaPage.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = add_tags_dialog_new ();
+	_tmp3_ = add_tags_dialog_new ();
 #line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dialog = _tmp4_;
+	dialog = _tmp3_;
 #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = dialog;
+	_tmp4_ = dialog;
 #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = add_tags_dialog_execute (_tmp5_, &_tmp6_);
+	_tmp6_ = add_tags_dialog_execute (_tmp4_, &_tmp5_);
 #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	names = _tmp7_;
+	names = _tmp6_;
 #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	names_length1 = _tmp6_;
+	names_length1 = _tmp5_;
 #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_names_size_ = names_length1;
 #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = names;
+	_tmp7_ = names;
 #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8__length1 = names_length1;
+	_tmp7__length1 = names_length1;
 #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp8_ != NULL) {
-#line 4786 "MediaPage.c"
+	if (_tmp7_ != NULL) {
+#line 5102 "MediaPage.c"
+		CommandManager* _tmp8_;
 		CommandManager* _tmp9_;
-		CommandManager* _tmp10_;
+		HierarchicalTagIndex* _tmp10_;
 		HierarchicalTagIndex* _tmp11_;
-		HierarchicalTagIndex* _tmp12_;
-		gchar** _tmp13_;
-		gint _tmp13__length1;
-		gint _tmp14_;
+		gchar** _tmp12_;
+		gint _tmp12__length1;
+		gint _tmp13_;
+		gchar** _tmp14_;
 		gchar** _tmp15_;
-		gchar** _tmp16_;
-		gint _tmp16__length1;
+		gint _tmp15__length1;
+		ViewCollection* _tmp16_;
 		ViewCollection* _tmp17_;
-		ViewCollection* _tmp18_;
-		GeeList* _tmp19_;
-		GeeCollection* _tmp20_;
+		GeeList* _tmp18_;
+		GeeCollection* _tmp19_;
+		AddTagsCommand* _tmp20_;
 		AddTagsCommand* _tmp21_;
-		AddTagsCommand* _tmp22_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = hierarchical_tag_index_get_global_index ();
+		_tmp10_ = hierarchical_tag_index_get_global_index ();
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp13_ = names;
+		_tmp12_ = names;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp13__length1 = names_length1;
+		_tmp12__length1 = names_length1;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_);
+		_tmp14_ = hierarchical_tag_index_get_paths_for_names_array (_tmp11_, _tmp12_, _tmp12__length1, &_tmp13_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16__length1 = _tmp14_;
+		_tmp15__length1 = _tmp13_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = _tmp17_;
+		_tmp17_ = _tmp16_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = view_collection_get_selected_sources (_tmp18_);
+		_tmp18_ = view_collection_get_selected_sources (_tmp17_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection);
+		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = add_tags_command_new (_tmp16_, _tmp14_, _tmp20_);
+		_tmp20_ = add_tags_command_new (_tmp15_, _tmp13_, _tmp19_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command));
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp22_);
+		_g_object_unref0 (_tmp21_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp20_);
+		_g_object_unref0 (_tmp19_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp18_);
+		_data_collection_unref0 (_tmp17_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL);
+		_tmp15_ = (_vala_array_free (_tmp15_, _tmp15__length1, (GDestroyNotify) g_free), NULL);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_hierarchical_tag_index_unref0 (_tmp12_);
+		_hierarchical_tag_index_unref0 (_tmp11_);
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp10_);
-#line 4847 "MediaPage.c"
+		_command_manager_unref0 (_tmp9_);
+#line 5163 "MediaPage.c"
 	}
 #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 4853 "MediaPage.c"
+#line 5169 "MediaPage.c"
 }
 
 
-static void media_page_on_modify_tags (MediaPage* self) {
+static void
+media_page_on_modify_tags (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	MediaSource* media = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	DataView* _tmp5_;
 	DataView* _tmp6_;
-	DataView* _tmp7_;
-	DataSource* _tmp8_;
-	MediaSource* _tmp9_;
+	DataSource* _tmp7_;
+	MediaSource* _tmp8_;
 	ModifyTagsDialog* dialog = NULL;
-	MediaSource* _tmp10_;
-	ModifyTagsDialog* _tmp11_;
+	MediaSource* _tmp9_;
+	ModifyTagsDialog* _tmp10_;
 	GeeArrayList* new_tags = NULL;
-	ModifyTagsDialog* _tmp12_;
+	ModifyTagsDialog* _tmp11_;
+	GeeArrayList* _tmp12_;
 	GeeArrayList* _tmp13_;
-	GeeArrayList* _tmp14_;
+	CommandManager* _tmp14_;
 	CommandManager* _tmp15_;
-	CommandManager* _tmp16_;
-	MediaSource* _tmp17_;
-	GeeArrayList* _tmp18_;
+	MediaSource* _tmp16_;
+	GeeArrayList* _tmp17_;
+	ModifyTagsCommand* _tmp18_;
 	ModifyTagsCommand* _tmp19_;
-	ModifyTagsCommand* _tmp20_;
 #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4885,51 +5202,49 @@ static void media_page_on_modify_tags (MediaPage* self) {
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ != 1;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4898 "MediaPage.c"
+#line 5213 "MediaPage.c"
 	}
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
+	_tmp5_ = view_collection_get_selected_at (_tmp4_, 0);
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = data_view_get_source (_tmp7_);
+	_tmp7_ = data_view_get_source (_tmp6_);
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource);
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media = _tmp9_;
+	media = _tmp8_;
 #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = media;
+	_tmp9_ = media;
 #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = modify_tags_dialog_new (_tmp10_);
+	_tmp10_ = modify_tags_dialog_new (_tmp9_);
 #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dialog = _tmp11_;
+	dialog = _tmp10_;
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = dialog;
+	_tmp11_ = dialog;
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = modify_tags_dialog_execute (_tmp12_);
+	_tmp12_ = modify_tags_dialog_execute (_tmp11_);
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_tags = _tmp13_;
+	new_tags = _tmp12_;
 #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = new_tags;
+	_tmp13_ = new_tags;
 #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp14_ == NULL) {
+	if (_tmp13_ == NULL) {
 #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (new_tags);
 #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4938,46 +5253,47 @@ static void media_page_on_modify_tags (MediaPage* self) {
 		_g_object_unref0 (media);
 #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4942 "MediaPage.c"
+#line 5257 "MediaPage.c"
 	}
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = media;
+	_tmp16_ = media;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = new_tags;
+	_tmp17_ = new_tags;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = modify_tags_command_new (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp18_ = modify_tags_command_new (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_COMMAND, Command));
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp19_);
 #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_command_manager_unref0 (_tmp16_);
+	_command_manager_unref0 (_tmp15_);
 #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (new_tags);
 #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 4968 "MediaPage.c"
+#line 5283 "MediaPage.c"
 }
 
 
-static void media_page_set_display_tags (MediaPage* self, gboolean display) {
+static void
+media_page_set_display_tags (MediaPage* self,
+                             gboolean display)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
-	gboolean _tmp4_;
-	GValue _tmp5_ = {0};
+	GValue _tmp4_ = {0};
+	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	gboolean _tmp8_;
 #line 675 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 676 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4993,38 +5309,35 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = display;
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
+	g_value_init (&_tmp4_, G_TYPE_BOOLEAN);
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_boolean (&_tmp5_, _tmp4_);
+	g_value_set_boolean (&_tmp4_, display);
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp5_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp4_, NULL, NULL);
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
+	G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL;
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
 #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
 #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp6_);
 #line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = display;
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
-#line 5020 "MediaPage.c"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", display);
+#line 5332 "MediaPage.c"
 }
 
 
-static void media_page_on_new_event (MediaPage* self) {
+static void
+media_page_on_new_event (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 #line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5032,70 +5345,69 @@ static void media_page_on_new_event (MediaPage* self) {
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ > 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) > 0;
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
-#line 5043 "MediaPage.c"
+	if (_tmp2_) {
+#line 5354 "MediaPage.c"
+		CommandManager* _tmp3_;
 		CommandManager* _tmp4_;
-		CommandManager* _tmp5_;
+		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
-		ViewCollection* _tmp7_;
+		GeeList* _tmp7_;
 		GeeList* _tmp8_;
-		GeeList* _tmp9_;
+		NewEventCommand* _tmp9_;
 		NewEventCommand* _tmp10_;
-		NewEventCommand* _tmp11_;
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp8_ = view_collection_get_selected (_tmp7_);
+		_tmp7_ = view_collection_get_selected (_tmp6_);
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp10_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp9_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp10_);
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp8_);
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp7_);
+		_data_collection_unref0 (_tmp6_);
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp5_);
-#line 5078 "MediaPage.c"
+		_command_manager_unref0 (_tmp4_);
+#line 5389 "MediaPage.c"
 	}
 }
 
 
-static void media_page_on_flag_unflag (MediaPage* self) {
+static void
+media_page_on_flag_unflag (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	GeeCollection* sources = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
-	GeeList* _tmp6_;
-	GeeCollection* _tmp7_;
+	GeeList* _tmp5_;
+	GeeCollection* _tmp6_;
 	gboolean flag = FALSE;
-	CommandManager* _tmp20_;
-	CommandManager* _tmp21_;
-	GeeCollection* _tmp22_;
-	gboolean _tmp23_;
-	FlagUnflagCommand* _tmp24_;
-	FlagUnflagCommand* _tmp25_;
+	CommandManager* _tmp17_;
+	CommandManager* _tmp18_;
+	GeeCollection* _tmp19_;
+	gboolean _tmp20_;
+	FlagUnflagCommand* _tmp21_;
+	FlagUnflagCommand* _tmp22_;
 #line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5103,98 +5415,90 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 690 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5116 "MediaPage.c"
+#line 5426 "MediaPage.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_MEDIA_SOURCE);
+	_tmp5_ = view_collection_get_selected_sources_of_type (_tmp4_, TYPE_MEDIA_SOURCE);
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sources = _tmp7_;
+	sources = _tmp6_;
 #line 696 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 5132 "MediaPage.c"
+#line 5442 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp8_;
-		GeeIterator* _tmp9_;
+		GeeCollection* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp8_ = sources;
+		_tmp7_ = sources;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_source_it = _tmp9_;
+		_source_it = _tmp8_;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5145 "MediaPage.c"
-			GeeIterator* _tmp10_;
-			gboolean _tmp11_;
+#line 5455 "MediaPage.c"
+			GeeIterator* _tmp9_;
 			MediaSource* source = NULL;
-			GeeIterator* _tmp12_;
-			gpointer _tmp13_;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
 			Flaggable* flaggable = NULL;
-			MediaSource* _tmp14_;
+			MediaSource* _tmp12_;
+			Flaggable* _tmp13_;
+			gboolean _tmp14_ = FALSE;
 			Flaggable* _tmp15_;
-			gboolean _tmp16_ = FALSE;
-			Flaggable* _tmp17_;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp10_ = _source_it;
-#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp11_ = gee_iterator_next (_tmp10_);
+			_tmp9_ = _source_it;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (!_tmp11_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5164 "MediaPage.c"
+#line 5471 "MediaPage.c"
 			}
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp12_ = _source_it;
+			_tmp10_ = _source_it;
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp13_ = gee_iterator_get (_tmp12_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			source = (MediaSource*) _tmp13_;
+			source = (MediaSource*) _tmp11_;
 #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp14_ = source;
+			_tmp12_ = source;
 #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
+			_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp12_) : NULL);
 #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			flaggable = _tmp15_;
-#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = flaggable;
+			flaggable = _tmp13_;
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp17_ != NULL) {
-#line 5182 "MediaPage.c"
-				Flaggable* _tmp18_;
-				gboolean _tmp19_;
+			_tmp15_ = flaggable;
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp18_ = flaggable;
+			if (_tmp15_ != NULL) {
+#line 5489 "MediaPage.c"
+				Flaggable* _tmp16_;
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp19_ = flaggable_is_flagged (_tmp18_);
+				_tmp16_ = flaggable;
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp16_ = !_tmp19_;
-#line 5191 "MediaPage.c"
+				_tmp14_ = !flaggable_is_flagged (_tmp16_);
+#line 5495 "MediaPage.c"
 			} else {
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp16_ = FALSE;
-#line 5195 "MediaPage.c"
+				_tmp14_ = FALSE;
+#line 5499 "MediaPage.c"
 			}
 #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp16_) {
+			if (_tmp14_) {
 #line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				flag = TRUE;
 #line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5203,386 +5507,418 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 				_g_object_unref0 (source);
 #line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5207 "MediaPage.c"
+#line 5511 "MediaPage.c"
 			}
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 5213 "MediaPage.c"
+#line 5517 "MediaPage.c"
 		}
 #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 5217 "MediaPage.c"
+#line 5521 "MediaPage.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = _tmp20_;
+	_tmp18_ = _tmp17_;
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = sources;
+	_tmp19_ = sources;
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = flag;
+	_tmp20_ = flag;
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = flag_unflag_command_new (_tmp22_, _tmp23_);
+	_tmp21_ = flag_unflag_command_new (_tmp19_, _tmp20_);
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = _tmp24_;
+	_tmp22_ = _tmp21_;
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp25_);
+	_g_object_unref0 (_tmp22_);
 #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_command_manager_unref0 (_tmp21_);
+	_command_manager_unref0 (_tmp18_);
 #line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 5239 "MediaPage.c"
+#line 5543 "MediaPage.c"
 }
 
 
-static void media_page_real_on_increase_rating (MediaPage* self) {
+static void
+media_page_real_on_increase_rating (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	SetRatingCommand* command = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
+	SetRatingCommand* _tmp7_;
 	SetRatingCommand* _tmp8_;
-	SetRatingCommand* _tmp9_;
+	CommandManager* _tmp9_;
 	CommandManager* _tmp10_;
-	CommandManager* _tmp11_;
-	SetRatingCommand* _tmp12_;
+	SetRatingCommand* _tmp11_;
 #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5272 "MediaPage.c"
+#line 5575 "MediaPage.c"
 	}
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected (_tmp5_);
+	_tmp5_ = view_collection_get_selected (_tmp4_);
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), TRUE);
+	_tmp7_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), TRUE);
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command = _tmp9_;
+	command = _tmp8_;
 #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = command;
+	_tmp11_ = command;
 #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
 #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_command_manager_unref0 (_tmp11_);
+	_command_manager_unref0 (_tmp10_);
 #line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
 #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5306 "MediaPage.c"
+#line 5609 "MediaPage.c"
 }
 
 
-void media_page_on_increase_rating (MediaPage* self) {
+void
+media_page_on_increase_rating (MediaPage* self)
+{
 #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 5315 "MediaPage.c"
+#line 5620 "MediaPage.c"
 }
 
 
-static void media_page_real_on_decrease_rating (MediaPage* self) {
+static void
+media_page_real_on_decrease_rating (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	SetRatingCommand* command = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
+	SetRatingCommand* _tmp7_;
 	SetRatingCommand* _tmp8_;
-	SetRatingCommand* _tmp9_;
+	CommandManager* _tmp9_;
 	CommandManager* _tmp10_;
-	CommandManager* _tmp11_;
-	SetRatingCommand* _tmp12_;
+	SetRatingCommand* _tmp11_;
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5348 "MediaPage.c"
+#line 5652 "MediaPage.c"
 	}
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected (_tmp5_);
+	_tmp5_ = view_collection_get_selected (_tmp4_);
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), FALSE);
+	_tmp7_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), FALSE);
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command = _tmp9_;
+	command = _tmp8_;
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = command;
+	_tmp11_ = command;
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
 #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_command_manager_unref0 (_tmp11_);
+	_command_manager_unref0 (_tmp10_);
 #line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
 #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5382 "MediaPage.c"
+#line 5686 "MediaPage.c"
 }
 
 
-void media_page_on_decrease_rating (MediaPage* self) {
+void
+media_page_on_decrease_rating (MediaPage* self)
+{
 #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 5391 "MediaPage.c"
+#line 5697 "MediaPage.c"
 }
 
 
-static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
+static void
+media_page_real_on_set_rating (MediaPage* self,
+                               Rating rating)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	SetRatingCommand* command = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
-	Rating _tmp8_;
-	SetRatingCommand* _tmp9_;
-	SetRatingCommand* _tmp10_;
-	CommandManager* _tmp11_;
-	CommandManager* _tmp12_;
-	SetRatingCommand* _tmp13_;
+	SetRatingCommand* _tmp7_;
+	SetRatingCommand* _tmp8_;
+	CommandManager* _tmp9_;
+	CommandManager* _tmp10_;
+	SetRatingCommand* _tmp11_;
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5425 "MediaPage.c"
+#line 5730 "MediaPage.c"
 	}
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected (_tmp5_);
+	_tmp4_ = _tmp3_;
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp5_ = view_collection_get_selected (_tmp4_);
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = rating;
+	_tmp6_ = _tmp5_;
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), _tmp8_);
+	_tmp7_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), rating);
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command = _tmp10_;
+	command = _tmp8_;
 #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp10_ = _tmp9_;
 #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = command;
+	_tmp11_ = command;
 #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
 #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_command_manager_unref0 (_tmp12_);
+	_command_manager_unref0 (_tmp10_);
 #line 736 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
 #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5461 "MediaPage.c"
+#line 5764 "MediaPage.c"
 }
 
 
-void media_page_on_set_rating (MediaPage* self, Rating rating) {
+void
+media_page_on_set_rating (MediaPage* self,
+                          Rating rating)
+{
 #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 5470 "MediaPage.c"
+#line 5776 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_rejected (MediaPage* self) {
+static void
+media_page_real_on_rate_rejected (MediaPage* self)
+{
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 5477 "MediaPage.c"
+#line 5785 "MediaPage.c"
 }
 
 
-void media_page_on_rate_rejected (MediaPage* self) {
+void
+media_page_on_rate_rejected (MediaPage* self)
+{
 #line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 5486 "MediaPage.c"
+#line 5796 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_unrated (MediaPage* self) {
+static void
+media_page_real_on_rate_unrated (MediaPage* self)
+{
 #line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 5493 "MediaPage.c"
+#line 5805 "MediaPage.c"
 }
 
 
-void media_page_on_rate_unrated (MediaPage* self) {
+void
+media_page_on_rate_unrated (MediaPage* self)
+{
 #line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 5502 "MediaPage.c"
+#line 5816 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_one (MediaPage* self) {
+static void
+media_page_real_on_rate_one (MediaPage* self)
+{
 #line 748 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 5509 "MediaPage.c"
+#line 5825 "MediaPage.c"
 }
 
 
-void media_page_on_rate_one (MediaPage* self) {
+void
+media_page_on_rate_one (MediaPage* self)
+{
 #line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 5518 "MediaPage.c"
+#line 5836 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_two (MediaPage* self) {
+static void
+media_page_real_on_rate_two (MediaPage* self)
+{
 #line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 5525 "MediaPage.c"
+#line 5845 "MediaPage.c"
 }
 
 
-void media_page_on_rate_two (MediaPage* self) {
+void
+media_page_on_rate_two (MediaPage* self)
+{
 #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 5534 "MediaPage.c"
+#line 5856 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_three (MediaPage* self) {
+static void
+media_page_real_on_rate_three (MediaPage* self)
+{
 #line 756 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 5541 "MediaPage.c"
+#line 5865 "MediaPage.c"
 }
 
 
-void media_page_on_rate_three (MediaPage* self) {
+void
+media_page_on_rate_three (MediaPage* self)
+{
 #line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 5550 "MediaPage.c"
+#line 5876 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_four (MediaPage* self) {
+static void
+media_page_real_on_rate_four (MediaPage* self)
+{
 #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 5557 "MediaPage.c"
+#line 5885 "MediaPage.c"
 }
 
 
-void media_page_on_rate_four (MediaPage* self) {
+void
+media_page_on_rate_four (MediaPage* self)
+{
 #line 759 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 759 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 5566 "MediaPage.c"
+#line 5896 "MediaPage.c"
 }
 
 
-static void media_page_real_on_rate_five (MediaPage* self) {
+static void
+media_page_real_on_rate_five (MediaPage* self)
+{
 #line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 5573 "MediaPage.c"
+#line 5905 "MediaPage.c"
 }
 
 
-void media_page_on_rate_five (MediaPage* self) {
+void
+media_page_on_rate_five (MediaPage* self)
+{
 #line 763 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 763 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 5582 "MediaPage.c"
+#line 5916 "MediaPage.c"
 }
 
 
-static void media_page_on_remove_from_library (MediaPage* self) {
+static void
+media_page_on_remove_from_library (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
@@ -5603,11 +5939,13 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 5607 "MediaPage.c"
+#line 5943 "MediaPage.c"
 }
 
 
-static void media_page_real_on_move_to_trash (MediaPage* self) {
+static void
+media_page_real_on_move_to_trash (MediaPage* self)
+{
 	CheckerboardItem* restore_point = NULL;
 	CheckerboardItem* _tmp0_;
 	GeeList* sources = NULL;
@@ -5617,17 +5955,16 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	GeeList* _tmp9_;
 	gboolean _tmp10_ = FALSE;
 	CheckerboardItem* _tmp11_;
+	ViewCollection* _tmp16_;
 	ViewCollection* _tmp17_;
-	ViewCollection* _tmp18_;
-	gint _tmp19_;
-	gboolean _tmp20_;
+	gboolean _tmp18_;
 #line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	restore_point = NULL;
 #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
 #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 5631 "MediaPage.c"
+#line 5968 "MediaPage.c"
 		ViewCollection* _tmp1_;
 		ViewCollection* _tmp2_;
 		CheckerboardItem* _tmp3_;
@@ -5647,7 +5984,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		if (_tmp5_ == NULL) {
 #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 5651 "MediaPage.c"
+#line 5988 "MediaPage.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
@@ -5655,7 +5992,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		restore_point = _tmp5_;
 #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 5659 "MediaPage.c"
+#line 5996 "MediaPage.c"
 	}
 #line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5673,11 +6010,10 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	_tmp11_ = restore_point;
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_ != NULL) {
-#line 5677 "MediaPage.c"
+#line 6014 "MediaPage.c"
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
 		CheckerboardItem* _tmp14_;
-		gboolean _tmp15_;
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5685,186 +6021,183 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = restore_point;
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp10_ = _tmp15_;
+		_tmp10_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 5694 "MediaPage.c"
+#line 6028 "MediaPage.c"
 	} else {
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = FALSE;
-#line 5698 "MediaPage.c"
+#line 6032 "MediaPage.c"
 	}
 #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp10_) {
-#line 5702 "MediaPage.c"
-		CheckerboardItem* _tmp16_;
+#line 6036 "MediaPage.c"
+		CheckerboardItem* _tmp15_;
 #line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = restore_point;
+		_tmp15_ = restore_point;
 #line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp16_);
-#line 5708 "MediaPage.c"
+		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp15_);
+#line 6042 "MediaPage.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = view_collection_get_selected_count (_tmp18_);
+	_tmp17_ = _tmp16_;
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = _tmp19_ > 0;
+	_tmp18_ = view_collection_get_selected_count (_tmp17_) > 0;
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp18_);
+	_data_collection_unref0 (_tmp17_);
 #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp20_) {
-#line 5722 "MediaPage.c"
-		CommandManager* _tmp21_;
-		CommandManager* _tmp22_;
-		GeeList* _tmp23_;
-		TrashUntrashPhotosCommand* _tmp24_;
-		TrashUntrashPhotosCommand* _tmp25_;
+	if (_tmp18_) {
+#line 6054 "MediaPage.c"
+		CommandManager* _tmp19_;
+		CommandManager* _tmp20_;
+		GeeList* _tmp21_;
+		TrashUntrashPhotosCommand* _tmp22_;
+		TrashUntrashPhotosCommand* _tmp23_;
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp19_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = _tmp21_;
+		_tmp20_ = _tmp19_;
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp23_ = sources;
+		_tmp21_ = sources;
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp24_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
+		_tmp22_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp25_ = _tmp24_;
+		_tmp23_ = _tmp22_;
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp25_);
+		_g_object_unref0 (_tmp23_);
 #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp22_);
-#line 5744 "MediaPage.c"
+		_command_manager_unref0 (_tmp20_);
+#line 6076 "MediaPage.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 5750 "MediaPage.c"
+#line 6082 "MediaPage.c"
 }
 
 
-void media_page_on_move_to_trash (MediaPage* self) {
+void
+media_page_on_move_to_trash (MediaPage* self)
+{
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 5759 "MediaPage.c"
+#line 6093 "MediaPage.c"
 }
 
 
-static void media_page_real_on_edit_title (MediaPage* self) {
+static void
+media_page_real_on_edit_title (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	GeeList* media_sources = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
 	EditTitleDialog* edit_title_dialog = NULL;
-	GeeList* _tmp8_;
-	gpointer _tmp9_;
-	MediaSource* _tmp10_;
+	GeeList* _tmp7_;
+	gpointer _tmp8_;
+	MediaSource* _tmp9_;
+	gchar* _tmp10_;
 	gchar* _tmp11_;
-	gchar* _tmp12_;
+	EditTitleDialog* _tmp12_;
 	EditTitleDialog* _tmp13_;
-	EditTitleDialog* _tmp14_;
 	gchar* new_title = NULL;
-	EditTitleDialog* _tmp15_;
-	gchar* _tmp16_;
-	const gchar* _tmp17_;
+	EditTitleDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 793 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5799 "MediaPage.c"
+#line 6132 "MediaPage.c"
 	}
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
+	_tmp5_ = view_collection_get_selected_sources (_tmp4_);
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_sources = _tmp7_;
+	media_sources = _tmp6_;
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = media_sources;
+	_tmp7_ = media_sources;
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = gee_list_get (_tmp8_, 0);
+	_tmp8_ = gee_list_get (_tmp7_, 0);
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = (MediaSource*) _tmp9_;
+	_tmp9_ = (MediaSource*) _tmp8_;
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = media_source_get_title (_tmp10_);
+	_tmp10_ = media_source_get_title (_tmp9_);
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = edit_title_dialog_new (_tmp12_);
+	_tmp12_ = edit_title_dialog_new (_tmp11_);
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp11_);
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_title_dialog = _tmp14_;
+	edit_title_dialog = _tmp13_;
 #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = edit_title_dialog;
+	_tmp14_ = edit_title_dialog;
 #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = edit_title_dialog_execute (_tmp15_);
+	_tmp15_ = edit_title_dialog_execute (_tmp14_);
 #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_title = _tmp16_;
+	new_title = _tmp15_;
 #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = new_title;
+	_tmp16_ = new_title;
 #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp17_ != NULL) {
-#line 5843 "MediaPage.c"
+	if (_tmp16_ != NULL) {
+#line 6176 "MediaPage.c"
+		CommandManager* _tmp17_;
 		CommandManager* _tmp18_;
-		CommandManager* _tmp19_;
-		GeeList* _tmp20_;
-		const gchar* _tmp21_;
+		GeeList* _tmp19_;
+		const gchar* _tmp20_;
+		EditMultipleTitlesCommand* _tmp21_;
 		EditMultipleTitlesCommand* _tmp22_;
-		EditMultipleTitlesCommand* _tmp23_;
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = media_sources;
+		_tmp19_ = media_sources;
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = new_title;
+		_tmp20_ = new_title;
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = edit_multiple_titles_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
+		_tmp21_ = edit_multiple_titles_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp23_ = _tmp22_;
+		_tmp22_ = _tmp21_;
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp23_);
+		_g_object_unref0 (_tmp22_);
 #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp19_);
-#line 5868 "MediaPage.c"
+		_command_manager_unref0 (_tmp18_);
+#line 6201 "MediaPage.c"
 	}
 #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
@@ -5872,125 +6205,126 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 5876 "MediaPage.c"
+#line 6209 "MediaPage.c"
 }
 
 
-void media_page_on_edit_title (MediaPage* self) {
+void
+media_page_on_edit_title (MediaPage* self)
+{
 #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 5885 "MediaPage.c"
+#line 6220 "MediaPage.c"
 }
 
 
-static void media_page_real_on_edit_comment (MediaPage* self) {
+static void
+media_page_real_on_edit_comment (MediaPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	GeeList* media_sources = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
 	EditCommentDialog* edit_comment_dialog = NULL;
-	GeeList* _tmp8_;
-	gpointer _tmp9_;
-	MediaSource* _tmp10_;
+	GeeList* _tmp7_;
+	gpointer _tmp8_;
+	MediaSource* _tmp9_;
+	gchar* _tmp10_;
 	gchar* _tmp11_;
-	gchar* _tmp12_;
+	EditCommentDialog* _tmp12_;
 	EditCommentDialog* _tmp13_;
-	EditCommentDialog* _tmp14_;
 	gchar* new_comment = NULL;
-	EditCommentDialog* _tmp15_;
-	gchar* _tmp16_;
-	const gchar* _tmp17_;
+	EditCommentDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5925 "MediaPage.c"
+#line 6259 "MediaPage.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
+	_tmp5_ = view_collection_get_selected_sources (_tmp4_);
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_sources = _tmp7_;
+	media_sources = _tmp6_;
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = media_sources;
+	_tmp7_ = media_sources;
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = gee_list_get (_tmp8_, 0);
+	_tmp8_ = gee_list_get (_tmp7_, 0);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = (MediaSource*) _tmp9_;
+	_tmp9_ = (MediaSource*) _tmp8_;
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = media_source_get_comment (_tmp10_);
+	_tmp10_ = media_source_get_comment (_tmp9_);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = edit_comment_dialog_new (_tmp12_, FALSE);
+	_tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp11_);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_comment_dialog = _tmp14_;
+	edit_comment_dialog = _tmp13_;
 #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = edit_comment_dialog;
+	_tmp14_ = edit_comment_dialog;
 #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = edit_comment_dialog_execute (_tmp15_);
+	_tmp15_ = edit_comment_dialog_execute (_tmp14_);
 #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_comment = _tmp16_;
+	new_comment = _tmp15_;
 #line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = new_comment;
+	_tmp16_ = new_comment;
 #line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp17_ != NULL) {
-#line 5969 "MediaPage.c"
+	if (_tmp16_ != NULL) {
+#line 6303 "MediaPage.c"
+		CommandManager* _tmp17_;
 		CommandManager* _tmp18_;
-		CommandManager* _tmp19_;
-		GeeList* _tmp20_;
-		const gchar* _tmp21_;
+		GeeList* _tmp19_;
+		const gchar* _tmp20_;
+		EditMultipleCommentsCommand* _tmp21_;
 		EditMultipleCommentsCommand* _tmp22_;
-		EditMultipleCommentsCommand* _tmp23_;
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = media_sources;
+		_tmp19_ = media_sources;
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = new_comment;
+		_tmp20_ = new_comment;
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = edit_multiple_comments_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
+		_tmp21_ = edit_multiple_comments_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp23_ = _tmp22_;
+		_tmp22_ = _tmp21_;
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp23_);
+		_g_object_unref0 (_tmp22_);
 #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp19_);
-#line 5994 "MediaPage.c"
+		_command_manager_unref0 (_tmp18_);
+#line 6328 "MediaPage.c"
 	}
 #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
@@ -5998,289 +6332,288 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6002 "MediaPage.c"
+#line 6336 "MediaPage.c"
 }
 
 
-void media_page_on_edit_comment (MediaPage* self) {
+void
+media_page_on_edit_comment (MediaPage* self)
+{
 #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 6011 "MediaPage.c"
+#line 6347 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
+static void
+media_page_real_on_display_titles (MediaPage* self,
+                                   GSimpleAction* action,
+                                   GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 818 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+	configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
 #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = action;
-#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = value;
+	_g_object_unref0 (_tmp1_);
 #line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6047 "MediaPage.c"
+	g_simple_action_set_state (action, value);
+#line 6375 "MediaPage.c"
 }
 
 
-void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
+void
+media_page_on_display_titles (MediaPage* self,
+                              GSimpleAction* action,
+                              GVariant* value)
+{
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
-#line 6056 "MediaPage.c"
+#line 6388 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
+static void
+media_page_real_on_display_comments (MediaPage* self,
+                                     GSimpleAction* action,
+                                     GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	configuration_facade_set_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+	configuration_facade_set_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
 #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = action;
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = value;
+	_g_object_unref0 (_tmp1_);
 #line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6092 "MediaPage.c"
+	g_simple_action_set_state (action, value);
+#line 6416 "MediaPage.c"
 }
 
 
-void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
+void
+media_page_on_display_comments (MediaPage* self,
+                                GSimpleAction* action,
+                                GVariant* value)
+{
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
-#line 6101 "MediaPage.c"
+#line 6429 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
+static void
+media_page_real_on_display_ratings (MediaPage* self,
+                                    GSimpleAction* action,
+                                    GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
-#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, display);
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
 #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = action;
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = value;
+	_g_object_unref0 (_tmp1_);
 #line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6137 "MediaPage.c"
+	g_simple_action_set_state (action, value);
+#line 6457 "MediaPage.c"
 }
 
 
-void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
+void
+media_page_on_display_ratings (MediaPage* self,
+                               GSimpleAction* action,
+                               GVariant* value)
+{
 #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
-#line 6146 "MediaPage.c"
+#line 6470 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
+static void
+media_page_real_on_display_tags (MediaPage* self,
+                                 GSimpleAction* action,
+                                 GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, display);
 #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	configuration_facade_set_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+	configuration_facade_set_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
 #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = action;
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = value;
+	_g_object_unref0 (_tmp1_);
 #line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6182 "MediaPage.c"
+	g_simple_action_set_state (action, value);
+#line 6498 "MediaPage.c"
 }
 
 
-void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
+void
+media_page_on_display_tags (MediaPage* self,
+                            GSimpleAction* action,
+                            GVariant* value)
+{
 #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
-#line 6191 "MediaPage.c"
+#line 6511 "MediaPage.c"
 }
 
 
-static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
+static void
+media_page_real_get_config_photos_sort (MediaPage* self,
+                                        gboolean* sort_order,
+                                        gint* sort_by)
+{
 #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6200 "MediaPage.c"
+#line 6524 "MediaPage.c"
 }
 
 
-void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
+void
+media_page_get_config_photos_sort (MediaPage* self,
+                                   gboolean* sort_order,
+                                   gint* sort_by)
+{
 #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 6209 "MediaPage.c"
+#line 6537 "MediaPage.c"
 }
 
 
-static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
+static void
+media_page_real_set_config_photos_sort (MediaPage* self,
+                                        gboolean sort_order,
+                                        gint sort_by)
+{
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6218 "MediaPage.c"
+#line 6550 "MediaPage.c"
 }
 
 
-void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
+void
+media_page_set_config_photos_sort (MediaPage* self,
+                                   gboolean sort_order,
+                                   gint sort_by)
+{
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 6227 "MediaPage.c"
+#line 6563 "MediaPage.c"
 }
 
 
-static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_;
-	GVariant* _tmp1_;
+static void
+media_page_real_on_sort_changed (MediaPage* self,
+                                 GSimpleAction* action,
+                                 GVariant* value)
+{
 	gint sort_by = 0;
-	gint _tmp2_;
 	gboolean sort_order = FALSE;
-	gboolean _tmp3_;
 #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = action;
-#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = value;
-#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_get_menu_sort_by (self);
+	g_simple_action_set_state (action, value);
 #line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_by = _tmp2_;
+	sort_by = media_page_get_menu_sort_by (self);
 #line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_page_get_menu_sort_order (self);
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order = _tmp3_;
+	sort_order = media_page_get_menu_sort_order (self);
 #line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_order);
 #line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 6258 "MediaPage.c"
+#line 6586 "MediaPage.c"
 }
 
 
-void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
+void
+media_page_on_sort_changed (MediaPage* self,
+                            GSimpleAction* action,
+                            GVariant* value)
+{
 #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
-#line 6267 "MediaPage.c"
+#line 6599 "MediaPage.c"
 }
 
 
-static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
+static void
+media_page_on_raw_developer_changed (MediaPage* self,
+                                     GSimpleAction* action,
+                                     GVariant* value)
+{
 	RawDeveloper developer = 0;
-	GVariant* _tmp0_;
+	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	GQuark _tmp4_ = 0U;
+	GQuark _tmp3_ = 0U;
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp3_label0 = 0;
+	static GQuark _tmp2_label0 = 0;
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp3_label1 = 0;
-#line 6281 "MediaPage.c"
-	RawDeveloper _tmp5_;
-	GSimpleAction* _tmp6_;
-	GVariant* _tmp7_;
+	static GQuark _tmp2_label1 = 0;
+#line 6616 "MediaPage.c"
+	RawDeveloper _tmp4_;
 #line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6288,353 +6621,328 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 #line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
+	_tmp0_ = g_variant_get_string (value, NULL);
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
+	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
+	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6303 "MediaPage.c"
+#line 6634 "MediaPage.c"
 			default:
 			{
 #line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6310 "MediaPage.c"
+#line 6641 "MediaPage.c"
 			}
 		}
-	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
+	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("Camera")))) {
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6316 "MediaPage.c"
+#line 6647 "MediaPage.c"
 			default:
 			{
 #line 874 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6323 "MediaPage.c"
+#line 6654 "MediaPage.c"
 			}
 		}
 	} else {
 #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6329 "MediaPage.c"
+#line 6660 "MediaPage.c"
 			default:
 			{
 #line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6334 "MediaPage.c"
+#line 6665 "MediaPage.c"
 			}
 		}
 	}
 #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = developer;
+	_tmp4_ = developer;
 #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_developer_changed (self, _tmp5_);
-#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = action;
+	media_page_developer_changed (self, _tmp4_);
 #line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = value;
-#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 6348 "MediaPage.c"
+	g_simple_action_set_state (action, value);
+#line 6675 "MediaPage.c"
 }
 
 
-static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) {
+static void
+media_page_real_developer_changed (MediaPage* self,
+                                   RawDeveloper rd)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	gboolean need_warn = FALSE;
 	GeeArrayList* to_set = NULL;
-	GeeArrayList* _tmp4_;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_;
+	GeeArrayList* _tmp3_;
+	gboolean _tmp26_ = FALSE;
+	gboolean _tmp27_;
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6376 "MediaPage.c"
+#line 6703 "MediaPage.c"
 	}
 #line 892 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
 #line 895 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 895 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	to_set = _tmp4_;
-#line 6384 "MediaPage.c"
+	to_set = _tmp3_;
+#line 6711 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
+		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
-		ViewCollection* _tmp6_;
+		GeeList* _tmp6_;
 		GeeList* _tmp7_;
-		GeeList* _tmp8_;
 		gint _view_size = 0;
-		GeeList* _tmp9_;
+		GeeList* _tmp8_;
+		gint _tmp9_;
 		gint _tmp10_;
-		gint _tmp11_;
 		gint _view_index = 0;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp7_ = view_collection_get_selected (_tmp6_);
+		_tmp6_ = view_collection_get_selected (_tmp5_);
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp6_);
+		_data_collection_unref0 (_tmp5_);
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_view_list = _tmp8_;
+		_view_list = _tmp7_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp9_ = _view_list;
+		_tmp8_ = _view_list;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_view_size = _tmp11_;
+		_view_size = _tmp10_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 6420 "MediaPage.c"
+#line 6747 "MediaPage.c"
+			gint _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
-			gint _tmp14_;
 			DataView* view = NULL;
-			GeeList* _tmp15_;
-			gint _tmp16_;
-			gpointer _tmp17_;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gpointer _tmp16_;
 			Photo* p = NULL;
-			DataView* _tmp18_;
-			DataSource* _tmp19_;
-			Photo* _tmp20_;
-			gboolean _tmp21_ = FALSE;
-			Photo* _tmp22_;
+			DataView* _tmp17_;
+			DataSource* _tmp18_;
+			Photo* _tmp19_;
+			gboolean _tmp20_ = FALSE;
+			Photo* _tmp21_;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp12_ = _view_index;
+			_tmp11_ = _view_index;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_view_index = _tmp12_ + 1;
+			_view_index = _tmp11_ + 1;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp13_ = _view_index;
+			_tmp12_ = _view_index;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp14_ = _view_size;
+			_tmp13_ = _view_size;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (!(_tmp13_ < _tmp14_)) {
+			if (!(_tmp12_ < _tmp13_)) {
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6446 "MediaPage.c"
+#line 6773 "MediaPage.c"
 			}
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp15_ = _view_list;
+			_tmp14_ = _view_list;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp16_ = _view_index;
+			_tmp15_ = _view_index;
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
+			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			view = (DataView*) _tmp17_;
+			view = (DataView*) _tmp16_;
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp18_ = view;
+			_tmp17_ = view;
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp19_ = data_view_get_source (_tmp18_);
+			_tmp18_ = data_view_get_source (_tmp17_);
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
+			_tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_PHOTO) ? ((Photo*) _tmp18_) : NULL;
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp20_ == NULL) {
+			if (_tmp19_ == NULL) {
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_g_object_unref0 (_tmp19_);
-#line 6466 "MediaPage.c"
+				_g_object_unref0 (_tmp18_);
+#line 6793 "MediaPage.c"
 			}
 #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			p = _tmp20_;
-#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp22_ = p;
-#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp22_ != NULL) {
-#line 6474 "MediaPage.c"
-				RawDeveloper _tmp23_;
-				Photo* _tmp24_;
-				RawDeveloper _tmp25_;
-				gboolean _tmp26_;
+			p = _tmp19_;
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp23_ = rd;
+			_tmp21_ = p;
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp24_ = p;
+			if (_tmp21_ != NULL) {
+#line 6801 "MediaPage.c"
+				Photo* _tmp22_;
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp25_ = photo_get_raw_developer (_tmp24_);
+				_tmp22_ = p;
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
-#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp21_ = !_tmp26_;
-#line 6489 "MediaPage.c"
+				_tmp20_ = !raw_developer_is_equivalent (rd, photo_get_raw_developer (_tmp22_));
+#line 6807 "MediaPage.c"
 			} else {
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp21_ = FALSE;
-#line 6493 "MediaPage.c"
+				_tmp20_ = FALSE;
+#line 6811 "MediaPage.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp21_) {
-#line 6497 "MediaPage.c"
-				GeeArrayList* _tmp27_;
-				DataView* _tmp28_;
-				Photo* _tmp29_;
-				gboolean _tmp30_;
+			if (_tmp20_) {
+#line 6815 "MediaPage.c"
+				GeeArrayList* _tmp23_;
+				DataView* _tmp24_;
+				Photo* _tmp25_;
 #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp27_ = to_set;
+				_tmp23_ = to_set;
 #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp28_ = view;
+				_tmp24_ = view;
 #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
 #line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp29_ = p;
+				_tmp25_ = p;
 #line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp30_ = photo_has_transformations (_tmp29_);
-#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp30_) {
+				if (photo_has_transformations (_tmp25_)) {
 #line 902 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 6516 "MediaPage.c"
+#line 6831 "MediaPage.c"
 				}
 			}
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6523 "MediaPage.c"
+#line 6838 "MediaPage.c"
 		}
 #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6527 "MediaPage.c"
+#line 6842 "MediaPage.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = need_warn;
+	_tmp27_ = need_warn;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (!_tmp32_) {
+	if (!_tmp27_) {
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp31_ = TRUE;
-#line 6535 "MediaPage.c"
+		_tmp26_ = TRUE;
+#line 6850 "MediaPage.c"
 	} else {
-		GeeArrayList* _tmp33_;
-		gint _tmp34_;
-		gint _tmp35_;
-		gboolean _tmp36_;
+		GeeArrayList* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp33_ = to_set;
+		_tmp28_ = to_set;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp35_ = _tmp34_;
+		_tmp30_ = _tmp29_;
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp31_ = _tmp36_;
-#line 6551 "MediaPage.c"
+		_tmp26_ = dialogs_confirm_warn_developer_changed (_tmp30_);
+#line 6863 "MediaPage.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp31_) {
-#line 6555 "MediaPage.c"
+	if (_tmp26_) {
+#line 6867 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
-		GeeArrayList* _tmp37_;
-		RawDeveloper _tmp38_;
-		SetRawDeveloperCommand* _tmp39_;
-		CommandManager* _tmp40_;
-		CommandManager* _tmp41_;
-		SetRawDeveloperCommand* _tmp42_;
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp37_ = to_set;
+		GeeArrayList* _tmp31_;
+		SetRawDeveloperCommand* _tmp32_;
+		CommandManager* _tmp33_;
+		CommandManager* _tmp34_;
+		SetRawDeveloperCommand* _tmp35_;
 #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp38_ = rd;
+		_tmp31_ = to_set;
 #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp39_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ITERABLE, GeeIterable), _tmp38_);
+		_tmp32_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable), rd);
 #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command = _tmp39_;
+		command = _tmp32_;
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp40_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp41_ = _tmp40_;
+		_tmp34_ = _tmp33_;
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp42_ = command;
+		_tmp35_ = command;
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
 #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp41_);
+		_command_manager_unref0 (_tmp34_);
 #line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_update_development_menu_item_sensitivity (self);
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 6585 "MediaPage.c"
+#line 6894 "MediaPage.c"
 	}
 #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 6589 "MediaPage.c"
+#line 6898 "MediaPage.c"
 }
 
 
-void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
+void
+media_page_developer_changed (MediaPage* self,
+                              RawDeveloper rd)
+{
 #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 6598 "MediaPage.c"
+#line 6910 "MediaPage.c"
 }
 
 
-static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
+static void
+media_page_real_set_display_titles (CheckerboardPage* base,
+                                    gboolean display)
+{
 	MediaPage * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
 #line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = display;
-#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
+	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
 #line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = display;
-#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 6616 "MediaPage.c"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", display);
+#line 6925 "MediaPage.c"
 }
 
 
-static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display) {
+static void
+media_page_real_set_display_comments (CheckerboardPage* base,
+                                      gboolean display)
+{
 	MediaPage * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
 #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = display;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = display;
+	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
 #line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
-#line 6634 "MediaPage.c"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", display);
+#line 6940 "MediaPage.c"
 }
 
 
-static GAction* media_page_sort_by_title_action (MediaPage* self) {
+static GAction*
+media_page_sort_by_title_action (MediaPage* self)
+{
 	GAction* result = NULL;
 	GAction* action = NULL;
 	GAction* _tmp0_;
@@ -6650,11 +6958,13 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) {
 	result = action;
 #line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6654 "MediaPage.c"
+#line 6962 "MediaPage.c"
 }
 
 
-static GAction* media_page_sort_ascending_action (MediaPage* self) {
+static GAction*
+media_page_sort_ascending_action (MediaPage* self)
+{
 	GAction* result = NULL;
 	GAction* action = NULL;
 	GAction* _tmp0_;
@@ -6670,11 +6980,13 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) {
 	result = action;
 #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6674 "MediaPage.c"
+#line 6984 "MediaPage.c"
 }
 
 
-gint media_page_get_menu_sort_by (MediaPage* self) {
+gint
+media_page_get_menu_sort_by (MediaPage* self)
+{
 	gint result = 0;
 	GAction* _tmp0_;
 	GAction* _tmp1_;
@@ -6682,7 +6994,6 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 	GVariant* _tmp3_;
 	const gchar* _tmp4_;
 	gint _tmp5_;
-	gint _tmp6_;
 #line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6698,60 +7009,62 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = atoi (_tmp4_);
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp3_);
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6711 "MediaPage.c"
+#line 7020 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new30 (const gchar* value) {
+static GVariant*
+_variant_new30 (const gchar* value)
+{
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6718 "MediaPage.c"
+#line 7029 "MediaPage.c"
 }
 
 
-void media_page_set_menu_sort_by (MediaPage* self, gint val) {
+void
+media_page_set_menu_sort_by (MediaPage* self,
+                             gint val)
+{
 	gchar* sort = NULL;
-	gint _tmp0_;
-	gchar* _tmp1_;
+	gchar* _tmp0_;
+	GAction* _tmp1_;
 	GAction* _tmp2_;
-	GAction* _tmp3_;
-	GVariant* _tmp4_;
+	GVariant* _tmp3_;
 #line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = val;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_strdup_printf ("%d", _tmp0_);
+	_tmp0_ = g_strdup_printf ("%d", val);
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort = _tmp1_;
+	sort = _tmp0_;
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_sort_by_title_action (self);
+	_tmp1_ = media_page_sort_by_title_action (self);
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _variant_new30 (sort);
+	_tmp3_ = _variant_new30 (sort);
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp3_, _tmp4_);
+	g_action_change_state (_tmp2_, _tmp3_);
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp4_);
+	_g_variant_unref0 (_tmp3_);
 #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (sort);
-#line 6751 "MediaPage.c"
+#line 7062 "MediaPage.c"
 }
 
 
-gboolean media_page_get_menu_sort_order (MediaPage* self) {
+gboolean
+media_page_get_menu_sort_order (MediaPage* self)
+{
 	gboolean result = FALSE;
 	GAction* _tmp0_;
 	GAction* _tmp1_;
@@ -6781,190 +7094,238 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	result = _tmp5_;
 #line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6785 "MediaPage.c"
+#line 7098 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new31 (const gchar* value) {
+static GVariant*
+_variant_new31 (const gchar* value)
+{
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6792 "MediaPage.c"
+#line 7107 "MediaPage.c"
 }
 
 
-void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
+void
+media_page_set_menu_sort_order (MediaPage* self,
+                                gboolean ascending)
+{
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_;
+	GAction* _tmp1_;
 	GAction* _tmp2_;
-	GAction* _tmp3_;
-	GVariant* _tmp4_;
+	GVariant* _tmp3_;
 #line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = ascending;
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp1_) {
+	if (ascending) {
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "ascending";
-#line 6810 "MediaPage.c"
+#line 7125 "MediaPage.c"
 	} else {
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "descending";
-#line 6814 "MediaPage.c"
+#line 7129 "MediaPage.c"
 	}
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_sort_ascending_action (self);
+	_tmp1_ = media_page_sort_ascending_action (self);
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _variant_new31 (_tmp0_);
+	_tmp3_ = _variant_new31 (_tmp0_);
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp3_, _tmp4_);
+	g_action_change_state (_tmp2_, _tmp3_);
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp4_);
+	_g_variant_unref0 (_tmp3_);
 #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 6828 "MediaPage.c"
+	_g_object_unref0 (_tmp2_);
+#line 7143 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_title_ascending_comparator_comparator (void* a,
+                                                  void* b,
+                                                  gpointer self)
+{
 	gint64 result;
 	result = thumbnail_title_ascending_comparator (a, b);
 #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6837 "MediaPage.c"
+#line 7156 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_title_descending_comparator_comparator (void* a,
+                                                   void* b,
+                                                   gpointer self)
+{
 	gint64 result;
 	result = thumbnail_title_descending_comparator (a, b);
 #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6846 "MediaPage.c"
+#line 7169 "MediaPage.c"
 }
 
 
-static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
+static gboolean
+_thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object,
+                                                            Alteration* alteration,
+                                                            gpointer self)
+{
 	gboolean result;
 	result = thumbnail_title_comparator_predicate (object, alteration);
 #line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6855 "MediaPage.c"
+#line 7182 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_exposure_time_ascending_comparator_comparator (void* a,
+                                                          void* b,
+                                                          gpointer self)
+{
 	gint64 result;
 	result = thumbnail_exposure_time_ascending_comparator (a, b);
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6864 "MediaPage.c"
+#line 7195 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_exposure_time_desending_comparator_comparator (void* a,
+                                                          void* b,
+                                                          gpointer self)
+{
 	gint64 result;
 	result = thumbnail_exposure_time_desending_comparator (a, b);
 #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6873 "MediaPage.c"
+#line 7208 "MediaPage.c"
 }
 
 
-static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
+static gboolean
+_thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object,
+                                                                    Alteration* alteration,
+                                                                    gpointer self)
+{
 	gboolean result;
 	result = thumbnail_exposure_time_comparator_predicate (object, alteration);
 #line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6882 "MediaPage.c"
+#line 7221 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_rating_ascending_comparator_comparator (void* a,
+                                                   void* b,
+                                                   gpointer self)
+{
 	gint64 result;
 	result = thumbnail_rating_ascending_comparator (a, b);
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6891 "MediaPage.c"
+#line 7234 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_rating_descending_comparator_comparator (void* a,
+                                                    void* b,
+                                                    gpointer self)
+{
 	gint64 result;
 	result = thumbnail_rating_descending_comparator (a, b);
 #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6900 "MediaPage.c"
+#line 7247 "MediaPage.c"
 }
 
 
-static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
+static gboolean
+_thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object,
+                                                             Alteration* alteration,
+                                                             gpointer self)
+{
 	gboolean result;
 	result = thumbnail_rating_comparator_predicate (object, alteration);
 #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6909 "MediaPage.c"
+#line 7260 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_filename_ascending_comparator_comparator (void* a,
+                                                     void* b,
+                                                     gpointer self)
+{
 	gint64 result;
 	result = thumbnail_filename_ascending_comparator (a, b);
 #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6918 "MediaPage.c"
+#line 7273 "MediaPage.c"
 }
 
 
-static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_thumbnail_filename_descending_comparator_comparator (void* a,
+                                                      void* b,
+                                                      gpointer self)
+{
 	gint64 result;
 	result = thumbnail_filename_descending_comparator (a, b);
 #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6927 "MediaPage.c"
+#line 7286 "MediaPage.c"
 }
 
 
-static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
+static gboolean
+_thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object,
+                                                               Alteration* alteration,
+                                                               gpointer self)
+{
 	gboolean result;
 	result = thumbnail_filename_comparator_predicate (object, alteration);
 #line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6936 "MediaPage.c"
+#line 7299 "MediaPage.c"
 }
 
 
-static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gboolean ascending) {
+static void
+media_page_set_view_comparator (MediaPage* self,
+                                gint sort_by,
+                                gboolean ascending)
+{
 	Comparator comparator = NULL;
 	void* comparator_target = NULL;
 	GDestroyNotify comparator_target_destroy_notify = NULL;
 	ComparatorPredicate predicate = NULL;
 	void* predicate_target = NULL;
 	GDestroyNotify predicate_target_destroy_notify = NULL;
-	gint _tmp0_;
-	ViewCollection* _tmp8_;
-	ViewCollection* _tmp9_;
-	Comparator _tmp10_;
-	void* _tmp10__target;
-	ComparatorPredicate _tmp11_;
-	void* _tmp11__target;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	Comparator _tmp4_;
+	void* _tmp4__target;
+	ComparatorPredicate _tmp5_;
+	void* _tmp5__target;
 #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = sort_by;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	switch (_tmp0_) {
+	switch (sort_by) {
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 6962 "MediaPage.c"
+#line 7326 "MediaPage.c"
 		{
-			gboolean _tmp1_;
 #line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp1_ = ascending;
-#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp1_) {
+			if (ascending) {
 #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
 #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6979,7 +7340,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 6983 "MediaPage.c"
+#line 7344 "MediaPage.c"
 			} else {
 #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -6995,7 +7356,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 6999 "MediaPage.c"
+#line 7360 "MediaPage.c"
 			}
 #line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7013,17 +7374,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7017 "MediaPage.c"
+#line 7378 "MediaPage.c"
 		}
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 7021 "MediaPage.c"
+#line 7382 "MediaPage.c"
 		{
-			gboolean _tmp2_;
 #line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp2_ = ascending;
-#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp2_) {
+			if (ascending) {
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7038,7 +7396,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7042 "MediaPage.c"
+#line 7400 "MediaPage.c"
 			} else {
 #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7054,7 +7412,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7058 "MediaPage.c"
+#line 7416 "MediaPage.c"
 			}
 #line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7072,17 +7430,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 975 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7076 "MediaPage.c"
+#line 7434 "MediaPage.c"
 		}
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 7080 "MediaPage.c"
+#line 7438 "MediaPage.c"
 		{
-			gboolean _tmp3_;
-#line 978 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp3_ = ascending;
 #line 978 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp3_) {
+			if (ascending) {
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7097,7 +7452,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7101 "MediaPage.c"
+#line 7456 "MediaPage.c"
 			} else {
 #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7113,7 +7468,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7117 "MediaPage.c"
+#line 7472 "MediaPage.c"
 			}
 #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7131,17 +7486,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7135 "MediaPage.c"
+#line 7490 "MediaPage.c"
 		}
 #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 7139 "MediaPage.c"
+#line 7494 "MediaPage.c"
 		{
-			gboolean _tmp4_;
-#line 985 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp4_ = ascending;
 #line 985 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			if (_tmp4_) {
+			if (ascending) {
 #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
 #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7156,7 +7508,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7160 "MediaPage.c"
+#line 7512 "MediaPage.c"
 			} else {
 #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
@@ -7172,7 +7524,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 				comparator_target = NULL;
 #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7176 "MediaPage.c"
+#line 7528 "MediaPage.c"
 			}
 #line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
@@ -7190,23 +7542,20 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7194 "MediaPage.c"
+#line 7546 "MediaPage.c"
 		}
 		default:
 		{
-			gint _tmp5_;
-			gchar* _tmp6_;
-			gchar* _tmp7_;
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp5_ = media_page_get_menu_sort_by (self);
+			gchar* _tmp0_;
+			gchar* _tmp1_;
 #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp6_ = g_strdup_printf ("%i", _tmp5_);
+			_tmp0_ = g_strdup_printf ("%i", media_page_get_menu_sort_by (self));
 #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp7_ = _tmp6_;
+			_tmp1_ = _tmp0_;
 #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			g_debug ("MediaPage.vala:992: Unknown sort criteria: %s", _tmp7_);
+			g_debug ("MediaPage.vala:992: Unknown sort criteria: %s", _tmp1_);
 #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_g_free0 (_tmp7_);
+			_g_free0 (_tmp1_);
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
 #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7237,25 +7586,25 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 			predicate_target_destroy_notify = NULL;
 #line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7241 "MediaPage.c"
+#line 7590 "MediaPage.c"
 		}
 	}
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp3_ = _tmp2_;
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = comparator;
+	_tmp4_ = comparator;
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10__target = comparator_target;
+	_tmp4__target = comparator_target;
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = predicate;
+	_tmp5_ = predicate;
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11__target = predicate_target;
+	_tmp5__target = predicate_target;
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, _tmp10__target, _tmp11_, _tmp11__target);
+	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp4_, _tmp4__target, _tmp5_, _tmp5__target);
 #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp9_);
+	_data_collection_unref0 (_tmp3_);
 #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
 #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7272,11 +7621,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	comparator_target = NULL;
 #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 7276 "MediaPage.c"
+#line 7625 "MediaPage.c"
 }
 
 
-void media_page_sync_sort (MediaPage* self) {
+void
+media_page_sync_sort (MediaPage* self)
+{
 	gboolean sort_ascending = FALSE;
 	gint sort_by = 0;
 	gboolean _tmp0_ = FALSE;
@@ -7295,11 +7646,13 @@ void media_page_sync_sort (MediaPage* self) {
 	media_page_set_menu_sort_order (self, sort_ascending);
 #line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 7299 "MediaPage.c"
+#line 7650 "MediaPage.c"
 }
 
 
-static void media_page_real_destroy (GtkWidget* base) {
+static void
+media_page_real_destroy (GtkWidget* base)
+{
 	MediaPage * self;
 #line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
@@ -7307,11 +7660,13 @@ static void media_page_real_destroy (GtkWidget* base) {
 	media_page_disconnect_slider (self);
 #line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget));
-#line 7311 "MediaPage.c"
+#line 7664 "MediaPage.c"
 }
 
 
-void media_page_increase_zoom_level (MediaPage* self) {
+void
+media_page_increase_zoom_level (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 #line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
@@ -7319,36 +7674,32 @@ void media_page_increase_zoom_level (MediaPage* self) {
 	_tmp0_ = self->priv->connected_slider;
 #line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7323 "MediaPage.c"
+#line 7678 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
 #line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 7329 "MediaPage.c"
+#line 7684 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp2_ = media_page_get_thumb_size (self);
 #line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_);
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		new_scale = _tmp3_;
+		new_scale = media_page_compute_zoom_scale_increase (media_page_get_thumb_size (self));
 #line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
 #line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = new_scale;
+		_tmp2_ = new_scale;
 #line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		media_page_set_thumb_size (self, _tmp4_);
-#line 7347 "MediaPage.c"
+		media_page_set_thumb_size (self, _tmp2_);
+#line 7696 "MediaPage.c"
 	}
 }
 
 
-void media_page_decrease_zoom_level (MediaPage* self) {
+void
+media_page_decrease_zoom_level (MediaPage* self)
+{
 	MediaPageZoomSliderAssembly* _tmp0_;
 #line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
@@ -7356,203 +7707,173 @@ void media_page_decrease_zoom_level (MediaPage* self) {
 	_tmp0_ = self->priv->connected_slider;
 #line 1043 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7360 "MediaPage.c"
+#line 7711 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
 #line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
 #line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 7366 "MediaPage.c"
+#line 7717 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
 #line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp2_ = media_page_get_thumb_size (self);
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_);
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		new_scale = _tmp3_;
+		new_scale = media_page_compute_zoom_scale_decrease (media_page_get_thumb_size (self));
 #line 1047 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
 #line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = new_scale;
+		_tmp2_ = new_scale;
 #line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		media_page_set_thumb_size (self, _tmp4_);
-#line 7384 "MediaPage.c"
+		media_page_set_thumb_size (self, _tmp2_);
+#line 7729 "MediaPage.c"
 	}
 }
 
 
-static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* source) {
+static DataView*
+media_page_real_create_thumbnail (MediaPage* self,
+                                  DataSource* source)
+{
 	DataView* result = NULL;
-	DataSource* _tmp0_;
-	gint _tmp1_;
-	Thumbnail* _tmp2_;
+	Thumbnail* _tmp0_;
 #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = source;
-#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_get_thumb_size (self);
+	_tmp0_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), media_page_get_thumb_size (self));
 #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
 #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7406 "MediaPage.c"
+#line 7748 "MediaPage.c"
 }
 
 
-DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
+DataView*
+media_page_create_thumbnail (MediaPage* self,
+                             DataSource* source)
+{
 #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
 #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 7415 "MediaPage.c"
+#line 7760 "MediaPage.c"
 }
 
 
-void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
+void
+media_page_set_thumb_size (MediaPage* self,
+                           gint new_scale)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 	gint _tmp2_;
+	gint _tmp3_;
 	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	CheckerboardLayout* _tmp10_;
-	CheckerboardLayout* _tmp11_;
-	gint _tmp12_;
+	CheckerboardLayout* _tmp5_;
+	CheckerboardLayout* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
+	ViewCollection* _tmp9_;
+	ViewCollection* _tmp10_;
+	GValue _tmp11_ = {0};
+	ViewCollection* _tmp12_;
 	ViewCollection* _tmp13_;
-	ViewCollection* _tmp14_;
-	ViewCollection* _tmp15_;
-	ViewCollection* _tmp16_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
 	gint _tmp17_;
-	GValue _tmp18_ = {0};
-	ViewCollection* _tmp19_;
-	ViewCollection* _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
-	gint _tmp23_;
-	gint _tmp24_;
-	gint _tmp25_;
-	gint _tmp26_;
 #line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_get_thumb_size (self);
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = new_scale;
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp1_ == _tmp2_) {
+	if (media_page_get_thumb_size (self) == new_scale) {
 #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 7456 "MediaPage.c"
+#line 7792 "MediaPage.c"
 	} else {
-		gboolean _tmp3_;
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = !_tmp3_;
-#line 7463 "MediaPage.c"
+		_tmp0_ = !page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 7796 "MediaPage.c"
 	}
 #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
 #line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7469 "MediaPage.c"
+#line 7802 "MediaPage.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = new_scale;
-#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = thumbnail_get_MIN_SCALE ();
-#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp1_ = thumbnail_get_MIN_SCALE ();
 #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = thumbnail_get_MAX_SCALE ();
+	_tmp2_ = _tmp1_;
 #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp3_ = thumbnail_get_MAX_SCALE ();
 #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_);
+	_tmp4_ = _tmp3_;
 #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_scale = _tmp9_;
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+	new_scale = CLAMP (new_scale, _tmp2_, _tmp4_);
 #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp5_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = new_scale;
+	_tmp6_ = _tmp5_;
 #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	checkerboard_layout_set_scale (_tmp11_, _tmp12_);
+	checkerboard_layout_set_scale (_tmp6_, new_scale);
 #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp6_);
 #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp8_ = _tmp7_;
 #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp14_);
+	_data_collection_unref0 (_tmp8_);
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = _tmp15_;
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = new_scale;
+	_tmp10_ = _tmp9_;
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_init (&_tmp18_, G_TYPE_INT);
+	g_value_init (&_tmp11_, G_TYPE_INT);
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_value_set_int (&_tmp18_, _tmp17_);
+	g_value_set_int (&_tmp11_, new_scale);
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp18_, NULL, NULL);
+	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp11_, NULL, NULL);
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL;
+	G_IS_VALUE (&_tmp11_) ? (g_value_unset (&_tmp11_), NULL) : NULL;
 #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp16_);
+	_data_collection_unref0 (_tmp10_);
 #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = _tmp19_;
+	_tmp13_ = _tmp12_;
 #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp20_);
+	_data_collection_unref0 (_tmp13_);
 #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = new_scale;
+	_tmp14_ = thumbnail_get_MAX_SCALE ();
 #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = thumbnail_get_MAX_SCALE ();
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp15_ = _tmp14_;
 #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_);
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = new_scale;
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", new_scale < _tmp15_);
 #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = thumbnail_get_MIN_SCALE ();
+	_tmp16_ = thumbnail_get_MIN_SCALE ();
 #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = _tmp25_;
+	_tmp17_ = _tmp16_;
 #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 7543 "MediaPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", new_scale > _tmp17_);
+#line 7864 "MediaPage.c"
 }
 
 
-gint media_page_get_thumb_size (MediaPage* self) {
+gint
+media_page_get_thumb_size (MediaPage* self)
+{
 	gint result = 0;
 	CheckerboardLayout* _tmp0_;
 	CheckerboardLayout* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	CheckerboardLayout* _tmp9_;
-	CheckerboardLayout* _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
+	gboolean _tmp2_;
+	CheckerboardLayout* _tmp7_;
+	CheckerboardLayout* _tmp8_;
+	gint _tmp9_;
 #line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
 #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7560,81 +7881,87 @@ gint media_page_get_thumb_size (MediaPage* self) {
 #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
 #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = checkerboard_layout_get_scale (_tmp1_);
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ <= 0;
+	_tmp2_ = checkerboard_layout_get_scale (_tmp1_) <= 0;
 #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_) {
-#line 7571 "MediaPage.c"
+	if (_tmp2_) {
+#line 7890 "MediaPage.c"
+		CheckerboardLayout* _tmp3_;
 		CheckerboardLayout* _tmp4_;
-		CheckerboardLayout* _tmp5_;
+		ConfigFacade* _tmp5_;
 		ConfigFacade* _tmp6_;
-		ConfigFacade* _tmp7_;
-		gint _tmp8_;
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp6_ = config_facade_get_instance ();
+		_tmp4_ = _tmp3_;
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = config_facade_get_instance ();
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp6_ = _tmp5_;
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		checkerboard_layout_set_scale (_tmp5_, _tmp8_);
+		checkerboard_layout_set_scale (_tmp4_, configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp7_);
+		_g_object_unref0 (_tmp6_);
 #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp5_);
-#line 7593 "MediaPage.c"
+		_g_object_unref0 (_tmp4_);
+#line 7909 "MediaPage.c"
 	}
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp7_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = checkerboard_layout_get_scale (_tmp10_);
+	_tmp8_ = _tmp7_;
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp9_ = checkerboard_layout_get_scale (_tmp8_);
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp8_);
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp12_;
+	result = _tmp9_;
 #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7609 "MediaPage.c"
+#line 7923 "MediaPage.c"
 }
 
 
-static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                    GdkEventButton* event,
+                                                                                    gpointer self)
+{
 	gboolean result;
 	result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7618 "MediaPage.c"
+#line 7936 "MediaPage.c"
 }
 
 
-static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                            gpointer self)
+{
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self);
-#line 7625 "MediaPage.c"
+#line 7946 "MediaPage.c"
 }
 
 
-static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                   GdkEventButton* event,
+                                                                                   gpointer self)
+{
 	gboolean result;
 	result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7634 "MediaPage.c"
+#line 7959 "MediaPage.c"
 }
 
 
-MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType object_type) {
+MediaPageZoomSliderAssembly*
+media_page_zoom_slider_assembly_construct (GType object_type)
+{
 	MediaPageZoomSliderAssembly * self = NULL;
 	GtkBox* zoom_group = NULL;
 	GtkBox* _tmp0_;
@@ -7650,25 +7977,22 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 	ConfigFacade* _tmp7_;
 	gint _tmp8_;
 	gint _tmp9_;
-	gdouble _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gdouble _tmp13_;
-	GtkAdjustment* _tmp14_;
-	GtkAdjustment* _tmp15_;
+	gint _tmp10_;
+	GtkAdjustment* _tmp11_;
+	GtkAdjustment* _tmp12_;
+	GtkScale* _tmp13_;
+	GtkScale* _tmp14_;
+	GtkScale* _tmp15_;
 	GtkScale* _tmp16_;
 	GtkScale* _tmp17_;
 	GtkScale* _tmp18_;
-	GtkScale* _tmp19_;
-	GtkScale* _tmp20_;
-	GtkScale* _tmp21_;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp22_;
-	GdkPixbuf* _tmp23_;
-	GtkImage* _tmp24_;
-	GtkImage* _tmp25_;
+	GdkPixbuf* _tmp19_;
+	GdkPixbuf* _tmp20_;
+	GtkImage* _tmp21_;
+	GtkImage* _tmp22_;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp26_;
+	GtkEventBox* _tmp23_;
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = (MediaPageZoomSliderAssembly*) g_object_new (object_type, NULL);
 #line 136 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7714,77 +8038,71 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_;
-#line 150 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
 #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	persisted_scale = _tmp9_;
+	persisted_scale = _tmp8_;
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = media_page_zoom_slider_assembly_scale_to_slider (persisted_scale);
+	_tmp9_ = thumbnail_get_MAX_SCALE ();
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = thumbnail_get_MAX_SCALE ();
-#line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
-#line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp12_);
+	_tmp10_ = _tmp9_;
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = gtk_adjustment_new (_tmp10_, (gdouble) 0, _tmp13_, (gdouble) 1, (gdouble) 10, (gdouble) 0);
+	_tmp11_ = gtk_adjustment_new (media_page_zoom_slider_assembly_scale_to_slider (persisted_scale), (gdouble) 0, media_page_zoom_slider_assembly_scale_to_slider (_tmp10_), (gdouble) 1, (gdouble) 10, (gdouble) 0);
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp14_);
+	g_object_ref_sink (_tmp11_);
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->adjustment);
 #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->adjustment = _tmp14_;
+	self->priv->adjustment = _tmp11_;
 #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = self->priv->adjustment;
+	_tmp12_ = self->priv->adjustment;
 #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp15_);
+	_tmp13_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp12_);
 #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp13_);
 #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->slider);
 #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self->priv->slider = _tmp16_;
+	self->priv->slider = _tmp13_;
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = self->priv->slider;
+	_tmp14_ = self->priv->slider;
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed, self, 0);
 #line 156 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = self->priv->slider;
+	_tmp15_ = self->priv->slider;
 #line 156 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_scale_set_draw_value (_tmp18_, FALSE);
+	gtk_scale_set_draw_value (_tmp15_, FALSE);
 #line 157 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = self->priv->slider;
+	_tmp16_ = self->priv->slider;
 #line 157 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 200, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 200, -1);
 #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = self->priv->slider;
+	_tmp17_ = self->priv->slider;
 #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), _ ("Adjust the size of the thumbnails"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), _ ("Adjust the size of the thumbnails"));
 #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = self->priv->slider;
+	_tmp18_ = self->priv->slider;
 #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+	_tmp19_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp20_ = _tmp19_;
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp23_);
+	_tmp21_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp20_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp24_);
+	g_object_ref_sink (_tmp21_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = _tmp24_;
+	_tmp22_ = _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp23_);
+	_g_object_unref0 (_tmp20_);
 #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	zoom_in = _tmp25_;
+	zoom_in = _tmp22_;
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp23_ = (GtkEventBox*) gtk_event_box_new ();
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp23_);
 #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	zoom_in_box = _tmp26_;
+	zoom_in_box = _tmp23_;
 #line 165 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_event_box_set_above_child (zoom_in_box, TRUE);
 #line 166 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7809,18 +8127,22 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 	_g_object_unref0 (zoom_group);
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 7813 "MediaPage.c"
+#line 8131 "MediaPage.c"
 }
 
 
-MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) {
+MediaPageZoomSliderAssembly*
+media_page_zoom_slider_assembly_new (void)
+{
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY);
-#line 7820 "MediaPage.c"
+#line 8140 "MediaPage.c"
 }
 
 
-gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
+gdouble
+media_page_zoom_slider_assembly_scale_to_slider (gint value)
+{
 	gdouble result = 0.0;
 	gint _tmp0_;
 	gint _tmp1_;
@@ -7828,78 +8150,71 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
 	gint _tmp3_;
 	gint _tmp4_;
 	gint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
 #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
+	_tmp0_ = thumbnail_get_MIN_SCALE ();
 #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = thumbnail_get_MIN_SCALE ();
-#line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_assert (_tmp0_ >= _tmp2_, "value >= Thumbnail.MIN_SCALE");
+	_vala_assert (value >= _tmp1_, "value >= Thumbnail.MIN_SCALE");
 #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = value;
+	_tmp2_ = thumbnail_get_MAX_SCALE ();
 #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 177 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_assert (_tmp3_ <= _tmp5_, "value <= Thumbnail.MAX_SCALE");
+	_vala_assert (value <= _tmp3_, "value <= Thumbnail.MAX_SCALE");
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = value;
+	_tmp4_ = thumbnail_get_MIN_SCALE ();
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = thumbnail_get_MIN_SCALE ();
-#line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp5_ = _tmp4_;
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING);
+	result = (gdouble) ((value - _tmp5_) / MEDIA_PAGE_SLIDER_STEPPING);
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7861 "MediaPage.c"
+#line 8174 "MediaPage.c"
 }
 
 
-gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) {
+gint
+media_page_zoom_slider_assembly_slider_to_scale (gdouble value)
+{
 	gint result = 0;
 	gint res = 0;
-	gdouble _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
 	gint _tmp4_;
 	gint _tmp5_;
-	gint _tmp6_;
-#line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = value;
 #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = thumbnail_get_MIN_SCALE ();
+	_tmp0_ = thumbnail_get_MIN_SCALE ();
 #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	res = ((gint) (_tmp0_ * MEDIA_PAGE_SLIDER_STEPPING)) + _tmp2_;
+	res = ((gint) (value * MEDIA_PAGE_SLIDER_STEPPING)) + _tmp1_;
 #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = thumbnail_get_MIN_SCALE ();
+	_tmp2_ = thumbnail_get_MIN_SCALE ();
 #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_assert (res >= _tmp4_, "res >= Thumbnail.MIN_SCALE");
+	_vala_assert (res >= _tmp3_, "res >= Thumbnail.MIN_SCALE");
 #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = thumbnail_get_MAX_SCALE ();
+	_tmp4_ = thumbnail_get_MAX_SCALE ();
 #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_assert (res <= _tmp6_, "res <= Thumbnail.MAX_SCALE");
+	_vala_assert (res <= _tmp5_, "res <= Thumbnail.MAX_SCALE");
 #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = res;
 #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7899 "MediaPage.c"
+#line 8211 "MediaPage.c"
 }
 
 
-static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event) {
+static gboolean
+media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self,
+                                                     GdkEventButton* event)
+{
 	gboolean result = FALSE;
 #line 191 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), FALSE);
@@ -7911,11 +8226,14 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo
 	result = TRUE;
 #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7915 "MediaPage.c"
+#line 8230 "MediaPage.c"
 }
 
 
-static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event) {
+static gboolean
+media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self,
+                                                    GdkEventButton* event)
+{
 	gboolean result = FALSE;
 #line 196 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), FALSE);
@@ -7927,24 +8245,27 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7931 "MediaPage.c"
+#line 8249 "MediaPage.c"
 }
 
 
-static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self) {
+static void
+media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self)
+{
 #line 201 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_emit (self, media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL], 0);
-#line 7940 "MediaPage.c"
+#line 8260 "MediaPage.c"
 }
 
 
-void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self) {
+void
+media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self)
+{
 	GtkScale* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-	gdouble _tmp3_;
 #line 205 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7954,18 +8275,17 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
-#line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 7961 "MediaPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_));
+#line 8280 "MediaPage.c"
 }
 
 
-void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self) {
+void
+media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self)
+{
 	GtkScale* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-	gdouble _tmp3_;
 #line 209 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7975,143 +8295,110 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
-#line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 7982 "MediaPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_));
+#line 8300 "MediaPage.c"
 }
 
 
-void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self) {
+void
+media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self)
+{
 	gint new_scale = 0;
 	gint _tmp0_;
-	gint _tmp1_;
+	GtkScale* _tmp1_;
 	gint _tmp2_;
-	gint _tmp3_;
-	GtkScale* _tmp4_;
-	gint _tmp5_;
-	gdouble _tmp6_;
 #line 213 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 214 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_zoom_slider_assembly_get_scale (self);
-#line 214 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_compute_zoom_scale_increase (_tmp0_);
-#line 214 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_scale = _tmp1_;
+	new_scale = media_page_compute_zoom_scale_increase (media_page_zoom_slider_assembly_get_scale (self));
 #line 216 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_zoom_slider_assembly_get_scale (self);
+	_tmp0_ = new_scale;
 #line 216 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = new_scale;
-#line 216 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp2_ == _tmp3_) {
+	if (media_page_zoom_slider_assembly_get_scale (self) == _tmp0_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8011 "MediaPage.c"
+#line 8321 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = self->priv->slider;
-#line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = new_scale;
+	_tmp1_ = self->priv->slider;
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
+	_tmp2_ = new_scale;
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8021 "MediaPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_));
+#line 8329 "MediaPage.c"
 }
 
 
-void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self) {
+void
+media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self)
+{
 	gint new_scale = 0;
 	gint _tmp0_;
-	gint _tmp1_;
+	GtkScale* _tmp1_;
 	gint _tmp2_;
-	gint _tmp3_;
-	GtkScale* _tmp4_;
-	gint _tmp5_;
-	gdouble _tmp6_;
 #line 222 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 223 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_zoom_slider_assembly_get_scale (self);
-#line 223 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_compute_zoom_scale_decrease (_tmp0_);
-#line 223 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_scale = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_zoom_slider_assembly_get_scale (self);
+	new_scale = media_page_compute_zoom_scale_decrease (media_page_zoom_slider_assembly_get_scale (self));
 #line 225 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = new_scale;
+	_tmp0_ = new_scale;
 #line 225 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp2_ == _tmp3_) {
+	if (media_page_zoom_slider_assembly_get_scale (self) == _tmp0_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8050 "MediaPage.c"
+#line 8350 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = self->priv->slider;
+	_tmp1_ = self->priv->slider;
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = new_scale;
-#line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
+	_tmp2_ = new_scale;
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8060 "MediaPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_));
+#line 8358 "MediaPage.c"
 }
 
 
-gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self) {
+gint
+media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self)
+{
 	gint result = 0;
 	GtkScale* _tmp0_;
-	gdouble _tmp1_;
-	gint _tmp2_;
 #line 231 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), 0);
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->slider;
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = media_page_zoom_slider_assembly_slider_to_scale (_tmp1_);
-#line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp2_;
+	result = media_page_zoom_slider_assembly_slider_to_scale (gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)));
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8081 "MediaPage.c"
+#line 8375 "MediaPage.c"
 }
 
 
-void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, gint scale) {
-	gint _tmp0_;
-	gint _tmp1_;
-	GtkScale* _tmp2_;
-	gint _tmp3_;
-	gdouble _tmp4_;
+void
+media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self,
+                                           gint scale)
+{
+	GtkScale* _tmp0_;
 #line 235 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 236 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_zoom_slider_assembly_get_scale (self);
-#line 236 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = scale;
-#line 236 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (media_page_zoom_slider_assembly_get_scale (self) == scale) {
 #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8101 "MediaPage.c"
+#line 8390 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = self->priv->slider;
-#line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = scale;
-#line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_);
+	_tmp0_ = self->priv->slider;
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_);
-#line 8111 "MediaPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (scale));
+#line 8396 "MediaPage.c"
 }
 
 
-static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssemblyClass * klass) {
+static void
+media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssemblyClass * klass)
+{
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_parent_class = g_type_class_peek_parent (klass);
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8120,18 +8407,22 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem
 	G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL] = g_signal_new ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8124 "MediaPage.c"
+#line 8411 "MediaPage.c"
 }
 
 
-static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) {
+static void
+media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self)
+{
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self);
-#line 8131 "MediaPage.c"
+#line 8420 "MediaPage.c"
 }
 
 
-static void media_page_zoom_slider_assembly_finalize (GObject * obj) {
+static void
+media_page_zoom_slider_assembly_finalize (GObject * obj)
+{
 	MediaPageZoomSliderAssembly * self;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, MediaPageZoomSliderAssembly);
@@ -8141,11 +8432,13 @@ static void media_page_zoom_slider_assembly_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj);
-#line 8145 "MediaPage.c"
+#line 8436 "MediaPage.c"
 }
 
 
-GType media_page_zoom_slider_assembly_get_type (void) {
+GType
+media_page_zoom_slider_assembly_get_type (void)
+{
 	static volatile gsize media_page_zoom_slider_assembly_type_id__volatile = 0;
 	if (g_once_init_enter (&media_page_zoom_slider_assembly_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MediaPageZoomSliderAssemblyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_page_zoom_slider_assembly_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaPageZoomSliderAssembly), 0, (GInstanceInitFunc) media_page_zoom_slider_assembly_instance_init, NULL };
@@ -8157,7 +8450,9 @@ GType media_page_zoom_slider_assembly_get_type (void) {
 }
 
 
-static void media_page_class_init (MediaPageClass * klass) {
+static void
+media_page_class_init (MediaPageClass * klass)
+{
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_parent_class = g_type_class_peek_parent (klass);
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8242,22 +8537,26 @@ static void media_page_class_init (MediaPageClass * klass) {
 	((MediaPageClass *) klass)->create_thumbnail = (DataView* (*) (MediaPage *, DataSource*)) media_page_real_create_thumbnail;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_finalize;
-#line 8246 "MediaPage.c"
+#line 8541 "MediaPage.c"
 }
 
 
-static void media_page_instance_init (MediaPage * self) {
+static void
+media_page_instance_init (MediaPage * self)
+{
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_PAGE_GET_PRIVATE (self);
 #line 243 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
 #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->dnd_handler = NULL;
-#line 8257 "MediaPage.c"
+#line 8554 "MediaPage.c"
 }
 
 
-static void media_page_finalize (GObject * obj) {
+static void
+media_page_finalize (GObject * obj)
+{
 	MediaPage * self;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_PAGE, MediaPage);
@@ -8269,11 +8568,13 @@ static void media_page_finalize (GObject * obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_parent_class)->finalize (obj);
-#line 8273 "MediaPage.c"
+#line 8572 "MediaPage.c"
 }
 
 
-GType media_page_get_type (void) {
+GType
+media_page_get_type (void)
+{
 	static volatile gsize media_page_type_id__volatile = 0;
 	if (g_once_init_enter (&media_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MediaPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaPage), 0, (GInstanceInitFunc) media_page_instance_init, NULL };
@@ -8285,7 +8586,11 @@ GType media_page_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -8297,7 +8602,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }