Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

1 files changed, 3503 insertions, 3238 deletions

diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 7dbbcda..ddc760b 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.36.6, the Vala compiler
+/* VideoSupport.c generated by valac 0.40.4, the Vala compiler
  * generated from VideoSupport.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 <gio/gio.h>
@@ -295,6 +296,11 @@ typedef struct _DateableIface DateableIface;
 typedef struct _Video Video;
 typedef struct _VideoClass VideoClass;
 typedef struct _VideoPrivate VideoPrivate;
+enum  {
+	VIDEO_0_PROPERTY,
+	VIDEO_NUM_PROPERTIES
+};
+static GParamSpec* video_properties[VIDEO_NUM_PROPERTIES];
 
 #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ())
 #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection))
@@ -1061,9 +1067,15 @@ static gpointer video_source_collection_parent_class = NULL;
 GQuark video_error_quark (void);
 gpointer video_import_params_ref (gpointer instance);
 void video_import_params_unref (gpointer instance);
-GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_video_import_params (GValue* value, gpointer v_object);
-void value_take_video_import_params (GValue* value, gpointer v_object);
+GParamSpec* param_spec_video_import_params (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_video_import_params (GValue* value,
+                                    gpointer v_object);
+void value_take_video_import_params (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_video_import_params (const GValue* value);
 GType video_import_params_get_type (void) G_GNUC_CONST;
 GType import_id_get_type (void) G_GNUC_CONST;
@@ -1071,67 +1083,107 @@ ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
 gpointer thumbnails_ref (gpointer instance);
 void thumbnails_unref (gpointer instance);
-GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_thumbnails (GValue* value, gpointer v_object);
-void value_take_thumbnails (GValue* value, gpointer v_object);
+GParamSpec* param_spec_thumbnails (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_thumbnails (GValue* value,
+                           gpointer v_object);
+void value_take_thumbnails (GValue* value,
+                            gpointer v_object);
 gpointer value_get_thumbnails (const GValue* value);
 GType thumbnails_get_type (void) G_GNUC_CONST;
 gpointer video_row_ref (gpointer instance);
 void video_row_unref (gpointer instance);
-GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_video_row (GValue* value, gpointer v_object);
-void value_take_video_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_video_row (const gchar* name,
+                                  const gchar* nick,
+                                  const gchar* blurb,
+                                  GType object_type,
+                                  GParamFlags flags);
+void value_set_video_row (GValue* value,
+                          gpointer v_object);
+void value_take_video_row (GValue* value,
+                           gpointer v_object);
 gpointer value_get_video_row (const GValue* value);
 GType video_row_get_type (void) G_GNUC_CONST;
-enum  {
-	VIDEO_IMPORT_PARAMS_DUMMY_PROPERTY
-};
 #define IMPORT_ID_INVALID ((gint64) 0)
-void import_id_init (ImportID *self, gint64 id);
+void import_id_init (ImportID *self,
+                     gint64 id);
 VideoRow* video_row_new (void);
 VideoRow* video_row_construct (GType object_type);
-VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
-VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
+VideoImportParams* video_import_params_new (GFile* file,
+                                            ImportID* import_id,
+                                            const gchar* md5,
+                                            Thumbnails* thumbnails,
+                                            time_t exposure_time_override);
+VideoImportParams* video_import_params_construct (GType object_type,
+                                                  GFile* file,
+                                                  ImportID* import_id,
+                                                  const gchar* md5,
+                                                  Thumbnails* thumbnails,
+                                                  time_t exposure_time_override);
 static void video_import_params_finalize (VideoImportParams * obj);
 gpointer video_reader_ref (gpointer instance);
 void video_reader_unref (gpointer instance);
-GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_video_reader (GValue* value, gpointer v_object);
-void value_take_video_reader (GValue* value, gpointer v_object);
+GParamSpec* param_spec_video_reader (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_video_reader (GValue* value,
+                             gpointer v_object);
+void value_take_video_reader (GValue* value,
+                              gpointer v_object);
 gpointer value_get_video_reader (const GValue* value);
 GType video_reader_get_type (void) G_GNUC_CONST;
 #define VIDEO_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_READER, VideoReaderPrivate))
-enum  {
-	VIDEO_READER_DUMMY_PROPERTY
-};
 #define VIDEO_READER_UNKNOWN_CLIP_DURATION (-1.0)
 #define VIDEO_READER_THUMBNAILER_TIMEOUT ((guint) 10000)
 VideoReader* video_reader_new (GFile* file);
-VideoReader* video_reader_construct (GType object_type, GFile* file);
+VideoReader* video_reader_construct (GType object_type,
+                                     GFile* file);
 gboolean video_reader_is_supported_video_file (GFile* file);
 gboolean video_reader_is_supported_video_filename (const gchar* filename);
-void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
-gint utf8_ci_compare (void* a, void* b);
+void disassemble_filename (const gchar* basename,
+                           gchar* * name,
+                           gchar* * ext);
+gint utf8_ci_compare (void* a,
+                      void* b);
 GType import_result_get_type (void) G_GNUC_CONST;
 ImportResult video_reader_prepare_for_import (VideoImportParams* params);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES
 GdkPixbuf* video_reader_read_preview_frame (VideoReader* self);
-gdouble video_reader_read_clip_duration (VideoReader* self, GError** error);
+gdouble video_reader_read_clip_duration (VideoReader* self,
+                                         GError** error);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+                               gpointer v_object);
+void value_take_media_metadata (GValue* value,
+                                gpointer v_object);
 gpointer value_get_media_metadata (const GValue* value);
 GType media_metadata_get_type (void) G_GNUC_CONST;
 GType video_metadata_get_type (void) G_GNUC_CONST;
-VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error);
+VideoMetadata* video_reader_read_metadata (VideoReader* self,
+                                           GError** error);
 gpointer metadata_date_time_ref (gpointer instance);
 void metadata_date_time_unref (gpointer instance);
-GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_metadata_date_time (GValue* value, gpointer v_object);
-void value_take_metadata_date_time (GValue* value, gpointer v_object);
+GParamSpec* param_spec_metadata_date_time (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_metadata_date_time (GValue* value,
+                                   gpointer v_object);
+void value_take_metadata_date_time (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_metadata_date_time (const GValue* value);
 GType metadata_date_time_get_type (void) G_GNUC_CONST;
 MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self);
@@ -1147,54 +1199,86 @@ EventID* event_id_dup (const EventID* self);
 void event_id_free (EventID* self);
 GType rating_get_type (void) G_GNUC_CONST;
 #define VIDEO_ID_INVALID ((gint64) -1)
-void video_id_init (VideoID *self, gint64 id);
+void video_id_init (VideoID *self,
+                    gint64 id);
 #define EVENT_ID_INVALID ((gint64) -1)
-void event_id_init (EventID *self, gint64 id);
+void event_id_init (EventID *self,
+                    gint64 id);
 Thumbnails* thumbnails_new (void);
 Thumbnails* thumbnails_construct (GType object_type);
-void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame);
-static void video_reader_read_internal (VideoReader* self, GError** error);
+void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails,
+                                               GdkPixbuf* preview_frame);
+static void video_reader_read_internal (VideoReader* self,
+                                 GError** error);
 static gboolean video_reader_does_file_exist (VideoReader* self);
 static GDate* _g_date_dup (GDate* self);
-static void video_reader_set_timestamp (VideoReader* self, GDateTime* value);
+static void video_reader_set_timestamp (VideoReader* self,
+                                 GDateTime* value);
 static gboolean video_reader_on_thumbnailer_timer (VideoReader* self);
-static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* video_file);
+static GdkPixbuf* video_reader_thumbnailer (VideoReader* self,
+                                     const gchar* video_file);
 GFile* app_dirs_get_thumbnailer_bin (void);
 static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self);
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
 VideoMetadata* video_metadata_new (void);
 VideoMetadata* video_metadata_construct (GType object_type);
-void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
+void media_metadata_read_from_file (MediaMetadata* self,
+                                    GFile* file,
+                                    GError** error);
 static void video_reader_finalize (VideoReader * obj);
 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_source_get_type (void) G_GNUC_CONST;
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+                                    gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_source_holding_tank (const GValue* value);
 GType source_holding_tank_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
 gpointer source_snapshot_ref (gpointer instance);
 void source_snapshot_unref (gpointer instance);
-GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_snapshot (GValue* value, gpointer v_object);
-void value_take_source_snapshot (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_snapshot (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_source_snapshot (GValue* value,
+                                gpointer v_object);
+void value_take_source_snapshot (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_source_snapshot (const GValue* value);
 GType source_snapshot_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -1203,9 +1287,15 @@ GType indexable_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 gpointer backing_file_state_ref (gpointer instance);
 void backing_file_state_unref (gpointer instance);
-GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_backing_file_state (GValue* value, gpointer v_object);
-void value_take_backing_file_state (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_file_state (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_backing_file_state (GValue* value,
+                                   gpointer v_object);
+void value_take_backing_file_state (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_backing_file_state (const GValue* value);
 GType backing_file_state_get_type (void) G_GNUC_CONST;
 GType photo_exception_get_type (void) G_GNUC_CONST;
@@ -1222,9 +1312,6 @@ GType monitorable_get_type (void) G_GNUC_CONST;
 GType dateable_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 #define VIDEO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO, VideoPrivate))
-enum  {
-	VIDEO_DUMMY_PROPERTY
-};
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType video_source_collection_get_type (void) G_GNUC_CONST;
@@ -1233,53 +1320,80 @@ GType video_source_collection_get_type (void) G_GNUC_CONST;
 #define VIDEO_FLAG_OFFLINE ((guint64) 0x0000000000000002)
 #define VIDEO_FLAG_FLAGGED ((guint64) 0x0000000000000004)
 Video* video_new (VideoRow* row);
-Video* video_construct (GType object_type, VideoRow* row);
+Video* video_construct (GType object_type,
+                        VideoRow* row);
 VideoSource* video_source_construct (GType object_type);
 gchar* media_source_prep_title (const gchar* title);
-void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated);
-void video_init (ProgressMonitor monitor, void* monitor_target);
+void data_source_rehydrate_backlinks (DataSource* self,
+                                      SourceCollection* unlinked_from,
+                                      const gchar* dehydrated);
+void video_init (ProgressMonitor monitor,
+                 void* monitor_target);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self);
 #define CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE -1
 static gboolean __lambda12_ (GstPluginFeature* f);
-static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self);
+static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature,
+                                                 gpointer self);
 VideoSourceCollection* video_source_collection_new (void);
 VideoSourceCollection* video_source_collection_construct (GType object_type);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_database_table (GValue* value, gpointer v_object);
-void value_take_database_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_database_table (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_database_table (GValue* value,
+                               gpointer v_object);
+void value_take_database_table (GValue* value,
+                                gpointer v_object);
 gpointer value_get_database_table (const GValue* value);
 GType database_table_get_type (void) G_GNUC_CONST;
 GType video_table_get_type (void) G_GNUC_CONST;
 VideoTable* video_table_get_instance (void);
 GeeArrayList* video_table_get_all (VideoTable* self);
-static void video_set_is_interpretable (Video* self, gboolean is_interpretable);
+static void video_set_is_interpretable (Video* self,
+                                 gboolean is_interpretable);
 gboolean media_source_is_trashed (MediaSource* self);
 gboolean media_source_is_offline (MediaSource* self);
-void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources);
-void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources);
-GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target);
+void media_source_collection_add_many_to_trash (MediaSourceCollection* self,
+                                                GeeCollection* sources);
+void media_source_collection_add_many_to_offline (MediaSourceCollection* self,
+                                                  GeeCollection* sources);
+GeeCollection* data_collection_add_many (DataCollection* self,
+                                         GeeCollection* objects,
+                                         ProgressMonitor monitor,
+                                         void* monitor_target);
 static void _g_object_unref0_ (gpointer var);
-static void _g_list_free__g_object_unref0_ (GList* self);
+static inline void _g_list_free__g_object_unref0_ (GList* self);
 gboolean video_has_interpreter_state_changed (void);
 void video_notify_normal_thumbs_regenerated (void);
 static void video_save_interpreter_state (void);
 void video_notify_offline_thumbs_regenerated (void);
-void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie);
+void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self,
+                                                              gint state_cookie);
 void video_terminate (void);
 GType exporter_get_type (void) G_GNUC_CONST;
 gpointer exporter_ui_ref (gpointer instance);
 void exporter_ui_unref (gpointer instance);
-GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_exporter_ui (GValue* value, gpointer v_object);
-void value_take_exporter_ui (GValue* value, gpointer v_object);
+GParamSpec* param_spec_exporter_ui (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_exporter_ui (GValue* value,
+                            gpointer v_object);
+void value_take_exporter_ui (GValue* value,
+                             gpointer v_object);
 gpointer value_get_exporter_ui (const GValue* value);
 GType exporter_ui_get_type (void) G_GNUC_CONST;
-ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place);
+ExporterUI* video_export_many (GeeCollection* videos,
+                               ExporterCompletionCallback done,
+                               void* done_target,
+                               gboolean export_in_place);
 void scaling_for_original (Scaling* result);
 GType export_format_parameters_get_type (void) G_GNUC_CONST;
 GType export_format_mode_get_type (void) G_GNUC_CONST;
@@ -1287,86 +1401,174 @@ GType jpeg_quality_get_type (void) G_GNUC_CONST;
 ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self);
 void export_format_parameters_free (ExportFormatParameters* self);
 void export_format_parameters_unmodified (ExportFormatParameters* result);
-Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params);
-Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params);
+Exporter* exporter_new_for_temp_file (GeeCollection* to_export,
+                                      Scaling* scaling,
+                                      ExportFormatParameters* export_params);
+Exporter* exporter_construct_for_temp_file (GType object_type,
+                                            GeeCollection* to_export,
+                                            Scaling* scaling,
+                                            ExportFormatParameters* export_params);
 ExporterUI* exporter_ui_new (Exporter* exporter);
-ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter);
-void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target);
+ExporterUI* exporter_ui_construct (GType object_type,
+                                   Exporter* exporter);
+void exporter_ui_export (ExporterUI* self,
+                         ExporterCompletionCallback completion_callback,
+                         void* completion_callback_target);
 GFile* export_ui_choose_file (const gchar* current_file_basename);
 gchar* media_source_get_basename (MediaSource* self);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
-void video_export (Video* self, GFile* dest_file, GError** error);
+void video_export (Video* self,
+                   GFile* dest_file,
+                   GError** error);
 void page_window_set_normal_cursor (PageWindow* self);
-GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining);
+GtkResponseType export_error_dialog (GFile* dest,
+                                     gboolean photos_remaining);
 GFile* export_ui_choose_dir (const gchar* user_title);
-Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all);
-Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all);
-static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks);
+Exporter* exporter_new (GeeCollection* to_export,
+                        GFile* dir,
+                        Scaling* scaling,
+                        ExportFormatParameters* export_params,
+                        gboolean auto_replace_all);
+Exporter* exporter_construct (GType object_type,
+                              GeeCollection* to_export,
+                              GFile* dir,
+                              Scaling* scaling,
+                              ExportFormatParameters* export_params,
+                              gboolean auto_replace_all);
+static void video_real_commit_backlinks (DataSource* base,
+                                  SourceCollection* sources,
+                                  const gchar* backlinks);
 GQuark database_error_quark (void);
-void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error);
-void video_get_video_id (Video* self, VideoID* result);
+void video_table_update_backlinks (VideoTable* self,
+                                   VideoID* video_id,
+                                   const gchar* backlinks,
+                                   GError** error);
+void video_get_video_id (Video* self,
+                         VideoID* result);
 gchar* data_object_to_string (DataObject* self);
-static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id);
-gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id);
-gboolean video_is_duplicate (GFile* file, const gchar* full_md5);
-gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5);
-ImportResult video_import_create (VideoImportParams* params, Video* * video);
-void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error);
+static gboolean video_real_set_event_id (MediaSource* base,
+                                  EventID* event_id);
+gboolean video_table_set_event (VideoTable* self,
+                                VideoID* video_id,
+                                EventID* event_id);
+gboolean video_is_duplicate (GFile* file,
+                             const gchar* full_md5);
+gboolean video_table_has_duplicate (VideoTable* self,
+                                    GFile* file,
+                                    const gchar* md5);
+ImportResult video_import_create (VideoImportParams* params,
+                                  Video* * video);
+void video_table_add (VideoTable* self,
+                      VideoRow* video_row,
+                      VideoID* result,
+                      GError** error);
 gboolean video_id_is_invalid (VideoID *self);
 void video_import_failed (Video* video);
-void video_table_remove (VideoTable* self, VideoID* videoID, GError** error);
+void video_table_remove (VideoTable* self,
+                         VideoID* videoID,
+                         GError** error);
 void app_window_database_error (GError* err);
-static BackingFileState** video_real_get_backing_files_state (MediaSource* base, int* result_length1);
-BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5);
-BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5);
-static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error);
-GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error);
+static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
+                                                       int* result_length1);
+BackingFileState* backing_file_state_new (const gchar* filepath,
+                                          gint64 filesize,
+                                          time_t modification_time,
+                                          const gchar* md5);
+BackingFileState* backing_file_state_construct (GType object_type,
+                                                const gchar* filepath,
+                                                gint64 filesize,
+                                                time_t modification_time,
+                                                const gchar* md5);
+static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base,
+                                     gint scale,
+                                     GError** error);
+GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source,
+                                  gint scale,
+                                  GError** error);
 static gchar* video_real_get_master_md5 (MediaSource* base);
-static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error);
-GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
+static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base,
+                                          Scaling* scaling,
+                                          GError** error);
+GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self,
+                                           gint scale,
+                                           GError** error);
 GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
-GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up);
-static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error);
+GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self,
+                                      GdkPixbuf* pixbuf,
+                                      GdkInterpType interp,
+                                      gboolean scale_up);
+static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base,
+                                        gint scale,
+                                        GError** error);
 GFile* media_source_get_file (MediaSource* self);
 static gchar* video_real_get_typename (DataSource* base);
 static gint64 video_real_get_instance_id (DataSource* base);
-static void video_real_get_import_id (MediaSource* base, ImportID* result);
+static void video_real_get_import_id (MediaSource* base,
+                               ImportID* result);
 static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSource* base);
 PhotoFileFormat photo_file_format_get_system_default_format (void);
 static gchar* video_real_get_title (MediaSource* base);
-static void video_real_set_title (MediaSource* base, const gchar* title);
-void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error);
-void data_object_notify_altered (DataObject* self, Alteration* alteration);
-Alteration* alteration_new (const gchar* subject, const gchar* detail);
-Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail);
+static void video_real_set_title (MediaSource* base,
+                           const gchar* title);
+void video_table_set_title (VideoTable* self,
+                            VideoID* video_id,
+                            const gchar* new_title,
+                            GError** error);
+void data_object_notify_altered (DataObject* self,
+                                 Alteration* alteration);
+Alteration* alteration_new (const gchar* subject,
+                            const gchar* detail);
+Alteration* alteration_construct (GType object_type,
+                                  const gchar* subject,
+                                  const gchar* detail);
 static gchar* video_real_get_comment (MediaSource* base);
-static gboolean video_real_set_comment (MediaSource* base, const gchar* comment);
-void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error);
+static gboolean video_real_set_comment (MediaSource* base,
+                                 const gchar* comment);
+void video_table_set_comment (VideoTable* self,
+                              VideoID* video_id,
+                              const gchar* new_comment,
+                              GError** error);
 static Rating video_real_get_rating (MediaSource* base);
-static void video_real_set_rating (MediaSource* base, Rating rating);
+static void video_real_set_rating (MediaSource* base,
+                            Rating rating);
 gboolean rating_is_valid (Rating self);
-void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error);
+void video_table_set_rating (VideoTable* self,
+                             VideoID* video_id,
+                             Rating rating,
+                             GError** error);
 static void video_real_increase_rating (MediaSource* base);
-void media_source_set_rating (MediaSource* self, Rating rating);
+void media_source_set_rating (MediaSource* self,
+                              Rating rating);
 Rating rating_increase (Rating self);
 static void video_real_decrease_rating (MediaSource* base);
 Rating rating_decrease (Rating self);
 static gboolean video_real_is_trashed (MediaSource* base);
-gboolean video_is_flag_set (Video* self, guint64 flag);
+gboolean video_is_flag_set (Video* self,
+                            guint64 flag);
 static gboolean video_real_is_offline (Monitorable* base);
 static void video_real_mark_offline (Monitorable* base);
-guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration);
+guint64 video_add_flags (Video* self,
+                         guint64 flags_to_add,
+                         Alteration* additional_alteration);
 static void video_real_mark_online (Monitorable* base);
-guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration);
+guint64 video_remove_flags (Video* self,
+                            guint64 flags_to_remove,
+                            Alteration* additional_alteration);
 gboolean video_get_is_interpretable (Video* self);
 gpointer video_interpretable_results_ref (gpointer instance);
 void video_interpretable_results_unref (gpointer instance);
-GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void video_value_set_interpretable_results (GValue* value, gpointer v_object);
-void video_value_take_interpretable_results (GValue* value, gpointer v_object);
+GParamSpec* video_param_spec_interpretable_results (const gchar* name,
+                                                    const gchar* nick,
+                                                    const gchar* blurb,
+                                                    GType object_type,
+                                                    GParamFlags flags);
+void video_value_set_interpretable_results (GValue* value,
+                                            gpointer v_object);
+void video_value_take_interpretable_results (GValue* value,
+                                             gpointer v_object);
 gpointer video_value_get_interpretable_results (const GValue* value);
 GType video_interpretable_results_get_type (void) G_GNUC_CONST;
 VideoInterpretableResults* video_check_is_interpretable (Video* self);
@@ -1376,167 +1578,290 @@ static void video_real_untrash (MediaSource* base);
 static gboolean video_real_is_flagged (Flaggable* base);
 static void video_real_mark_flagged (Flaggable* base);
 static void video_real_mark_unflagged (Flaggable* base);
-static void video_real_get_event_id (MediaSource* base, EventID* result);
+static void video_real_get_event_id (MediaSource* base,
+                              EventID* result);
 static gchar* video_real_to_string (DataObject* base);
 static time_t video_real_get_exposure_time (Dateable* base);
-static void video_real_set_exposure_time (Dateable* base, time_t time);
-void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error);
-void video_get_frame_dimensions (Video* self, Dimensions* result);
-void dimensions_init (Dimensions *self, gint width, gint height);
-static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result);
+static void video_real_set_exposure_time (Dateable* base,
+                                   time_t time);
+void video_table_set_exposure_time (VideoTable* self,
+                                    VideoID* video_id,
+                                    time_t time,
+                                    GError** error);
+void video_get_frame_dimensions (Video* self,
+                                 Dimensions* result);
+void dimensions_init (Dimensions *self,
+                      gint width,
+                      gint height);
+static void video_real_get_dimensions (MediaSource* base,
+                                PhotoException disallowed_steps,
+                                Dimensions* result);
 static guint64 video_real_get_filesize (MediaSource* base);
 guint64 media_source_get_master_filesize (MediaSource* self);
 static guint64 video_real_get_master_filesize (MediaSource* base);
 static time_t video_real_get_timestamp (MediaSource* base);
-static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info);
-void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error);
+static void video_real_set_master_timestamp (Monitorable* base,
+                                      GFileInfo* info);
+void video_table_set_timestamp (VideoTable* self,
+                                VideoID* video_id,
+                                time_t timestamp,
+                                GError** error);
 gchar* video_get_filename (Video* self);
 static GFile* video_real_get_file (MediaSource* base);
 static GFile* video_real_get_master_file (MediaSource* base);
 gdouble video_get_clip_duration (Video* self);
-void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error);
+void video_table_update_is_interpretable (VideoTable* self,
+                                          VideoID* video_id,
+                                          gboolean is_interpretable,
+                                          GError** error);
 VideoInterpretableResults* video_interpretable_results_new (Video* video);
-VideoInterpretableResults* video_interpretable_results_construct (GType object_type, Video* video);
+VideoInterpretableResults* video_interpretable_results_construct (GType object_type,
+                                                                  Video* video);
 static void video_real_destroy (DataSource* base);
 void thumbnail_cache_remove (ThumbnailSource* source);
 void data_source_destroy (DataSource* self);
-static gboolean video_real_internal_delete_backing (DataSource* base, GError** error);
+static gboolean video_real_internal_delete_backing (DataSource* base,
+                                             GError** error);
 gboolean media_source_delete_original_file (MediaSource* self);
-gboolean data_source_internal_delete_backing (DataSource* self, GError** error);
-static void video_notify_flags_altered (Video* self, Alteration* additional_alteration);
-Alteration* alteration_compress (Alteration* self, Alteration* other);
-guint64 media_source_internal_add_flags (guint64 flags, guint64 selector);
-void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error);
-guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector);
-gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector);
-static void video_real_set_master_file (Monitorable* base, GFile* file);
-void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error);
-void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
+gboolean data_source_internal_delete_backing (DataSource* self,
+                                              GError** error);
+static void video_notify_flags_altered (Video* self,
+                                 Alteration* additional_alteration);
+Alteration* alteration_compress (Alteration* self,
+                                 Alteration* other);
+guint64 media_source_internal_add_flags (guint64 flags,
+                                         guint64 selector);
+void video_table_set_flags (VideoTable* self,
+                            VideoID* video_id,
+                            guint64 flags,
+                            GError** error);
+guint64 media_source_internal_remove_flags (guint64 flags,
+                                            guint64 selector);
+gboolean media_source_internal_is_flag_set (guint64 flags,
+                                            guint64 selector);
+static void video_real_set_master_file (Monitorable* base,
+                                 GFile* file);
+void video_table_set_filepath (VideoTable* self,
+                               VideoID* video_id,
+                               const gchar* filepath,
+                               GError** error);
+void media_source_notify_master_replaced (MediaSource* self,
+                                          GFile* old_file,
+                                          GFile* new_file);
 Alteration* alteration_new_from_list (const gchar* list);
-Alteration* alteration_construct_from_list (GType object_type, const gchar* list);
-VideoMetadata* video_read_metadata (Video* self, GError** error);
-enum  {
-	VIDEO_INTERPRETABLE_RESULTS_DUMMY_PROPERTY
-};
-void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error);
+Alteration* alteration_construct_from_list (GType object_type,
+                                            const gchar* list);
+VideoMetadata* video_read_metadata (Video* self,
+                                    GError** error);
+void thumbnail_cache_replace (ThumbnailSource* source,
+                              ThumbnailCacheSize size,
+                              GdkPixbuf* replacement,
+                              GError** error);
 void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self);
 static void video_interpretable_results_finalize (VideoInterpretableResults * obj);
 static void video_finalize (GObject * obj);
 GType marker_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
-GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_backlink (GValue* value, gpointer v_object);
-void value_take_source_backlink (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_backlink (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_source_backlink (GValue* value,
+                                gpointer v_object);
+void value_take_source_backlink (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_source_backlink (const GValue* value);
 GType source_backlink_get_type (void) G_GNUC_CONST;
 GType database_source_holding_tank_get_type (void) G_GNUC_CONST;
 GType media_source_holding_tank_get_type (void) G_GNUC_CONST;
 gpointer workers_ref (gpointer instance);
 void workers_unref (gpointer instance);
-GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_workers (GValue* value, gpointer v_object);
-void value_take_workers (GValue* value, gpointer v_object);
+GParamSpec* param_spec_workers (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags);
+void value_set_workers (GValue* value,
+                        gpointer v_object);
+void value_take_workers (GValue* value,
+                         gpointer v_object);
 gpointer value_get_workers (const GValue* value);
 GType workers_get_type (void) G_GNUC_CONST;
 GType media_monitor_get_type (void) G_GNUC_CONST;
 gpointer transaction_controller_ref (gpointer instance);
 void transaction_controller_unref (gpointer instance);
-GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_transaction_controller (GValue* value, gpointer v_object);
-void value_take_transaction_controller (GValue* value, gpointer v_object);
+GParamSpec* param_spec_transaction_controller (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void value_set_transaction_controller (GValue* value,
+                                       gpointer v_object);
+void value_take_transaction_controller (GValue* value,
+                                        gpointer v_object);
 gpointer value_get_transaction_controller (const GValue* value);
 GType transaction_controller_get_type (void) G_GNUC_CONST;
 #define VIDEO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollectionPrivate))
-enum  {
-	VIDEO_SOURCE_COLLECTION_DUMMY_PROPERTY
-};
 GType video_source_collection_state_get_type (void) G_GNUC_CONST;
-gint uint64_compare (guint64* a, guint64* b);
-static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+gint uint64_compare (guint64* a,
+                     guint64* b);
+static gint _uint64_compare_gcompare_data_func (gconstpointer a,
+                                         gconstpointer b,
+                                         gpointer self);
 static guint64* _uint64_dup (guint64* self);
 gint64 video_source_collection_get_video_key (DataSource* source);
-static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self);
-MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target);
+static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source,
+                                                                       gpointer self);
+MediaSourceCollection* media_source_collection_construct (GType object_type,
+                                                          const gchar* name,
+                                                          GetSourceDatabaseKey source_key_func,
+                                                          void* source_key_func_target);
 MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self);
-static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed);
-static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self,
+                                                           GeeCollection* added,
+                                                           GeeCollection* removed);
+static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender,
+                                                                                                 GeeCollection* added,
+                                                                                                 GeeCollection* removed,
+                                                                                                 gpointer self);
 MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self);
-static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed);
-static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self,
+                                                          GeeCollection* added,
+                                                          GeeCollection* removed);
+static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender,
+                                                                                                GeeCollection* added,
+                                                                                                GeeCollection* removed,
+                                                                                                gpointer self);
 static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (MediaSourceCollection* base);
 gboolean video_source_collection_is_video_trashed (DataSource* source);
-static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self);
-MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target);
-MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target);
+static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source,
+                                                                                      Alteration* alteration,
+                                                                                      gpointer self);
+MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources,
+                                                       SourceHoldingTankCheckToKeep check_to_keep,
+                                                       void* check_to_keep_target,
+                                                       GetSourceDatabaseKey get_key,
+                                                       void* get_key_target);
+MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type,
+                                                             MediaSourceCollection* sources,
+                                                             SourceHoldingTankCheckToKeep check_to_keep,
+                                                             void* check_to_keep_target,
+                                                             GetSourceDatabaseKey get_key,
+                                                             void* get_key_target);
 static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (MediaSourceCollection* base);
 gboolean video_source_collection_is_video_offline (DataSource* source);
-static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self);
-static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable);
+static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source,
+                                                                                      Alteration* alteration,
+                                                                                      gpointer self);
+static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base,
+                                                                 Workers* workers,
+                                                                 GCancellable* cancellable);
 VideoMonitor* video_monitor_new (GCancellable* cancellable);
-VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable);
+VideoMonitor* video_monitor_construct (GType object_type,
+                                       GCancellable* cancellable);
 GType video_monitor_get_type (void) G_GNUC_CONST;
-static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source);
+static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base,
+                                                            DataSource* source);
 static gchar* video_source_collection_real_get_typename (MediaSourceCollection* base);
-static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file);
-static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id);
-Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id);
-DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key);
-static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id);
-GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id);
-Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state);
-MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file);
-MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file);
-static void video_source_collection_compare_backing (VideoSourceCollection* self, Video* video, GFileInfo* info, GeeCollection* matching_master);
+static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base,
+                                                          GFile* file);
+static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base,
+                                                               gint64 numeric_id);
+Video* video_source_collection_fetch (VideoSourceCollection* self,
+                                      VideoID* video_id);
+DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self,
+                                                     gint64 key);
+static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base,
+                                                                  EventID* event_id);
+GeeArrayList* video_table_get_event_source_ids (VideoTable* self,
+                                                EventID* event_id);
+Video* video_source_collection_get_state_by_file (VideoSourceCollection* self,
+                                                  GFile* file,
+                                                  VideoSourceCollectionState* state);
+MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self,
+                                                           GFile* file);
+MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self,
+                                                             GFile* file);
+static void video_source_collection_compare_backing (VideoSourceCollection* self,
+                                              Video* video,
+                                              GFileInfo* info,
+                                              GeeCollection* matching_master);
 guint64 media_source_get_filesize (MediaSource* self);
 time_t media_source_get_timestamp (MediaSource* self);
-void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master);
+void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self,
+                                                        GFileInfo* info,
+                                                        GeeCollection* matching_master);
 GeeCollection* data_collection_get_all (DataCollection* self);
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
-static void video_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed);
-void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed);
-void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result);
+static void video_source_collection_real_notify_contents_altered (DataCollection* base,
+                                                           GeeIterable* added,
+                                                           GeeIterable* removed);
+void data_collection_notify_contents_altered (DataCollection* self,
+                                              GeeIterable* added,
+                                              GeeIterable* removed);
+void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self,
+                                                              const gchar* basename,
+                                                              guint64 filesize,
+                                                              VideoID* result);
 GFile* media_source_get_master_file (MediaSource* self);
-gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize);
+gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self,
+                                                                  const gchar* basename,
+                                                                  guint64 filesize);
 gboolean video_id_is_valid (VideoID *self);
 MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources);
-MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources);
+MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type,
+                                                                                 MediaSourceCollection* sources);
 GType media_source_transaction_controller_get_type (void) G_GNUC_CONST;
 static void video_source_collection_finalize (DataCollection * 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 gchar* VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS[4] = {"bdm", "bdmv", "cpi", "mpl"};
 
-GQuark video_error_quark (void) {
+GQuark
+video_error_quark (void)
+{
 	return g_quark_from_static_string ("video_error-quark");
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1520 "VideoSupport.c"
+#line 1840 "VideoSupport.c"
 }
 
 
-static gpointer _thumbnails_ref0 (gpointer self) {
+static gpointer
+_thumbnails_ref0 (gpointer self)
+{
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 1527 "VideoSupport.c"
+#line 1849 "VideoSupport.c"
 }
 
 
-VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) {
+VideoImportParams*
+video_import_params_construct (GType object_type,
+                               GFile* file,
+                               ImportID* import_id,
+                               const gchar* md5,
+                               Thumbnails* thumbnails,
+                               time_t exposure_time_override)
+{
 	VideoImportParams* self = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
-	ImportID _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	Thumbnails* _tmp5_;
-	Thumbnails* _tmp6_;
-	time_t _tmp7_;
+	ImportID _tmp1_;
+	gchar* _tmp2_;
+	Thumbnails* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1546,148 +1871,171 @@ VideoImportParams* video_import_params_construct (GType object_type, GFile* file
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoImportParams*) g_type_create_instance (object_type);
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
-#line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (file);
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->file);
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->file = _tmp1_;
+	self->file = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = *import_id;
+	_tmp1_ = *import_id;
 #line 31 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->import_id = _tmp2_;
-#line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = md5;
+	self->import_id = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp2_ = g_strdup (md5);
 #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (self->md5);
 #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->md5 = _tmp4_;
+	self->md5 = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = thumbnails;
-#line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = _thumbnails_ref0 (_tmp5_);
+	_tmp3_ = _thumbnails_ref0 (thumbnails);
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_thumbnails_unref0 (self->thumbnails);
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->thumbnails = _tmp6_;
-#line 34 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = exposure_time_override;
+	self->thumbnails = _tmp3_;
 #line 34 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->exposure_time_override = _tmp7_;
+	self->exposure_time_override = exposure_time_override;
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1583 "VideoSupport.c"
+#line 1900 "VideoSupport.c"
 }
 
 
-VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) {
+VideoImportParams*
+video_import_params_new (GFile* file,
+                         ImportID* import_id,
+                         const gchar* md5,
+                         Thumbnails* thumbnails,
+                         time_t exposure_time_override)
+{
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_import_params_construct (TYPE_VIDEO_IMPORT_PARAMS, file, import_id, md5, thumbnails, exposure_time_override);
-#line 1590 "VideoSupport.c"
+#line 1913 "VideoSupport.c"
 }
 
 
-static void value_video_import_params_init (GValue* value) {
+static void
+value_video_import_params_init (GValue* value)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1597 "VideoSupport.c"
+#line 1922 "VideoSupport.c"
 }
 
 
-static void value_video_import_params_free_value (GValue* value) {
+static void
+value_video_import_params_free_value (GValue* value)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (value->data[0].v_pointer);
-#line 1606 "VideoSupport.c"
+#line 1933 "VideoSupport.c"
 	}
 }
 
 
-static void value_video_import_params_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_video_import_params_copy_value (const GValue* src_value,
+                                      GValue* dest_value)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_import_params_ref (src_value->data[0].v_pointer);
-#line 1616 "VideoSupport.c"
+#line 1946 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1620 "VideoSupport.c"
+#line 1950 "VideoSupport.c"
 	}
 }
 
 
-static gpointer value_video_import_params_peek_pointer (const GValue* value) {
+static gpointer
+value_video_import_params_peek_pointer (const GValue* value)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1628 "VideoSupport.c"
+#line 1960 "VideoSupport.c"
 }
 
 
-static gchar* value_video_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_video_import_params_collect_value (GValue* value,
+                                         guint n_collect_values,
+                                         GTypeCValue* collect_values,
+                                         guint collect_flags)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1635 "VideoSupport.c"
+#line 1972 "VideoSupport.c"
 		VideoImportParams * object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1642 "VideoSupport.c"
+#line 1979 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1646 "VideoSupport.c"
+#line 1983 "VideoSupport.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_import_params_ref (object);
-#line 1650 "VideoSupport.c"
+#line 1987 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1654 "VideoSupport.c"
+#line 1991 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1658 "VideoSupport.c"
+#line 1995 "VideoSupport.c"
 }
 
 
-static gchar* value_video_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_video_import_params_lcopy_value (const GValue* value,
+                                       guint n_collect_values,
+                                       GTypeCValue* collect_values,
+                                       guint collect_flags)
+{
 	VideoImportParams ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1669 "VideoSupport.c"
+#line 2011 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 1675 "VideoSupport.c"
+#line 2017 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1679 "VideoSupport.c"
+#line 2021 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_import_params_ref (value->data[0].v_pointer);
-#line 1683 "VideoSupport.c"
+#line 2025 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1687 "VideoSupport.c"
+#line 2029 "VideoSupport.c"
 }
 
 
-GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_video_import_params (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags)
+{
 	ParamSpecVideoImportParams* spec;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_IMPORT_PARAMS), NULL);
@@ -1697,20 +2045,25 @@ GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1701 "VideoSupport.c"
+#line 2049 "VideoSupport.c"
 }
 
 
-gpointer value_get_video_import_params (const GValue* value) {
+gpointer
+value_get_video_import_params (const GValue* value)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS), NULL);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1710 "VideoSupport.c"
+#line 2060 "VideoSupport.c"
 }
 
 
-void value_set_video_import_params (GValue* value, gpointer v_object) {
+void
+value_set_video_import_params (GValue* value,
+                               gpointer v_object)
+{
 	VideoImportParams * old;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS));
@@ -1726,22 +2079,25 @@ void value_set_video_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_ref (value->data[0].v_pointer);
-#line 1730 "VideoSupport.c"
+#line 2083 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1734 "VideoSupport.c"
+#line 2087 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1740 "VideoSupport.c"
+#line 2093 "VideoSupport.c"
 	}
 }
 
 
-void value_take_video_import_params (GValue* value, gpointer v_object) {
+void
+value_take_video_import_params (GValue* value,
+                                gpointer v_object)
+{
 	VideoImportParams * old;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS));
@@ -1755,31 +2111,35 @@ void value_take_video_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1759 "VideoSupport.c"
+#line 2115 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1763 "VideoSupport.c"
+#line 2119 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1769 "VideoSupport.c"
+#line 2125 "VideoSupport.c"
 	}
 }
 
 
-static void video_import_params_class_init (VideoImportParamsClass * klass) {
+static void
+video_import_params_class_init (VideoImportParamsClass * klass)
+{
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoImportParamsClass *) klass)->finalize = video_import_params_finalize;
-#line 1779 "VideoSupport.c"
+#line 2137 "VideoSupport.c"
 }
 
 
-static void video_import_params_instance_init (VideoImportParams * self) {
+static void
+video_import_params_instance_init (VideoImportParams * self)
+{
 	VideoRow* _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	import_id_init (&self->import_id, IMPORT_ID_INVALID);
@@ -1789,11 +2149,13 @@ static void video_import_params_instance_init (VideoImportParams * self) {
 	self->row = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 1793 "VideoSupport.c"
+#line 2153 "VideoSupport.c"
 }
 
 
-static void video_import_params_finalize (VideoImportParams * obj) {
+static void
+video_import_params_finalize (VideoImportParams * obj)
+{
 	VideoImportParams * self;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_IMPORT_PARAMS, VideoImportParams);
@@ -1807,11 +2169,13 @@ static void video_import_params_finalize (VideoImportParams * obj) {
 	_thumbnails_unref0 (self->thumbnails);
 #line 26 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->row);
-#line 1811 "VideoSupport.c"
+#line 2173 "VideoSupport.c"
 }
 
 
-GType video_import_params_get_type (void) {
+GType
+video_import_params_get_type (void)
+{
 	static volatile gsize video_import_params_type_id__volatile = 0;
 	if (g_once_init_enter (&video_import_params_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_video_import_params_init, value_video_import_params_free_value, value_video_import_params_copy_value, value_video_import_params_peek_pointer, "p", value_video_import_params_collect_value, "p", value_video_import_params_lcopy_value };
@@ -1825,18 +2189,22 @@ GType video_import_params_get_type (void) {
 }
 
 
-gpointer video_import_params_ref (gpointer instance) {
+gpointer
+video_import_params_ref (gpointer instance)
+{
 	VideoImportParams * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 1836 "VideoSupport.c"
+#line 2202 "VideoSupport.c"
 }
 
 
-void video_import_params_unref (gpointer instance) {
+void
+video_import_params_unref (gpointer instance)
+{
 	VideoImportParams * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1845,155 +2213,141 @@ void video_import_params_unref (gpointer instance) {
 		VIDEO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1849 "VideoSupport.c"
+#line 2217 "VideoSupport.c"
 	}
 }
 
 
-VideoReader* video_reader_construct (GType object_type, GFile* file) {
+VideoReader*
+video_reader_construct (GType object_type,
+                        GFile* file)
+{
 	VideoReader* self = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoReader*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
-#line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (file);
 #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->file);
 #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->file = _tmp1_;
+	self->priv->file = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1872 "VideoSupport.c"
+#line 2240 "VideoSupport.c"
 }
 
 
-VideoReader* video_reader_new (GFile* file) {
+VideoReader*
+video_reader_new (GFile* file)
+{
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_reader_construct (TYPE_VIDEO_READER, file);
-#line 1879 "VideoSupport.c"
+#line 2249 "VideoSupport.c"
 }
 
 
-gboolean video_reader_is_supported_video_file (GFile* file) {
+gboolean
+video_reader_is_supported_video_file (GFile* file)
+{
 	gboolean result = FALSE;
 	gchar* mime_type = NULL;
-	GFile* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
+	guchar* _tmp2_;
 	guchar* _tmp3_;
-	guchar* _tmp4_;
-	gint _tmp4__length1;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_;
-	GFile* _tmp23_;
-	gchar* _tmp24_;
-	gchar* _tmp25_;
-	gboolean _tmp26_;
-	gboolean _tmp27_;
+	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp7_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gboolean _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
+	_tmp0_ = g_file_get_basename (file);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = g_file_get_basename (_tmp0_);
-#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = g_new0 (guchar, 0);
+	_tmp2_ = g_new0 (guchar, 0);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4__length1 = 0;
+	_tmp3__length1 = 0;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = g_content_type_guess (_tmp2_, _tmp4_, (gsize) 0, NULL);
+	_tmp4_ = g_content_type_guess (_tmp1_, _tmp3_, (gsize) 0, NULL);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = (g_free (_tmp4_), NULL);
+	_tmp3_ = (g_free (_tmp3_), NULL);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	mime_type = _tmp6_;
+	mime_type = _tmp5_;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = mime_type;
+	_tmp7_ = mime_type;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) {
-#line 1930 "VideoSupport.c"
-		GFile* _tmp9_;
-		gboolean _tmp10_;
+	if (g_strcmp0 (_tmp7_, "audio/ogg") == 0) {
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = file;
-#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = g_file_has_uri_scheme (_tmp9_, "file");
-#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = _tmp10_;
-#line 1939 "VideoSupport.c"
+		_tmp6_ = g_file_has_uri_scheme (file, "file");
+#line 2299 "VideoSupport.c"
 	} else {
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = FALSE;
-#line 1943 "VideoSupport.c"
+		_tmp6_ = FALSE;
+#line 2303 "VideoSupport.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp7_) {
-#line 1947 "VideoSupport.c"
+	if (_tmp6_) {
+#line 2307 "VideoSupport.c"
 		{
 			GFileInfo* info = NULL;
-			GFile* _tmp11_;
-			GFileInfo* _tmp12_;
+			GFileInfo* _tmp8_;
 			gchar* content_type = NULL;
-			GFileInfo* _tmp13_;
-			const gchar* _tmp14_;
-			gchar* _tmp15_;
-			gboolean _tmp16_ = FALSE;
-			const gchar* _tmp17_;
-#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp11_ = file;
+			GFileInfo* _tmp9_;
+			const gchar* _tmp10_;
+			gchar* _tmp11_;
+			gboolean _tmp12_ = FALSE;
+			const gchar* _tmp13_;
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+			_tmp8_ = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			info = _tmp12_;
+			info = _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1966 "VideoSupport.c"
+#line 2323 "VideoSupport.c"
 				goto __catch503_g_error;
 			}
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp13_ = info;
+			_tmp9_ = info;
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp14_ = g_file_info_get_content_type (_tmp13_);
+			_tmp10_ = g_file_info_get_content_type (_tmp9_);
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp15_ = g_strdup (_tmp14_);
+			_tmp11_ = g_strdup (_tmp10_);
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			content_type = _tmp15_;
+			content_type = _tmp11_;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = content_type;
+			_tmp13_ = content_type;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp17_ != NULL) {
-#line 1981 "VideoSupport.c"
-				const gchar* _tmp18_;
-				gboolean _tmp19_;
-#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = content_type;
+			if (_tmp13_ != NULL) {
+#line 2338 "VideoSupport.c"
+				const gchar* _tmp14_;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = g_str_has_prefix (_tmp18_, "video/");
+				_tmp14_ = content_type;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = _tmp19_;
-#line 1990 "VideoSupport.c"
+				_tmp12_ = g_str_has_prefix (_tmp14_, "video/");
+#line 2344 "VideoSupport.c"
 			} else {
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = FALSE;
-#line 1994 "VideoSupport.c"
+				_tmp12_ = FALSE;
+#line 2348 "VideoSupport.c"
 			}
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp16_) {
+			if (_tmp12_) {
 #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
 #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2004,39 +2358,39 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 				_g_free0 (mime_type);
 #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 2008 "VideoSupport.c"
+#line 2362 "VideoSupport.c"
 			}
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (content_type);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 2014 "VideoSupport.c"
+#line 2368 "VideoSupport.c"
 		}
 		goto __finally503;
 		__catch503_g_error:
 		{
 			GError* _error_ = NULL;
-			GError* _tmp20_;
-			const gchar* _tmp21_;
+			GError* _tmp15_;
+			const gchar* _tmp16_;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_error_ = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
 #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp20_ = _error_;
+			_tmp15_ = _error_;
 #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = _tmp20_->message;
+			_tmp16_ = _tmp15_->message;
 #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp21_);
+			g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp16_);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (_error_);
-#line 2034 "VideoSupport.c"
+#line 2388 "VideoSupport.c"
 		}
 		__finally503:
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2039 "VideoSupport.c"
-			gboolean _tmp22_ = FALSE;
+#line 2393 "VideoSupport.c"
+			gboolean _tmp17_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2044,110 +2398,96 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return _tmp22_;
-#line 2049 "VideoSupport.c"
+			return _tmp17_;
+#line 2403 "VideoSupport.c"
 		}
 	}
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = file;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = g_file_get_basename (_tmp23_);
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = _tmp24_;
+	_tmp18_ = g_file_get_basename (file);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = video_reader_is_supported_video_filename (_tmp25_);
+	_tmp19_ = _tmp18_;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = _tmp26_;
+	_tmp20_ = video_reader_is_supported_video_filename (_tmp19_);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp25_);
+	_g_free0 (_tmp19_);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp27_;
+	result = _tmp20_;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2070 "VideoSupport.c"
+#line 2420 "VideoSupport.c"
 }
 
 
-gboolean video_reader_is_supported_video_filename (const gchar* filename) {
+gboolean
+video_reader_is_supported_video_filename (const gchar* filename)
+{
 	gboolean result = FALSE;
 	gchar* mime_type = NULL;
-	const gchar* _tmp0_;
+	guchar* _tmp0_;
 	guchar* _tmp1_;
-	guchar* _tmp2_;
-	gint _tmp2__length1;
-	gchar* _tmp3_;
-	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_;
-	gboolean _tmp6_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp4_;
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (filename != NULL, FALSE);
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = filename;
-#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = g_new0 (guchar, 0);
+	_tmp0_ = g_new0 (guchar, 0);
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2__length1 = 0;
+	_tmp1__length1 = 0;
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = g_content_type_guess (_tmp0_, _tmp2_, (gsize) 0, NULL);
+	_tmp2_ = g_content_type_guess (filename, _tmp1_, (gsize) 0, NULL);
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	mime_type = _tmp3_;
+	mime_type = _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = (g_free (_tmp2_), NULL);
+	_tmp1_ = (g_free (_tmp1_), NULL);
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = mime_type;
+	_tmp4_ = mime_type;
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = g_str_has_prefix (_tmp5_, "video/");
-#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp6_) {
+	if (g_str_has_prefix (_tmp4_, "video/")) {
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = TRUE;
-#line 2111 "VideoSupport.c"
+		_tmp3_ = TRUE;
+#line 2457 "VideoSupport.c"
 	} else {
-		const gchar* _tmp7_;
-		gboolean _tmp8_;
+		const gchar* _tmp5_;
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = mime_type;
+		_tmp5_ = mime_type;
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = g_str_has_suffix (_tmp7_, "mp4");
-#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = _tmp8_;
-#line 2121 "VideoSupport.c"
+		_tmp3_ = g_str_has_suffix (_tmp5_, "mp4");
+#line 2464 "VideoSupport.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp4_) {
-#line 2125 "VideoSupport.c"
+	if (_tmp3_) {
+#line 2468 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
-		const gchar* _tmp9_;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		const gchar* _tmp8_;
 #line 79 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		extension = NULL;
 #line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		name = NULL;
 #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = filename;
-#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_);
+		disassemble_filename (filename, &_tmp6_, &_tmp7_);
 #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
 #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		name = _tmp10_;
+		name = _tmp6_;
 #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
 #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		extension = _tmp11_;
+		extension = _tmp7_;
 #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = extension;
+		_tmp8_ = extension;
 #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp12_ == NULL) {
+		if (_tmp8_ == NULL) {
 #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = TRUE;
 #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2158,7 +2498,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			_g_free0 (mime_type);
 #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2162 "VideoSupport.c"
+#line 2502 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
@@ -2171,26 +2511,23 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) {
-#line 2175 "VideoSupport.c"
-				gchar* _tmp13_;
+#line 2515 "VideoSupport.c"
+				gchar* _tmp9_;
 				gchar* s = NULL;
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = g_strdup (s_collection[s_it]);
+				_tmp9_ = g_strdup (s_collection[s_it]);
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				s = _tmp13_;
-#line 2182 "VideoSupport.c"
+				s = _tmp9_;
+#line 2522 "VideoSupport.c"
 				{
-					const gchar* _tmp14_;
-					const gchar* _tmp15_;
-					gint _tmp16_;
-#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp14_ = s;
+					const gchar* _tmp10_;
+					const gchar* _tmp11_;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp15_ = extension;
+					_tmp10_ = s;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp16_ = utf8_ci_compare (_tmp14_, _tmp15_);
+					_tmp11_ = extension;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp16_ == 0) {
+					if (utf8_ci_compare (_tmp10_, _tmp11_) == 0) {
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						result = FALSE;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2203,11 +2540,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 						_g_free0 (mime_type);
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2207 "VideoSupport.c"
+#line 2544 "VideoSupport.c"
 					}
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2211 "VideoSupport.c"
+#line 2548 "VideoSupport.c"
 				}
 			}
 		}
@@ -2221,166 +2558,136 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2225 "VideoSupport.c"
+#line 2562 "VideoSupport.c"
 	} else {
-		const gchar* _tmp17_;
-		const gchar* _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp17_ = filename;
+		const gchar* _tmp12_;
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp18_ = mime_type;
+		_tmp12_ = mime_type;
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:93: Skipping %s, unsupported mime type %s", _tmp17_, _tmp18_);
+		g_debug ("VideoSupport.vala:93: Skipping %s, unsupported mime type %s", filename, _tmp12_);
 #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = FALSE;
 #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
 #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2241 "VideoSupport.c"
+#line 2575 "VideoSupport.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2245 "VideoSupport.c"
+#line 2579 "VideoSupport.c"
 }
 
 
-ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
+ImportResult
+video_reader_prepare_for_import (VideoImportParams* params)
+{
 	ImportResult result = 0;
 	GFile* file = NULL;
-	VideoImportParams* _tmp0_;
+	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
 	GFileInfo* info = NULL;
-	GFileInfo* _tmp7_;
-	GFileType _tmp8_;
-	GFile* _tmp9_;
-	gboolean _tmp10_;
+	GFileInfo* _tmp6_;
+	GFile* _tmp7_;
 	GTimeVal timestamp = {0};
-	GFileInfo* _tmp14_;
-	GTimeVal _tmp15_ = {0};
-	VideoImportParams* _tmp16_;
-	const gchar* _tmp17_;
+	GFileInfo* _tmp11_;
+	GTimeVal _tmp12_ = {0};
+	const gchar* _tmp13_;
 	time_t exposure_time = 0;
-	VideoImportParams* _tmp18_;
-	time_t _tmp19_;
+	time_t _tmp14_;
 	gchar* title = NULL;
-	gchar* _tmp20_;
+	gchar* _tmp15_;
 	gchar* comment = NULL;
-	gchar* _tmp21_;
+	gchar* _tmp16_;
 	VideoReader* reader = NULL;
-	GFile* _tmp22_;
-	VideoReader* _tmp23_;
+	GFile* _tmp17_;
+	VideoReader* _tmp18_;
 	gboolean is_interpretable = FALSE;
 	gdouble clip_duration = 0.0;
 	GdkPixbuf* preview_frame = NULL;
-	VideoReader* _tmp24_;
-	GdkPixbuf* _tmp25_;
-	time_t _tmp53_;
-	VideoImportParams* _tmp60_;
-	VideoRow* _tmp61_;
-	VideoImportParams* _tmp62_;
-	VideoRow* _tmp63_;
-	GFile* _tmp64_;
-	gchar* _tmp65_;
-	VideoImportParams* _tmp66_;
-	VideoRow* _tmp67_;
-	GFileInfo* _tmp68_;
-	gint64 _tmp69_;
-	VideoImportParams* _tmp70_;
-	VideoRow* _tmp71_;
-	GTimeVal _tmp72_;
-	glong _tmp73_;
-	VideoImportParams* _tmp74_;
-	VideoRow* _tmp75_;
-	GdkPixbuf* _tmp76_;
-	gint _tmp77_;
-	gint _tmp78_;
-	VideoImportParams* _tmp79_;
+	VideoReader* _tmp19_;
+	GdkPixbuf* _tmp20_;
+	time_t _tmp45_;
+	VideoRow* _tmp51_;
+	VideoRow* _tmp52_;
+	GFile* _tmp53_;
+	gchar* _tmp54_;
+	VideoRow* _tmp55_;
+	GFileInfo* _tmp56_;
+	VideoRow* _tmp57_;
+	GTimeVal _tmp58_;
+	glong _tmp59_;
+	VideoRow* _tmp60_;
+	GdkPixbuf* _tmp61_;
+	gint _tmp62_;
+	gint _tmp63_;
+	VideoRow* _tmp64_;
+	GdkPixbuf* _tmp65_;
+	gint _tmp66_;
+	gint _tmp67_;
+	VideoRow* _tmp68_;
+	gdouble _tmp69_;
+	VideoRow* _tmp70_;
+	gboolean _tmp71_;
+	VideoRow* _tmp72_;
+	time_t _tmp73_;
+	VideoRow* _tmp74_;
+	ImportID _tmp75_;
+	VideoRow* _tmp76_;
+	VideoRow* _tmp77_;
+	const gchar* _tmp78_;
+	gchar* _tmp79_;
 	VideoRow* _tmp80_;
-	GdkPixbuf* _tmp81_;
-	gint _tmp82_;
-	gint _tmp83_;
-	VideoImportParams* _tmp84_;
-	VideoRow* _tmp85_;
-	gdouble _tmp86_;
-	VideoImportParams* _tmp87_;
-	VideoRow* _tmp88_;
-	gboolean _tmp89_;
-	VideoImportParams* _tmp90_;
-	VideoRow* _tmp91_;
-	time_t _tmp92_;
-	VideoImportParams* _tmp93_;
-	VideoRow* _tmp94_;
-	VideoImportParams* _tmp95_;
-	ImportID _tmp96_;
-	VideoImportParams* _tmp97_;
-	VideoRow* _tmp98_;
-	VideoImportParams* _tmp99_;
-	VideoRow* _tmp100_;
-	VideoImportParams* _tmp101_;
-	const gchar* _tmp102_;
-	gchar* _tmp103_;
-	VideoImportParams* _tmp104_;
-	VideoRow* _tmp105_;
-	VideoImportParams* _tmp106_;
-	VideoRow* _tmp107_;
-	const gchar* _tmp108_;
-	gchar* _tmp109_;
-	VideoImportParams* _tmp110_;
-	VideoRow* _tmp111_;
-	const gchar* _tmp112_;
-	gchar* _tmp113_;
-	VideoImportParams* _tmp114_;
-	VideoRow* _tmp115_;
-	gchar* _tmp116_;
-	VideoImportParams* _tmp117_;
-	VideoRow* _tmp118_;
-	VideoImportParams* _tmp119_;
-	VideoRow* _tmp120_;
-	VideoImportParams* _tmp121_;
-	Thumbnails* _tmp122_;
+	VideoRow* _tmp81_;
+	const gchar* _tmp82_;
+	gchar* _tmp83_;
+	VideoRow* _tmp84_;
+	const gchar* _tmp85_;
+	gchar* _tmp86_;
+	VideoRow* _tmp87_;
+	gchar* _tmp88_;
+	VideoRow* _tmp89_;
+	VideoRow* _tmp90_;
+	Thumbnails* _tmp91_;
 	GError * _inner_error_ = NULL;
 #line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
 #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = params;
+	_tmp0_ = params->file;
 #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _tmp0_->file;
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	file = _tmp2_;
+	file = _tmp1_;
 #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2357 "VideoSupport.c"
+#line 2664 "VideoSupport.c"
 	{
-		GFileInfo* _tmp3_ = NULL;
-		GFile* _tmp4_;
+		GFileInfo* _tmp2_ = NULL;
+		GFile* _tmp3_;
+		GFileInfo* _tmp4_;
 		GFileInfo* _tmp5_;
-		GFileInfo* _tmp6_;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = file;
+		_tmp3_ = file;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
+		_tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = _tmp5_;
+		_tmp2_ = _tmp4_;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2371 "VideoSupport.c"
+#line 2678 "VideoSupport.c"
 			goto __catch504_g_error;
 		}
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp6_ = _tmp3_;
+		_tmp5_ = _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = NULL;
+		_tmp2_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		info = _tmp6_;
+		info = _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp3_);
-#line 2384 "VideoSupport.c"
+		_g_object_unref0 (_tmp2_);
+#line 2691 "VideoSupport.c"
 	}
 	goto __finally504;
 	__catch504_g_error:
@@ -2400,7 +2707,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2404 "VideoSupport.c"
+#line 2711 "VideoSupport.c"
 	}
 	__finally504:
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2415,14 +2722,12 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2419 "VideoSupport.c"
+#line 2726 "VideoSupport.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = info;
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = g_file_info_get_file_type (_tmp7_);
+	_tmp6_ = info;
 #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
+	if (g_file_info_get_file_type (_tmp6_) != G_FILE_TYPE_REGULAR) {
 #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
 #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2431,28 +2736,26 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2435 "VideoSupport.c"
+#line 2740 "VideoSupport.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_ = file;
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
+	_tmp7_ = file;
 #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp10_) {
-#line 2443 "VideoSupport.c"
-		GFile* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
+	if (!video_reader_is_supported_video_file (_tmp7_)) {
+#line 2746 "VideoSupport.c"
+		GFile* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = file;
+		_tmp8_ = file;
 #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
+		_tmp9_ = g_file_get_path (_tmp8_);
 #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp13_ = _tmp12_;
+		_tmp10_ = _tmp9_;
 #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp13_);
+		g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp10_);
 #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp13_);
+		_g_free0 (_tmp10_);
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2461,66 +2764,59 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2465 "VideoSupport.c"
+#line 2768 "VideoSupport.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp14_ = info;
+	_tmp11_ = info;
 #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_file_info_get_modification_time (_tmp14_, &_tmp15_);
+	g_file_info_get_modification_time (_tmp11_, &_tmp12_);
 #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	timestamp = _tmp15_;
+	timestamp = _tmp12_;
 #line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp16_ = params;
+	_tmp13_ = params->md5;
 #line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp17_ = _tmp16_->md5;
-#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_vala_assert (_tmp17_ != NULL, "params.md5 != null");
-#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp18_ = params;
+	_vala_assert (_tmp13_ != NULL, "params.md5 != null");
 #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp19_ = _tmp18_->exposure_time_override;
+	_tmp14_ = params->exposure_time_override;
 #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exposure_time = _tmp19_;
+	exposure_time = _tmp14_;
 #line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = g_strdup ("");
+	_tmp15_ = g_strdup ("");
 #line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	title = _tmp20_;
+	title = _tmp15_;
 #line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = g_strdup ("");
+	_tmp16_ = g_strdup ("");
 #line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	comment = _tmp21_;
+	comment = _tmp16_;
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp22_ = file;
+	_tmp17_ = file;
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = video_reader_new (_tmp22_);
+	_tmp18_ = video_reader_new (_tmp17_);
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	reader = _tmp23_;
+	reader = _tmp18_;
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	is_interpretable = TRUE;
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = 0.0;
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = reader;
+	_tmp19_ = reader;
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
+	_tmp20_ = video_reader_read_preview_frame (_tmp19_);
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	preview_frame = _tmp25_;
-#line 2509 "VideoSupport.c"
+	preview_frame = _tmp20_;
+#line 2808 "VideoSupport.c"
 	{
-		gdouble _tmp26_ = 0.0;
-		VideoReader* _tmp27_;
-		gdouble _tmp28_;
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp27_ = reader;
+		gdouble _tmp21_ = 0.0;
+		VideoReader* _tmp22_;
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp28_ = video_reader_read_clip_duration (_tmp27_, &_inner_error_);
+		_tmp22_ = reader;
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp26_ = _tmp28_;
+		_tmp21_ = video_reader_read_clip_duration (_tmp22_, &_inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2524 "VideoSupport.c"
+#line 2820 "VideoSupport.c"
 				goto __catch505_video_error;
 			}
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2541,25 +2837,25 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2545 "VideoSupport.c"
+#line 2841 "VideoSupport.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		clip_duration = _tmp26_;
-#line 2549 "VideoSupport.c"
+		clip_duration = _tmp21_;
+#line 2845 "VideoSupport.c"
 	}
 	goto __finally505;
 	__catch505_video_error:
 	{
 		GError* err = NULL;
-		GError* _tmp29_;
+		GError* _tmp23_;
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp29_ = err;
+		_tmp23_ = err;
 #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
+		if (g_error_matches (_tmp23_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
 #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
 #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2578,28 +2874,28 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_object_unref0 (file);
 #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2582 "VideoSupport.c"
+#line 2878 "VideoSupport.c"
 		} else {
-			GError* _tmp30_;
+			GError* _tmp24_;
 #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp30_ = err;
+			_tmp24_ = err;
 #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
+			if (g_error_matches (_tmp24_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
 #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				is_interpretable = FALSE;
 #line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2593 "VideoSupport.c"
+#line 2889 "VideoSupport.c"
 			} else {
 #line 144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_error ("VideoSupport.vala:144: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2597 "VideoSupport.c"
+#line 2893 "VideoSupport.c"
 			}
 		}
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2602 "VideoSupport.c"
+#line 2898 "VideoSupport.c"
 	}
 	__finally505:
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2622,119 +2918,113 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2625 "VideoSupport.c"
+#line 2921 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
-		VideoReader* _tmp31_;
-		VideoMetadata* _tmp32_;
+		VideoReader* _tmp25_;
+		VideoMetadata* _tmp26_;
 		MetadataDateTime* creation_date_time = NULL;
-		VideoMetadata* _tmp33_;
-		MetadataDateTime* _tmp34_;
-		gboolean _tmp35_ = FALSE;
-		MetadataDateTime* _tmp36_;
+		VideoMetadata* _tmp27_;
+		MetadataDateTime* _tmp28_;
+		gboolean _tmp29_ = FALSE;
+		MetadataDateTime* _tmp30_;
 		gchar* video_title = NULL;
-		VideoMetadata* _tmp41_;
-		gchar* _tmp42_;
+		VideoMetadata* _tmp33_;
+		gchar* _tmp34_;
 		gchar* video_comment = NULL;
-		VideoMetadata* _tmp43_;
-		gchar* _tmp44_;
-		const gchar* _tmp45_;
-		const gchar* _tmp48_;
+		VideoMetadata* _tmp35_;
+		gchar* _tmp36_;
+		const gchar* _tmp37_;
+		const gchar* _tmp40_;
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp31_ = reader;
+		_tmp25_ = reader;
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp32_ = video_reader_read_metadata (_tmp31_, &_inner_error_);
+		_tmp26_ = video_reader_read_metadata (_tmp25_, &_inner_error_);
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		metadata = _tmp32_;
+		metadata = _tmp26_;
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2652 "VideoSupport.c"
+#line 2948 "VideoSupport.c"
 			goto __catch506_g_error;
 		}
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp33_ = metadata;
+		_tmp27_ = metadata;
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp34_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp28_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		creation_date_time = _tmp34_;
+		creation_date_time = _tmp28_;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp36_ = creation_date_time;
+		_tmp30_ = creation_date_time;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp36_ != NULL) {
-#line 2665 "VideoSupport.c"
-			MetadataDateTime* _tmp37_;
-			time_t _tmp38_;
+		if (_tmp30_ != NULL) {
+#line 2961 "VideoSupport.c"
+			MetadataDateTime* _tmp31_;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp37_ = creation_date_time;
+			_tmp31_ = creation_date_time;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
-#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2674 "VideoSupport.c"
+			_tmp29_ = metadata_date_time_get_timestamp (_tmp31_) != ((time_t) 0);
+#line 2967 "VideoSupport.c"
 		} else {
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp35_ = FALSE;
-#line 2678 "VideoSupport.c"
+			_tmp29_ = FALSE;
+#line 2971 "VideoSupport.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp35_) {
-#line 2682 "VideoSupport.c"
-			MetadataDateTime* _tmp39_;
-			time_t _tmp40_;
+		if (_tmp29_) {
+#line 2975 "VideoSupport.c"
+			MetadataDateTime* _tmp32_;
 #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp39_ = creation_date_time;
+			_tmp32_ = creation_date_time;
 #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
-#line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			exposure_time = _tmp40_;
-#line 2691 "VideoSupport.c"
+			exposure_time = metadata_date_time_get_timestamp (_tmp32_);
+#line 2981 "VideoSupport.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp41_ = metadata;
+		_tmp33_ = metadata;
 #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp42_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp34_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_title = _tmp42_;
+		video_title = _tmp34_;
 #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp43_ = metadata;
+		_tmp35_ = metadata;
 #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp44_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp36_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_comment = _tmp44_;
+		video_comment = _tmp36_;
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp45_ = video_title;
+		_tmp37_ = video_title;
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp45_ != NULL) {
-#line 2709 "VideoSupport.c"
-			const gchar* _tmp46_;
-			gchar* _tmp47_;
+		if (_tmp37_ != NULL) {
+#line 2999 "VideoSupport.c"
+			const gchar* _tmp38_;
+			gchar* _tmp39_;
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp46_ = video_title;
+			_tmp38_ = video_title;
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp47_ = g_strdup (_tmp46_);
+			_tmp39_ = g_strdup (_tmp38_);
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			title = _tmp47_;
-#line 2720 "VideoSupport.c"
+			title = _tmp39_;
+#line 3010 "VideoSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp48_ = video_comment;
+		_tmp40_ = video_comment;
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp48_ != NULL) {
-#line 2726 "VideoSupport.c"
-			const gchar* _tmp49_;
-			gchar* _tmp50_;
+		if (_tmp40_ != NULL) {
+#line 3016 "VideoSupport.c"
+			const gchar* _tmp41_;
+			gchar* _tmp42_;
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp49_ = video_comment;
+			_tmp41_ = video_comment;
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp50_ = g_strdup (_tmp49_);
+			_tmp42_ = g_strdup (_tmp41_);
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			comment = _tmp50_;
-#line 2737 "VideoSupport.c"
+			comment = _tmp42_;
+#line 3027 "VideoSupport.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
@@ -2744,27 +3034,27 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_metadata_date_time_unref0 (creation_date_time);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2747 "VideoSupport.c"
+#line 3037 "VideoSupport.c"
 	}
 	goto __finally506;
 	__catch506_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp51_;
-		const gchar* _tmp52_;
+		GError* _tmp43_;
+		const gchar* _tmp44_;
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp51_ = err;
+		_tmp43_ = err;
 #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp52_ = _tmp51_->message;
+		_tmp44_ = _tmp43_->message;
 #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp52_);
+		g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp44_);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2767 "VideoSupport.c"
+#line 3057 "VideoSupport.c"
 	}
 	__finally506:
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2787,241 +3077,188 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2790 "VideoSupport.c"
+#line 3080 "VideoSupport.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp53_ = exposure_time;
+	_tmp45_ = exposure_time;
 #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp53_ == ((time_t) 0)) {
-#line 2796 "VideoSupport.c"
-		gint64 _tmp54_ = 0LL;
-		VideoReader* _tmp55_;
-		GDateTime* _tmp56_;
+	if (_tmp45_ == ((time_t) 0)) {
+#line 3086 "VideoSupport.c"
+		gint64 _tmp46_ = 0LL;
+		VideoReader* _tmp47_;
+		GDateTime* _tmp48_;
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp55_ = reader;
+		_tmp47_ = reader;
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp56_ = _tmp55_->priv->_timestamp;
+		_tmp48_ = _tmp47_->priv->_timestamp;
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp56_ != NULL) {
-#line 2806 "VideoSupport.c"
-			VideoReader* _tmp57_;
-			GDateTime* _tmp58_;
-			gint64 _tmp59_;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp57_ = reader;
+		if (_tmp48_ != NULL) {
+#line 3096 "VideoSupport.c"
+			VideoReader* _tmp49_;
+			GDateTime* _tmp50_;
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp58_ = _tmp57_->priv->_timestamp;
+			_tmp49_ = reader;
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp59_ = g_date_time_to_unix (_tmp58_);
+			_tmp50_ = _tmp49_->priv->_timestamp;
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp54_ = _tmp59_;
-#line 2818 "VideoSupport.c"
+			_tmp46_ = g_date_time_to_unix (_tmp50_);
+#line 3105 "VideoSupport.c"
 		} else {
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp54_ = (gint64) 0;
-#line 2822 "VideoSupport.c"
+			_tmp46_ = (gint64) 0;
+#line 3109 "VideoSupport.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		exposure_time = (time_t) _tmp54_;
-#line 2826 "VideoSupport.c"
+		exposure_time = (time_t) _tmp46_;
+#line 3113 "VideoSupport.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp60_ = params;
+	_tmp51_ = params->row;
 #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp61_ = _tmp60_->row;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID);
-#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp62_ = params;
+	video_id_init (&_tmp51_->video_id, VIDEO_ID_INVALID);
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp63_ = _tmp62_->row;
+	_tmp52_ = params->row;
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp64_ = file;
+	_tmp53_ = file;
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp65_ = g_file_get_path (_tmp64_);
+	_tmp54_ = g_file_get_path (_tmp53_);
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp63_->filepath);
+	_g_free0 (_tmp52_->filepath);
 #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp63_->filepath = _tmp65_;
+	_tmp52_->filepath = _tmp54_;
 #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp66_ = params;
+	_tmp55_ = params->row;
 #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp67_ = _tmp66_->row;
+	_tmp56_ = info;
 #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp68_ = info;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp69_ = g_file_info_get_size (_tmp68_);
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp67_->filesize = _tmp69_;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp70_ = params;
+	_tmp55_->filesize = g_file_info_get_size (_tmp56_);
 #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp71_ = _tmp70_->row;
+	_tmp57_ = params->row;
 #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp72_ = timestamp;
+	_tmp58_ = timestamp;
 #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp73_ = _tmp72_.tv_sec;
+	_tmp59_ = _tmp58_.tv_sec;
 #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp71_->timestamp = (time_t) _tmp73_;
+	_tmp57_->timestamp = (time_t) _tmp59_;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp74_ = params;
+	_tmp60_ = params->row;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp75_ = _tmp74_->row;
+	_tmp61_ = preview_frame;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp76_ = preview_frame;
+	_tmp62_ = gdk_pixbuf_get_width (_tmp61_);
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp77_ = gdk_pixbuf_get_width (_tmp76_);
+	_tmp63_ = _tmp62_;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp78_ = _tmp77_;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp75_->width = _tmp78_;
-#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp79_ = params;
+	_tmp60_->width = _tmp63_;
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp80_ = _tmp79_->row;
+	_tmp64_ = params->row;
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp81_ = preview_frame;
+	_tmp65_ = preview_frame;
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp82_ = gdk_pixbuf_get_height (_tmp81_);
+	_tmp66_ = gdk_pixbuf_get_height (_tmp65_);
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp83_ = _tmp82_;
+	_tmp67_ = _tmp66_;
 #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp80_->height = _tmp83_;
+	_tmp64_->height = _tmp67_;
 #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp84_ = params;
+	_tmp68_ = params->row;
 #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp85_ = _tmp84_->row;
+	_tmp69_ = clip_duration;
 #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp86_ = clip_duration;
-#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp85_->clip_duration = _tmp86_;
-#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp87_ = params;
+	_tmp68_->clip_duration = _tmp69_;
 #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp88_ = _tmp87_->row;
+	_tmp70_ = params->row;
 #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp89_ = is_interpretable;
+	_tmp71_ = is_interpretable;
 #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp88_->is_interpretable = _tmp89_;
+	_tmp70_->is_interpretable = _tmp71_;
 #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp90_ = params;
+	_tmp72_ = params->row;
 #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp91_ = _tmp90_->row;
+	_tmp73_ = exposure_time;
 #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp92_ = exposure_time;
-#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp91_->exposure_time = _tmp92_;
-#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp93_ = params;
-#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp94_ = _tmp93_->row;
+	_tmp72_->exposure_time = _tmp73_;
 #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp95_ = params;
+	_tmp74_ = params->row;
 #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp96_ = _tmp95_->import_id;
+	_tmp75_ = params->import_id;
 #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp94_->import_id = _tmp96_;
+	_tmp74_->import_id = _tmp75_;
 #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp97_ = params;
+	_tmp76_ = params->row;
 #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp98_ = _tmp97_->row;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID);
-#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp99_ = params;
-#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp100_ = _tmp99_->row;
+	event_id_init (&_tmp76_->event_id, EVENT_ID_INVALID);
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp101_ = params;
+	_tmp77_ = params->row;
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp102_ = _tmp101_->md5;
+	_tmp78_ = params->md5;
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp103_ = g_strdup (_tmp102_);
+	_tmp79_ = g_strdup (_tmp78_);
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp100_->md5);
+	_g_free0 (_tmp77_->md5);
 #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp100_->md5 = _tmp103_;
+	_tmp77_->md5 = _tmp79_;
 #line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp104_ = params;
+	_tmp80_ = params->row;
 #line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp105_ = _tmp104_->row;
-#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp105_->time_created = (time_t) 0;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp106_ = params;
+	_tmp80_->time_created = (time_t) 0;
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp107_ = _tmp106_->row;
+	_tmp81_ = params->row;
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp108_ = title;
+	_tmp82_ = title;
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp109_ = g_strdup (_tmp108_);
+	_tmp83_ = g_strdup (_tmp82_);
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp107_->title);
+	_g_free0 (_tmp81_->title);
 #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp107_->title = _tmp109_;
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp110_ = params;
+	_tmp81_->title = _tmp83_;
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp111_ = _tmp110_->row;
+	_tmp84_ = params->row;
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp112_ = comment;
+	_tmp85_ = comment;
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp113_ = g_strdup (_tmp112_);
+	_tmp86_ = g_strdup (_tmp85_);
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp111_->comment);
+	_g_free0 (_tmp84_->comment);
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp111_->comment = _tmp113_;
+	_tmp84_->comment = _tmp86_;
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp114_ = params;
+	_tmp87_ = params->row;
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp115_ = _tmp114_->row;
+	_tmp88_ = g_strdup ("");
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp116_ = g_strdup ("");
+	_g_free0 (_tmp87_->backlinks);
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp115_->backlinks);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp115_->backlinks = _tmp116_;
-#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp117_ = params;
+	_tmp87_->backlinks = _tmp88_;
 #line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp118_ = _tmp117_->row;
+	_tmp89_ = params->row;
 #line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp118_->time_reimported = (time_t) 0;
+	_tmp89_->time_reimported = (time_t) 0;
 #line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp119_ = params;
+	_tmp90_ = params->row;
 #line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp120_ = _tmp119_->row;
-#line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp120_->flags = (guint64) 0;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp121_ = params;
+	_tmp90_->flags = (guint64) 0;
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp122_ = _tmp121_->thumbnails;
+	_tmp91_ = params->thumbnails;
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp122_ != NULL) {
-#line 3002 "VideoSupport.c"
-		VideoImportParams* _tmp123_;
-		Thumbnails* _tmp124_;
-		VideoImportParams* _tmp125_;
-		Thumbnails* _tmp126_;
-		GdkPixbuf* _tmp127_;
+	if (_tmp91_ != NULL) {
+#line 3245 "VideoSupport.c"
+		Thumbnails* _tmp92_;
+		Thumbnails* _tmp93_;
+		GdkPixbuf* _tmp94_;
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp123_ = params;
+		_tmp92_ = thumbnails_new ();
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp124_ = thumbnails_new ();
+		_thumbnails_unref0 (params->thumbnails);
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_thumbnails_unref0 (_tmp123_->thumbnails);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp123_->thumbnails = _tmp124_;
-#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp125_ = params;
+		params->thumbnails = _tmp92_;
 #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp126_ = _tmp125_->thumbnails;
+		_tmp93_ = params->thumbnails;
 #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp127_ = preview_frame;
+		_tmp94_ = preview_frame;
 #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 3024 "VideoSupport.c"
+		thumbnail_cache_generate_for_video_frame (_tmp93_, _tmp94_);
+#line 3261 "VideoSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -3039,11 +3276,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_g_object_unref0 (file);
 #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3042 "VideoSupport.c"
+#line 3279 "VideoSupport.c"
 }
 
 
-static GDate* _g_date_dup (GDate* self) {
+static GDate*
+_g_date_dup (GDate* self)
+{
 	GDate* dup;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (GDate, 1);
@@ -3051,61 +3290,63 @@ static GDate* _g_date_dup (GDate* self) {
 	memcpy (dup, self, sizeof (GDate));
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3054 "VideoSupport.c"
+#line 3293 "VideoSupport.c"
 }
 
 
-static gpointer __g_date_dup0 (gpointer self) {
+static gpointer
+__g_date_dup0 (gpointer self)
+{
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3061 "VideoSupport.c"
+#line 3302 "VideoSupport.c"
 }
 
 
-static void video_reader_read_internal (VideoReader* self, GError** error) {
-	gboolean _tmp0_;
+static void
+video_reader_read_internal (VideoReader* self,
+                            GError** error)
+{
 	GError * _inner_error_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_READER (self));
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video_reader_does_file_exist (self);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp0_) {
-#line 3074 "VideoSupport.c"
-		GFile* _tmp1_;
+	if (!video_reader_does_file_exist (self)) {
+#line 3315 "VideoSupport.c"
+		GFile* _tmp0_;
+		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
-		gchar* _tmp5_;
+		GError* _tmp5_;
 		GError* _tmp6_;
-		GError* _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp1_ = self->priv->file;
+		_tmp0_ = self->priv->file;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = g_file_get_path (_tmp1_);
+		_tmp1_ = g_file_get_path (_tmp0_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp3_);
+		_tmp3_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp2_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp6_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp5_);
+		_tmp5_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp4_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp4_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp3_);
+		_g_free0 (_tmp2_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_inner_error_ = _tmp7_;
+		_inner_error_ = _tmp6_;
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3108 "VideoSupport.c"
+#line 3349 "VideoSupport.c"
 		} else {
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3113,138 +3354,126 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3116 "VideoSupport.c"
+#line 3357 "VideoSupport.c"
 		}
 	}
 	{
 		GstDiscoverer* d = NULL;
-		GstDiscoverer* _tmp8_;
+		GstDiscoverer* _tmp7_;
 		GstDiscovererInfo* info = NULL;
-		GstDiscoverer* _tmp9_;
-		GFile* _tmp10_;
+		GstDiscoverer* _tmp8_;
+		GFile* _tmp9_;
+		gchar* _tmp10_;
 		gchar* _tmp11_;
-		gchar* _tmp12_;
+		GstDiscovererInfo* _tmp12_;
 		GstDiscovererInfo* _tmp13_;
 		GstDiscovererInfo* _tmp14_;
-		GstDiscovererInfo* _tmp15_;
-		GstClockTime _tmp16_;
 		GDate* video_date = NULL;
-		gboolean _tmp17_ = FALSE;
-		GstDiscovererInfo* _tmp18_;
-		GstTagList* _tmp19_;
+		gboolean _tmp15_ = FALSE;
+		GstDiscovererInfo* _tmp16_;
+		GstTagList* _tmp17_;
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_);
+		_tmp7_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_);
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		d = _tmp8_;
+		d = _tmp7_;
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3141 "VideoSupport.c"
+#line 3381 "VideoSupport.c"
 			goto __catch507_g_error;
 		}
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = d;
+		_tmp8_ = d;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = self->priv->file;
+		_tmp9_ = self->priv->file;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = g_file_get_uri (_tmp10_);
+		_tmp10_ = g_file_get_uri (_tmp9_);
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp13_ = gst_discoverer_discover_uri (_tmp9_, _tmp12_, &_inner_error_);
+		_tmp12_ = gst_discoverer_discover_uri (_tmp8_, _tmp11_, &_inner_error_);
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp12_);
+		_g_free0 (_tmp11_);
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		info = _tmp14_;
+		info = _tmp13_;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3164 "VideoSupport.c"
+#line 3404 "VideoSupport.c"
 			goto __catch507_g_error;
 		}
 #line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp15_ = info;
-#line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp16_ = gst_discoverer_info_get_duration (_tmp15_);
+		_tmp14_ = info;
 #line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		self->priv->clip_duration = ((gdouble) _tmp16_) / 1000000000.0;
+		self->priv->clip_duration = ((gdouble) gst_discoverer_info_get_duration (_tmp14_)) / 1000000000.0;
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_date = NULL;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp18_ = info;
+		_tmp16_ = info;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
+		_tmp17_ = gst_discoverer_info_get_tags (_tmp16_);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp19_ != NULL) {
-#line 3181 "VideoSupport.c"
-			GstDiscovererInfo* _tmp20_;
-			GstTagList* _tmp21_;
-			GDate _tmp22_ = {0};
-			gboolean _tmp23_;
-			GDate _tmp24_;
-			GDate* _tmp25_;
+		if (_tmp17_ != NULL) {
+#line 3419 "VideoSupport.c"
+			GstDiscovererInfo* _tmp18_;
+			GstTagList* _tmp19_;
+			GDate _tmp20_ = {0};
+			gboolean _tmp21_;
+			GDate _tmp22_;
+			GDate* _tmp23_;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp20_ = info;
+			_tmp18_ = info;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = gst_discoverer_info_get_tags (_tmp20_);
+			_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = gst_tag_list_get_date (_tmp21_, GST_TAG_DATE, &_tmp22_);
+			_tmp21_ = gst_tag_list_get_date (_tmp19_, GST_TAG_DATE, &_tmp20_);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (video_date);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp24_ = _tmp22_;
+			_tmp22_ = _tmp20_;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp25_ = __g_date_dup0 (&_tmp24_);
+			_tmp23_ = __g_date_dup0 (&_tmp22_);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_date = _tmp25_;
+			video_date = _tmp23_;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = _tmp23_;
-#line 3204 "VideoSupport.c"
+			_tmp15_ = _tmp21_;
+#line 3442 "VideoSupport.c"
 		} else {
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = FALSE;
-#line 3208 "VideoSupport.c"
+			_tmp15_ = FALSE;
+#line 3446 "VideoSupport.c"
 		}
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp17_) {
-#line 3212 "VideoSupport.c"
-			GDate* _tmp26_;
+		if (_tmp15_) {
+#line 3450 "VideoSupport.c"
+			GDate* _tmp24_;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp26_ = video_date;
+			_tmp24_ = video_date;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp26_ != NULL) {
-#line 3218 "VideoSupport.c"
+			if (_tmp24_ != NULL) {
+#line 3456 "VideoSupport.c"
+				GDate* _tmp25_;
+				GDate* _tmp26_;
 				GDate* _tmp27_;
-				GDateYear _tmp28_;
-				GDate* _tmp29_;
-				GDateMonth _tmp30_;
-				GDate* _tmp31_;
-				GDateDay _tmp32_;
-				GDateTime* _tmp33_;
-				GDateTime* _tmp34_;
-#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp27_ = video_date;
-#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp28_ = g_date_get_year (_tmp27_);
-#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp29_ = video_date;
+				GDateTime* _tmp28_;
+				GDateTime* _tmp29_;
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp30_ = g_date_get_month (_tmp29_);
+				_tmp25_ = video_date;
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp31_ = video_date;
+				_tmp26_ = video_date;
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp32_ = g_date_get_day (_tmp31_);
+				_tmp27_ = video_date;
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp33_ = g_date_time_new_local ((gint) _tmp28_, (gint) _tmp30_, (gint) _tmp32_, 0, 0, (gdouble) 0);
+				_tmp28_ = g_date_time_new_local ((gint) g_date_get_year (_tmp25_), (gint) g_date_get_month (_tmp26_), (gint) g_date_get_day (_tmp27_), 0, 0, (gdouble) 0);
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp34_ = _tmp33_;
+				_tmp29_ = _tmp28_;
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_reader_set_timestamp (self, _tmp34_);
+				video_reader_set_timestamp (self, _tmp29_);
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_g_date_time_unref0 (_tmp34_);
-#line 3247 "VideoSupport.c"
+				_g_date_time_unref0 (_tmp29_);
+#line 3476 "VideoSupport.c"
 			}
 		}
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3253,49 +3482,49 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (info);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3256 "VideoSupport.c"
+#line 3485 "VideoSupport.c"
 	}
 	goto __finally507;
 	__catch507_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp35_;
-		const gchar* _tmp36_;
+		GError* _tmp30_;
+		const gchar* _tmp31_;
+		GError* _tmp32_;
+		const gchar* _tmp33_;
+		gchar* _tmp34_;
+		gchar* _tmp35_;
+		GError* _tmp36_;
 		GError* _tmp37_;
-		const gchar* _tmp38_;
-		gchar* _tmp39_;
-		gchar* _tmp40_;
-		GError* _tmp41_;
-		GError* _tmp42_;
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp35_ = e;
+		_tmp30_ = e;
 #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp36_ = _tmp35_->message;
+		_tmp31_ = _tmp30_->message;
 #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:224: Video read error: %s", _tmp36_);
+		g_debug ("VideoSupport.vala:224: Video read error: %s", _tmp31_);
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp37_ = e;
+		_tmp32_ = e;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp38_ = _tmp37_->message;
+		_tmp33_ = _tmp32_->message;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp39_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp38_);
+		_tmp34_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp33_);
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp40_ = _tmp39_;
+		_tmp35_ = _tmp34_;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp41_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp40_);
+		_tmp36_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp35_);
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp42_ = _tmp41_;
+		_tmp37_ = _tmp36_;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp40_);
+		_g_free0 (_tmp35_);
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_inner_error_ = _tmp42_;
+		_inner_error_ = _tmp37_;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3298 "VideoSupport.c"
+#line 3527 "VideoSupport.c"
 		goto __finally507;
 	}
 	__finally507:
@@ -3307,7 +3536,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3310 "VideoSupport.c"
+#line 3539 "VideoSupport.c"
 		} else {
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3315,13 +3544,15 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3318 "VideoSupport.c"
+#line 3547 "VideoSupport.c"
 		}
 	}
 }
 
 
-static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
+static gboolean
+video_reader_on_thumbnailer_timer (VideoReader* self)
+{
 	gboolean result = FALSE;
 	GPid _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3332,7 +3563,7 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	_tmp0_ = self->priv->thumbnailer_pid;
 #line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3335 "VideoSupport.c"
+#line 3566 "VideoSupport.c"
 		GPid _tmp1_;
 		GPid _tmp2_;
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3343,26 +3574,31 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 		_tmp2_ = self->priv->thumbnailer_pid;
 #line 235 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3346 "VideoSupport.c"
+#line 3577 "VideoSupport.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
 #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3352 "VideoSupport.c"
+#line 3583 "VideoSupport.c"
 }
 
 
-static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self) {
+static gboolean
+_video_reader_on_thumbnailer_timer_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
 #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3361 "VideoSupport.c"
+#line 3594 "VideoSupport.c"
 }
 
 
-static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* video_file) {
+static GdkPixbuf*
+video_reader_thumbnailer (VideoReader* self,
+                          const gchar* video_file)
+{
 	GdkPixbuf* result = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
@@ -3372,22 +3608,21 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	GFile* _tmp4_;
 	GFile* _tmp5_;
 	gchar* _tmp6_;
-	const gchar* _tmp7_;
-	gchar* _tmp8_;
+	gchar* _tmp7_;
+	gchar** _tmp8_;
 	gchar** _tmp9_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
+	gint _tmp9__length1;
 	gint argv_length1;
 	gint _argv_size_;
 	gint child_stdout = 0;
 	GdkPixbuf* buf = NULL;
 	gint child_status = 0;
 	gint ret_waitpid = 0;
-	GPid _tmp27_;
-	gint _tmp28_ = 0;
-	pid_t _tmp29_;
-	gint _tmp30_;
-	GPid _tmp36_;
+	GPid _tmp26_;
+	gint _tmp27_ = 0;
+	pid_t _tmp28_;
+	gint _tmp29_;
+	GPid _tmp33_;
 	GError * _inner_error_ = NULL;
 #line 242 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
@@ -3414,83 +3649,81 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = video_file;
+	_tmp7_ = g_strdup (video_file);
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp8_ = g_new0 (gchar*, 2 + 1);
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_ = g_new0 (gchar*, 2 + 1);
+	_tmp8_[0] = _tmp6_;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_[0] = _tmp6_;
+	_tmp8_[1] = _tmp7_;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_[1] = _tmp8_;
-#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10__length1 = 2;
+	_tmp9__length1 = 2;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	argv = _tmp10_;
+	argv = _tmp9_;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	argv_length1 = _tmp10__length1;
+	argv_length1 = _tmp9__length1;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3438 "VideoSupport.c"
+#line 3671 "VideoSupport.c"
 	{
-		gchar** _tmp11_;
-		gint _tmp11__length1;
-		GPid _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		GPid _tmp14_;
+		gchar** _tmp10_;
+		gint _tmp10__length1;
+		GPid _tmp11_ = 0;
+		gint _tmp12_ = 0;
+		GPid _tmp13_;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = argv;
+		_tmp10_ = argv;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11__length1 = argv_length1;
+		_tmp10__length1 = argv_length1;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_spawn_async_with_pipes (NULL, _tmp11_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp12_, NULL, &_tmp13_, NULL, &_inner_error_);
+		g_spawn_async_with_pipes (NULL, _tmp10_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp11_, NULL, &_tmp12_, NULL, &_inner_error_);
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		self->priv->thumbnailer_pid = _tmp12_;
+		self->priv->thumbnailer_pid = _tmp11_;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		child_stdout = _tmp13_;
+		child_stdout = _tmp12_;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3457 "VideoSupport.c"
+#line 3690 "VideoSupport.c"
 			goto __catch508_g_error;
 		}
 #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = self->priv->thumbnailer_pid;
+		_tmp13_ = self->priv->thumbnailer_pid;
 #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3464 "VideoSupport.c"
+		g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp13_);
+#line 3697 "VideoSupport.c"
 	}
 	goto __finally508;
 	__catch508_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp15_;
-		const gchar* _tmp16_;
-		GPid _tmp17_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
+		GPid _tmp16_;
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp15_ = e;
+		_tmp14_ = e;
 #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp16_ = _tmp15_->message;
+		_tmp15_ = _tmp14_->message;
 #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:253: Error spawning process: %s", _tmp16_);
+		g_debug ("VideoSupport.vala:253: Error spawning process: %s", _tmp15_);
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp17_ = self->priv->thumbnailer_pid;
+		_tmp16_ = self->priv->thumbnailer_pid;
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp17_ != ((GPid) 0)) {
-#line 3487 "VideoSupport.c"
-			GPid _tmp18_;
+		if (_tmp16_ != ((GPid) 0)) {
+#line 3720 "VideoSupport.c"
+			GPid _tmp17_;
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = self->priv->thumbnailer_pid;
+			_tmp17_ = self->priv->thumbnailer_pid;
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_spawn_close_pid (_tmp18_);
-#line 3493 "VideoSupport.c"
+			g_spawn_close_pid (_tmp17_);
+#line 3726 "VideoSupport.c"
 		}
 #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -3500,7 +3733,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3503 "VideoSupport.c"
+#line 3736 "VideoSupport.c"
 	}
 	__finally508:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3513,77 +3746,77 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3516 "VideoSupport.c"
+#line 3749 "VideoSupport.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3522 "VideoSupport.c"
+#line 3755 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
-		gint _tmp19_;
-		GUnixInputStream* _tmp20_;
-		GdkPixbuf* _tmp21_ = NULL;
-		GUnixInputStream* _tmp22_;
+		gint _tmp18_;
+		GUnixInputStream* _tmp19_;
+		GdkPixbuf* _tmp20_ = NULL;
+		GUnixInputStream* _tmp21_;
+		GdkPixbuf* _tmp22_;
 		GdkPixbuf* _tmp23_;
-		GdkPixbuf* _tmp24_;
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp19_ = child_stdout;
+		_tmp18_ = child_stdout;
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp20_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp19_, TRUE);
+		_tmp19_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp18_, TRUE);
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		unix_input = _tmp20_;
+		unix_input = _tmp19_;
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp22_ = unix_input;
+		_tmp21_ = unix_input;
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp22_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp21_ = _tmp23_;
+		_tmp20_ = _tmp22_;
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3547 "VideoSupport.c"
+#line 3780 "VideoSupport.c"
 			goto __catch509_g_error;
 		}
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp24_ = _tmp21_;
+		_tmp23_ = _tmp20_;
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp21_ = NULL;
+		_tmp20_ = NULL;
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		buf = _tmp24_;
+		buf = _tmp23_;
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp21_);
+		_g_object_unref0 (_tmp20_);
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3562 "VideoSupport.c"
+#line 3795 "VideoSupport.c"
 	}
 	goto __finally509;
 	__catch509_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp25_;
-		const gchar* _tmp26_;
+		GError* _tmp24_;
+		const gchar* _tmp25_;
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp25_ = e;
+		_tmp24_ = e;
 #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp26_ = _tmp25_->message;
+		_tmp25_ = _tmp24_->message;
 #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:268: Error creating pixbuf: %s", _tmp26_);
+		g_debug ("VideoSupport.vala:268: Error creating pixbuf: %s", _tmp25_);
 #line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
 #line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3586 "VideoSupport.c"
+#line 3819 "VideoSupport.c"
 	}
 	__finally509:
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3598,62 +3831,56 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3601 "VideoSupport.c"
+#line 3834 "VideoSupport.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = self->priv->thumbnailer_pid;
+	_tmp26_ = self->priv->thumbnailer_pid;
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp29_ = waitpid ((pid_t) _tmp27_, &_tmp28_, 0);
+	_tmp28_ = waitpid ((pid_t) _tmp26_, &_tmp27_, 0);
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	child_status = _tmp28_;
+	child_status = _tmp27_;
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	ret_waitpid = (gint) _tmp29_;
+	ret_waitpid = (gint) _tmp28_;
 #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp30_ = ret_waitpid;
+	_tmp29_ = ret_waitpid;
 #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp30_ < 0) {
-#line 3617 "VideoSupport.c"
-		gint _tmp31_;
+	if (_tmp29_ < 0) {
+#line 3850 "VideoSupport.c"
+		gint _tmp30_;
 #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp31_ = ret_waitpid;
+		_tmp30_ = ret_waitpid;
 #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:276: waitpid returned error code: %d", _tmp31_);
+		g_debug ("VideoSupport.vala:276: waitpid returned error code: %d", _tmp30_);
 #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
 #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3627 "VideoSupport.c"
+#line 3860 "VideoSupport.c"
 	} else {
-		gint _tmp32_;
-		gint _tmp33_;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp32_ = child_status;
+		gint _tmp31_;
 #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp33_ = WEXITSTATUS (_tmp32_);
+		_tmp31_ = child_status;
 #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (0 != _tmp33_) {
-#line 3637 "VideoSupport.c"
-			gint _tmp34_;
-			gint _tmp35_;
+		if (0 != WEXITSTATUS (_tmp31_)) {
+#line 3867 "VideoSupport.c"
+			gint _tmp32_;
 #line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp34_ = child_status;
+			_tmp32_ = child_status;
 #line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp35_ = WEXITSTATUS (_tmp34_);
-#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_debug ("VideoSupport.vala:279: Thumbnailer exited with error code: %d", _tmp35_);
+			g_debug ("VideoSupport.vala:279: Thumbnailer exited with error code: %d", WEXITSTATUS (_tmp32_));
 #line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (buf);
 #line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3650 "VideoSupport.c"
+#line 3877 "VideoSupport.c"
 		}
 	}
 #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp36_ = self->priv->thumbnailer_pid;
+	_tmp33_ = self->priv->thumbnailer_pid;
 #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_spawn_close_pid (_tmp36_);
+	g_spawn_close_pid (_tmp33_);
 #line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->thumbnailer_pid = (GPid) 0;
 #line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3662,17 +3889,18 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3665 "VideoSupport.c"
+#line 3892 "VideoSupport.c"
 }
 
 
-static gboolean video_reader_does_file_exist (VideoReader* self) {
+static gboolean
+video_reader_does_file_exist (VideoReader* self)
+{
 	gboolean result = FALSE;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gboolean _tmp3_;
-	gboolean _tmp4_;
 #line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3684,35 +3912,34 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR);
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_;
-#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_);
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3694 "VideoSupport.c"
+#line 3920 "VideoSupport.c"
 }
 
 
-GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
+GdkPixbuf*
+video_reader_read_preview_frame (VideoReader* self)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_;
-	gboolean _tmp3_;
-	GFile* _tmp4_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
+	GdkPixbuf* _tmp6_;
 	GdkPixbuf* _tmp7_;
-	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
 	GdkPixbuf* _tmp10_;
-	GdkPixbuf* _tmp11_;
 #line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->preview_frame;
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3715 "VideoSupport.c"
+#line 3942 "VideoSupport.c"
 		GdkPixbuf* _tmp1_;
 		GdkPixbuf* _tmp2_;
 #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3723,59 +3950,60 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		result = _tmp2_;
 #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3726 "VideoSupport.c"
+#line 3953 "VideoSupport.c"
 	}
 #line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_reader_does_file_exist (self);
-#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp3_) {
+	if (!video_reader_does_file_exist (self)) {
 #line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
 #line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3736 "VideoSupport.c"
+#line 3961 "VideoSupport.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = self->priv->file;
+	_tmp3_ = self->priv->file;
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = g_file_get_path (_tmp4_);
+	_tmp4_ = g_file_get_path (_tmp3_);
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = video_reader_thumbnailer (self, _tmp6_);
+	_tmp6_ = video_reader_thumbnailer (self, _tmp5_);
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->preview_frame);
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->preview_frame = _tmp7_;
+	self->priv->preview_frame = _tmp6_;
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp5_);
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = self->priv->preview_frame;
+	_tmp7_ = self->priv->preview_frame;
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (NULL == _tmp8_) {
-#line 3756 "VideoSupport.c"
-		GdkPixbuf* _tmp9_;
+	if (NULL == _tmp7_) {
+#line 3981 "VideoSupport.c"
+		GdkPixbuf* _tmp8_;
 #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
+		_tmp8_ = resources_get_noninterpretable_badge_pixbuf ();
 #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (self->priv->preview_frame);
 #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		self->priv->preview_frame = _tmp9_;
-#line 3764 "VideoSupport.c"
+		self->priv->preview_frame = _tmp8_;
+#line 3989 "VideoSupport.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10_ = self->priv->preview_frame;
+	_tmp9_ = self->priv->preview_frame;
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp11_ = _g_object_ref0 (_tmp10_);
+	_tmp10_ = _g_object_ref0 (_tmp9_);
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp11_;
+	result = _tmp10_;
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3774 "VideoSupport.c"
+#line 3999 "VideoSupport.c"
 }
 
 
-gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
+gdouble
+video_reader_read_clip_duration (VideoReader* self,
+                                 GError** error)
+{
 	gdouble result = 0.0;
 	gdouble _tmp0_;
 	gdouble _tmp3_;
@@ -3792,13 +4020,13 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 3795 "VideoSupport.c"
+#line 4023 "VideoSupport.c"
 				gdouble _tmp1_ = 0.0;
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp1_;
-#line 3801 "VideoSupport.c"
+#line 4029 "VideoSupport.c"
 			} else {
 				gdouble _tmp2_ = 0.0;
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3807,7 +4035,7 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp2_;
-#line 3810 "VideoSupport.c"
+#line 4038 "VideoSupport.c"
 			}
 		}
 	}
@@ -3817,11 +4045,14 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	result = _tmp3_;
 #line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3820 "VideoSupport.c"
+#line 4048 "VideoSupport.c"
 }
 
 
-VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
+VideoMetadata*
+video_reader_read_metadata (VideoReader* self,
+                            GError** error)
+{
 	VideoMetadata* result = NULL;
 	VideoMetadata* metadata = NULL;
 	VideoMetadata* _tmp0_;
@@ -3861,17 +4092,19 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 		_media_metadata_unref0 (metadata);
 #line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3864 "VideoSupport.c"
+#line 4095 "VideoSupport.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
 #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3870 "VideoSupport.c"
+#line 4101 "VideoSupport.c"
 }
 
 
-GDateTime* video_reader_get_timestamp (VideoReader* self) {
+GDateTime*
+video_reader_get_timestamp (VideoReader* self)
+{
 	GDateTime* result;
 	GDateTime* _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3882,132 +4115,159 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3885 "VideoSupport.c"
+#line 4118 "VideoSupport.c"
 }
 
 
-static gpointer _g_date_time_ref0 (gpointer self) {
+static gpointer
+_g_date_time_ref0 (gpointer self)
+{
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 3892 "VideoSupport.c"
+#line 4127 "VideoSupport.c"
 }
 
 
-static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
+static void
+video_reader_set_timestamp (VideoReader* self,
+                            GDateTime* value)
+{
 	GDateTime* _tmp0_;
-	GDateTime* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_READER (self));
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = value;
-#line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _g_date_time_ref0 (_tmp0_);
+	_tmp0_ = _g_date_time_ref0 (value);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->_timestamp = _tmp1_;
-#line 3909 "VideoSupport.c"
+	self->priv->_timestamp = _tmp0_;
+#line 4144 "VideoSupport.c"
 }
 
 
-static void value_video_reader_init (GValue* value) {
+static void
+value_video_reader_init (GValue* value)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3916 "VideoSupport.c"
+#line 4153 "VideoSupport.c"
 }
 
 
-static void value_video_reader_free_value (GValue* value) {
+static void
+value_video_reader_free_value (GValue* value)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (value->data[0].v_pointer);
-#line 3925 "VideoSupport.c"
+#line 4164 "VideoSupport.c"
 	}
 }
 
 
-static void value_video_reader_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_video_reader_copy_value (const GValue* src_value,
+                               GValue* dest_value)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer);
-#line 3935 "VideoSupport.c"
+#line 4177 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3939 "VideoSupport.c"
+#line 4181 "VideoSupport.c"
 	}
 }
 
 
-static gpointer value_video_reader_peek_pointer (const GValue* value) {
+static gpointer
+value_video_reader_peek_pointer (const GValue* value)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3947 "VideoSupport.c"
+#line 4191 "VideoSupport.c"
 }
 
 
-static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_video_reader_collect_value (GValue* value,
+                                  guint n_collect_values,
+                                  GTypeCValue* collect_values,
+                                  guint collect_flags)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3954 "VideoSupport.c"
+#line 4203 "VideoSupport.c"
 		VideoReader * object;
 		object = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3961 "VideoSupport.c"
+#line 4210 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3965 "VideoSupport.c"
+#line 4214 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 3969 "VideoSupport.c"
+#line 4218 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3973 "VideoSupport.c"
+#line 4222 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3977 "VideoSupport.c"
+#line 4226 "VideoSupport.c"
 }
 
 
-static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_video_reader_lcopy_value (const GValue* value,
+                                guint n_collect_values,
+                                GTypeCValue* collect_values,
+                                guint collect_flags)
+{
 	VideoReader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3988 "VideoSupport.c"
+#line 4242 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 3994 "VideoSupport.c"
+#line 4248 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3998 "VideoSupport.c"
+#line 4252 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 4002 "VideoSupport.c"
+#line 4256 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4006 "VideoSupport.c"
+#line 4260 "VideoSupport.c"
 }
 
 
-GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_video_reader (const gchar* name,
+                         const gchar* nick,
+                         const gchar* blurb,
+                         GType object_type,
+                         GParamFlags flags)
+{
 	ParamSpecVideoReader* spec;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_READER), NULL);
@@ -4017,20 +4277,25 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4020 "VideoSupport.c"
+#line 4280 "VideoSupport.c"
 }
 
 
-gpointer value_get_video_reader (const GValue* value) {
+gpointer
+value_get_video_reader (const GValue* value)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 4029 "VideoSupport.c"
+#line 4291 "VideoSupport.c"
 }
 
 
-void value_set_video_reader (GValue* value, gpointer v_object) {
+void
+value_set_video_reader (GValue* value,
+                        gpointer v_object)
+{
 	VideoReader * old;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER));
@@ -4046,22 +4311,25 @@ void value_set_video_reader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_ref (value->data[0].v_pointer);
-#line 4049 "VideoSupport.c"
+#line 4314 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4053 "VideoSupport.c"
+#line 4318 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4059 "VideoSupport.c"
+#line 4324 "VideoSupport.c"
 	}
 }
 
 
-void value_take_video_reader (GValue* value, gpointer v_object) {
+void
+value_take_video_reader (GValue* value,
+                         gpointer v_object)
+{
 	VideoReader * old;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER));
@@ -4075,33 +4343,37 @@ void value_take_video_reader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4078 "VideoSupport.c"
+#line 4346 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4082 "VideoSupport.c"
+#line 4350 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4088 "VideoSupport.c"
+#line 4356 "VideoSupport.c"
 	}
 }
 
 
-static void video_reader_class_init (VideoReaderClass * klass) {
+static void
+video_reader_class_init (VideoReaderClass * klass)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_reader_parent_class = g_type_class_peek_parent (klass);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoReaderClass *) klass)->finalize = video_reader_finalize;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoReaderPrivate));
-#line 4100 "VideoSupport.c"
+#line 4370 "VideoSupport.c"
 }
 
 
-static void video_reader_instance_init (VideoReader * self) {
+static void
+video_reader_instance_init (VideoReader * self)
+{
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_READER_GET_PRIVATE (self);
 #line 45 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4116,11 +4388,13 @@ static void video_reader_instance_init (VideoReader * self) {
 	self->priv->_timestamp = NULL;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 4119 "VideoSupport.c"
+#line 4391 "VideoSupport.c"
 }
 
 
-static void video_reader_finalize (VideoReader * obj) {
+static void
+video_reader_finalize (VideoReader * obj)
+{
 	VideoReader * self;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_READER, VideoReader);
@@ -4132,11 +4406,13 @@ static void video_reader_finalize (VideoReader * obj) {
 	_g_object_unref0 (self->priv->file);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
-#line 4135 "VideoSupport.c"
+#line 4409 "VideoSupport.c"
 }
 
 
-GType video_reader_get_type (void) {
+GType
+video_reader_get_type (void)
+{
 	static volatile gsize video_reader_type_id__volatile = 0;
 	if (g_once_init_enter (&video_reader_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_video_reader_init, value_video_reader_free_value, value_video_reader_copy_value, value_video_reader_peek_pointer, "p", value_video_reader_collect_value, "p", value_video_reader_lcopy_value };
@@ -4150,18 +4426,22 @@ GType video_reader_get_type (void) {
 }
 
 
-gpointer video_reader_ref (gpointer instance) {
+gpointer
+video_reader_ref (gpointer instance)
+{
 	VideoReader * self;
 	self = instance;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4160 "VideoSupport.c"
+#line 4438 "VideoSupport.c"
 }
 
 
-void video_reader_unref (gpointer instance) {
+void
+video_reader_unref (gpointer instance)
+{
 	VideoReader * self;
 	self = instance;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4170,157 +4450,156 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4173 "VideoSupport.c"
+#line 4453 "VideoSupport.c"
 	}
 }
 
 
-static gpointer _video_row_ref0 (gpointer self) {
+static gpointer
+_video_row_ref0 (gpointer self)
+{
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4181 "VideoSupport.c"
+#line 4463 "VideoSupport.c"
 }
 
 
-Video* video_construct (GType object_type, VideoRow* row) {
+Video*
+video_construct (GType object_type,
+                 VideoRow* row)
+{
 	Video * self = NULL;
 	VideoRow* _tmp0_;
 	VideoRow* _tmp1_;
 	VideoRow* _tmp2_;
-	VideoRow* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-	gboolean _tmp6_ = FALSE;
-	VideoRow* _tmp7_;
-	guint64 _tmp8_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	guint64 _tmp6_;
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_ROW (row), NULL);
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (Video*) video_source_construct (object_type);
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = row;
-#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _video_row_ref0 (_tmp0_);
+	_tmp0_ = _video_row_ref0 (row);
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->priv->backing_row = _tmp1_;
+	self->priv->backing_row = _tmp0_;
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = self->priv->backing_row;
+	_tmp1_ = self->priv->backing_row;
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = self->priv->backing_row;
+	_tmp2_ = self->priv->backing_row;
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_->title;
+	_tmp3_ = _tmp2_->title;
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = media_source_prep_title (_tmp4_);
+	_tmp4_ = media_source_prep_title (_tmp3_);
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp2_->title);
+	_g_free0 (_tmp1_->title);
 #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_->title = _tmp5_;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = row;
+	_tmp1_->title = _tmp4_;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = _tmp7_->flags;
+	_tmp6_ = row->flags;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
+	if ((_tmp6_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp6_ = TRUE;
-#line 4228 "VideoSupport.c"
+		_tmp5_ = TRUE;
+#line 4507 "VideoSupport.c"
 	} else {
-		VideoRow* _tmp9_;
-		guint64 _tmp10_;
+		guint64 _tmp7_;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = row;
+		_tmp7_ = row->flags;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = _tmp9_->flags;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4238 "VideoSupport.c"
+		_tmp5_ = (_tmp7_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
+#line 4514 "VideoSupport.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp6_) {
-#line 4242 "VideoSupport.c"
-		VideoSourceCollection* _tmp11_;
-		VideoRow* _tmp12_;
-		const gchar* _tmp13_;
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = video_global;
+	if (_tmp5_) {
+#line 4518 "VideoSupport.c"
+		VideoSourceCollection* _tmp8_;
+		const gchar* _tmp9_;
 #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = row;
+		_tmp8_ = video_global;
 #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp13_ = _tmp12_->backlinks;
+		_tmp9_ = row->backlinks;
 #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_);
-#line 4254 "VideoSupport.c"
+		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp9_);
+#line 4527 "VideoSupport.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4258 "VideoSupport.c"
+#line 4531 "VideoSupport.c"
 }
 
 
-Video* video_new (VideoRow* row) {
+Video*
+video_new (VideoRow* row)
+{
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4265 "VideoSupport.c"
+#line 4540 "VideoSupport.c"
 }
 
 
-static gboolean __lambda12_ (GstPluginFeature* f) {
+static gboolean
+__lambda12_ (GstPluginFeature* f)
+{
 	gboolean result = FALSE;
-	GstPluginFeature* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp2_;
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (f), FALSE);
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = f;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gst_object_get_type (), GstObject));
+	_tmp0_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (f, gst_object_get_type (), GstObject));
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _tmp1_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = g_str_has_prefix (_tmp2_, "vaapi");
+	_tmp1_ = _tmp0_;
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = g_str_has_prefix (_tmp1_, "vaapi");
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp4_;
+	result = _tmp2_;
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4294 "VideoSupport.c"
+#line 4565 "VideoSupport.c"
 }
 
 
-static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self) {
+static gboolean
+___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature,
+                                        gpointer self)
+{
 	gboolean result;
 	result = __lambda12_ (feature);
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4303 "VideoSupport.c"
+#line 4577 "VideoSupport.c"
 }
 
 
-static void _g_object_unref0_ (gpointer var) {
+static void
+_g_object_unref0_ (gpointer var)
+{
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 4310 "VideoSupport.c"
+#line 4586 "VideoSupport.c"
 }
 
 
-static void _g_list_free__g_object_unref0_ (GList* self) {
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
+static inline void
+_g_list_free__g_object_unref0_ (GList* self)
+{
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_list_free (self);
-#line 4319 "VideoSupport.c"
+	g_list_free_full (self, (GDestroyNotify) _g_object_unref0_);
+#line 4595 "VideoSupport.c"
 }
 
 
-void video_init (ProgressMonitor monitor, void* monitor_target) {
+void
+video_init (ProgressMonitor monitor,
+            void* monitor_target)
+{
 	gchar** args = NULL;
 	gint args_length1;
 	gint _args_size_;
@@ -4331,38 +4610,36 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
 	gint _tmp4_;
-	gint _tmp5_;
-	GstRegistry* _tmp6_;
-	guint32 _tmp7_;
-	gint _tmp8_;
+	GstRegistry* _tmp5_;
+	gint _tmp6_;
 	GList* features = NULL;
-	GstRegistry* _tmp11_;
-	GList* _tmp12_;
-	GList* _tmp13_;
-	VideoSourceCollection* _tmp20_;
+	GstRegistry* _tmp9_;
+	GList* _tmp10_;
+	GList* _tmp11_;
+	VideoSourceCollection* _tmp18_;
 	GeeArrayList* all = NULL;
-	VideoTable* _tmp21_;
-	VideoTable* _tmp22_;
-	GeeArrayList* _tmp23_;
-	GeeArrayList* _tmp24_;
+	VideoTable* _tmp19_;
+	VideoTable* _tmp20_;
+	GeeArrayList* _tmp21_;
+	GeeArrayList* _tmp22_;
 	GeeArrayList* all_videos = NULL;
-	GeeArrayList* _tmp25_;
+	GeeArrayList* _tmp23_;
 	GeeArrayList* trashed_videos = NULL;
-	GeeArrayList* _tmp26_;
+	GeeArrayList* _tmp24_;
 	GeeArrayList* offline_videos = NULL;
-	GeeArrayList* _tmp27_;
+	GeeArrayList* _tmp25_;
 	gint count = 0;
-	GeeArrayList* _tmp28_;
-	gint _tmp29_;
-	gint _tmp30_;
-	VideoSourceCollection* _tmp57_;
-	GeeArrayList* _tmp58_;
-	VideoSourceCollection* _tmp59_;
-	GeeArrayList* _tmp60_;
-	VideoSourceCollection* _tmp61_;
-	GeeArrayList* _tmp62_;
-	GeeCollection* _tmp63_;
-	GeeCollection* _tmp64_;
+	GeeArrayList* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	VideoSourceCollection* _tmp51_;
+	GeeArrayList* _tmp52_;
+	VideoSourceCollection* _tmp53_;
+	GeeArrayList* _tmp54_;
+	VideoSourceCollection* _tmp55_;
+	GeeArrayList* _tmp56_;
+	GeeCollection* _tmp57_;
+	GeeCollection* _tmp58_;
 #line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
 #line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4392,309 +4669,287 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = _tmp4_;
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp3_);
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	saved_state = _tmp5_;
+	saved_state = _tmp4_;
 #line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = registry;
+	_tmp5_ = registry;
 #line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_current_state = (gint) _tmp7_;
+	video_current_state = (gint) gst_registry_get_feature_list_cookie (_tmp5_);
 #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = saved_state;
+	_tmp6_ = saved_state;
 #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
+	if (_tmp6_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
 #line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_message ("VideoSupport.vala:394: interpreter state cookie not found; assuming al" \
 "l video thumbnails are out of date");
 #line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4414 "VideoSupport.c"
+#line 4687 "VideoSupport.c"
 	} else {
-		gint _tmp9_;
-		gint _tmp10_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = saved_state;
+		_tmp7_ = saved_state;
 #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = video_current_state;
+		_tmp8_ = video_current_state;
 #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp9_ != _tmp10_) {
+		if (_tmp7_ != _tmp8_) {
 #line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_message ("VideoSupport.vala:397: interpreter state has changed; video thumbnails" \
 " may be out of date");
 #line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4428 "VideoSupport.c"
+#line 4701 "VideoSupport.c"
 		}
 	}
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp11_ = registry;
+	_tmp9_ = registry;
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp12_ = gst_registry_feature_filter (_tmp11_, ___lambda12__gst_plugin_feature_filter, FALSE, NULL);
+	_tmp10_ = gst_registry_feature_filter (_tmp9_, ___lambda12__gst_plugin_feature_filter, FALSE, NULL);
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	features = _tmp12_;
+	features = _tmp10_;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = features;
-#line 4439 "VideoSupport.c"
+	_tmp11_ = features;
+#line 4712 "VideoSupport.c"
 	{
 		GList* feature_collection = NULL;
 		GList* feature_it = NULL;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		feature_collection = _tmp13_;
+		feature_collection = _tmp11_;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		for (feature_it = feature_collection; feature_it != NULL; feature_it = feature_it->next) {
-#line 4447 "VideoSupport.c"
-			GstPluginFeature* _tmp14_;
+#line 4720 "VideoSupport.c"
+			GstPluginFeature* _tmp12_;
 			GstPluginFeature* feature = NULL;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp14_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data);
+			_tmp12_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data);
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			feature = _tmp14_;
-#line 4454 "VideoSupport.c"
+			feature = _tmp12_;
+#line 4727 "VideoSupport.c"
 			{
-				GstPluginFeature* _tmp15_;
-				gchar* _tmp16_;
-				gchar* _tmp17_;
-				GstRegistry* _tmp18_;
-				GstPluginFeature* _tmp19_;
+				GstPluginFeature* _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
+				GstRegistry* _tmp16_;
+				GstPluginFeature* _tmp17_;
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp15_ = feature;
+				_tmp13_ = feature;
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gst_object_get_type (), GstObject));
+				_tmp14_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gst_object_get_type (), GstObject));
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = _tmp16_;
+				_tmp15_ = _tmp14_;
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:412: Removing registry feature %s", _tmp17_);
+				g_debug ("VideoSupport.vala:412: Removing registry feature %s", _tmp15_);
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_g_free0 (_tmp17_);
+				_g_free0 (_tmp15_);
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = registry;
+				_tmp16_ = registry;
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = feature;
+				_tmp17_ = feature;
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				gst_registry_remove_feature (_tmp18_, _tmp19_);
+				gst_registry_remove_feature (_tmp16_, _tmp17_);
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (feature);
-#line 4479 "VideoSupport.c"
+#line 4752 "VideoSupport.c"
 			}
 		}
 	}
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = video_source_collection_new ();
+	_tmp18_ = video_source_collection_new ();
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_data_collection_unref0 (video_global);
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_global = _tmp20_;
+	video_global = _tmp18_;
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = video_table_get_instance ();
+	_tmp19_ = video_table_get_instance ();
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp22_ = _tmp21_;
+	_tmp20_ = _tmp19_;
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = video_table_get_all (_tmp22_);
+	_tmp21_ = video_table_get_all (_tmp20_);
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = _tmp23_;
+	_tmp22_ = _tmp21_;
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_database_table_unref0 (_tmp22_);
+	_database_table_unref0 (_tmp20_);
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all = _tmp24_;
+	all = _tmp22_;
 #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all_videos = _tmp25_;
+	all_videos = _tmp23_;
 #line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	trashed_videos = _tmp26_;
+	trashed_videos = _tmp24_;
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp25_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	offline_videos = _tmp27_;
+	offline_videos = _tmp25_;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp28_ = all;
+	_tmp26_ = all;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp30_ = _tmp29_;
+	_tmp28_ = _tmp27_;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	count = _tmp30_;
-#line 4521 "VideoSupport.c"
+	count = _tmp28_;
+#line 4794 "VideoSupport.c"
 	{
 		gint ctr = 0;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4526 "VideoSupport.c"
+#line 4799 "VideoSupport.c"
 		{
-			gboolean _tmp31_ = FALSE;
+			gboolean _tmp29_ = FALSE;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp31_ = TRUE;
+			_tmp29_ = TRUE;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4533 "VideoSupport.c"
-				gint _tmp33_;
-				gint _tmp34_;
+#line 4806 "VideoSupport.c"
+				gint _tmp31_;
+				gint _tmp32_;
 				Video* video = NULL;
-				GeeArrayList* _tmp35_;
-				gint _tmp36_;
-				gpointer _tmp37_;
-				VideoRow* _tmp38_;
-				Video* _tmp39_;
-				Video* _tmp40_;
-				gboolean _tmp41_;
-				Video* _tmp43_;
-				gboolean _tmp44_;
-				ProgressMonitor _tmp53_;
-				void* _tmp53__target;
+				GeeArrayList* _tmp33_;
+				gint _tmp34_;
+				gpointer _tmp35_;
+				VideoRow* _tmp36_;
+				Video* _tmp37_;
+				Video* _tmp38_;
+				gboolean _tmp39_;
+				Video* _tmp41_;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp31_) {
-#line 4550 "VideoSupport.c"
-					gint _tmp32_;
+				if (!_tmp29_) {
+#line 4820 "VideoSupport.c"
+					gint _tmp30_;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp32_ = ctr;
+					_tmp30_ = ctr;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					ctr = _tmp32_ + 1;
-#line 4556 "VideoSupport.c"
+					ctr = _tmp30_ + 1;
+#line 4826 "VideoSupport.c"
 				}
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp31_ = FALSE;
+				_tmp29_ = FALSE;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp33_ = ctr;
+				_tmp31_ = ctr;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp34_ = count;
+				_tmp32_ = count;
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!(_tmp33_ < _tmp34_)) {
+				if (!(_tmp31_ < _tmp32_)) {
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4568 "VideoSupport.c"
+#line 4838 "VideoSupport.c"
 				}
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp35_ = all;
+				_tmp33_ = all;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp36_ = ctr;
+				_tmp34_ = ctr;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_);
+				_tmp35_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp34_);
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp38_ = (VideoRow*) _tmp37_;
+				_tmp36_ = (VideoRow*) _tmp35_;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp39_ = video_new (_tmp38_);
+				_tmp37_ = video_new (_tmp36_);
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp40_ = _tmp39_;
+				_tmp38_ = _tmp37_;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_video_row_unref0 (_tmp38_);
+				_video_row_unref0 (_tmp36_);
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp40_;
+				video = _tmp38_;
 #line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp41_ = video_interpreter_state_changed;
+				_tmp39_ = video_interpreter_state_changed;
 #line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp41_) {
-#line 4590 "VideoSupport.c"
-					Video* _tmp42_;
+				if (_tmp39_) {
+#line 4860 "VideoSupport.c"
+					Video* _tmp40_;
 #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp42_ = video;
+					_tmp40_ = video;
 #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					video_set_is_interpretable (_tmp42_, FALSE);
-#line 4596 "VideoSupport.c"
+					video_set_is_interpretable (_tmp40_, FALSE);
+#line 4866 "VideoSupport.c"
 				}
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp43_ = video;
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp44_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp41_ = video;
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp44_) {
-#line 4604 "VideoSupport.c"
-					GeeArrayList* _tmp45_;
-					Video* _tmp46_;
+				if (media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource))) {
+#line 4872 "VideoSupport.c"
+					GeeArrayList* _tmp42_;
+					Video* _tmp43_;
 #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp45_ = trashed_videos;
+					_tmp42_ = trashed_videos;
 #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp46_ = video;
+					_tmp43_ = video;
 #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_);
-#line 4613 "VideoSupport.c"
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_);
+#line 4881 "VideoSupport.c"
 				} else {
-					Video* _tmp47_;
-					gboolean _tmp48_;
+					Video* _tmp44_;
 #line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp47_ = video;
+					_tmp44_ = video;
 #line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp48_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp48_) {
-#line 4623 "VideoSupport.c"
-						GeeArrayList* _tmp49_;
-						Video* _tmp50_;
+					if (media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource))) {
+#line 4888 "VideoSupport.c"
+						GeeArrayList* _tmp45_;
+						Video* _tmp46_;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp49_ = offline_videos;
+						_tmp45_ = offline_videos;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp50_ = video;
+						_tmp46_ = video;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_);
-#line 4632 "VideoSupport.c"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_);
+#line 4897 "VideoSupport.c"
 					} else {
-						GeeArrayList* _tmp51_;
-						Video* _tmp52_;
+						GeeArrayList* _tmp47_;
+						Video* _tmp48_;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp51_ = all_videos;
+						_tmp47_ = all_videos;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp52_ = video;
+						_tmp48_ = video;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_);
-#line 4642 "VideoSupport.c"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_);
+#line 4907 "VideoSupport.c"
 					}
 				}
 #line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp53_ = monitor;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp53__target = monitor_target;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp53_ != NULL) {
-#line 4651 "VideoSupport.c"
-					ProgressMonitor _tmp54_;
-					void* _tmp54__target;
-					gint _tmp55_;
-					gint _tmp56_;
+				if (monitor != NULL) {
+#line 4912 "VideoSupport.c"
+					gint _tmp49_;
+					gint _tmp50_;
 #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp54_ = monitor;
+					_tmp49_ = ctr;
 #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp54__target = monitor_target;
+					_tmp50_ = count;
 #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp55_ = ctr;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp56_ = count;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp54_ ((guint64) _tmp55_, (guint64) _tmp56_, TRUE, _tmp54__target);
-#line 4666 "VideoSupport.c"
+					monitor ((guint64) _tmp49_, (guint64) _tmp50_, TRUE, monitor_target);
+#line 4921 "VideoSupport.c"
 				}
 #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4670 "VideoSupport.c"
+#line 4925 "VideoSupport.c"
 			}
 		}
 	}
 #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp57_ = video_global;
+	_tmp51_ = video_global;
 #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp58_ = trashed_videos;
+	_tmp52_ = trashed_videos;
 #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp59_ = video_global;
+	_tmp53_ = video_global;
 #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp60_ = offline_videos;
+	_tmp54_ = offline_videos;
 #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
+	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp61_ = video_global;
+	_tmp55_ = video_global;
 #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp62_ = all_videos;
+	_tmp56_ = all_videos;
 #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp63_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+	_tmp57_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
 #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp64_ = _tmp63_;
+	_tmp58_ = _tmp57_;
 #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp64_);
+	_g_object_unref0 (_tmp58_);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4707,11 +4962,13 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	__g_list_free__g_object_unref0_0 (features);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4708 "VideoSupport.c"
+#line 4963 "VideoSupport.c"
 }
 
 
-gboolean video_has_interpreter_state_changed (void) {
+gboolean
+video_has_interpreter_state_changed (void)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4720,11 +4977,13 @@ gboolean video_has_interpreter_state_changed (void) {
 	result = _tmp0_;
 #line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4721 "VideoSupport.c"
+#line 4978 "VideoSupport.c"
 }
 
 
-void video_notify_normal_thumbs_regenerated (void) {
+void
+video_notify_normal_thumbs_regenerated (void)
+{
 	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
@@ -4734,7 +4993,7 @@ void video_notify_normal_thumbs_regenerated (void) {
 	if (_tmp0_) {
 #line 451 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4735 "VideoSupport.c"
+#line 4994 "VideoSupport.c"
 	}
 #line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_message ("VideoSupport.vala:453: normal video thumbnail regeneration completed");
@@ -4744,28 +5003,30 @@ void video_notify_normal_thumbs_regenerated (void) {
 	_tmp2_ = video_normal_regen_complete;
 #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4745 "VideoSupport.c"
+#line 5004 "VideoSupport.c"
 		gboolean _tmp3_;
 #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
 #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4751 "VideoSupport.c"
+#line 5010 "VideoSupport.c"
 	} else {
 #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4755 "VideoSupport.c"
+#line 5014 "VideoSupport.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
 #line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4761 "VideoSupport.c"
+#line 5020 "VideoSupport.c"
 	}
 }
 
 
-void video_notify_offline_thumbs_regenerated (void) {
+void
+video_notify_offline_thumbs_regenerated (void)
+{
 	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
@@ -4775,7 +5036,7 @@ void video_notify_offline_thumbs_regenerated (void) {
 	if (_tmp0_) {
 #line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4776 "VideoSupport.c"
+#line 5037 "VideoSupport.c"
 	}
 #line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_message ("VideoSupport.vala:464: offline video thumbnail regeneration completed");
@@ -4785,34 +5046,36 @@ void video_notify_offline_thumbs_regenerated (void) {
 	_tmp2_ = video_normal_regen_complete;
 #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4786 "VideoSupport.c"
+#line 5047 "VideoSupport.c"
 		gboolean _tmp3_;
 #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
 #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4792 "VideoSupport.c"
+#line 5053 "VideoSupport.c"
 	} else {
 #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4796 "VideoSupport.c"
+#line 5057 "VideoSupport.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
 #line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4802 "VideoSupport.c"
+#line 5063 "VideoSupport.c"
 	}
 }
 
 
-static void video_save_interpreter_state (void) {
+static void
+video_save_interpreter_state (void)
+{
 	gboolean _tmp0_;
 #line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
 #line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4813 "VideoSupport.c"
+#line 5076 "VideoSupport.c"
 		ConfigFacade* _tmp1_;
 		ConfigFacade* _tmp2_;
 		gint _tmp3_;
@@ -4831,196 +5094,176 @@ static void video_save_interpreter_state (void) {
 		_g_object_unref0 (_tmp2_);
 #line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4831 "VideoSupport.c"
+#line 5094 "VideoSupport.c"
 	}
 }
 
 
-void video_terminate (void) {
+void
+video_terminate (void)
+{
 }
 
 
-ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place) {
+ExporterUI*
+video_export_many (GeeCollection* videos,
+                   ExporterCompletionCallback done,
+                   void* done_target,
+                   gboolean export_in_place)
+{
 	ExporterUI* result = NULL;
-	GeeCollection* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	GeeCollection* _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
+	gint _tmp9_;
+	gint _tmp10_;
 	GFile* export_dir = NULL;
-	GFile* _tmp39_;
-	GFile* _tmp40_;
+	GFile* _tmp32_;
+	GFile* _tmp33_;
 	ExporterUI* exporter = NULL;
-	GeeCollection* _tmp41_;
-	GFile* _tmp42_;
-	Scaling _tmp43_ = {0};
-	ExportFormatParameters _tmp44_ = {0};
-	Exporter* _tmp45_;
-	Exporter* _tmp46_;
-	ExporterUI* _tmp47_;
-	ExporterUI* _tmp48_;
-	ExporterUI* _tmp49_;
-	ExporterCompletionCallback _tmp50_;
-	void* _tmp50__target;
+	GFile* _tmp34_;
+	Scaling _tmp35_ = {0};
+	ExportFormatParameters _tmp36_ = {0};
+	Exporter* _tmp37_;
+	Exporter* _tmp38_;
+	ExporterUI* _tmp39_;
+	ExporterUI* _tmp40_;
+	ExporterUI* _tmp41_;
 	GError * _inner_error_ = NULL;
 #line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
 #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = videos;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = gee_collection_get_size (_tmp0_);
+	_tmp0_ = gee_collection_get_size (videos);
 #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp2_ == 0) {
+	if (_tmp1_ == 0) {
 #line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
 #line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4879 "VideoSupport.c"
+#line 5141 "VideoSupport.c"
 	}
 #line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = export_in_place;
-#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp3_) {
-#line 4885 "VideoSupport.c"
+	if (export_in_place) {
+#line 5145 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
-		GeeCollection* _tmp4_;
-		Scaling _tmp5_ = {0};
-		ExportFormatParameters _tmp6_ = {0};
-		Exporter* _tmp7_;
-		Exporter* _tmp8_;
-		ExporterUI* _tmp9_;
-		ExporterUI* _tmp10_;
-		ExporterUI* _tmp11_;
-		ExporterCompletionCallback _tmp12_;
-		void* _tmp12__target;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = videos;
+		Scaling _tmp2_ = {0};
+		ExportFormatParameters _tmp3_ = {0};
+		Exporter* _tmp4_;
+		Exporter* _tmp5_;
+		ExporterUI* _tmp6_;
+		ExporterUI* _tmp7_;
+		ExporterUI* _tmp8_;
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		scaling_for_original (&_tmp5_);
+		scaling_for_original (&_tmp2_);
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		export_format_parameters_unmodified (&_tmp6_);
+		export_format_parameters_unmodified (&_tmp3_);
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
+		_tmp4_ = exporter_new_for_temp_file (videos, &_tmp2_, &_tmp3_);
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = _tmp7_;
+		_tmp5_ = _tmp4_;
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = exporter_ui_new (_tmp8_);
+		_tmp6_ = exporter_ui_new (_tmp5_);
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = _tmp9_;
+		_tmp7_ = _tmp6_;
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp5_);
 #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		temp_exporter = _tmp10_;
+		temp_exporter = _tmp7_;
 #line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = temp_exporter;
+		_tmp8_ = temp_exporter;
 #line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = done;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12__target = done_target;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
+		exporter_ui_export (_tmp8_, done, done_target);
 #line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
 #line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4927 "VideoSupport.c"
+#line 5178 "VideoSupport.c"
 	}
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = videos;
+	_tmp9_ = gee_collection_get_size (videos);
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp15_ = _tmp14_;
+	_tmp10_ = _tmp9_;
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp15_ == 1) {
-#line 4937 "VideoSupport.c"
+	if (_tmp10_ == 1) {
+#line 5186 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
-		Video* _tmp24_;
-		gchar* _tmp25_;
-		gchar* _tmp26_;
-		GFile* _tmp27_;
-		GFile* _tmp28_;
-		GFile* _tmp29_;
+		Video* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		GFile* _tmp20_;
+		GFile* _tmp21_;
+		GFile* _tmp22_;
 #line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4948 "VideoSupport.c"
+#line 5197 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
-			GeeCollection* _tmp16_;
-			GeeIterator* _tmp17_;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = videos;
+			GeeIterator* _tmp11_;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ITERABLE, GeeIterable));
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_v_it = _tmp17_;
+			_v_it = _tmp11_;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4961 "VideoSupport.c"
-				GeeIterator* _tmp18_;
-				gboolean _tmp19_;
+#line 5207 "VideoSupport.c"
+				GeeIterator* _tmp12_;
 				Video* v = NULL;
-				GeeIterator* _tmp20_;
-				gpointer _tmp21_;
-				Video* _tmp22_;
-				Video* _tmp23_;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = _v_it;
+				GeeIterator* _tmp13_;
+				gpointer _tmp14_;
+				Video* _tmp15_;
+				Video* _tmp16_;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = gee_iterator_next (_tmp18_);
+				_tmp12_ = _v_it;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp19_) {
+				if (!gee_iterator_next (_tmp12_)) {
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4977 "VideoSupport.c"
+#line 5220 "VideoSupport.c"
 				}
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp20_ = _v_it;
+				_tmp13_ = _v_it;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp21_ = gee_iterator_get (_tmp20_);
+				_tmp14_ = gee_iterator_get (_tmp13_);
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				v = (Video*) _tmp21_;
+				v = (Video*) _tmp14_;
 #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp22_ = v;
+				_tmp15_ = v;
 #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp23_ = _g_object_ref0 (_tmp22_);
+				_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
 #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp23_;
+				video = _tmp16_;
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4997 "VideoSupport.c"
+#line 5240 "VideoSupport.c"
 			}
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 5001 "VideoSupport.c"
+#line 5244 "VideoSupport.c"
 		}
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp24_ = video;
+		_tmp17_ = video;
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp18_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp26_ = _tmp25_;
+		_tmp19_ = _tmp18_;
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp27_ = export_ui_choose_file (_tmp26_);
+		_tmp20_ = export_ui_choose_file (_tmp19_);
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp28_ = _tmp27_;
+		_tmp21_ = _tmp20_;
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp26_);
+		_g_free0 (_tmp19_);
 #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		save_as = _tmp28_;
+		save_as = _tmp21_;
 #line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp29_ = save_as;
+		_tmp22_ = save_as;
 #line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp29_ == NULL) {
+		if (_tmp22_ == NULL) {
 #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
 #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5029,70 +5272,70 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_object_unref0 (video);
 #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5029 "VideoSupport.c"
+#line 5272 "VideoSupport.c"
 		}
 		{
-			AppWindow* _tmp30_;
-			AppWindow* _tmp31_;
-			Video* _tmp32_;
-			GFile* _tmp33_;
-			AppWindow* _tmp34_;
-			AppWindow* _tmp35_;
+			AppWindow* _tmp23_;
+			AppWindow* _tmp24_;
+			Video* _tmp25_;
+			GFile* _tmp26_;
+			AppWindow* _tmp27_;
+			AppWindow* _tmp28_;
 #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp30_ = app_window_get_instance ();
+			_tmp23_ = app_window_get_instance ();
 #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp31_ = _tmp30_;
+			_tmp24_ = _tmp23_;
 #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PAGE_WINDOW, PageWindow));
 #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp31_);
+			_g_object_unref0 (_tmp24_);
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp32_ = video;
+			_tmp25_ = video;
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp33_ = save_as;
+			_tmp26_ = save_as;
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_export (_tmp32_, _tmp33_, &_inner_error_);
+			video_export (_tmp25_, _tmp26_, &_inner_error_);
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5054 "VideoSupport.c"
+#line 5297 "VideoSupport.c"
 				goto __catch510_g_error;
 			}
 #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp34_ = app_window_get_instance ();
+			_tmp27_ = app_window_get_instance ();
 #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp35_ = _tmp34_;
+			_tmp28_ = _tmp27_;
 #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PAGE_WINDOW, PageWindow));
 #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp35_);
-#line 5065 "VideoSupport.c"
+			_g_object_unref0 (_tmp28_);
+#line 5308 "VideoSupport.c"
 		}
 		goto __finally510;
 		__catch510_g_error:
 		{
 			GError* err = NULL;
-			AppWindow* _tmp36_;
-			AppWindow* _tmp37_;
-			GFile* _tmp38_;
+			AppWindow* _tmp29_;
+			AppWindow* _tmp30_;
+			GFile* _tmp31_;
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp36_ = app_window_get_instance ();
+			_tmp29_ = app_window_get_instance ();
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp37_ = _tmp36_;
+			_tmp30_ = _tmp29_;
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PAGE_WINDOW, PageWindow));
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp37_);
+			_g_object_unref0 (_tmp30_);
 #line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp38_ = save_as;
+			_tmp31_ = save_as;
 #line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			export_error_dialog (_tmp38_, FALSE);
+			export_error_dialog (_tmp31_, FALSE);
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 5092 "VideoSupport.c"
+#line 5335 "VideoSupport.c"
 		}
 		__finally510:
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5107,7 +5350,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			g_clear_error (&_inner_error_);
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5107 "VideoSupport.c"
+#line 5350 "VideoSupport.c"
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -5117,75 +5360,72 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		_g_object_unref0 (video);
 #line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5117 "VideoSupport.c"
+#line 5360 "VideoSupport.c"
 	}
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp39_ = export_ui_choose_dir (_ ("Export Videos"));
+	_tmp32_ = export_ui_choose_dir (_ ("Export Videos"));
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	export_dir = _tmp39_;
+	export_dir = _tmp32_;
 #line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp40_ = export_dir;
+	_tmp33_ = export_dir;
 #line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp40_ == NULL) {
+	if (_tmp33_ == NULL) {
 #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
 #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
 #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5133 "VideoSupport.c"
+#line 5376 "VideoSupport.c"
 	}
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp41_ = videos;
+	_tmp34_ = export_dir;
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp42_ = export_dir;
+	scaling_for_original (&_tmp35_);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	scaling_for_original (&_tmp43_);
+	export_format_parameters_unmodified (&_tmp36_);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	export_format_parameters_unmodified (&_tmp44_);
+	_tmp37_ = exporter_new (videos, _tmp34_, &_tmp35_, &_tmp36_, FALSE);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp45_ = exporter_new (_tmp41_, _tmp42_, &_tmp43_, &_tmp44_, FALSE);
+	_tmp38_ = _tmp37_;
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp46_ = _tmp45_;
+	_tmp39_ = exporter_ui_new (_tmp38_);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp47_ = exporter_ui_new (_tmp46_);
+	_tmp40_ = _tmp39_;
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp48_ = _tmp47_;
+	_g_object_unref0 (_tmp38_);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp46_);
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exporter = _tmp48_;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp49_ = exporter;
+	exporter = _tmp40_;
 #line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp50_ = done;
+	_tmp41_ = exporter;
 #line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp50__target = done_target;
-#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	exporter_ui_export (_tmp49_, _tmp50_, _tmp50__target);
+	exporter_ui_export (_tmp41_, done, done_target);
 #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
 #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
 #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5169 "VideoSupport.c"
+#line 5406 "VideoSupport.c"
 }
 
 
-static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
+static void
+video_real_commit_backlinks (DataSource* base,
+                             SourceCollection* sources,
+                             const gchar* backlinks)
+{
 	Video * self;
 	GError * _inner_error_ = NULL;
 #line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5180 "VideoSupport.c"
+#line 5421 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_;
 		VideoTable* _tmp1_;
 		VideoID _tmp2_ = {0};
-		const gchar* _tmp3_;
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5193,16 +5433,14 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = backlinks;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
+		video_table_update_backlinks (_tmp1_, &_tmp2_, backlinks, &_inner_error_);
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5202 "VideoSupport.c"
+#line 5440 "VideoSupport.c"
 				goto __catch511_database_error;
 			}
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5211,45 +5449,42 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			g_clear_error (&_inner_error_);
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5211 "VideoSupport.c"
+#line 5449 "VideoSupport.c"
 		}
 		{
-			VideoRow* _tmp4_;
+			VideoRow* _tmp3_;
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = self->priv->backing_row;
+			_tmp3_ = self->priv->backing_row;
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5219 "VideoSupport.c"
+#line 5457 "VideoSupport.c"
 			{
-				VideoRow* _tmp5_;
-				const gchar* _tmp6_;
-				gchar* _tmp7_;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = self->priv->backing_row;
+				VideoRow* _tmp4_;
+				gchar* _tmp5_;
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp6_ = backlinks;
+				_tmp4_ = self->priv->backing_row;
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = g_strdup (_tmp6_);
+				_tmp5_ = g_strdup (backlinks);
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_g_free0 (_tmp5_->backlinks);
+				_g_free0 (_tmp4_->backlinks);
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_->backlinks = _tmp7_;
-#line 5234 "VideoSupport.c"
+				_tmp4_->backlinks = _tmp5_;
+#line 5469 "VideoSupport.c"
 			}
 			__finally512:
 			{
-				VideoRow* _tmp8_;
+				VideoRow* _tmp6_;
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = self->priv->backing_row;
+				_tmp6_ = self->priv->backing_row;
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5243 "VideoSupport.c"
+#line 5478 "VideoSupport.c"
 			}
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5249 "VideoSupport.c"
+#line 5484 "VideoSupport.c"
 					goto __catch511_database_error;
 				}
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5258,7 +5493,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				g_clear_error (&_inner_error_);
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5258 "VideoSupport.c"
+#line 5493 "VideoSupport.c"
 			}
 		}
 	}
@@ -5266,29 +5501,29 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 	__catch511_database_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp9_;
-		gchar* _tmp10_;
-		GError* _tmp11_;
-		const gchar* _tmp12_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
 #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+		_tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = _tmp7_;
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = err;
+		_tmp9_ = err;
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = _tmp11_->message;
+		_tmp10_ = _tmp9_->message;
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:539: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+		g_warning ("VideoSupport.vala:539: Unable to update link state for %s: %s", _tmp8_, _tmp10_);
 #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp8_);
 #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5288 "VideoSupport.c"
+#line 5523 "VideoSupport.c"
 	}
 	__finally511:
 #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5299,12 +5534,15 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		g_clear_error (&_inner_error_);
 #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5299 "VideoSupport.c"
+#line 5534 "VideoSupport.c"
 	}
 }
 
 
-static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
+static gboolean
+video_real_set_event_id (MediaSource* base,
+                         EventID* event_id)
+{
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
@@ -5312,15 +5550,15 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5312 "VideoSupport.c"
+#line 5550 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp12_ = FALSE;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5320 "VideoSupport.c"
+#line 5558 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_;
@@ -5330,7 +5568,6 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			EventID _tmp5_;
 			gboolean _tmp6_;
 			gboolean _tmp7_;
-			gboolean _tmp8_;
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5344,118 +5581,106 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = _tmp6_;
-#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			committed = _tmp7_;
+			committed = _tmp6_;
 #line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp8_ = committed;
+			_tmp7_ = committed;
 #line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp8_) {
-#line 5353 "VideoSupport.c"
-				VideoRow* _tmp9_;
-				EventID _tmp10_;
+			if (_tmp7_) {
+#line 5588 "VideoSupport.c"
+				VideoRow* _tmp8_;
+				EventID _tmp9_;
 #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = self->priv->backing_row;
+				_tmp8_ = self->priv->backing_row;
 #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = *event_id;
+				_tmp9_ = *event_id;
 #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_->event_id = _tmp10_;
-#line 5362 "VideoSupport.c"
+				_tmp8_->event_id = _tmp9_;
+#line 5597 "VideoSupport.c"
 			}
 #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5366 "VideoSupport.c"
+#line 5601 "VideoSupport.c"
 			{
-				VideoRow* _tmp11_;
+				VideoRow* _tmp10_;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = self->priv->backing_row;
+				_tmp10_ = self->priv->backing_row;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5373 "VideoSupport.c"
+#line 5608 "VideoSupport.c"
 			}
 #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5377 "VideoSupport.c"
+#line 5612 "VideoSupport.c"
 		}
 		__finally513:
 		{
-			VideoRow* _tmp12_;
+			VideoRow* _tmp11_;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp12_ = self->priv->backing_row;
+			_tmp11_ = self->priv->backing_row;
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5386 "VideoSupport.c"
+#line 5621 "VideoSupport.c"
 		}
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
 #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return _tmp13_;
-#line 5394 "VideoSupport.c"
+		return _tmp12_;
+#line 5629 "VideoSupport.c"
 	}
 }
 
 
-gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
+gboolean
+video_is_duplicate (GFile* file,
+                    const gchar* full_md5)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_;
-	VideoTable* _tmp3_;
-	VideoTable* _tmp4_;
-	GFile* _tmp5_;
-	const gchar* _tmp6_;
-	gboolean _tmp7_;
-	gboolean _tmp8_;
+	VideoTable* _tmp1_;
+	VideoTable* _tmp2_;
+	gboolean _tmp3_;
 #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = file;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_ != NULL) {
+	if (file != NULL) {
 #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5417 "VideoSupport.c"
+#line 5649 "VideoSupport.c"
 	} else {
-		const gchar* _tmp2_;
 #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = full_md5;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp0_ = _tmp2_ != NULL;
-#line 5424 "VideoSupport.c"
+		_tmp0_ = full_md5 != NULL;
+#line 5653 "VideoSupport.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_table_get_instance ();
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = file;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = full_md5;
+	_tmp1_ = video_table_get_instance ();
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
+	_tmp2_ = _tmp1_;
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = _tmp7_;
+	_tmp3_ = video_table_has_duplicate (_tmp2_, file, full_md5);
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_database_table_unref0 (_tmp4_);
+	_database_table_unref0 (_tmp2_);
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp8_;
+	result = _tmp3_;
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5446 "VideoSupport.c"
+#line 5669 "VideoSupport.c"
 }
 
 
-ImportResult video_import_create (VideoImportParams* params, Video* * video) {
+ImportResult
+video_import_create (VideoImportParams* params,
+                     Video* * video)
+{
 	Video* _vala_video = NULL;
 	ImportResult result = 0;
-	VideoImportParams* _tmp8_;
-	VideoRow* _tmp9_;
-	Video* _tmp10_;
+	VideoRow* _tmp6_;
+	Video* _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
@@ -5463,37 +5688,33 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 	_g_object_unref0 (_vala_video);
 #line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5463 "VideoSupport.c"
+#line 5688 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_;
 		VideoTable* _tmp2_;
-		VideoImportParams* _tmp3_;
-		VideoRow* _tmp4_;
-		VideoID _tmp5_ = {0};
-		VideoID _tmp6_;
-		gboolean _tmp7_;
+		VideoRow* _tmp3_;
+		VideoID _tmp4_ = {0};
+		VideoID _tmp5_;
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = params;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = _tmp3_->row;
+		_tmp3_ = params->row;
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
+		video_table_add (_tmp2_, _tmp3_, &_tmp4_, &_inner_error_);
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp0_ = _tmp6_;
+		_tmp0_ = _tmp5_;
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5493 "VideoSupport.c"
+#line 5714 "VideoSupport.c"
 				goto __catch514_database_error;
 			}
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5502,27 +5723,25 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 			g_clear_error (&_inner_error_);
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5502 "VideoSupport.c"
+#line 5723 "VideoSupport.c"
 		}
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		if (_tmp7_) {
+		if (video_id_is_invalid (&_tmp0_)) {
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5514 "VideoSupport.c"
+#line 5733 "VideoSupport.c"
 			} else {
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5518 "VideoSupport.c"
+#line 5737 "VideoSupport.c"
 			}
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5522 "VideoSupport.c"
+#line 5741 "VideoSupport.c"
 		}
 	}
 	goto __finally514;
@@ -5541,15 +5760,15 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 		if (video) {
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5541 "VideoSupport.c"
+#line 5760 "VideoSupport.c"
 		} else {
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5545 "VideoSupport.c"
+#line 5764 "VideoSupport.c"
 		}
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5549 "VideoSupport.c"
+#line 5768 "VideoSupport.c"
 	}
 	__finally514:
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5560,63 +5779,60 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 		g_clear_error (&_inner_error_);
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5560 "VideoSupport.c"
+#line 5779 "VideoSupport.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = params;
+	_tmp6_ = params->row;
 #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_ = _tmp8_->row;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10_ = video_new (_tmp9_);
+	_tmp7_ = video_new (_tmp6_);
 #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
 #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_vala_video = _tmp10_;
+	_vala_video = _tmp7_;
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5578 "VideoSupport.c"
+#line 5795 "VideoSupport.c"
 	} else {
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5582 "VideoSupport.c"
+#line 5799 "VideoSupport.c"
 	}
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5586 "VideoSupport.c"
+#line 5803 "VideoSupport.c"
 }
 
 
-void video_import_failed (Video* video) {
+void
+video_import_failed (Video* video)
+{
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5594 "VideoSupport.c"
+#line 5813 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_;
 		VideoTable* _tmp1_;
-		Video* _tmp2_;
-		VideoID _tmp3_ = {0};
+		VideoID _tmp2_ = {0};
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = video;
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_get_video_id (_tmp2_, &_tmp3_);
+		video_get_video_id (video, &_tmp2_);
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
+		video_table_remove (_tmp1_, &_tmp2_, &_inner_error_);
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5616 "VideoSupport.c"
+#line 5832 "VideoSupport.c"
 				goto __catch515_database_error;
 			}
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5625,25 +5841,25 @@ void video_import_failed (Video* video) {
 			g_clear_error (&_inner_error_);
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5625 "VideoSupport.c"
+#line 5841 "VideoSupport.c"
 		}
 	}
 	goto __finally515;
 	__catch515_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_;
+		GError* _tmp3_;
 #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = err;
+		_tmp3_ = err;
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp4_);
+		app_window_database_error (_tmp3_);
 #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5643 "VideoSupport.c"
+#line 5859 "VideoSupport.c"
 	}
 	__finally515:
 #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5654,12 +5870,15 @@ void video_import_failed (Video* video) {
 		g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5654 "VideoSupport.c"
+#line 5870 "VideoSupport.c"
 	}
 }
 
 
-static BackingFileState** video_real_get_backing_files_state (MediaSource* base, int* result_length1) {
+static BackingFileState**
+video_real_get_backing_files_state (MediaSource* base,
+                                    int* result_length1)
+{
 	Video * self;
 	BackingFileState** result = NULL;
 	BackingFileState** backing = NULL;
@@ -5679,14 +5898,14 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	backing_length1 = 1;
 #line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5679 "VideoSupport.c"
+#line 5898 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_;
 #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
 #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5686 "VideoSupport.c"
+#line 5905 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_;
 			const gchar* _tmp3_;
@@ -5722,7 +5941,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			backing[0] = _tmp10_;
 #line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5722 "VideoSupport.c"
+#line 5941 "VideoSupport.c"
 		}
 		__finally516:
 		{
@@ -5731,7 +5950,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			_tmp12_ = self->priv->backing_row;
 #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5731 "VideoSupport.c"
+#line 5950 "VideoSupport.c"
 		}
 #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5743,7 +5962,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			g_clear_error (&_inner_error_);
 #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5743 "VideoSupport.c"
+#line 5962 "VideoSupport.c"
 		}
 	}
 #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5754,68 +5973,71 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	if (result_length1) {
 #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5754 "VideoSupport.c"
+#line 5973 "VideoSupport.c"
 	}
 #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
 #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5760 "VideoSupport.c"
+#line 5979 "VideoSupport.c"
 }
 
 
-static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+video_real_get_thumbnail (ThumbnailSource* base,
+                          gint scale,
+                          GError** error)
+{
 	Video * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	gint _tmp1_;
+	GdkPixbuf* _tmp1_;
 	GdkPixbuf* _tmp2_;
-	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = scale;
+	_tmp1_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_);
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = _tmp2_;
+	_tmp0_ = _tmp1_;
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5786 "VideoSupport.c"
+#line 6006 "VideoSupport.c"
 	}
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = _tmp0_;
+	_tmp2_ = _tmp0_;
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
 #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5798 "VideoSupport.c"
+#line 6018 "VideoSupport.c"
 }
 
 
-static gchar* video_real_get_master_md5 (MediaSource* base) {
+static gchar*
+video_real_get_master_md5 (MediaSource* base)
+{
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5808 "VideoSupport.c"
+#line 6030 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5815 "VideoSupport.c"
+#line 6037 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
@@ -5828,18 +6050,18 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5828 "VideoSupport.c"
+#line 6050 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5835 "VideoSupport.c"
+#line 6057 "VideoSupport.c"
 			}
 #line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5839 "VideoSupport.c"
+#line 6061 "VideoSupport.c"
 		}
 		__finally517:
 		{
@@ -5848,7 +6070,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5848 "VideoSupport.c"
+#line 6070 "VideoSupport.c"
 		}
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5856,12 +6078,16 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5856 "VideoSupport.c"
+#line 6078 "VideoSupport.c"
 	}
 }
 
 
-static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) {
+static GdkPixbuf*
+video_real_get_preview_pixbuf (MediaSource* base,
+                               Scaling* scaling,
+                               GError** error)
+{
 	Video * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
@@ -5882,7 +6108,7 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 		g_propagate_error (error, _inner_error_);
 #line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5882 "VideoSupport.c"
+#line 6108 "VideoSupport.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
@@ -5892,11 +6118,15 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	_g_object_unref0 (pixbuf);
 #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5892 "VideoSupport.c"
+#line 6118 "VideoSupport.c"
 }
 
 
-static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+video_real_create_thumbnail (ThumbnailSource* base,
+                             gint scale,
+                             GError** error)
+{
 	Video * self;
 	GdkPixbuf* result = NULL;
 	VideoReader* reader = NULL;
@@ -5933,7 +6163,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_tmp7_ = frame;
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5933 "VideoSupport.c"
+#line 6163 "VideoSupport.c"
 		GdkPixbuf* _tmp8_;
 		GdkPixbuf* _tmp9_;
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5944,7 +6174,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 		_g_object_unref0 (_tmp6_);
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5944 "VideoSupport.c"
+#line 6174 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_;
 		GdkPixbuf* _tmp11_;
@@ -5961,7 +6191,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 		_tmp6_ = _tmp12_;
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5961 "VideoSupport.c"
+#line 6191 "VideoSupport.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
@@ -5971,11 +6201,13 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_video_reader_unref0 (reader);
 #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5971 "VideoSupport.c"
+#line 6201 "VideoSupport.c"
 }
 
 
-static gchar* video_real_get_typename (DataSource* base) {
+static gchar*
+video_real_get_typename (DataSource* base)
+{
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -5987,11 +6219,13 @@ static gchar* video_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5987 "VideoSupport.c"
+#line 6219 "VideoSupport.c"
 }
 
 
-static gint64 video_real_get_instance_id (DataSource* base) {
+static gint64
+video_real_get_instance_id (DataSource* base)
+{
 	Video * self;
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
@@ -6006,23 +6240,26 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6006 "VideoSupport.c"
+#line 6240 "VideoSupport.c"
 }
 
 
-static void video_real_get_import_id (MediaSource* base, ImportID* result) {
+static void
+video_real_get_import_id (MediaSource* base,
+                          ImportID* result)
+{
 	Video * self;
 	GError * _inner_error_ = NULL;
 #line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6015 "VideoSupport.c"
+#line 6252 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6022 "VideoSupport.c"
+#line 6259 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			ImportID _tmp2_;
@@ -6032,18 +6269,18 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp2_ = _tmp1_->import_id;
 #line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 6032 "VideoSupport.c"
+#line 6269 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6039 "VideoSupport.c"
+#line 6276 "VideoSupport.c"
 			}
 #line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6043 "VideoSupport.c"
+#line 6280 "VideoSupport.c"
 		}
 		__finally518:
 		{
@@ -6052,7 +6289,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6052 "VideoSupport.c"
+#line 6289 "VideoSupport.c"
 		}
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6060,41 +6297,42 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 		g_clear_error (&_inner_error_);
 #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 6060 "VideoSupport.c"
+#line 6297 "VideoSupport.c"
 	}
 }
 
 
-static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
+static PhotoFileFormat
+video_real_get_preferred_thumbnail_format (ThumbnailSource* base)
+{
 	Video * self;
 	PhotoFileFormat result = 0;
-	PhotoFileFormat _tmp0_;
 #line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp0_;
+	result = photo_file_format_get_system_default_format ();
 #line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6077 "VideoSupport.c"
+#line 6313 "VideoSupport.c"
 }
 
 
-static gchar* video_real_get_title (MediaSource* base) {
+static gchar*
+video_real_get_title (MediaSource* base)
+{
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6087 "VideoSupport.c"
+#line 6325 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6094 "VideoSupport.c"
+#line 6332 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
@@ -6107,18 +6345,18 @@ static gchar* video_real_get_title (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6107 "VideoSupport.c"
+#line 6345 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6114 "VideoSupport.c"
+#line 6352 "VideoSupport.c"
 			}
 #line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6118 "VideoSupport.c"
+#line 6356 "VideoSupport.c"
 		}
 		__finally519:
 		{
@@ -6127,7 +6365,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6127 "VideoSupport.c"
+#line 6365 "VideoSupport.c"
 		}
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6135,99 +6373,99 @@ static gchar* video_real_get_title (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6135 "VideoSupport.c"
+#line 6373 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_set_title (MediaSource* base, const gchar* title) {
+static void
+video_real_set_title (MediaSource* base,
+                      const gchar* title)
+{
 	Video * self;
 	gchar* new_title = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	gchar* _tmp0_;
+	Alteration* _tmp19_;
 	Alteration* _tmp20_;
-	Alteration* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = title;
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_prep_title (_tmp0_);
+	_tmp0_ = media_source_prep_title (title);
 #line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	new_title = _tmp1_;
-#line 6156 "VideoSupport.c"
+	new_title = _tmp0_;
+#line 6394 "VideoSupport.c"
 	{
-		VideoRow* _tmp2_;
+		VideoRow* _tmp1_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = self->priv->backing_row;
+		_tmp1_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6163 "VideoSupport.c"
+#line 6401 "VideoSupport.c"
 		{
-			VideoRow* _tmp3_;
+			VideoRow* _tmp2_;
+			const gchar* _tmp3_;
 			const gchar* _tmp4_;
-			const gchar* _tmp5_;
-			VideoRow* _tmp16_;
-			const gchar* _tmp17_;
-			gchar* _tmp18_;
+			VideoRow* _tmp15_;
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
 #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = self->priv->backing_row;
+			_tmp2_ = self->priv->backing_row;
 #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = _tmp3_->title;
+			_tmp3_ = _tmp2_->title;
 #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = new_title;
+			_tmp4_ = new_title;
 #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6179 "VideoSupport.c"
+			if (g_strcmp0 (_tmp3_, _tmp4_) == 0) {
+#line 6417 "VideoSupport.c"
 				{
-					VideoRow* _tmp6_;
+					VideoRow* _tmp5_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp6_ = self->priv->backing_row;
+					_tmp5_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6186 "VideoSupport.c"
+#line 6424 "VideoSupport.c"
 				}
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6192 "VideoSupport.c"
+#line 6430 "VideoSupport.c"
 			}
 			{
+				VideoTable* _tmp6_;
 				VideoTable* _tmp7_;
-				VideoTable* _tmp8_;
-				VideoRow* _tmp9_;
-				VideoID _tmp10_;
-				const gchar* _tmp11_;
+				VideoRow* _tmp8_;
+				VideoID _tmp9_;
+				const gchar* _tmp10_;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = video_table_get_instance ();
+				_tmp6_ = video_table_get_instance ();
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = _tmp7_;
+				_tmp7_ = _tmp6_;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = self->priv->backing_row;
+				_tmp8_ = self->priv->backing_row;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = _tmp9_->video_id;
+				_tmp9_ = _tmp8_->video_id;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = new_title;
+				_tmp10_ = new_title;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
+				video_table_set_title (_tmp7_, &_tmp9_, _tmp10_, &_inner_error_);
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp8_);
+				_database_table_unref0 (_tmp7_);
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6218 "VideoSupport.c"
+#line 6456 "VideoSupport.c"
 						goto __catch521_database_error;
 					}
 					{
-						VideoRow* _tmp12_;
+						VideoRow* _tmp11_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp12_ = self->priv->backing_row;
+						_tmp11_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6227 "VideoSupport.c"
+#line 6465 "VideoSupport.c"
 					}
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
@@ -6237,50 +6475,50 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 					g_clear_error (&_inner_error_);
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6237 "VideoSupport.c"
+#line 6475 "VideoSupport.c"
 				}
 			}
 			goto __finally521;
 			__catch521_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp13_;
+				GError* _tmp12_;
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = e;
+				_tmp12_ = e;
 #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp13_);
+				app_window_database_error (_tmp12_);
 #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6255 "VideoSupport.c"
+#line 6493 "VideoSupport.c"
 				{
-					VideoRow* _tmp14_;
+					VideoRow* _tmp13_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp14_ = self->priv->backing_row;
+					_tmp13_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6262 "VideoSupport.c"
+#line 6500 "VideoSupport.c"
 				}
 #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
 #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6268 "VideoSupport.c"
+#line 6506 "VideoSupport.c"
 			}
 			__finally521:
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6273 "VideoSupport.c"
+#line 6511 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_;
+					VideoRow* _tmp14_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp15_ = self->priv->backing_row;
+					_tmp14_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6280 "VideoSupport.c"
+#line 6518 "VideoSupport.c"
 				}
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
@@ -6290,28 +6528,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				g_clear_error (&_inner_error_);
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6290 "VideoSupport.c"
+#line 6528 "VideoSupport.c"
 			}
 #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = self->priv->backing_row;
+			_tmp15_ = self->priv->backing_row;
 #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = new_title;
+			_tmp16_ = new_title;
 #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = g_strdup (_tmp17_);
+			_tmp17_ = g_strdup (_tmp16_);
 #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_free0 (_tmp16_->title);
+			_g_free0 (_tmp15_->title);
 #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_->title = _tmp18_;
-#line 6302 "VideoSupport.c"
+			_tmp15_->title = _tmp17_;
+#line 6540 "VideoSupport.c"
 		}
 		__finally520:
 		{
-			VideoRow* _tmp19_;
+			VideoRow* _tmp18_;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp19_ = self->priv->backing_row;
+			_tmp18_ = self->priv->backing_row;
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6311 "VideoSupport.c"
+#line 6549 "VideoSupport.c"
 		}
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6323,37 +6561,39 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6323 "VideoSupport.c"
+#line 6561 "VideoSupport.c"
 		}
 	}
 #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = alteration_new ("metadata", "name");
+	_tmp19_ = alteration_new ("metadata", "name");
 #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = _tmp20_;
+	_tmp20_ = _tmp19_;
 #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp21_);
+	_alteration_unref0 (_tmp20_);
 #line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6336 "VideoSupport.c"
+#line 6574 "VideoSupport.c"
 }
 
 
-static gchar* video_real_get_comment (MediaSource* base) {
+static gchar*
+video_real_get_comment (MediaSource* base)
+{
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6346 "VideoSupport.c"
+#line 6586 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6353 "VideoSupport.c"
+#line 6593 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
@@ -6366,18 +6606,18 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6366 "VideoSupport.c"
+#line 6606 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6373 "VideoSupport.c"
+#line 6613 "VideoSupport.c"
 			}
 #line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6377 "VideoSupport.c"
+#line 6617 "VideoSupport.c"
 		}
 		__finally522:
 		{
@@ -6386,7 +6626,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6386 "VideoSupport.c"
+#line 6626 "VideoSupport.c"
 		}
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6394,104 +6634,104 @@ static gchar* video_real_get_comment (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6394 "VideoSupport.c"
+#line 6634 "VideoSupport.c"
 	}
 }
 
 
-static gboolean video_real_set_comment (MediaSource* base, const gchar* comment) {
+static gboolean
+video_real_set_comment (MediaSource* base,
+                        const gchar* comment)
+{
 	Video * self;
 	gboolean result = FALSE;
 	gchar* new_comment = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	gchar* _tmp0_;
+	Alteration* _tmp22_;
 	Alteration* _tmp23_;
-	Alteration* _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = comment;
+	_tmp0_ = media_source_prep_title (comment);
 #line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	new_comment = _tmp1_;
-#line 6416 "VideoSupport.c"
+	new_comment = _tmp0_;
+#line 6656 "VideoSupport.c"
 	{
-		VideoRow* _tmp2_;
+		VideoRow* _tmp1_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = self->priv->backing_row;
+		_tmp1_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6423 "VideoSupport.c"
+#line 6663 "VideoSupport.c"
 		{
-			VideoRow* _tmp3_;
+			VideoRow* _tmp2_;
+			const gchar* _tmp3_;
 			const gchar* _tmp4_;
-			const gchar* _tmp5_;
-			VideoRow* _tmp18_;
-			const gchar* _tmp19_;
-			gchar* _tmp20_;
+			VideoRow* _tmp17_;
+			const gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = self->priv->backing_row;
+			_tmp2_ = self->priv->backing_row;
 #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = _tmp3_->comment;
+			_tmp3_ = _tmp2_->comment;
 #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = new_comment;
+			_tmp4_ = new_comment;
 #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
+			if (g_strcmp0 (_tmp3_, _tmp4_) == 0) {
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6441 "VideoSupport.c"
+#line 6681 "VideoSupport.c"
 				{
-					VideoRow* _tmp6_;
+					VideoRow* _tmp5_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp6_ = self->priv->backing_row;
+					_tmp5_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6448 "VideoSupport.c"
+#line 6688 "VideoSupport.c"
 				}
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6454 "VideoSupport.c"
+#line 6694 "VideoSupport.c"
 			}
 			{
+				VideoTable* _tmp6_;
 				VideoTable* _tmp7_;
-				VideoTable* _tmp8_;
-				VideoRow* _tmp9_;
-				VideoID _tmp10_;
-				const gchar* _tmp11_;
+				VideoRow* _tmp8_;
+				VideoID _tmp9_;
+				const gchar* _tmp10_;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = video_table_get_instance ();
+				_tmp6_ = video_table_get_instance ();
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = _tmp7_;
+				_tmp7_ = _tmp6_;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = self->priv->backing_row;
+				_tmp8_ = self->priv->backing_row;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = _tmp9_->video_id;
+				_tmp9_ = _tmp8_->video_id;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = new_comment;
+				_tmp10_ = new_comment;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
+				video_table_set_comment (_tmp7_, &_tmp9_, _tmp10_, &_inner_error_);
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp8_);
+				_database_table_unref0 (_tmp7_);
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6478 "VideoSupport.c"
-					gboolean _tmp13_ = FALSE;
+#line 6718 "VideoSupport.c"
+					gboolean _tmp12_ = FALSE;
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6482 "VideoSupport.c"
+#line 6722 "VideoSupport.c"
 						goto __catch524_database_error;
 					}
 					{
-						VideoRow* _tmp12_;
+						VideoRow* _tmp11_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp12_ = self->priv->backing_row;
+						_tmp11_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6491 "VideoSupport.c"
+#line 6731 "VideoSupport.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
@@ -6500,54 +6740,54 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return _tmp13_;
-#line 6501 "VideoSupport.c"
+					return _tmp12_;
+#line 6741 "VideoSupport.c"
 				}
 			}
 			goto __finally524;
 			__catch524_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp14_;
+				GError* _tmp13_;
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_ = e;
+				_tmp13_ = e;
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp14_);
+				app_window_database_error (_tmp13_);
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6521 "VideoSupport.c"
+#line 6761 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_;
+					VideoRow* _tmp14_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp15_ = self->priv->backing_row;
+					_tmp14_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6528 "VideoSupport.c"
+#line 6768 "VideoSupport.c"
 				}
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6534 "VideoSupport.c"
+#line 6774 "VideoSupport.c"
 			}
 			__finally524:
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6539 "VideoSupport.c"
-				gboolean _tmp17_ = FALSE;
+#line 6779 "VideoSupport.c"
+				gboolean _tmp16_ = FALSE;
 				{
-					VideoRow* _tmp16_;
+					VideoRow* _tmp15_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp16_ = self->priv->backing_row;
+					_tmp15_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6547 "VideoSupport.c"
+#line 6787 "VideoSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
@@ -6556,34 +6796,34 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return _tmp17_;
-#line 6557 "VideoSupport.c"
+				return _tmp16_;
+#line 6797 "VideoSupport.c"
 			}
 #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = self->priv->backing_row;
+			_tmp17_ = self->priv->backing_row;
 #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp19_ = new_comment;
+			_tmp18_ = new_comment;
 #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp20_ = g_strdup (_tmp19_);
+			_tmp19_ = g_strdup (_tmp18_);
 #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_free0 (_tmp18_->comment);
+			_g_free0 (_tmp17_->comment);
 #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_->comment = _tmp20_;
-#line 6569 "VideoSupport.c"
+			_tmp17_->comment = _tmp19_;
+#line 6809 "VideoSupport.c"
 		}
 		__finally523:
 		{
-			VideoRow* _tmp21_;
+			VideoRow* _tmp20_;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = self->priv->backing_row;
+			_tmp20_ = self->priv->backing_row;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6578 "VideoSupport.c"
+#line 6818 "VideoSupport.c"
 		}
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6582 "VideoSupport.c"
-			gboolean _tmp22_ = FALSE;
+#line 6822 "VideoSupport.c"
+			gboolean _tmp21_ = FALSE;
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6591,42 +6831,44 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return _tmp22_;
-#line 6592 "VideoSupport.c"
+			return _tmp21_;
+#line 6832 "VideoSupport.c"
 		}
 	}
 #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = alteration_new ("metadata", "comment");
+	_tmp22_ = alteration_new ("metadata", "comment");
 #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = _tmp23_;
+	_tmp23_ = _tmp22_;
 #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
 #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp24_);
+	_alteration_unref0 (_tmp23_);
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6609 "VideoSupport.c"
+#line 6849 "VideoSupport.c"
 }
 
 
-static Rating video_real_get_rating (MediaSource* base) {
+static Rating
+video_real_get_rating (MediaSource* base)
+{
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
 #line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6619 "VideoSupport.c"
+#line 6861 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6626 "VideoSupport.c"
+#line 6868 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
@@ -6636,18 +6878,18 @@ static Rating video_real_get_rating (MediaSource* base) {
 			_tmp2_ = _tmp1_->rating;
 #line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6636 "VideoSupport.c"
+#line 6878 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6643 "VideoSupport.c"
+#line 6885 "VideoSupport.c"
 			}
 #line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6647 "VideoSupport.c"
+#line 6889 "VideoSupport.c"
 		}
 		__finally525:
 		{
@@ -6656,7 +6898,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6656 "VideoSupport.c"
+#line 6898 "VideoSupport.c"
 		}
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6664,101 +6906,91 @@ static Rating video_real_get_rating (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6664 "VideoSupport.c"
+#line 6906 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_set_rating (MediaSource* base, Rating rating) {
+static void
+video_real_set_rating (MediaSource* base,
+                       Rating rating)
+{
 	Video * self;
-	Alteration* _tmp19_;
-	Alteration* _tmp20_;
+	Alteration* _tmp14_;
+	Alteration* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6676 "VideoSupport.c"
+#line 6921 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6683 "VideoSupport.c"
+#line 6928 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			Rating _tmp2_;
-			gboolean _tmp3_;
-			VideoRow* _tmp16_;
-			Rating _tmp17_;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp2_ = rating;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = rating_is_valid (_tmp2_);
+			VideoRow* _tmp12_;
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (!_tmp3_) {
+			if (!rating_is_valid (rating)) {
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6698 "VideoSupport.c"
+#line 6936 "VideoSupport.c"
 			} else {
-				Rating _tmp4_;
-				VideoRow* _tmp5_;
-				Rating _tmp6_;
+				VideoRow* _tmp2_;
+				Rating _tmp3_;
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp4_ = rating;
+				_tmp2_ = self->priv->backing_row;
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = self->priv->backing_row;
+				_tmp3_ = _tmp2_->rating;
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp6_ = _tmp5_->rating;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6711 "VideoSupport.c"
+				_tmp1_ = rating == _tmp3_;
+#line 6946 "VideoSupport.c"
 			}
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6715 "VideoSupport.c"
+#line 6950 "VideoSupport.c"
 				{
-					VideoRow* _tmp7_;
+					VideoRow* _tmp4_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp7_ = self->priv->backing_row;
+					_tmp4_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6722 "VideoSupport.c"
+#line 6957 "VideoSupport.c"
 				}
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6726 "VideoSupport.c"
+#line 6961 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp8_;
-				VideoTable* _tmp9_;
-				VideoID _tmp10_ = {0};
-				Rating _tmp11_;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = video_table_get_instance ();
+				VideoTable* _tmp5_;
+				VideoTable* _tmp6_;
+				VideoID _tmp7_ = {0};
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = _tmp8_;
+				_tmp5_ = video_table_get_instance ();
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_get_video_id (self, &_tmp10_);
+				_tmp6_ = _tmp5_;
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = rating;
+				video_get_video_id (self, &_tmp7_);
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
+				video_table_set_rating (_tmp6_, &_tmp7_, rating, &_inner_error_);
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp9_);
+				_database_table_unref0 (_tmp6_);
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6749 "VideoSupport.c"
+#line 6981 "VideoSupport.c"
 						goto __catch527_database_error;
 					}
 					{
-						VideoRow* _tmp12_;
+						VideoRow* _tmp8_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp12_ = self->priv->backing_row;
+						_tmp8_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6758 "VideoSupport.c"
+#line 6990 "VideoSupport.c"
 					}
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6766,48 +6998,48 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 					g_clear_error (&_inner_error_);
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6766 "VideoSupport.c"
+#line 6998 "VideoSupport.c"
 				}
 			}
 			goto __finally527;
 			__catch527_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp13_;
+				GError* _tmp9_;
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = e;
+				_tmp9_ = e;
 #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp13_);
+				app_window_database_error (_tmp9_);
 #line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6784 "VideoSupport.c"
+#line 7016 "VideoSupport.c"
 				{
-					VideoRow* _tmp14_;
+					VideoRow* _tmp10_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp14_ = self->priv->backing_row;
+					_tmp10_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6791 "VideoSupport.c"
+#line 7023 "VideoSupport.c"
 				}
 #line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6795 "VideoSupport.c"
+#line 7027 "VideoSupport.c"
 			}
 			__finally527:
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6800 "VideoSupport.c"
+#line 7032 "VideoSupport.c"
 				{
-					VideoRow* _tmp15_;
+					VideoRow* _tmp11_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp15_ = self->priv->backing_row;
+					_tmp11_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6807 "VideoSupport.c"
+#line 7039 "VideoSupport.c"
 				}
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6815,24 +7047,22 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				g_clear_error (&_inner_error_);
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6815 "VideoSupport.c"
+#line 7047 "VideoSupport.c"
 			}
 #line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = self->priv->backing_row;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = rating;
+			_tmp12_ = self->priv->backing_row;
 #line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_->rating = _tmp17_;
-#line 6823 "VideoSupport.c"
+			_tmp12_->rating = rating;
+#line 7053 "VideoSupport.c"
 		}
 		__finally526:
 		{
-			VideoRow* _tmp18_;
+			VideoRow* _tmp13_;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = self->priv->backing_row;
+			_tmp13_ = self->priv->backing_row;
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6832 "VideoSupport.c"
+#line 7062 "VideoSupport.c"
 		}
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6842,56 +7072,55 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			g_clear_error (&_inner_error_);
 #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6842 "VideoSupport.c"
+#line 7072 "VideoSupport.c"
 		}
 	}
 #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp19_ = alteration_new ("metadata", "rating");
+	_tmp14_ = alteration_new ("metadata", "rating");
 #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = _tmp19_;
+	_tmp15_ = _tmp14_;
 #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
 #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp20_);
-#line 6853 "VideoSupport.c"
+	_alteration_unref0 (_tmp15_);
+#line 7083 "VideoSupport.c"
 }
 
 
-static void video_real_increase_rating (MediaSource* base) {
+static void
+video_real_increase_rating (MediaSource* base)
+{
 	Video * self;
 	GError * _inner_error_ = NULL;
 #line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6862 "VideoSupport.c"
+#line 7094 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6869 "VideoSupport.c"
+#line 7101 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
-			Rating _tmp3_;
 #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
 #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = rating_increase (_tmp2_);
-#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6882 "VideoSupport.c"
+			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_increase (_tmp2_));
+#line 7111 "VideoSupport.c"
 		}
 		__finally528:
 		{
-			VideoRow* _tmp4_;
+			VideoRow* _tmp3_;
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = self->priv->backing_row;
+			_tmp3_ = self->priv->backing_row;
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6891 "VideoSupport.c"
+#line 7120 "VideoSupport.c"
 		}
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6901,47 +7130,46 @@ static void video_real_increase_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6901 "VideoSupport.c"
+#line 7130 "VideoSupport.c"
 		}
 	}
 }
 
 
-static void video_real_decrease_rating (MediaSource* base) {
+static void
+video_real_decrease_rating (MediaSource* base)
+{
 	Video * self;
 	GError * _inner_error_ = NULL;
 #line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6912 "VideoSupport.c"
+#line 7143 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6919 "VideoSupport.c"
+#line 7150 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
-			Rating _tmp3_;
 #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
 #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = rating_decrease (_tmp2_);
-#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6932 "VideoSupport.c"
+			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_decrease (_tmp2_));
+#line 7160 "VideoSupport.c"
 		}
 		__finally529:
 		{
-			VideoRow* _tmp4_;
+			VideoRow* _tmp3_;
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = self->priv->backing_row;
+			_tmp3_ = self->priv->backing_row;
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6941 "VideoSupport.c"
+#line 7169 "VideoSupport.c"
 		}
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6951,133 +7179,133 @@ static void video_real_decrease_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6951 "VideoSupport.c"
+#line 7179 "VideoSupport.c"
 		}
 	}
 }
 
 
-static gboolean video_real_is_trashed (MediaSource* base) {
+static gboolean
+video_real_is_trashed (MediaSource* base)
+{
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_;
 #line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp0_;
+	result = video_is_flag_set (self, VIDEO_FLAG_TRASH);
 #line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6969 "VideoSupport.c"
+#line 7196 "VideoSupport.c"
 }
 
 
-static gboolean video_real_is_offline (Monitorable* base) {
+static gboolean
+video_real_is_offline (Monitorable* base)
+{
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_;
 #line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp0_;
+	result = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
 #line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6985 "VideoSupport.c"
+#line 7211 "VideoSupport.c"
 }
 
 
-static void video_real_mark_offline (Monitorable* base) {
+static void
+video_real_mark_offline (Monitorable* base)
+{
 	Video * self;
 #line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6995 "VideoSupport.c"
+#line 7223 "VideoSupport.c"
 }
 
 
-static void video_real_mark_online (Monitorable* base) {
+static void
+video_real_mark_online (Monitorable* base)
+{
 	Video * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 #line 745 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
 #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = video_get_is_interpretable (self);
+	if (!video_get_is_interpretable (self)) {
 #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (!_tmp1_) {
-#line 7011 "VideoSupport.c"
-		gboolean _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = video_has_interpreter_state_changed ();
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp0_ = _tmp2_;
-#line 7017 "VideoSupport.c"
+		_tmp0_ = video_has_interpreter_state_changed ();
+#line 7240 "VideoSupport.c"
 	} else {
 #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 7021 "VideoSupport.c"
+#line 7244 "VideoSupport.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 7025 "VideoSupport.c"
-		VideoInterpretableResults* _tmp3_;
-		VideoInterpretableResults* _tmp4_;
+#line 7248 "VideoSupport.c"
+		VideoInterpretableResults* _tmp1_;
+		VideoInterpretableResults* _tmp2_;
 #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = video_check_is_interpretable (self);
+		_tmp1_ = video_check_is_interpretable (self);
 #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = _tmp3_;
+		_tmp2_ = _tmp1_;
 #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_interpretable_results_foreground_finish (_tmp4_);
+		video_interpretable_results_foreground_finish (_tmp2_);
 #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_video_interpretable_results_unref0 (_tmp4_);
-#line 7036 "VideoSupport.c"
+		_video_interpretable_results_unref0 (_tmp2_);
+#line 7259 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_trash (MediaSource* base) {
+static void
+video_real_trash (MediaSource* base)
+{
 	Video * self;
 #line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 753 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7047 "VideoSupport.c"
+#line 7272 "VideoSupport.c"
 }
 
 
-static void video_real_untrash (MediaSource* base) {
+static void
+video_real_untrash (MediaSource* base)
+{
 	Video * self;
 #line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 757 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7057 "VideoSupport.c"
+#line 7284 "VideoSupport.c"
 }
 
 
-static gboolean video_real_is_flagged (Flaggable* base) {
+static gboolean
+video_real_is_flagged (Flaggable* base)
+{
 	Video * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_;
 #line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp0_;
+	result = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
 #line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7073 "VideoSupport.c"
+#line 7299 "VideoSupport.c"
 }
 
 
-static void video_real_mark_flagged (Flaggable* base) {
+static void
+video_real_mark_flagged (Flaggable* base)
+{
 	Video * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
@@ -7091,11 +7319,13 @@ static void video_real_mark_flagged (Flaggable* base) {
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
 #line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7091 "VideoSupport.c"
+#line 7319 "VideoSupport.c"
 }
 
 
-static void video_real_mark_unflagged (Flaggable* base) {
+static void
+video_real_mark_unflagged (Flaggable* base)
+{
 	Video * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
@@ -7109,23 +7339,26 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
 #line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7109 "VideoSupport.c"
+#line 7339 "VideoSupport.c"
 }
 
 
-static void video_real_get_event_id (MediaSource* base, EventID* result) {
+static void
+video_real_get_event_id (MediaSource* base,
+                         EventID* result)
+{
 	Video * self;
 	GError * _inner_error_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7118 "VideoSupport.c"
+#line 7351 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7125 "VideoSupport.c"
+#line 7358 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			EventID _tmp2_;
@@ -7135,18 +7368,18 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			_tmp2_ = _tmp1_->event_id;
 #line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7135 "VideoSupport.c"
+#line 7368 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7142 "VideoSupport.c"
+#line 7375 "VideoSupport.c"
 			}
 #line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7146 "VideoSupport.c"
+#line 7379 "VideoSupport.c"
 		}
 		__finally530:
 		{
@@ -7155,7 +7388,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7155 "VideoSupport.c"
+#line 7388 "VideoSupport.c"
 		}
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7163,25 +7396,27 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 		g_clear_error (&_inner_error_);
 #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7163 "VideoSupport.c"
+#line 7396 "VideoSupport.c"
 	}
 }
 
 
-static gchar* video_real_to_string (DataObject* base) {
+static gchar*
+video_real_to_string (DataObject* base)
+{
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7174 "VideoSupport.c"
+#line 7409 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7181 "VideoSupport.c"
+#line 7416 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			VideoID _tmp2_;
@@ -7214,18 +7449,18 @@ static gchar* video_real_to_string (DataObject* base) {
 			_g_free0 (_tmp5_);
 #line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7214 "VideoSupport.c"
+#line 7449 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_;
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7221 "VideoSupport.c"
+#line 7456 "VideoSupport.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7225 "VideoSupport.c"
+#line 7460 "VideoSupport.c"
 		}
 		__finally531:
 		{
@@ -7234,7 +7469,7 @@ static gchar* video_real_to_string (DataObject* base) {
 			_tmp11_ = self->priv->backing_row;
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7234 "VideoSupport.c"
+#line 7469 "VideoSupport.c"
 		}
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7242,23 +7477,26 @@ static gchar* video_real_to_string (DataObject* base) {
 		g_clear_error (&_inner_error_);
 #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7242 "VideoSupport.c"
+#line 7477 "VideoSupport.c"
 	}
 }
 
 
-void video_get_video_id (Video* self, VideoID* result) {
+void
+video_get_video_id (Video* self,
+                    VideoID* result)
+{
 	GError * _inner_error_ = NULL;
 #line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7251 "VideoSupport.c"
+#line 7489 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7258 "VideoSupport.c"
+#line 7496 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			VideoID _tmp2_;
@@ -7268,18 +7506,18 @@ void video_get_video_id (Video* self, VideoID* result) {
 			_tmp2_ = _tmp1_->video_id;
 #line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7268 "VideoSupport.c"
+#line 7506 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7275 "VideoSupport.c"
+#line 7513 "VideoSupport.c"
 			}
 #line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7279 "VideoSupport.c"
+#line 7517 "VideoSupport.c"
 		}
 		__finally532:
 		{
@@ -7288,7 +7526,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7288 "VideoSupport.c"
+#line 7526 "VideoSupport.c"
 		}
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7296,18 +7534,20 @@ void video_get_video_id (Video* self, VideoID* result) {
 		g_clear_error (&_inner_error_);
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7296 "VideoSupport.c"
+#line 7534 "VideoSupport.c"
 	}
 }
 
 
-static time_t video_real_get_exposure_time (Dateable* base) {
+static time_t
+video_real_get_exposure_time (Dateable* base)
+{
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
 #line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7307 "VideoSupport.c"
+#line 7547 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
@@ -7315,7 +7555,7 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 		_tmp0_ = self->priv->backing_row;
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7315 "VideoSupport.c"
+#line 7555 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			time_t _tmp2_;
@@ -7325,18 +7565,18 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			_tmp2_ = _tmp1_->exposure_time;
 #line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7325 "VideoSupport.c"
+#line 7565 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7332 "VideoSupport.c"
+#line 7572 "VideoSupport.c"
 			}
 #line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7336 "VideoSupport.c"
+#line 7576 "VideoSupport.c"
 		}
 		__finally533:
 		{
@@ -7345,7 +7585,7 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7345 "VideoSupport.c"
+#line 7585 "VideoSupport.c"
 		}
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7353,35 +7593,36 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 		g_clear_error (&_inner_error_);
 #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7353 "VideoSupport.c"
+#line 7593 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_set_exposure_time (Dateable* base, time_t time) {
+static void
+video_real_set_exposure_time (Dateable* base,
+                              time_t time)
+{
 	Video * self;
-	Alteration* _tmp12_;
-	Alteration* _tmp13_;
+	Alteration* _tmp10_;
+	Alteration* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7365 "VideoSupport.c"
+#line 7608 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7372 "VideoSupport.c"
+#line 7615 "VideoSupport.c"
 		{
-			VideoRow* _tmp9_;
-			time_t _tmp10_;
+			VideoRow* _tmp8_;
 			{
 				VideoTable* _tmp1_;
 				VideoTable* _tmp2_;
 				VideoRow* _tmp3_;
 				VideoID _tmp4_;
-				time_t _tmp5_;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7391,14 +7632,12 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = time;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
+				video_table_set_exposure_time (_tmp2_, &_tmp4_, time, &_inner_error_);
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7398 "VideoSupport.c"
+#line 7637 "VideoSupport.c"
 					goto __catch535_g_error;
 				}
 			}
@@ -7406,33 +7645,33 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			__catch535_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp6_;
-				const gchar* _tmp7_;
+				GError* _tmp5_;
+				const gchar* _tmp6_;
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp6_ = e;
+				_tmp5_ = e;
 #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = _tmp6_->message;
+				_tmp6_ = _tmp5_->message;
 #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:801: Warning - %s", _tmp7_);
+				g_debug ("VideoSupport.vala:801: Warning - %s", _tmp6_);
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7420 "VideoSupport.c"
+#line 7659 "VideoSupport.c"
 			}
 			__finally535:
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7425 "VideoSupport.c"
+#line 7664 "VideoSupport.c"
 				{
-					VideoRow* _tmp8_;
+					VideoRow* _tmp7_;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp8_ = self->priv->backing_row;
+					_tmp7_ = self->priv->backing_row;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7432 "VideoSupport.c"
+#line 7671 "VideoSupport.c"
 				}
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7440,24 +7679,22 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				g_clear_error (&_inner_error_);
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7440 "VideoSupport.c"
+#line 7679 "VideoSupport.c"
 			}
 #line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp9_ = self->priv->backing_row;
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp10_ = time;
+			_tmp8_ = self->priv->backing_row;
 #line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp9_->exposure_time = _tmp10_;
-#line 7448 "VideoSupport.c"
+			_tmp8_->exposure_time = time;
+#line 7685 "VideoSupport.c"
 		}
 		__finally534:
 		{
-			VideoRow* _tmp11_;
+			VideoRow* _tmp9_;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp11_ = self->priv->backing_row;
+			_tmp9_ = self->priv->backing_row;
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7457 "VideoSupport.c"
+#line 7694 "VideoSupport.c"
 		}
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7467,33 +7704,36 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			g_clear_error (&_inner_error_);
 #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7467 "VideoSupport.c"
+#line 7704 "VideoSupport.c"
 		}
 	}
 #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp12_ = alteration_new ("metadata", "exposure-time");
+	_tmp10_ = alteration_new ("metadata", "exposure-time");
 #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = _tmp10_;
 #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp11_);
 #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp13_);
-#line 7478 "VideoSupport.c"
+	_alteration_unref0 (_tmp11_);
+#line 7715 "VideoSupport.c"
 }
 
 
-void video_get_frame_dimensions (Video* self, Dimensions* result) {
+void
+video_get_frame_dimensions (Video* self,
+                            Dimensions* result)
+{
 	GError * _inner_error_ = NULL;
 #line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7486 "VideoSupport.c"
+#line 7726 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7493 "VideoSupport.c"
+#line 7733 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gint _tmp2_;
@@ -7512,18 +7752,18 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
 #line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7512 "VideoSupport.c"
+#line 7752 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7519 "VideoSupport.c"
+#line 7759 "VideoSupport.c"
 			}
 #line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7523 "VideoSupport.c"
+#line 7763 "VideoSupport.c"
 		}
 		__finally536:
 		{
@@ -7532,7 +7772,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			_tmp7_ = self->priv->backing_row;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7532 "VideoSupport.c"
+#line 7772 "VideoSupport.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7540,12 +7780,16 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 		g_clear_error (&_inner_error_);
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7540 "VideoSupport.c"
+#line 7780 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) {
+static void
+video_real_get_dimensions (MediaSource* base,
+                           PhotoException disallowed_steps,
+                           Dimensions* result)
+{
 	Video * self;
 	Dimensions _tmp0_ = {0};
 #line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7556,33 +7800,34 @@ static void video_real_get_dimensions (MediaSource* base, PhotoException disallo
 	*result = _tmp0_;
 #line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7556 "VideoSupport.c"
+#line 7800 "VideoSupport.c"
 }
 
 
-static guint64 video_real_get_filesize (MediaSource* base) {
+static guint64
+video_real_get_filesize (MediaSource* base)
+{
 	Video * self;
 	guint64 result = 0ULL;
-	guint64 _tmp0_;
 #line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp0_;
+	result = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7572 "VideoSupport.c"
+#line 7815 "VideoSupport.c"
 }
 
 
-static guint64 video_real_get_master_filesize (MediaSource* base) {
+static guint64
+video_real_get_master_filesize (MediaSource* base)
+{
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
 #line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7582 "VideoSupport.c"
+#line 7827 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
@@ -7590,7 +7835,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 		_tmp0_ = self->priv->backing_row;
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7590 "VideoSupport.c"
+#line 7835 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gint64 _tmp2_;
@@ -7600,18 +7845,18 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			_tmp2_ = _tmp1_->filesize;
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7600 "VideoSupport.c"
+#line 7845 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7607 "VideoSupport.c"
+#line 7852 "VideoSupport.c"
 			}
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7611 "VideoSupport.c"
+#line 7856 "VideoSupport.c"
 		}
 		__finally537:
 		{
@@ -7620,7 +7865,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7620 "VideoSupport.c"
+#line 7865 "VideoSupport.c"
 		}
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7628,18 +7873,20 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7628 "VideoSupport.c"
+#line 7873 "VideoSupport.c"
 	}
 }
 
 
-static time_t video_real_get_timestamp (MediaSource* base) {
+static time_t
+video_real_get_timestamp (MediaSource* base)
+{
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
 #line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7639 "VideoSupport.c"
+#line 7886 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
@@ -7647,7 +7894,7 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 		_tmp0_ = self->priv->backing_row;
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7647 "VideoSupport.c"
+#line 7894 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			time_t _tmp2_;
@@ -7657,18 +7904,18 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			_tmp2_ = _tmp1_->timestamp;
 #line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7657 "VideoSupport.c"
+#line 7904 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7664 "VideoSupport.c"
+#line 7911 "VideoSupport.c"
 			}
 #line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7668 "VideoSupport.c"
+#line 7915 "VideoSupport.c"
 		}
 		__finally538:
 		{
@@ -7677,7 +7924,7 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7677 "VideoSupport.c"
+#line 7924 "VideoSupport.c"
 		}
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7685,120 +7932,120 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7685 "VideoSupport.c"
+#line 7932 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) {
+static void
+video_real_set_master_timestamp (Monitorable* base,
+                                 GFileInfo* info)
+{
 	Video * self;
 	GTimeVal time_val = {0};
-	GFileInfo* _tmp0_;
-	GTimeVal _tmp1_ = {0};
+	GTimeVal _tmp0_ = {0};
+	Alteration* _tmp18_;
 	Alteration* _tmp19_;
-	Alteration* _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
 #line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = info;
-#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
+	g_file_info_get_modification_time (info, &_tmp0_);
 #line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	time_val = _tmp1_;
-#line 7708 "VideoSupport.c"
+	time_val = _tmp0_;
+#line 7955 "VideoSupport.c"
 	{
 		{
-			VideoRow* _tmp2_;
+			VideoRow* _tmp1_;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp2_ = self->priv->backing_row;
+			_tmp1_ = self->priv->backing_row;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7716 "VideoSupport.c"
+#line 7963 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_;
-				time_t _tmp4_;
-				GTimeVal _tmp5_;
-				glong _tmp6_;
+				VideoRow* _tmp2_;
+				time_t _tmp3_;
+				GTimeVal _tmp4_;
+				glong _tmp5_;
+				VideoTable* _tmp7_;
 				VideoTable* _tmp8_;
-				VideoTable* _tmp9_;
-				VideoRow* _tmp10_;
-				VideoID _tmp11_;
-				GTimeVal _tmp12_;
-				glong _tmp13_;
-				VideoRow* _tmp14_;
-				GTimeVal _tmp15_;
-				glong _tmp16_;
+				VideoRow* _tmp9_;
+				VideoID _tmp10_;
+				GTimeVal _tmp11_;
+				glong _tmp12_;
+				VideoRow* _tmp13_;
+				GTimeVal _tmp14_;
+				glong _tmp15_;
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp3_ = self->priv->backing_row;
+				_tmp2_ = self->priv->backing_row;
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp4_ = _tmp3_->timestamp;
+				_tmp3_ = _tmp2_->timestamp;
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = time_val;
+				_tmp4_ = time_val;
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp6_ = _tmp5_.tv_sec;
+				_tmp5_ = _tmp4_.tv_sec;
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7741 "VideoSupport.c"
+				if (_tmp3_ == ((time_t) _tmp5_)) {
+#line 7988 "VideoSupport.c"
 					{
-						VideoRow* _tmp7_;
+						VideoRow* _tmp6_;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp7_ = self->priv->backing_row;
+						_tmp6_ = self->priv->backing_row;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7748 "VideoSupport.c"
+#line 7995 "VideoSupport.c"
 					}
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7752 "VideoSupport.c"
+#line 7999 "VideoSupport.c"
 				}
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = video_table_get_instance ();
+				_tmp7_ = video_table_get_instance ();
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = _tmp8_;
+				_tmp8_ = _tmp7_;
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = self->priv->backing_row;
+				_tmp9_ = self->priv->backing_row;
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = _tmp10_->video_id;
+				_tmp10_ = _tmp9_->video_id;
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp12_ = time_val;
+				_tmp11_ = time_val;
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = _tmp12_.tv_sec;
+				_tmp12_ = _tmp11_.tv_sec;
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
+				video_table_set_timestamp (_tmp8_, &_tmp10_, (time_t) _tmp12_, &_inner_error_);
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp9_);
+				_database_table_unref0 (_tmp8_);
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7772 "VideoSupport.c"
+#line 8019 "VideoSupport.c"
 					goto __finally540;
 				}
 #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_ = self->priv->backing_row;
+				_tmp13_ = self->priv->backing_row;
 #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp15_ = time_val;
+				_tmp14_ = time_val;
 #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = _tmp15_.tv_sec;
+				_tmp15_ = _tmp14_.tv_sec;
 #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7783 "VideoSupport.c"
+				_tmp13_->timestamp = (time_t) _tmp15_;
+#line 8030 "VideoSupport.c"
 			}
 			__finally540:
 			{
-				VideoRow* _tmp17_;
+				VideoRow* _tmp16_;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = self->priv->backing_row;
+				_tmp16_ = self->priv->backing_row;
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7792 "VideoSupport.c"
+#line 8039 "VideoSupport.c"
 			}
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7798 "VideoSupport.c"
+#line 8045 "VideoSupport.c"
 					goto __catch539_database_error;
 				}
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7807,7 +8054,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				g_clear_error (&_inner_error_);
 #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7807 "VideoSupport.c"
+#line 8054 "VideoSupport.c"
 			}
 		}
 	}
@@ -7815,20 +8062,20 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	__catch539_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp18_;
+		GError* _tmp17_;
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp18_ = err;
+		_tmp17_ = err;
 #line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp18_);
+		app_window_database_error (_tmp17_);
 #line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
 #line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7828 "VideoSupport.c"
+#line 8075 "VideoSupport.c"
 	}
 	__finally539:
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7839,33 +8086,35 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		g_clear_error (&_inner_error_);
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7839 "VideoSupport.c"
+#line 8086 "VideoSupport.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp19_ = alteration_new ("metadata", "master-timestamp");
+	_tmp18_ = alteration_new ("metadata", "master-timestamp");
 #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp19_);
 #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp20_);
-#line 7849 "VideoSupport.c"
+	_alteration_unref0 (_tmp19_);
+#line 8096 "VideoSupport.c"
 }
 
 
-gchar* video_get_filename (Video* self) {
+gchar*
+video_get_filename (Video* self)
+{
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7858 "VideoSupport.c"
+#line 8107 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7865 "VideoSupport.c"
+#line 8114 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
@@ -7878,18 +8127,18 @@ gchar* video_get_filename (Video* self) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7878 "VideoSupport.c"
+#line 8127 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7885 "VideoSupport.c"
+#line 8134 "VideoSupport.c"
 			}
 #line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7889 "VideoSupport.c"
+#line 8138 "VideoSupport.c"
 		}
 		__finally541:
 		{
@@ -7898,7 +8147,7 @@ gchar* video_get_filename (Video* self) {
 			_tmp5_ = self->priv->backing_row;
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7898 "VideoSupport.c"
+#line 8147 "VideoSupport.c"
 		}
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7906,12 +8155,14 @@ gchar* video_get_filename (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7906 "VideoSupport.c"
+#line 8155 "VideoSupport.c"
 	}
 }
 
 
-static GFile* video_real_get_file (MediaSource* base) {
+static GFile*
+video_real_get_file (MediaSource* base)
+{
 	Video * self;
 	GFile* result = NULL;
 	gchar* _tmp0_;
@@ -7934,11 +8185,13 @@ static GFile* video_real_get_file (MediaSource* base) {
 	result = _tmp3_;
 #line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7934 "VideoSupport.c"
+#line 8185 "VideoSupport.c"
 }
 
 
-static GFile* video_real_get_master_file (MediaSource* base) {
+static GFile*
+video_real_get_master_file (MediaSource* base)
+{
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_;
@@ -7950,17 +8203,20 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	result = _tmp0_;
 #line 866 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7950 "VideoSupport.c"
+#line 8203 "VideoSupport.c"
 }
 
 
-void video_export (Video* self, GFile* dest_file, GError** error) {
+void
+video_export (Video* self,
+              GFile* dest_file,
+              GError** error)
+{
 	GFile* source_file = NULL;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-	GFile* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
@@ -7979,9 +8235,7 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 #line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
 #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = dest_file;
-#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
+	g_file_copy (source_file, dest_file, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
 #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7990,20 +8244,22 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 		_g_object_unref0 (source_file);
 #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7990 "VideoSupport.c"
+#line 8244 "VideoSupport.c"
 	}
 #line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7994 "VideoSupport.c"
+#line 8248 "VideoSupport.c"
 }
 
 
-gdouble video_get_clip_duration (Video* self) {
+gdouble
+video_get_clip_duration (Video* self)
+{
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
 #line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 8003 "VideoSupport.c"
+#line 8259 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gdouble _tmp5_ = 0.0;
@@ -8011,7 +8267,7 @@ gdouble video_get_clip_duration (Video* self) {
 		_tmp0_ = self->priv->backing_row;
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8011 "VideoSupport.c"
+#line 8267 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gdouble _tmp2_;
@@ -8021,18 +8277,18 @@ gdouble video_get_clip_duration (Video* self) {
 			_tmp2_ = _tmp1_->clip_duration;
 #line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8021 "VideoSupport.c"
+#line 8277 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8028 "VideoSupport.c"
+#line 8284 "VideoSupport.c"
 			}
 #line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8032 "VideoSupport.c"
+#line 8288 "VideoSupport.c"
 		}
 		__finally542:
 		{
@@ -8041,7 +8297,7 @@ gdouble video_get_clip_duration (Video* self) {
 			_tmp4_ = self->priv->backing_row;
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8041 "VideoSupport.c"
+#line 8297 "VideoSupport.c"
 		}
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8049,17 +8305,19 @@ gdouble video_get_clip_duration (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 8049 "VideoSupport.c"
+#line 8305 "VideoSupport.c"
 	}
 }
 
 
-gboolean video_get_is_interpretable (Video* self) {
+gboolean
+video_get_is_interpretable (Video* self)
+{
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8059 "VideoSupport.c"
+#line 8317 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gboolean _tmp5_ = FALSE;
@@ -8067,7 +8325,7 @@ gboolean video_get_is_interpretable (Video* self) {
 		_tmp0_ = self->priv->backing_row;
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8067 "VideoSupport.c"
+#line 8325 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gboolean _tmp2_;
@@ -8077,18 +8335,18 @@ gboolean video_get_is_interpretable (Video* self) {
 			_tmp2_ = _tmp1_->is_interpretable;
 #line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8077 "VideoSupport.c"
+#line 8335 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8084 "VideoSupport.c"
+#line 8342 "VideoSupport.c"
 			}
 #line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8088 "VideoSupport.c"
+#line 8346 "VideoSupport.c"
 		}
 		__finally543:
 		{
@@ -8097,7 +8355,7 @@ gboolean video_get_is_interpretable (Video* self) {
 			_tmp4_ = self->priv->backing_row;
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8097 "VideoSupport.c"
+#line 8355 "VideoSupport.c"
 		}
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8105,66 +8363,63 @@ gboolean video_get_is_interpretable (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 8105 "VideoSupport.c"
+#line 8363 "VideoSupport.c"
 	}
 }
 
 
-static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
+static void
+video_set_is_interpretable (Video* self,
+                            gboolean is_interpretable)
+{
 	GError * _inner_error_ = NULL;
 #line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 8114 "VideoSupport.c"
+#line 8375 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8121 "VideoSupport.c"
+#line 8382 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gboolean _tmp2_;
-			gboolean _tmp3_;
-			VideoRow* _tmp5_;
-			gboolean _tmp6_;
+			VideoRow* _tmp4_;
 #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
 #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = is_interpretable;
-#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp2_ == _tmp3_) {
-#line 8136 "VideoSupport.c"
+			if (_tmp2_ == is_interpretable) {
+#line 8393 "VideoSupport.c"
 				{
-					VideoRow* _tmp4_;
+					VideoRow* _tmp3_;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp4_ = self->priv->backing_row;
+					_tmp3_ = self->priv->backing_row;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8143 "VideoSupport.c"
+#line 8400 "VideoSupport.c"
 				}
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8147 "VideoSupport.c"
+#line 8404 "VideoSupport.c"
 			}
 #line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = self->priv->backing_row;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = is_interpretable;
+			_tmp4_ = self->priv->backing_row;
 #line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_->is_interpretable = _tmp6_;
-#line 8155 "VideoSupport.c"
+			_tmp4_->is_interpretable = is_interpretable;
+#line 8410 "VideoSupport.c"
 		}
 		__finally544:
 		{
-			VideoRow* _tmp7_;
+			VideoRow* _tmp5_;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = self->priv->backing_row;
+			_tmp5_ = self->priv->backing_row;
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8164 "VideoSupport.c"
+#line 8419 "VideoSupport.c"
 		}
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -8174,31 +8429,28 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			g_clear_error (&_inner_error_);
 #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8174 "VideoSupport.c"
+#line 8429 "VideoSupport.c"
 		}
 	}
 	{
-		VideoTable* _tmp8_;
-		VideoTable* _tmp9_;
-		VideoID _tmp10_ = {0};
-		gboolean _tmp11_;
+		VideoTable* _tmp6_;
+		VideoTable* _tmp7_;
+		VideoID _tmp8_ = {0};
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = video_table_get_instance ();
-#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = _tmp8_;
+		_tmp6_ = video_table_get_instance ();
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_get_video_id (self, &_tmp10_);
+		_tmp7_ = _tmp6_;
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = is_interpretable;
+		video_get_video_id (self, &_tmp8_);
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
+		video_table_update_is_interpretable (_tmp7_, &_tmp8_, is_interpretable, &_inner_error_);
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_database_table_unref0 (_tmp9_);
+		_database_table_unref0 (_tmp7_);
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8198 "VideoSupport.c"
+#line 8450 "VideoSupport.c"
 				goto __catch545_database_error;
 			}
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8207,25 +8459,25 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			g_clear_error (&_inner_error_);
 #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8207 "VideoSupport.c"
+#line 8459 "VideoSupport.c"
 		}
 	}
 	goto __finally545;
 	__catch545_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp12_;
+		GError* _tmp9_;
 #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
 #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = e;
+		_tmp9_ = e;
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp12_);
+		app_window_database_error (_tmp9_);
 #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8225 "VideoSupport.c"
+#line 8477 "VideoSupport.c"
 	}
 	__finally545:
 #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8236,12 +8488,14 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		g_clear_error (&_inner_error_);
 #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8236 "VideoSupport.c"
+#line 8488 "VideoSupport.c"
 	}
 }
 
 
-VideoInterpretableResults* video_check_is_interpretable (Video* self) {
+VideoInterpretableResults*
+video_check_is_interpretable (Video* self)
+{
 	VideoInterpretableResults* result = NULL;
 	VideoInterpretableResults* results = NULL;
 	VideoInterpretableResults* _tmp0_;
@@ -8252,16 +8506,15 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GFile* _tmp2_;
 	VideoReader* _tmp3_;
 	VideoReader* _tmp4_;
-	gboolean _tmp13_;
-	GFile* _tmp16_;
-	GFile* _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
-	VideoInterpretableResults* _tmp24_;
-	VideoInterpretableResults* _tmp25_;
-	VideoInterpretableResults* _tmp26_;
-	GdkPixbuf* _tmp27_;
-	GdkPixbuf* _tmp28_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	VideoInterpretableResults* _tmp21_;
+	VideoInterpretableResults* _tmp22_;
+	VideoInterpretableResults* _tmp23_;
+	GdkPixbuf* _tmp24_;
+	GdkPixbuf* _tmp25_;
 	GError * _inner_error_ = NULL;
 #line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
@@ -8285,24 +8538,21 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	_g_object_unref0 (_tmp2_);
 #line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8285 "VideoSupport.c"
+#line 8538 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_;
-		gdouble _tmp7_;
-		VideoReader* _tmp8_;
-		GdkPixbuf* _tmp9_;
+		VideoReader* _tmp7_;
+		GdkPixbuf* _tmp8_;
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp5_ = _tmp7_;
+		_tmp5_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8302 "VideoSupport.c"
+#line 8552 "VideoSupport.c"
 				goto __catch546_video_error;
 			}
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8317,41 +8567,38 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			g_clear_error (&_inner_error_);
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8317 "VideoSupport.c"
+#line 8567 "VideoSupport.c"
 		}
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp8_ = backing_file_reader;
+		_tmp7_ = backing_file_reader;
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
+		_tmp8_ = video_reader_read_preview_frame (_tmp7_);
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		preview_frame = _tmp9_;
-#line 8329 "VideoSupport.c"
+		preview_frame = _tmp8_;
+#line 8579 "VideoSupport.c"
 	}
 	goto __finally546;
 	__catch546_video_error:
 	{
 		GError* e = NULL;
+		VideoInterpretableResults* _tmp9_;
 		VideoInterpretableResults* _tmp10_;
-		gboolean _tmp11_;
-		VideoInterpretableResults* _tmp12_;
 #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
 #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = results;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = video_get_is_interpretable (self);
+		_tmp9_ = results;
 #line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_->update_interpretable = _tmp11_;
+		_tmp9_->update_interpretable = video_get_is_interpretable (self);
 #line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = results;
+		_tmp10_ = results;
 #line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_->is_interpretable = FALSE;
+		_tmp10_->is_interpretable = FALSE;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8362,7 +8609,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		_g_object_unref0 (preview_frame);
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8362 "VideoSupport.c"
+#line 8609 "VideoSupport.c"
 	}
 	__finally546:
 #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8379,23 +8626,21 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8379 "VideoSupport.c"
+#line 8626 "VideoSupport.c"
 	}
 #line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = video_get_is_interpretable (self);
-#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp13_) {
-#line 8385 "VideoSupport.c"
-		VideoInterpretableResults* _tmp14_;
-		VideoInterpretableResults* _tmp15_;
+	if (video_get_is_interpretable (self)) {
+#line 8630 "VideoSupport.c"
+		VideoInterpretableResults* _tmp11_;
+		VideoInterpretableResults* _tmp12_;
 #line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = results;
+		_tmp11_ = results;
 #line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_->update_interpretable = FALSE;
+		_tmp11_->update_interpretable = FALSE;
 #line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp15_ = results;
+		_tmp12_ = results;
 #line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp15_->is_interpretable = TRUE;
+		_tmp12_->is_interpretable = TRUE;
 #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
 #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8404,49 +8649,49 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		_g_object_unref0 (preview_frame);
 #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8404 "VideoSupport.c"
+#line 8649 "VideoSupport.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp17_ = _tmp16_;
+	_tmp14_ = _tmp13_;
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp18_ = g_file_get_basename (_tmp17_);
+	_tmp15_ = g_file_get_basename (_tmp14_);
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp19_ = _tmp18_;
+	_tmp16_ = _tmp15_;
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:932: video %s has become interpretable", _tmp19_);
+	g_debug ("VideoSupport.vala:932: video %s has become interpretable", _tmp16_);
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp19_);
+	_g_free0 (_tmp16_);
 #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp17_);
-#line 8420 "VideoSupport.c"
+	_g_object_unref0 (_tmp14_);
+#line 8665 "VideoSupport.c"
 	{
-		VideoRow* _tmp20_;
+		VideoRow* _tmp17_;
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp20_ = self->priv->backing_row;
+		_tmp17_ = self->priv->backing_row;
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8427 "VideoSupport.c"
+#line 8672 "VideoSupport.c"
 		{
-			VideoRow* _tmp21_;
-			gdouble _tmp22_;
+			VideoRow* _tmp18_;
+			gdouble _tmp19_;
 #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = self->priv->backing_row;
+			_tmp18_ = self->priv->backing_row;
 #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp22_ = clip_duration;
+			_tmp19_ = clip_duration;
 #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_->clip_duration = _tmp22_;
-#line 8437 "VideoSupport.c"
+			_tmp18_->clip_duration = _tmp19_;
+#line 8682 "VideoSupport.c"
 		}
 		__finally547:
 		{
-			VideoRow* _tmp23_;
+			VideoRow* _tmp20_;
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = self->priv->backing_row;
+			_tmp20_ = self->priv->backing_row;
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8446 "VideoSupport.c"
+#line 8691 "VideoSupport.c"
 		}
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -8462,27 +8707,27 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			g_clear_error (&_inner_error_);
 #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8462 "VideoSupport.c"
+#line 8707 "VideoSupport.c"
 		}
 	}
 #line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = results;
+	_tmp21_ = results;
 #line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_->update_interpretable = TRUE;
+	_tmp21_->update_interpretable = TRUE;
 #line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = results;
+	_tmp22_ = results;
 #line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_->is_interpretable = TRUE;
+	_tmp22_->is_interpretable = TRUE;
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = results;
+	_tmp23_ = results;
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = preview_frame;
+	_tmp24_ = preview_frame;
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp28_ = _g_object_ref0 (_tmp27_);
+	_tmp25_ = _g_object_ref0 (_tmp24_);
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp26_->new_thumbnail);
+	_g_object_unref0 (_tmp23_->new_thumbnail);
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_->new_thumbnail = _tmp28_;
+	_tmp23_->new_thumbnail = _tmp25_;
 #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
 #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8491,11 +8736,13 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	_g_object_unref0 (preview_frame);
 #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8491 "VideoSupport.c"
+#line 8736 "VideoSupport.c"
 }
 
 
-static void video_real_destroy (DataSource* base) {
+static void
+video_real_destroy (DataSource* base)
+{
 	Video * self;
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
@@ -8508,7 +8755,7 @@ static void video_real_destroy (DataSource* base) {
 	video_id = _tmp0_;
 #line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8508 "VideoSupport.c"
+#line 8755 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_;
 		VideoTable* _tmp2_;
@@ -8527,7 +8774,7 @@ static void video_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8527 "VideoSupport.c"
+#line 8774 "VideoSupport.c"
 				goto __catch548_database_error;
 			}
 #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8536,7 +8783,7 @@ static void video_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8536 "VideoSupport.c"
+#line 8783 "VideoSupport.c"
 		}
 	}
 	goto __finally548;
@@ -8559,7 +8806,7 @@ static void video_real_destroy (DataSource* base) {
 		_g_free0 (_tmp5_);
 #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8559 "VideoSupport.c"
+#line 8806 "VideoSupport.c"
 	}
 	__finally548:
 #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8570,66 +8817,65 @@ static void video_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8570 "VideoSupport.c"
+#line 8817 "VideoSupport.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource));
-#line 8574 "VideoSupport.c"
+#line 8821 "VideoSupport.c"
 }
 
 
-static gboolean video_real_internal_delete_backing (DataSource* base, GError** error) {
+static gboolean
+video_real_internal_delete_backing (DataSource* base,
+                                    GError** error)
+{
 	Video * self;
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 960 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	ret = _tmp0_;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
+	ret = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = _tmp3_;
+	_tmp1_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8599 "VideoSupport.c"
-		gboolean _tmp4_ = FALSE;
+#line 8843 "VideoSupport.c"
+		gboolean _tmp2_ = FALSE;
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return _tmp4_;
-#line 8605 "VideoSupport.c"
+		return _tmp2_;
+#line 8849 "VideoSupport.c"
 	}
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp2_) {
+	if (_tmp1_) {
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp1_ = ret;
-#line 8611 "VideoSupport.c"
+		_tmp0_ = ret;
+#line 8855 "VideoSupport.c"
 	} else {
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp1_ = FALSE;
-#line 8615 "VideoSupport.c"
+		_tmp0_ = FALSE;
+#line 8859 "VideoSupport.c"
 	}
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8621 "VideoSupport.c"
+#line 8865 "VideoSupport.c"
 }
 
 
-static void video_notify_flags_altered (Video* self, Alteration* additional_alteration) {
+static void
+video_notify_flags_altered (Video* self,
+                            Alteration* additional_alteration)
+{
 	Alteration* alteration = NULL;
 	Alteration* _tmp0_;
-	Alteration* _tmp1_;
-	Alteration* _tmp5_;
+	Alteration* _tmp3_;
 #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
 #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8639,581 +8885,562 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 #line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
 #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = additional_alteration;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_ != NULL) {
-#line 8642 "VideoSupport.c"
+	if (additional_alteration != NULL) {
+#line 8886 "VideoSupport.c"
+		Alteration* _tmp1_;
 		Alteration* _tmp2_;
-		Alteration* _tmp3_;
-		Alteration* _tmp4_;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = alteration;
 #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = additional_alteration;
+		_tmp1_ = alteration;
 #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
+		_tmp2_ = alteration_compress (_tmp1_, additional_alteration);
 #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
 #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		alteration = _tmp4_;
-#line 8656 "VideoSupport.c"
+		alteration = _tmp2_;
+#line 8897 "VideoSupport.c"
 	}
 #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = alteration;
+	_tmp3_ = alteration;
 #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp3_);
 #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8664 "VideoSupport.c"
+#line 8905 "VideoSupport.c"
 }
 
 
-guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration) {
+guint64
+video_add_flags (Video* self,
+                 guint64 flags_to_add,
+                 Alteration* additional_alteration)
+{
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
 #line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8677 "VideoSupport.c"
+#line 8921 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8684 "VideoSupport.c"
+#line 8928 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
-			guint64 _tmp3_;
+			VideoRow* _tmp3_;
 			guint64 _tmp4_;
-			VideoRow* _tmp5_;
-			guint64 _tmp6_;
-			guint64 _tmp7_;
-			VideoRow* _tmp23_;
-			guint64 _tmp24_;
+			guint64 _tmp5_;
+			VideoRow* _tmp21_;
+			guint64 _tmp22_;
 #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
 #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = flags_to_add;
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			new_flags = _tmp4_;
+			new_flags = media_source_internal_add_flags (_tmp2_, flags_to_add);
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = self->priv->backing_row;
+			_tmp3_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = _tmp5_->flags;
+			_tmp4_ = _tmp3_->flags;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = new_flags;
+			_tmp5_ = new_flags;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp6_ == _tmp7_) {
-#line 8713 "VideoSupport.c"
-				VideoRow* _tmp8_;
-				guint64 _tmp9_;
+			if (_tmp4_ == _tmp5_) {
+#line 8951 "VideoSupport.c"
+				VideoRow* _tmp6_;
+				guint64 _tmp7_;
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = self->priv->backing_row;
+				_tmp6_ = self->priv->backing_row;
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = _tmp8_->flags;
+				_tmp7_ = _tmp6_->flags;
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp9_;
-#line 8722 "VideoSupport.c"
+				result = _tmp7_;
+#line 8960 "VideoSupport.c"
 				{
-					VideoRow* _tmp10_;
+					VideoRow* _tmp8_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp10_ = self->priv->backing_row;
+					_tmp8_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8729 "VideoSupport.c"
+#line 8967 "VideoSupport.c"
 				}
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8733 "VideoSupport.c"
+#line 8971 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp11_;
-				VideoTable* _tmp12_;
-				VideoID _tmp13_ = {0};
-				guint64 _tmp14_;
+				VideoTable* _tmp9_;
+				VideoTable* _tmp10_;
+				VideoID _tmp11_ = {0};
+				guint64 _tmp12_;
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = video_table_get_instance ();
+				_tmp9_ = video_table_get_instance ();
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp12_ = _tmp11_;
+				_tmp10_ = _tmp9_;
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_get_video_id (self, &_tmp13_);
+				video_get_video_id (self, &_tmp11_);
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_ = new_flags;
+				_tmp12_ = new_flags;
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
+				video_table_set_flags (_tmp10_, &_tmp11_, _tmp12_, &_inner_error_);
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp12_);
+				_database_table_unref0 (_tmp10_);
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8754 "VideoSupport.c"
-					guint64 _tmp16_ = 0ULL;
+#line 8992 "VideoSupport.c"
+					guint64 _tmp14_ = 0ULL;
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8758 "VideoSupport.c"
+#line 8996 "VideoSupport.c"
 						goto __catch550_database_error;
 					}
 					{
-						VideoRow* _tmp15_;
+						VideoRow* _tmp13_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp15_ = self->priv->backing_row;
+						_tmp13_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8767 "VideoSupport.c"
+#line 9005 "VideoSupport.c"
 					}
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return _tmp16_;
-#line 8775 "VideoSupport.c"
+					return _tmp14_;
+#line 9013 "VideoSupport.c"
 				}
 			}
 			goto __finally550;
 			__catch550_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp17_;
-				VideoRow* _tmp18_;
-				guint64 _tmp19_;
+				GError* _tmp15_;
+				VideoRow* _tmp16_;
+				guint64 _tmp17_;
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = e;
+				_tmp15_ = e;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp17_);
+				app_window_database_error (_tmp15_);
 #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = self->priv->backing_row;
+				_tmp16_ = self->priv->backing_row;
 #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = _tmp18_->flags;
+				_tmp17_ = _tmp16_->flags;
 #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp19_;
+				result = _tmp17_;
 #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8801 "VideoSupport.c"
+#line 9039 "VideoSupport.c"
 				{
-					VideoRow* _tmp20_;
+					VideoRow* _tmp18_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp20_ = self->priv->backing_row;
+					_tmp18_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8808 "VideoSupport.c"
+#line 9046 "VideoSupport.c"
 				}
 #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8812 "VideoSupport.c"
+#line 9050 "VideoSupport.c"
 			}
 			__finally550:
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8817 "VideoSupport.c"
-				guint64 _tmp22_ = 0ULL;
+#line 9055 "VideoSupport.c"
+				guint64 _tmp20_ = 0ULL;
 				{
-					VideoRow* _tmp21_;
+					VideoRow* _tmp19_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp21_ = self->priv->backing_row;
+					_tmp19_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8825 "VideoSupport.c"
+#line 9063 "VideoSupport.c"
 				}
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return _tmp22_;
-#line 8833 "VideoSupport.c"
+				return _tmp20_;
+#line 9071 "VideoSupport.c"
 			}
 #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = self->priv->backing_row;
+			_tmp21_ = self->priv->backing_row;
 #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp24_ = new_flags;
+			_tmp22_ = new_flags;
 #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_->flags = _tmp24_;
-#line 8841 "VideoSupport.c"
+			_tmp21_->flags = _tmp22_;
+#line 9079 "VideoSupport.c"
 		}
 		__finally549:
 		{
-			VideoRow* _tmp25_;
+			VideoRow* _tmp23_;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp25_ = self->priv->backing_row;
+			_tmp23_ = self->priv->backing_row;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8850 "VideoSupport.c"
+#line 9088 "VideoSupport.c"
 		}
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8854 "VideoSupport.c"
-			guint64 _tmp26_ = 0ULL;
+#line 9092 "VideoSupport.c"
+			guint64 _tmp24_ = 0ULL;
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return _tmp26_;
-#line 8862 "VideoSupport.c"
+			return _tmp24_;
+#line 9100 "VideoSupport.c"
 		}
 	}
 #line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = additional_alteration;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_notify_flags_altered (self, _tmp27_);
+	video_notify_flags_altered (self, additional_alteration);
 #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
 #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8873 "VideoSupport.c"
+#line 9109 "VideoSupport.c"
 }
 
 
-guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration) {
+guint64
+video_remove_flags (Video* self,
+                    guint64 flags_to_remove,
+                    Alteration* additional_alteration)
+{
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
 #line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8886 "VideoSupport.c"
+#line 9125 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8893 "VideoSupport.c"
+#line 9132 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
-			guint64 _tmp3_;
+			VideoRow* _tmp3_;
 			guint64 _tmp4_;
-			VideoRow* _tmp5_;
-			guint64 _tmp6_;
-			guint64 _tmp7_;
-			VideoRow* _tmp23_;
-			guint64 _tmp24_;
+			guint64 _tmp5_;
+			VideoRow* _tmp21_;
+			guint64 _tmp22_;
 #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
 #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = flags_to_remove;
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			new_flags = _tmp4_;
+			new_flags = media_source_internal_remove_flags (_tmp2_, flags_to_remove);
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = self->priv->backing_row;
+			_tmp3_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = _tmp5_->flags;
+			_tmp4_ = _tmp3_->flags;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = new_flags;
+			_tmp5_ = new_flags;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp6_ == _tmp7_) {
-#line 8922 "VideoSupport.c"
-				VideoRow* _tmp8_;
-				guint64 _tmp9_;
+			if (_tmp4_ == _tmp5_) {
+#line 9155 "VideoSupport.c"
+				VideoRow* _tmp6_;
+				guint64 _tmp7_;
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = self->priv->backing_row;
+				_tmp6_ = self->priv->backing_row;
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = _tmp8_->flags;
+				_tmp7_ = _tmp6_->flags;
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp9_;
-#line 8931 "VideoSupport.c"
+				result = _tmp7_;
+#line 9164 "VideoSupport.c"
 				{
-					VideoRow* _tmp10_;
+					VideoRow* _tmp8_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp10_ = self->priv->backing_row;
+					_tmp8_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8938 "VideoSupport.c"
+#line 9171 "VideoSupport.c"
 				}
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8942 "VideoSupport.c"
+#line 9175 "VideoSupport.c"
 			}
 			{
-				VideoTable* _tmp11_;
-				VideoTable* _tmp12_;
-				VideoID _tmp13_ = {0};
-				guint64 _tmp14_;
+				VideoTable* _tmp9_;
+				VideoTable* _tmp10_;
+				VideoID _tmp11_ = {0};
+				guint64 _tmp12_;
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = video_table_get_instance ();
+				_tmp9_ = video_table_get_instance ();
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp12_ = _tmp11_;
+				_tmp10_ = _tmp9_;
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_get_video_id (self, &_tmp13_);
+				video_get_video_id (self, &_tmp11_);
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_ = new_flags;
+				_tmp12_ = new_flags;
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
+				video_table_set_flags (_tmp10_, &_tmp11_, _tmp12_, &_inner_error_);
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp12_);
+				_database_table_unref0 (_tmp10_);
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8963 "VideoSupport.c"
-					guint64 _tmp16_ = 0ULL;
+#line 9196 "VideoSupport.c"
+					guint64 _tmp14_ = 0ULL;
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8967 "VideoSupport.c"
+#line 9200 "VideoSupport.c"
 						goto __catch552_database_error;
 					}
 					{
-						VideoRow* _tmp15_;
+						VideoRow* _tmp13_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp15_ = self->priv->backing_row;
+						_tmp13_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8976 "VideoSupport.c"
+#line 9209 "VideoSupport.c"
 					}
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return _tmp16_;
-#line 8984 "VideoSupport.c"
+					return _tmp14_;
+#line 9217 "VideoSupport.c"
 				}
 			}
 			goto __finally552;
 			__catch552_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp17_;
-				VideoRow* _tmp18_;
-				guint64 _tmp19_;
+				GError* _tmp15_;
+				VideoRow* _tmp16_;
+				guint64 _tmp17_;
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = e;
+				_tmp15_ = e;
 #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp17_);
+				app_window_database_error (_tmp15_);
 #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = self->priv->backing_row;
+				_tmp16_ = self->priv->backing_row;
 #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = _tmp18_->flags;
+				_tmp17_ = _tmp16_->flags;
 #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp19_;
+				result = _tmp17_;
 #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 9010 "VideoSupport.c"
+#line 9243 "VideoSupport.c"
 				{
-					VideoRow* _tmp20_;
+					VideoRow* _tmp18_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp20_ = self->priv->backing_row;
+					_tmp18_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9017 "VideoSupport.c"
+#line 9250 "VideoSupport.c"
 				}
 #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 9021 "VideoSupport.c"
+#line 9254 "VideoSupport.c"
 			}
 			__finally552:
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9026 "VideoSupport.c"
-				guint64 _tmp22_ = 0ULL;
+#line 9259 "VideoSupport.c"
+				guint64 _tmp20_ = 0ULL;
 				{
-					VideoRow* _tmp21_;
+					VideoRow* _tmp19_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp21_ = self->priv->backing_row;
+					_tmp19_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9034 "VideoSupport.c"
+#line 9267 "VideoSupport.c"
 				}
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return _tmp22_;
-#line 9042 "VideoSupport.c"
+				return _tmp20_;
+#line 9275 "VideoSupport.c"
 			}
 #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = self->priv->backing_row;
+			_tmp21_ = self->priv->backing_row;
 #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp24_ = new_flags;
+			_tmp22_ = new_flags;
 #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_->flags = _tmp24_;
-#line 9050 "VideoSupport.c"
+			_tmp21_->flags = _tmp22_;
+#line 9283 "VideoSupport.c"
 		}
 		__finally551:
 		{
-			VideoRow* _tmp25_;
+			VideoRow* _tmp23_;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp25_ = self->priv->backing_row;
+			_tmp23_ = self->priv->backing_row;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9059 "VideoSupport.c"
+#line 9292 "VideoSupport.c"
 		}
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9063 "VideoSupport.c"
-			guint64 _tmp26_ = 0ULL;
+#line 9296 "VideoSupport.c"
+			guint64 _tmp24_ = 0ULL;
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return _tmp26_;
-#line 9071 "VideoSupport.c"
+			return _tmp24_;
+#line 9304 "VideoSupport.c"
 		}
 	}
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = additional_alteration;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_notify_flags_altered (self, _tmp27_);
+	video_notify_flags_altered (self, additional_alteration);
 #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
 #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9082 "VideoSupport.c"
+#line 9313 "VideoSupport.c"
 }
 
 
-gboolean video_is_flag_set (Video* self, guint64 flag) {
+gboolean
+video_is_flag_set (Video* self,
+                   guint64 flag)
+{
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
 #line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 9091 "VideoSupport.c"
+#line 9325 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-		gboolean _tmp7_ = FALSE;
+		gboolean _tmp5_ = FALSE;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9099 "VideoSupport.c"
+#line 9333 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
-			guint64 _tmp3_;
-			gboolean _tmp4_;
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp3_ = flag;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			result = _tmp4_;
-#line 9115 "VideoSupport.c"
+			result = media_source_internal_is_flag_set (_tmp2_, flag);
+#line 9343 "VideoSupport.c"
 			{
-				VideoRow* _tmp5_;
+				VideoRow* _tmp3_;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = self->priv->backing_row;
+				_tmp3_ = self->priv->backing_row;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9122 "VideoSupport.c"
+#line 9350 "VideoSupport.c"
 			}
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 9126 "VideoSupport.c"
+#line 9354 "VideoSupport.c"
 		}
 		__finally553:
 		{
-			VideoRow* _tmp6_;
+			VideoRow* _tmp4_;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = self->priv->backing_row;
+			_tmp4_ = self->priv->backing_row;
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9135 "VideoSupport.c"
+#line 9363 "VideoSupport.c"
 		}
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
 #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return _tmp7_;
-#line 9143 "VideoSupport.c"
+		return _tmp5_;
+#line 9371 "VideoSupport.c"
 	}
 }
 
 
-static void video_real_set_master_file (Monitorable* base, GFile* file) {
+static void
+video_real_set_master_file (Monitorable* base,
+                            GFile* file)
+{
 	Video * self;
 	gchar* new_filepath = NULL;
-	GFile* _tmp0_;
-	gchar* _tmp1_;
+	gchar* _tmp0_;
 	gchar* old_filepath = NULL;
+	const gchar* _tmp19_;
 	const gchar* _tmp20_;
-	const gchar* _tmp21_;
+	GFile* _tmp21_;
 	GFile* _tmp22_;
-	GFile* _tmp23_;
-	GFile* _tmp24_;
-	Alteration* _tmp25_;
-	Alteration* _tmp26_;
+	Alteration* _tmp23_;
+	Alteration* _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
+	_tmp0_ = g_file_get_path (file);
 #line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	new_filepath = _tmp1_;
+	new_filepath = _tmp0_;
 #line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9174 "VideoSupport.c"
+#line 9401 "VideoSupport.c"
 	{
 		{
-			VideoRow* _tmp2_;
+			VideoRow* _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp2_ = self->priv->backing_row;
+			_tmp1_ = self->priv->backing_row;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9182 "VideoSupport.c"
+#line 9409 "VideoSupport.c"
 			{
-				VideoRow* _tmp3_;
+				VideoRow* _tmp2_;
+				const gchar* _tmp3_;
 				const gchar* _tmp4_;
-				const gchar* _tmp5_;
-				VideoRow* _tmp7_;
-				const gchar* _tmp8_;
-				gchar* _tmp9_;
+				VideoRow* _tmp6_;
+				const gchar* _tmp7_;
+				gchar* _tmp8_;
+				VideoTable* _tmp9_;
 				VideoTable* _tmp10_;
-				VideoTable* _tmp11_;
-				VideoRow* _tmp12_;
-				VideoID _tmp13_;
-				const gchar* _tmp14_;
-				VideoRow* _tmp15_;
-				const gchar* _tmp16_;
-				gchar* _tmp17_;
+				VideoRow* _tmp11_;
+				VideoID _tmp12_;
+				const gchar* _tmp13_;
+				VideoRow* _tmp14_;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp3_ = self->priv->backing_row;
+				_tmp2_ = self->priv->backing_row;
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp4_ = _tmp3_->filepath;
+				_tmp3_ = _tmp2_->filepath;
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = new_filepath;
+				_tmp4_ = new_filepath;
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9206 "VideoSupport.c"
+				if (g_strcmp0 (_tmp3_, _tmp4_) == 0) {
+#line 9433 "VideoSupport.c"
 					{
-						VideoRow* _tmp6_;
+						VideoRow* _tmp5_;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp6_ = self->priv->backing_row;
+						_tmp5_ = self->priv->backing_row;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9213 "VideoSupport.c"
+#line 9440 "VideoSupport.c"
 					}
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
@@ -9221,63 +9448,63 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 					_g_free0 (new_filepath);
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9221 "VideoSupport.c"
+#line 9448 "VideoSupport.c"
 				}
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = self->priv->backing_row;
+				_tmp6_ = self->priv->backing_row;
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = _tmp7_->filepath;
+				_tmp7_ = _tmp6_->filepath;
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = g_strdup (_tmp8_);
+				_tmp8_ = g_strdup (_tmp7_);
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				old_filepath = _tmp9_;
+				old_filepath = _tmp8_;
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = video_table_get_instance ();
+				_tmp9_ = video_table_get_instance ();
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = _tmp10_;
+				_tmp10_ = _tmp9_;
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp12_ = self->priv->backing_row;
+				_tmp11_ = self->priv->backing_row;
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = _tmp12_->video_id;
+				_tmp12_ = _tmp11_->video_id;
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp14_ = new_filepath;
+				_tmp13_ = new_filepath;
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
+				video_table_set_filepath (_tmp10_, &_tmp12_, _tmp13_, &_inner_error_);
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_database_table_unref0 (_tmp11_);
+				_database_table_unref0 (_tmp10_);
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9249 "VideoSupport.c"
+#line 9476 "VideoSupport.c"
 					goto __finally555;
 				}
 #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp15_ = self->priv->backing_row;
+				_tmp14_ = self->priv->backing_row;
 #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = new_filepath;
+				_tmp15_ = new_filepath;
 #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = g_strdup (_tmp16_);
+				_tmp16_ = g_strdup (_tmp15_);
 #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_g_free0 (_tmp15_->filepath);
+				_g_free0 (_tmp14_->filepath);
 #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp15_->filepath = _tmp17_;
-#line 9262 "VideoSupport.c"
+				_tmp14_->filepath = _tmp16_;
+#line 9489 "VideoSupport.c"
 			}
 			__finally555:
 			{
-				VideoRow* _tmp18_;
+				VideoRow* _tmp17_;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = self->priv->backing_row;
+				_tmp17_ = self->priv->backing_row;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9271 "VideoSupport.c"
+#line 9498 "VideoSupport.c"
 			}
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9277 "VideoSupport.c"
+#line 9504 "VideoSupport.c"
 					goto __catch554_database_error;
 				}
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9290,7 +9517,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9290 "VideoSupport.c"
+#line 9517 "VideoSupport.c"
 			}
 		}
 	}
@@ -9298,15 +9525,15 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	__catch554_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp19_;
+		GError* _tmp18_;
 #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
 #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
 #line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp19_ = err;
+		_tmp18_ = err;
 #line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp19_);
+		app_window_database_error (_tmp18_);
 #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
 #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9315,7 +9542,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		_g_free0 (new_filepath);
 #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9315 "VideoSupport.c"
+#line 9542 "VideoSupport.c"
 	}
 	__finally554:
 #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9330,41 +9557,42 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9330 "VideoSupport.c"
+#line 9557 "VideoSupport.c"
 	}
 #line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = old_filepath;
+	_tmp19_ = old_filepath;
 #line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = old_filepath;
+	_vala_assert (_tmp19_ != NULL, "old_filepath != null");
 #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp22_ = g_file_new_for_path (_tmp21_);
+	_tmp20_ = old_filepath;
 #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = _tmp22_;
+	_tmp21_ = g_file_new_for_path (_tmp20_);
 #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = file;
+	_tmp22_ = _tmp21_;
 #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_);
+	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_, file);
 #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp23_);
+	_g_object_unref0 (_tmp22_);
 #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
+	_tmp23_ = alteration_new_from_list ("backing:master,metadata:name");
 #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = _tmp25_;
+	_tmp24_ = _tmp23_;
 #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_);
 #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp26_);
+	_alteration_unref0 (_tmp24_);
 #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
 #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9360 "VideoSupport.c"
+#line 9585 "VideoSupport.c"
 }
 
 
-VideoMetadata* video_read_metadata (Video* self, GError** error) {
+VideoMetadata*
+video_read_metadata (Video* self,
+                     GError** error)
+{
 	VideoMetadata* result = NULL;
 	VideoMetadata* _tmp0_ = NULL;
 	GFile* _tmp1_;
@@ -9401,7 +9629,7 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9401 "VideoSupport.c"
+#line 9629 "VideoSupport.c"
 	}
 #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
@@ -9413,40 +9641,44 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	_media_metadata_unref0 (_tmp0_);
 #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9413 "VideoSupport.c"
+#line 9641 "VideoSupport.c"
 }
 
 
-VideoInterpretableResults* video_interpretable_results_construct (GType object_type, Video* video) {
+VideoInterpretableResults*
+video_interpretable_results_construct (GType object_type,
+                                       Video* video)
+{
 	VideoInterpretableResults* self = NULL;
 	Video* _tmp0_;
-	Video* _tmp1_;
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
 #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video;
-#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (video);
 #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
 #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->video = _tmp1_;
+	self->video = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9435 "VideoSupport.c"
+#line 9663 "VideoSupport.c"
 }
 
 
-VideoInterpretableResults* video_interpretable_results_new (Video* video) {
+VideoInterpretableResults*
+video_interpretable_results_new (Video* video)
+{
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9442 "VideoSupport.c"
+#line 9672 "VideoSupport.c"
 }
 
 
-void video_interpretable_results_foreground_finish (VideoInterpretableResults* self) {
+void
+video_interpretable_results_foreground_finish (VideoInterpretableResults* self)
+{
 	gboolean _tmp0_;
 	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
@@ -9456,7 +9688,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	_tmp0_ = self->update_interpretable;
 #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9456 "VideoSupport.c"
+#line 9688 "VideoSupport.c"
 		Video* _tmp1_;
 		gboolean _tmp2_;
 #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9465,13 +9697,13 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 		_tmp2_ = self->is_interpretable;
 #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9465 "VideoSupport.c"
+#line 9697 "VideoSupport.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9471 "VideoSupport.c"
+#line 9703 "VideoSupport.c"
 		{
 			Video* _tmp4_;
 			GdkPixbuf* _tmp5_;
@@ -9486,7 +9718,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
 #line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9486 "VideoSupport.c"
+#line 9718 "VideoSupport.c"
 				goto __catch556_g_error;
 			}
 #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9497,14 +9729,14 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
 #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9497 "VideoSupport.c"
+#line 9729 "VideoSupport.c"
 				goto __catch556_g_error;
 			}
 #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
 #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9504 "VideoSupport.c"
+#line 9736 "VideoSupport.c"
 		}
 		goto __finally556;
 		__catch556_g_error:
@@ -9535,7 +9767,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_free0 (_tmp11_);
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9535 "VideoSupport.c"
+#line 9767 "VideoSupport.c"
 		}
 		__finally556:
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9546,110 +9778,135 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			g_clear_error (&_inner_error_);
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9546 "VideoSupport.c"
+#line 9778 "VideoSupport.c"
 		}
 	}
 }
 
 
-static void video_value_interpretable_results_init (GValue* value) {
+static void
+video_value_interpretable_results_init (GValue* value)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9555 "VideoSupport.c"
+#line 9789 "VideoSupport.c"
 }
 
 
-static void video_value_interpretable_results_free_value (GValue* value) {
+static void
+video_value_interpretable_results_free_value (GValue* value)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9564 "VideoSupport.c"
+#line 9800 "VideoSupport.c"
 	}
 }
 
 
-static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+video_value_interpretable_results_copy_value (const GValue* src_value,
+                                              GValue* dest_value)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9574 "VideoSupport.c"
+#line 9813 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9578 "VideoSupport.c"
+#line 9817 "VideoSupport.c"
 	}
 }
 
 
-static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
+static gpointer
+video_value_interpretable_results_peek_pointer (const GValue* value)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9586 "VideoSupport.c"
+#line 9827 "VideoSupport.c"
 }
 
 
-static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+video_value_interpretable_results_collect_value (GValue* value,
+                                                 guint n_collect_values,
+                                                 GTypeCValue* collect_values,
+                                                 guint collect_flags)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9593 "VideoSupport.c"
+#line 9839 "VideoSupport.c"
 		VideoInterpretableResults * object;
 		object = collect_values[0].v_pointer;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9600 "VideoSupport.c"
+#line 9846 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9604 "VideoSupport.c"
+#line 9850 "VideoSupport.c"
 		}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9608 "VideoSupport.c"
+#line 9854 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9612 "VideoSupport.c"
+#line 9858 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9616 "VideoSupport.c"
+#line 9862 "VideoSupport.c"
 }
 
 
-static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+video_value_interpretable_results_lcopy_value (const GValue* value,
+                                               guint n_collect_values,
+                                               GTypeCValue* collect_values,
+                                               guint collect_flags)
+{
 	VideoInterpretableResults ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9627 "VideoSupport.c"
+#line 9878 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9633 "VideoSupport.c"
+#line 9884 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9637 "VideoSupport.c"
+#line 9888 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9641 "VideoSupport.c"
+#line 9892 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9645 "VideoSupport.c"
+#line 9896 "VideoSupport.c"
 }
 
 
-GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+video_param_spec_interpretable_results (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags)
+{
 	VideoParamSpecInterpretableResults* spec;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
@@ -9659,20 +9916,25 @@ GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9659 "VideoSupport.c"
+#line 9916 "VideoSupport.c"
 }
 
 
-gpointer video_value_get_interpretable_results (const GValue* value) {
+gpointer
+video_value_get_interpretable_results (const GValue* value)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9668 "VideoSupport.c"
+#line 9927 "VideoSupport.c"
 }
 
 
-void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
+void
+video_value_set_interpretable_results (GValue* value,
+                                       gpointer v_object)
+{
 	VideoInterpretableResults * old;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
@@ -9688,22 +9950,25 @@ void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9688 "VideoSupport.c"
+#line 9950 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9692 "VideoSupport.c"
+#line 9954 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9698 "VideoSupport.c"
+#line 9960 "VideoSupport.c"
 	}
 }
 
 
-void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
+void
+video_value_take_interpretable_results (GValue* value,
+                                        gpointer v_object)
+{
 	VideoInterpretableResults * old;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
@@ -9717,31 +9982,35 @@ void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9717 "VideoSupport.c"
+#line 9982 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9721 "VideoSupport.c"
+#line 9986 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9727 "VideoSupport.c"
+#line 9992 "VideoSupport.c"
 	}
 }
 
 
-static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) {
+static void
+video_interpretable_results_class_init (VideoInterpretableResultsClass * klass)
+{
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9737 "VideoSupport.c"
+#line 10004 "VideoSupport.c"
 }
 
 
-static void video_interpretable_results_instance_init (VideoInterpretableResults * self) {
+static void
+video_interpretable_results_instance_init (VideoInterpretableResults * self)
+{
 #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->update_interpretable = FALSE;
 #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9750,11 +10019,13 @@ static void video_interpretable_results_instance_init (VideoInterpretableResults
 	self->new_thumbnail = NULL;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9750 "VideoSupport.c"
+#line 10019 "VideoSupport.c"
 }
 
 
-static void video_interpretable_results_finalize (VideoInterpretableResults * obj) {
+static void
+video_interpretable_results_finalize (VideoInterpretableResults * obj)
+{
 	VideoInterpretableResults * self;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults);
@@ -9764,11 +10035,13 @@ static void video_interpretable_results_finalize (VideoInterpretableResults * ob
 	_g_object_unref0 (self->video);
 #line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9764 "VideoSupport.c"
+#line 10035 "VideoSupport.c"
 }
 
 
-GType video_interpretable_results_get_type (void) {
+GType
+video_interpretable_results_get_type (void)
+{
 	static volatile gsize video_interpretable_results_type_id__volatile = 0;
 	if (g_once_init_enter (&video_interpretable_results_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { video_value_interpretable_results_init, video_value_interpretable_results_free_value, video_value_interpretable_results_copy_value, video_value_interpretable_results_peek_pointer, "p", video_value_interpretable_results_collect_value, "p", video_value_interpretable_results_lcopy_value };
@@ -9782,18 +10055,22 @@ GType video_interpretable_results_get_type (void) {
 }
 
 
-gpointer video_interpretable_results_ref (gpointer instance) {
+gpointer
+video_interpretable_results_ref (gpointer instance)
+{
 	VideoInterpretableResults * self;
 	self = instance;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9789 "VideoSupport.c"
+#line 10064 "VideoSupport.c"
 }
 
 
-void video_interpretable_results_unref (gpointer instance) {
+void
+video_interpretable_results_unref (gpointer instance)
+{
 	VideoInterpretableResults * self;
 	self = instance;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9802,12 +10079,14 @@ void video_interpretable_results_unref (gpointer instance) {
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9802 "VideoSupport.c"
+#line 10079 "VideoSupport.c"
 	}
 }
 
 
-static void video_class_init (VideoClass * klass) {
+static void
+video_class_init (VideoClass * klass)
+{
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_parent_class = g_type_class_peek_parent (klass);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9886,11 +10165,13 @@ static void video_class_init (VideoClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) video_real_internal_delete_backing;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9886 "VideoSupport.c"
+#line 10165 "VideoSupport.c"
 }
 
 
-static void video_flaggable_interface_init (FlaggableIface * iface) {
+static void
+video_flaggable_interface_init (FlaggableIface * iface)
+{
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_flaggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9899,11 +10180,13 @@ static void video_flaggable_interface_init (FlaggableIface * iface) {
 	iface->mark_flagged = (void (*) (Flaggable *)) video_real_mark_flagged;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*) (Flaggable *)) video_real_mark_unflagged;
-#line 9899 "VideoSupport.c"
+#line 10180 "VideoSupport.c"
 }
 
 
-static void video_monitorable_interface_init (MonitorableIface * iface) {
+static void
+video_monitorable_interface_init (MonitorableIface * iface)
+{
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_monitorable_parent_iface = g_type_interface_peek_parent (iface);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9916,31 +10199,37 @@ static void video_monitorable_interface_init (MonitorableIface * iface) {
 	iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) video_real_set_master_timestamp;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*) (Monitorable *, GFile*)) video_real_set_master_file;
-#line 9916 "VideoSupport.c"
+#line 10199 "VideoSupport.c"
 }
 
 
-static void video_dateable_interface_init (DateableIface * iface) {
+static void
+video_dateable_interface_init (DateableIface * iface)
+{
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_dateable_parent_iface = g_type_interface_peek_parent (iface);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->get_exposure_time = (time_t (*) (Dateable *)) video_real_get_exposure_time;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*) (Dateable *, time_t)) video_real_set_exposure_time;
-#line 9927 "VideoSupport.c"
+#line 10212 "VideoSupport.c"
 }
 
 
-static void video_instance_init (Video * self) {
+static void
+video_instance_init (Video * self)
+{
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_GET_PRIVATE (self);
 #line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9936 "VideoSupport.c"
+#line 10223 "VideoSupport.c"
 }
 
 
-static void video_finalize (GObject * obj) {
+static void
+video_finalize (GObject * obj)
+{
 	Video * self;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video);
@@ -9950,11 +10239,13 @@ static void video_finalize (GObject * obj) {
 	_video_row_unref0 (self->priv->backing_row);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9950 "VideoSupport.c"
+#line 10239 "VideoSupport.c"
 }
 
 
-GType video_get_type (void) {
+GType
+video_get_type (void)
+{
 	static volatile gsize video_type_id__volatile = 0;
 	if (g_once_init_enter (&video_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (VideoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Video), 0, (GInstanceInitFunc) video_instance_init, NULL };
@@ -9972,7 +10263,9 @@ GType video_get_type (void) {
 }
 
 
-GType video_source_collection_state_get_type (void) {
+GType
+video_source_collection_state_get_type (void)
+{
 	static volatile gsize video_source_collection_state_type_id__volatile = 0;
 	if (g_once_init_enter (&video_source_collection_state_type_id__volatile)) {
 		static const GEnumValue values[] = {{VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN, "VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN", "unknown"}, {VIDEO_SOURCE_COLLECTION_STATE_ONLINE, "VIDEO_SOURCE_COLLECTION_STATE_ONLINE", "online"}, {VIDEO_SOURCE_COLLECTION_STATE_OFFLINE, "VIDEO_SOURCE_COLLECTION_STATE_OFFLINE", "offline"}, {VIDEO_SOURCE_COLLECTION_STATE_TRASH, "VIDEO_SOURCE_COLLECTION_STATE_TRASH", "trash"}, {0, NULL, NULL}};
@@ -9984,16 +10277,22 @@ GType video_source_collection_state_get_type (void) {
 }
 
 
-static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_uint64_compare_gcompare_data_func (gconstpointer a,
+                                    gconstpointer b,
+                                    gpointer self)
+{
 	gint result;
 	result = uint64_compare ((guint64*) a, (guint64*) b);
 #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9989 "VideoSupport.c"
+#line 10286 "VideoSupport.c"
 }
 
 
-static guint64* _uint64_dup (guint64* self) {
+static guint64*
+_uint64_dup (guint64* self)
+{
 	guint64* dup;
 #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
@@ -10001,34 +10300,49 @@ static guint64* _uint64_dup (guint64* self) {
 	memcpy (dup, self, sizeof (guint64));
 #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 10001 "VideoSupport.c"
+#line 10300 "VideoSupport.c"
 }
 
 
-static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) {
+static gint64
+_video_source_collection_get_video_key_get_source_database_key (DataSource* source,
+                                                                gpointer self)
+{
 	gint64 result;
 	result = video_source_collection_get_video_key (source);
 #line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10010 "VideoSupport.c"
+#line 10312 "VideoSupport.c"
 }
 
 
-static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender,
+                                                                                            GeeCollection* added,
+                                                                                            GeeCollection* removed,
+                                                                                            gpointer self)
+{
 #line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10017 "VideoSupport.c"
+#line 10324 "VideoSupport.c"
 }
 
 
-static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender,
+                                                                                           GeeCollection* added,
+                                                                                           GeeCollection* removed,
+                                                                                           gpointer self)
+{
 #line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10024 "VideoSupport.c"
+#line 10336 "VideoSupport.c"
 }
 
 
-VideoSourceCollection* video_source_collection_construct (GType object_type) {
+VideoSourceCollection*
+video_source_collection_construct (GType object_type)
+{
 	VideoSourceCollection* self = NULL;
 	MediaSourceHoldingTank* _tmp0_;
 	MediaSourceHoldingTank* _tmp1_;
@@ -10054,27 +10368,35 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	_source_holding_tank_unref0 (_tmp3_);
 #line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 10054 "VideoSupport.c"
+#line 10368 "VideoSupport.c"
 }
 
 
-VideoSourceCollection* video_source_collection_new (void) {
+VideoSourceCollection*
+video_source_collection_new (void)
+{
 #line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 10061 "VideoSupport.c"
+#line 10377 "VideoSupport.c"
 }
 
 
-static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
+static gboolean
+_video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source,
+                                                                             Alteration* alteration,
+                                                                             gpointer self)
+{
 	gboolean result;
 	result = video_source_collection_is_video_trashed (source);
 #line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10070 "VideoSupport.c"
+#line 10390 "VideoSupport.c"
 }
 
 
-static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (MediaSourceCollection* base) {
+static MediaSourceHoldingTank*
+video_source_collection_real_create_trashcan (MediaSourceCollection* base)
+{
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
@@ -10086,20 +10408,26 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	result = _tmp0_;
 #line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10086 "VideoSupport.c"
+#line 10408 "VideoSupport.c"
 }
 
 
-static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
+static gboolean
+_video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source,
+                                                                             Alteration* alteration,
+                                                                             gpointer self)
+{
 	gboolean result;
 	result = video_source_collection_is_video_offline (source);
 #line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10095 "VideoSupport.c"
+#line 10421 "VideoSupport.c"
 }
 
 
-static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (MediaSourceCollection* base) {
+static MediaSourceHoldingTank*
+video_source_collection_real_create_offline_bin (MediaSourceCollection* base)
+{
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
@@ -10111,15 +10439,18 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	result = _tmp0_;
 #line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10111 "VideoSupport.c"
+#line 10439 "VideoSupport.c"
 }
 
 
-static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) {
+static MediaMonitor*
+video_source_collection_real_create_media_monitor (MediaSourceCollection* base,
+                                                   Workers* workers,
+                                                   GCancellable* cancellable)
+{
 	VideoSourceCollection * self;
 	MediaMonitor* result = NULL;
-	GCancellable* _tmp0_;
-	VideoMonitor* _tmp1_;
+	VideoMonitor* _tmp0_;
 #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
 #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10127,36 +10458,36 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = cancellable;
-#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = video_monitor_new (_tmp0_);
+	_tmp0_ = video_monitor_new (cancellable);
 #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_MONITOR, MediaMonitor);
 #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10134 "VideoSupport.c"
+#line 10463 "VideoSupport.c"
 }
 
 
-static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
+static gboolean
+video_source_collection_real_holds_type_of_source (SourceCollection* base,
+                                                   DataSource* source)
+{
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
 #line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
 #line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = source;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
+	result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO);
 #line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10152 "VideoSupport.c"
+#line 10481 "VideoSupport.c"
 }
 
 
-static gchar* video_source_collection_real_get_typename (MediaSourceCollection* base) {
+static gchar*
+video_source_collection_real_get_typename (MediaSourceCollection* base)
+{
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -10168,34 +10499,33 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	result = _tmp0_;
 #line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10168 "VideoSupport.c"
+#line 10499 "VideoSupport.c"
 }
 
 
-static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) {
+static gboolean
+video_source_collection_real_is_file_recognized (MediaSourceCollection* base,
+                                                 GFile* file)
+{
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
-	GFile* _tmp0_;
-	gboolean _tmp1_;
 #line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
 #line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
-#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp1_;
+	result = video_reader_is_supported_video_file (file);
 #line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10189 "VideoSupport.c"
+#line 10517 "VideoSupport.c"
 }
 
 
-static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp1_;
+static void
+video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self,
+                                                      GeeCollection* added,
+                                                      GeeCollection* removed)
+{
 #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10203,18 +10533,16 @@ static void video_source_collection_on_trashcan_contents_altered (VideoSourceCol
 #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = added;
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = removed;
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10208 "VideoSupport.c"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection));
+#line 10534 "VideoSupport.c"
 }
 
 
-static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp1_;
+static void
+video_source_collection_on_offline_contents_altered (VideoSourceCollection* self,
+                                                     GeeCollection* added,
+                                                     GeeCollection* removed)
+{
 #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10222,109 +10550,99 @@ static void video_source_collection_on_offline_contents_altered (VideoSourceColl
 #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = added;
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = removed;
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10227 "VideoSupport.c"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection));
+#line 10551 "VideoSupport.c"
 }
 
 
-static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) {
+static MediaSource*
+video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base,
+                                                  gint64 numeric_id)
+{
 	VideoSourceCollection * self;
 	MediaSource* result = NULL;
-	gint64 _tmp0_;
-	VideoID _tmp1_ = {0};
-	Video* _tmp2_;
+	VideoID _tmp0_ = {0};
+	Video* _tmp1_;
 #line 1119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
 #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = numeric_id;
+	video_id_init (&_tmp0_, numeric_id);
 #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_id_init (&_tmp1_, _tmp0_);
+	_tmp1_ = video_source_collection_fetch (self, &_tmp0_);
 #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10249 "VideoSupport.c"
+#line 10573 "VideoSupport.c"
 }
 
 
-gint64 video_source_collection_get_video_key (DataSource* source) {
+gint64
+video_source_collection_get_video_key (DataSource* source)
+{
 	gint64 result = 0LL;
 	Video* video = NULL;
-	DataSource* _tmp0_;
-	Video* _tmp1_;
+	Video* _tmp0_;
 	VideoID video_id = {0};
-	VideoID _tmp2_ = {0};
-	VideoID _tmp3_;
-	gint64 _tmp4_;
+	VideoID _tmp1_ = {0};
+	VideoID _tmp2_;
+	gint64 _tmp3_;
 #line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
 #line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = source;
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video));
 #line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = _tmp1_;
+	video = _tmp0_;
 #line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_get_video_id (video, &_tmp2_);
+	video_get_video_id (video, &_tmp1_);
 #line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_id = _tmp2_;
+	video_id = _tmp1_;
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_id;
+	_tmp2_ = video_id;
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_.id;
+	_tmp3_ = _tmp2_.id;
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
 #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10284 "VideoSupport.c"
+#line 10607 "VideoSupport.c"
 }
 
 
-gboolean video_source_collection_is_video_trashed (DataSource* source) {
+gboolean
+video_source_collection_is_video_trashed (DataSource* source)
+{
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
-	gboolean _tmp1_;
 #line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = source;
-#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp1_;
+	result = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
 #line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10302 "VideoSupport.c"
+#line 10621 "VideoSupport.c"
 }
 
 
-gboolean video_source_collection_is_video_offline (DataSource* source) {
+gboolean
+video_source_collection_is_video_offline (DataSource* source)
+{
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
-	gboolean _tmp1_;
 #line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = source;
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp1_;
+	result = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
 #line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10320 "VideoSupport.c"
+#line 10635 "VideoSupport.c"
 }
 
 
-Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id) {
+Video*
+video_source_collection_fetch (VideoSourceCollection* self,
+                               VideoID* video_id)
+{
 	Video* result = NULL;
 	VideoID _tmp0_;
 	gint64 _tmp1_;
@@ -10343,11 +10661,14 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
 #line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10343 "VideoSupport.c"
+#line 10661 "VideoSupport.c"
 }
 
 
-static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) {
+static GeeCollection*
+video_source_collection_real_get_event_source_ids (MediaSourceCollection* base,
+                                                   EventID* event_id)
+{
 	VideoSourceCollection * self;
 	GeeCollection* result = NULL;
 	VideoTable* _tmp0_;
@@ -10375,41 +10696,40 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	result = _tmp4_;
 #line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10375 "VideoSupport.c"
+#line 10696 "VideoSupport.c"
 }
 
 
-Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state) {
+Video*
+video_source_collection_get_state_by_file (VideoSourceCollection* self,
+                                           GFile* file,
+                                           VideoSourceCollectionState* state)
+{
 	VideoSourceCollectionState _vala_state = 0;
 	Video* result = NULL;
 	Video* video = NULL;
-	GFile* _tmp0_;
-	MediaSource* _tmp1_;
-	Video* _tmp2_;
+	MediaSource* _tmp0_;
+	Video* _tmp1_;
+	MediaSourceHoldingTank* _tmp2_;
 	MediaSourceHoldingTank* _tmp3_;
-	MediaSourceHoldingTank* _tmp4_;
-	GFile* _tmp5_;
-	MediaSource* _tmp6_;
-	Video* _tmp7_;
-	MediaSourceHoldingTank* _tmp8_;
-	MediaSourceHoldingTank* _tmp9_;
-	GFile* _tmp10_;
-	MediaSource* _tmp11_;
-	Video* _tmp12_;
+	MediaSource* _tmp4_;
+	Video* _tmp5_;
+	MediaSourceHoldingTank* _tmp6_;
+	MediaSourceHoldingTank* _tmp7_;
+	MediaSource* _tmp8_;
+	Video* _tmp9_;
 #line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
 #line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = file;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
+	_tmp0_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), file);
 #line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
+	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video);
 #line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = video;
+	_tmp1_ = video;
 #line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp2_ != NULL) {
+	if (_tmp1_ != NULL) {
 #line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
 #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10418,30 +10738,28 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10418 "VideoSupport.c"
+#line 10738 "VideoSupport.c"
 		}
 #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10422 "VideoSupport.c"
+#line 10742 "VideoSupport.c"
 	}
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+	_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = _tmp3_;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = file;
+	_tmp3_ = _tmp2_;
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
+	_tmp4_ = media_source_holding_tank_fetch_by_master_file (_tmp3_, file);
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
+	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIDEO, Video);
 #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_source_holding_tank_unref0 (_tmp4_);
+	_source_holding_tank_unref0 (_tmp3_);
 #line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp7_ = video;
+	_tmp5_ = video;
 #line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp7_ != NULL) {
+	if (_tmp5_ != NULL) {
 #line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
 #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10450,30 +10768,28 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10450 "VideoSupport.c"
+#line 10768 "VideoSupport.c"
 		}
 #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10454 "VideoSupport.c"
+#line 10772 "VideoSupport.c"
 	}
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp10_ = file;
+	_tmp7_ = _tmp6_;
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
+	_tmp8_ = media_source_holding_tank_fetch_by_master_file (_tmp7_, file);
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
+	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video);
 #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_source_holding_tank_unref0 (_tmp9_);
+	_source_holding_tank_unref0 (_tmp7_);
 #line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp12_ = video;
+	_tmp9_ = video;
 #line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp12_ != NULL) {
+	if (_tmp9_ != NULL) {
 #line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
 #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10482,11 +10798,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10482 "VideoSupport.c"
+#line 10798 "VideoSupport.c"
 		}
 #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10486 "VideoSupport.c"
+#line 10802 "VideoSupport.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -10498,24 +10814,22 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	if (state) {
 #line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10498 "VideoSupport.c"
+#line 10814 "VideoSupport.c"
 	}
 #line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10502 "VideoSupport.c"
+#line 10818 "VideoSupport.c"
 }
 
 
-static void video_source_collection_compare_backing (VideoSourceCollection* self, Video* video, GFileInfo* info, GeeCollection* matching_master) {
-	Video* _tmp0_;
-	guint64 _tmp1_;
-	GFileInfo* _tmp2_;
-	gint64 _tmp3_;
-	Video* _tmp4_;
-	time_t _tmp5_;
-	GFileInfo* _tmp6_;
-	GTimeVal _tmp7_ = {0};
-	glong _tmp8_;
+static void
+video_source_collection_compare_backing (VideoSourceCollection* self,
+                                         Video* video,
+                                         GFileInfo* info,
+                                         GeeCollection* matching_master)
+{
+	GTimeVal _tmp0_ = {0};
+	glong _tmp1_;
 #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10525,53 +10839,36 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
 #line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = video;
-#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp2_ = info;
-#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp1_ != ((guint64) _tmp3_)) {
+	if (media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MEDIA_SOURCE, MediaSource)) != ((guint64) g_file_info_get_size (info))) {
 #line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10536 "VideoSupport.c"
+#line 10842 "VideoSupport.c"
 	}
 #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp4_ = video;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = info;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
+	g_file_info_get_modification_time (info, &_tmp0_);
 #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp8_ = _tmp7_.tv_sec;
+	_tmp1_ = _tmp0_.tv_sec;
 #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10550 "VideoSupport.c"
-		GeeCollection* _tmp9_;
-		Video* _tmp10_;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp9_ = matching_master;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp10_ = video;
+	if (media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MEDIA_SOURCE, MediaSource)) == ((time_t) _tmp1_)) {
 #line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		gee_collection_add (_tmp9_, _tmp10_);
-#line 10559 "VideoSupport.c"
+		gee_collection_add (matching_master, video);
+#line 10852 "VideoSupport.c"
 	}
 }
 
 
-void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
+void
+video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self,
+                                                   GFileInfo* info,
+                                                   GeeCollection* matching_master)
+{
 #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
 #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10571 "VideoSupport.c"
+#line 10868 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_;
@@ -10592,117 +10889,99 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		_object_it = _tmp3_;
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10592 "VideoSupport.c"
+#line 10889 "VideoSupport.c"
 			GeeIterator* _tmp4_;
-			gboolean _tmp5_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp6_;
-			gpointer _tmp7_;
-			DataObject* _tmp8_;
-			GFileInfo* _tmp9_;
-			GeeCollection* _tmp10_;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			DataObject* _tmp7_;
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (!_tmp5_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10609 "VideoSupport.c"
+#line 10901 "VideoSupport.c"
 			}
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = _object_it;
+			_tmp5_ = _object_it;
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = gee_iterator_get (_tmp6_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			object = (DataObject*) _tmp7_;
+			object = (DataObject*) _tmp6_;
 #line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp8_ = object;
+			_tmp7_ = object;
 #line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp9_ = info;
-#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp10_ = matching_master;
-#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
+			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video), info, matching_master);
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10627 "VideoSupport.c"
+#line 10915 "VideoSupport.c"
 		}
 #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10631 "VideoSupport.c"
+#line 10919 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp11_;
-		GeeCollection* _tmp12_;
-		GeeIterator* _tmp13_;
-		GeeIterator* _tmp14_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+		_tmp8_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp12_ = _tmp11_;
+		_tmp9_ = _tmp8_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = _tmp13_;
+		_tmp11_ = _tmp10_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp9_);
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_media_it = _tmp14_;
+		_media_it = _tmp11_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10653 "VideoSupport.c"
-			GeeIterator* _tmp15_;
-			gboolean _tmp16_;
+#line 10941 "VideoSupport.c"
+			GeeIterator* _tmp12_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp17_;
-			gpointer _tmp18_;
-			MediaSource* _tmp19_;
-			GFileInfo* _tmp20_;
-			GeeCollection* _tmp21_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp15_ = _media_it;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			MediaSource* _tmp15_;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = gee_iterator_next (_tmp15_);
+			_tmp12_ = _media_it;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (!_tmp16_) {
+			if (!gee_iterator_next (_tmp12_)) {
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10670 "VideoSupport.c"
+#line 10953 "VideoSupport.c"
 			}
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = _media_it;
+			_tmp13_ = _media_it;
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = gee_iterator_get (_tmp17_);
+			_tmp14_ = gee_iterator_get (_tmp13_);
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			media = (MediaSource*) _tmp18_;
+			media = (MediaSource*) _tmp14_;
 #line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp19_ = media;
+			_tmp15_ = media;
 #line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp20_ = info;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = matching_master;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
+			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video), info, matching_master);
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10688 "VideoSupport.c"
+#line 10967 "VideoSupport.c"
 		}
 #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10692 "VideoSupport.c"
+#line 10971 "VideoSupport.c"
 	}
 }
 
 
-static void video_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
+static void
+video_source_collection_real_notify_contents_altered (DataCollection* base,
+                                                      GeeIterable* added,
+                                                      GeeIterable* removed)
+{
 	VideoSourceCollection * self;
-	GeeIterable* _tmp0_;
-	GeeIterable* _tmp13_;
-	GeeIterable* _tmp26_;
-	GeeIterable* _tmp27_;
 #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
 #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10710,303 +10989,273 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
 #line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = added;
-#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp0_ != NULL) {
-#line 10713 "VideoSupport.c"
+	if (added != NULL) {
+#line 10990 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp1_;
-			GeeIterator* _tmp2_;
-#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp1_ = added;
+			GeeIterator* _tmp0_;
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp2_ = gee_iterable_iterator (_tmp1_);
+			_tmp0_ = gee_iterable_iterator (added);
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_object_it = _tmp2_;
+			_object_it = _tmp0_;
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10726 "VideoSupport.c"
-				GeeIterator* _tmp3_;
-				gboolean _tmp4_;
+#line 11000 "VideoSupport.c"
+				GeeIterator* _tmp1_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp5_;
-				gpointer _tmp6_;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
 				Video* video = NULL;
-				DataObject* _tmp7_;
-				Video* _tmp8_;
-				GeeMultiMap* _tmp9_;
-				Video* _tmp10_;
-				guint64 _tmp11_;
-				Video* _tmp12_;
+				DataObject* _tmp4_;
+				Video* _tmp5_;
+				GeeMultiMap* _tmp6_;
+				Video* _tmp7_;
+				guint64 _tmp8_;
+				Video* _tmp9_;
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp3_ = _object_it;
+				_tmp1_ = _object_it;
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp4_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10747 "VideoSupport.c"
+#line 11018 "VideoSupport.c"
 				}
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp5_ = _object_it;
+				_tmp2_ = _object_it;
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp6_ = gee_iterator_get (_tmp5_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				object = (DataObject*) _tmp6_;
+				object = (DataObject*) _tmp3_;
 #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp7_ = object;
+				_tmp4_ = object;
 #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
+				_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIDEO, Video));
 #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp8_;
+				video = _tmp5_;
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp9_ = self->priv->filesize_to_video;
+				_tmp6_ = self->priv->filesize_to_video;
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp10_ = video;
+				_tmp7_ = video;
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp8_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp12_ = video;
+				_tmp9_ = video;
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
+				gee_multi_map_set (_tmp6_, &_tmp8_, _tmp9_);
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10775 "VideoSupport.c"
+#line 11046 "VideoSupport.c"
 			}
 #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10779 "VideoSupport.c"
+#line 11050 "VideoSupport.c"
 		}
 	}
 #line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = removed;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp13_ != NULL) {
-#line 10786 "VideoSupport.c"
+	if (removed != NULL) {
+#line 11055 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
-			GeeIterable* _tmp14_;
-			GeeIterator* _tmp15_;
+			GeeIterator* _tmp10_;
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp14_ = removed;
+			_tmp10_ = gee_iterable_iterator (removed);
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_object_it = _tmp15_;
+			_object_it = _tmp10_;
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10799 "VideoSupport.c"
-				GeeIterator* _tmp16_;
-				gboolean _tmp17_;
+#line 11065 "VideoSupport.c"
+				GeeIterator* _tmp11_;
 				DataObject* object = NULL;
-				GeeIterator* _tmp18_;
-				gpointer _tmp19_;
+				GeeIterator* _tmp12_;
+				gpointer _tmp13_;
 				Video* video = NULL;
-				DataObject* _tmp20_;
-				Video* _tmp21_;
-				GeeMultiMap* _tmp22_;
-				Video* _tmp23_;
-				guint64 _tmp24_;
-				Video* _tmp25_;
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = _object_it;
+				DataObject* _tmp14_;
+				Video* _tmp15_;
+				GeeMultiMap* _tmp16_;
+				Video* _tmp17_;
+				guint64 _tmp18_;
+				Video* _tmp19_;
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = gee_iterator_next (_tmp16_);
+				_tmp11_ = _object_it;
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp17_) {
+				if (!gee_iterator_next (_tmp11_)) {
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10820 "VideoSupport.c"
+#line 11083 "VideoSupport.c"
 				}
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = _object_it;
+				_tmp12_ = _object_it;
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp19_ = gee_iterator_get (_tmp18_);
+				_tmp13_ = gee_iterator_get (_tmp12_);
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				object = (DataObject*) _tmp19_;
+				object = (DataObject*) _tmp13_;
 #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp20_ = object;
+				_tmp14_ = object;
 #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
+				_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIDEO, Video));
 #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp21_;
+				video = _tmp15_;
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp22_ = self->priv->filesize_to_video;
+				_tmp16_ = self->priv->filesize_to_video;
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp23_ = video;
+				_tmp17_ = video;
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp18_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp25_ = video;
+				_tmp19_ = video;
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
+				gee_multi_map_remove (_tmp16_, &_tmp18_, _tmp19_);
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10848 "VideoSupport.c"
+#line 11111 "VideoSupport.c"
 			}
 #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10852 "VideoSupport.c"
+#line 11115 "VideoSupport.c"
 		}
 	}
 #line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = added;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = removed;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_);
-#line 10861 "VideoSupport.c"
+	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed);
+#line 11120 "VideoSupport.c"
 }
 
 
-void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
-	VideoID _tmp19_ = {0};
+void
+video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self,
+                                                         const gchar* basename,
+                                                         guint64 filesize,
+                                                         VideoID* result)
+{
+	VideoID _tmp15_ = {0};
 #line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10871 "VideoSupport.c"
+#line 11135 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_;
-		guint64 _tmp1_;
+		GeeCollection* _tmp1_;
 		GeeCollection* _tmp2_;
-		GeeCollection* _tmp3_;
+		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-		GeeIterator* _tmp5_;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp1_ = filesize;
+		_tmp1_ = gee_multi_map_get (_tmp0_, &filesize);
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.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 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_object_unref0 (_tmp3_);
+		_g_object_unref0 (_tmp2_);
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_video_it = _tmp5_;
+		_video_it = _tmp4_;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10898 "VideoSupport.c"
-			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
+#line 11159 "VideoSupport.c"
+			GeeIterator* _tmp5_;
 			Video* video = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			Video* _tmp10_;
-			GFile* _tmp11_;
-			GFile* _tmp12_;
-			gchar* _tmp13_;
-			const gchar* _tmp14_;
-			gint _tmp15_;
-			gboolean _tmp16_;
-#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp6_ = _video_it;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			Video* _tmp8_;
+			GFile* _tmp9_;
+			GFile* _tmp10_;
+			gchar* _tmp11_;
+			gboolean _tmp12_;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
+			_tmp5_ = _video_it;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp5_)) {
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10919 "VideoSupport.c"
+#line 11175 "VideoSupport.c"
 			}
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp8_ = _video_it;
+			_tmp6_ = _video_it;
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp7_ = gee_iterator_get (_tmp6_);
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video = (Video*) _tmp9_;
-#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp10_ = video;
+			video = (Video*) _tmp7_;
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
+			_tmp8_ = video;
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp12_ = _tmp11_;
+			_tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp13_ = g_file_get_basename (_tmp12_);
+			_tmp10_ = _tmp9_;
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp14_ = basename;
+			_tmp11_ = g_file_get_basename (_tmp10_);
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
+			_tmp12_ = utf8_ci_compare (_tmp11_, basename) == 0;
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = _tmp15_ == 0;
+			_g_object_unref0 (_tmp10_);
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_object_unref0 (_tmp12_);
-#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			if (_tmp16_) {
-#line 10945 "VideoSupport.c"
-				Video* _tmp17_;
-				VideoID _tmp18_ = {0};
+			if (_tmp12_) {
+#line 11197 "VideoSupport.c"
+				Video* _tmp13_;
+				VideoID _tmp14_ = {0};
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = video;
+				_tmp13_ = video;
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video_get_video_id (_tmp17_, &_tmp18_);
+				video_get_video_id (_tmp13_, &_tmp14_);
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				*result = _tmp18_;
+				*result = _tmp14_;
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10960 "VideoSupport.c"
+#line 11212 "VideoSupport.c"
 			}
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10964 "VideoSupport.c"
+#line 11216 "VideoSupport.c"
 		}
 #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10968 "VideoSupport.c"
+#line 11220 "VideoSupport.c"
 	}
 #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
+	video_id_init (&_tmp15_, VIDEO_ID_INVALID);
 #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	*result = _tmp19_;
+	*result = _tmp15_;
 #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10976 "VideoSupport.c"
+#line 11228 "VideoSupport.c"
 }
 
 
-gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize) {
+gboolean
+video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self,
+                                                         const gchar* basename,
+                                                         guint64 filesize)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	guint64 _tmp1_;
-	VideoID _tmp2_ = {0};
-	gboolean _tmp3_;
+	VideoID _tmp0_ = {0};
 #line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
 #line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
 #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = basename;
-#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = filesize;
+	video_source_collection_get_basename_filesize_duplicate (self, basename, filesize, &_tmp0_);
 #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp3_;
+	result = video_id_is_valid (&_tmp0_);
 #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11002 "VideoSupport.c"
+#line 11249 "VideoSupport.c"
 }
 
 
-static TransactionController* video_source_collection_real_get_transaction_controller (MediaSourceCollection* base) {
+static TransactionController*
+video_source_collection_real_get_transaction_controller (MediaSourceCollection* base)
+{
 	TransactionController* result;
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_;
@@ -11017,7 +11266,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	_tmp0_ = self->priv->_transaction_controller;
 #line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 11017 "VideoSupport.c"
+#line 11266 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_;
 #line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -11025,7 +11274,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
 #line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 11025 "VideoSupport.c"
+#line 11274 "VideoSupport.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
@@ -11033,11 +11282,13 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	result = _tmp2_;
 #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11033 "VideoSupport.c"
+#line 11282 "VideoSupport.c"
 }
 
 
-static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
+static void
+video_source_collection_class_init (VideoSourceCollectionClass * klass)
+{
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -11064,11 +11315,13 @@ static void video_source_collection_class_init (VideoSourceCollectionClass * kla
 	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) video_source_collection_real_notify_contents_altered;
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 11064 "VideoSupport.c"
+#line 11315 "VideoSupport.c"
 }
 
 
-static void video_source_collection_instance_init (VideoSourceCollection * self) {
+static void
+video_source_collection_instance_init (VideoSourceCollection * self)
+{
 	GeeTreeMultiMap* _tmp0_;
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
@@ -11078,11 +11331,13 @@ static void video_source_collection_instance_init (VideoSourceCollection * self)
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, (GDestroyNotify) g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 11078 "VideoSupport.c"
+#line 11331 "VideoSupport.c"
 }
 
 
-static void video_source_collection_finalize (DataCollection * obj) {
+static void
+video_source_collection_finalize (DataCollection * obj)
+{
 	VideoSourceCollection * self;
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
@@ -11092,11 +11347,13 @@ static void video_source_collection_finalize (DataCollection * obj) {
 	_g_object_unref0 (self->priv->filesize_to_video);
 #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 11092 "VideoSupport.c"
+#line 11347 "VideoSupport.c"
 }
 
 
-GType video_source_collection_get_type (void) {
+GType
+video_source_collection_get_type (void)
+{
 	static volatile gsize video_source_collection_type_id__volatile = 0;
 	if (g_once_init_enter (&video_source_collection_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (VideoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoSourceCollection), 0, (GInstanceInitFunc) video_source_collection_instance_init, NULL };
@@ -11108,7 +11365,11 @@ GType video_source_collection_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) {
@@ -11120,7 +11381,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);
 }