Merge branch 'feature/upstream' into develop

1 files changed, 523 insertions, 378 deletions

diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index d701b8e..d7da2f4 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.36.6, the Vala compiler
+/* EventPage.c generated by valac 0.40.4, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -231,6 +232,11 @@ typedef struct _EventSourceClass EventSourceClass;
 
 typedef struct _Event Event;
 typedef struct _EventClass EventClass;
+enum  {
+	EVENT_PAGE_0_PROPERTY,
+	EVENT_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* event_page_properties[EVENT_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -437,6 +443,11 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 typedef struct _NoEventPage NoEventPage;
 typedef struct _NoEventPageClass NoEventPageClass;
 typedef struct _NoEventPagePrivate NoEventPagePrivate;
+enum  {
+	NO_EVENT_PAGE_0_PROPERTY,
+	NO_EVENT_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* no_event_page_properties[NO_EVENT_PAGE_NUM_PROPERTIES];
 
 #define TYPE_VIEW_MANAGER (view_manager_get_type ())
 #define VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_MANAGER, ViewManager))
@@ -744,9 +755,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
 void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_injection_group (GValue* value,
+                                gpointer v_object);
+void value_take_injection_group (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_injection_group (const GValue* value);
 GType injection_group_get_type (void) G_GNUC_CONST;
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -760,17 +777,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 GType search_view_filter_get_type (void) G_GNUC_CONST;
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+                             gpointer v_object);
+void core_value_take_tracker (GValue* value,
+                              gpointer v_object);
 gpointer core_value_get_tracker (const GValue* value);
 GType core_tracker_get_type (void) G_GNUC_CONST;
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
@@ -784,14 +813,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType event_source_get_type (void) G_GNUC_CONST;
 GType event_get_type (void) G_GNUC_CONST;
 #define EVENT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_PAGE, EventPagePrivate))
-enum  {
-	EVENT_PAGE_DUMMY_PROPERTY
-};
 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 source_collection_get_type (void) G_GNUC_CONST;
@@ -800,244 +832,359 @@ GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType event_source_collection_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;
-static void event_page_on_events_altered (EventPage* self, GeeMap* map);
-static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void event_page_on_events_altered (EventPage* self,
+                                   GeeMap* map);
+static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                  GeeMap* items,
+                                                                  gpointer self);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 void view_collection_halt_mirroring (ViewCollection* self);
 static void event_page_on_make_primary (EventPage* self);
-static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self);
 static void event_page_on_rename (EventPage* self);
-static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self);
 void media_page_on_edit_comment (MediaPage* self);
-static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self);
 EventPage* event_page_new (Event* page_event);
-EventPage* event_page_construct (GType object_type, Event* page_event);
+EventPage* event_page_construct (GType object_type,
+                                 Event* page_event);
 gchar* data_object_get_name (DataObject* self);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
-void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target);
-DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source);
-static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self);
-void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
+void event_mirror_photos (Event* self,
+                          ViewCollection* view,
+                          CreateView mirroring_ctor,
+                          void* mirroring_ctor_target);
+DataView* media_page_create_thumbnail (MediaPage* self,
+                                       DataSource* source);
+static DataView* _media_page_create_thumbnail_create_view (DataSource* source,
+                                                    gpointer self);
+void checkerboard_page_init_page_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
 Event* event_page_get_event (EventPage* self);
-static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event);
+static gboolean event_page_real_on_app_key_pressed (Page* base,
+                                             GdkEventKey* event);
 gint view_collection_get_selected_count (ViewCollection* self);
-gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
-static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void event_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void event_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-static void event_page_real_init_actions (Page* base, gint selected_count, gint count);
-void page_init_actions (Page* self, gint selected_count, gint count);
-static void event_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_update_actions (Page* self, gint selected_count, gint count);
-static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
+gboolean page_on_app_key_pressed (Page* self,
+                                  GdkEventKey* event);
+static void event_page_real_init_collect_ui_filenames (Page* base,
+                                                GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void event_page_real_add_actions (Page* base,
+                                  GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void event_page_real_remove_actions (Page* base,
+                                     GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
+static void event_page_real_init_actions (Page* base,
+                                   gint selected_count,
+                                   gint count);
+void page_init_actions (Page* self,
+                        gint selected_count,
+                        gint count);
+static void event_page_real_update_actions (Page* base,
+                                     gint selected_count,
+                                     gint count);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
+static void event_page_real_get_config_photos_sort (MediaPage* base,
+                                             gboolean* sort_order,
+                                             gint* sort_by);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
-void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by);
-static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
-void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
-void page_set_page_name (Page* self, const gchar* page_name);
+void configuration_facade_get_event_photos_sort (ConfigurationFacade* self,
+                                                 gboolean* sort_order,
+                                                 gint* sort_by);
+static void event_page_real_set_config_photos_sort (MediaPage* base,
+                                             gboolean sort_order,
+                                             gint sort_by);
+void configuration_facade_set_event_photos_sort (ConfigurationFacade* self,
+                                                 gboolean sort_order,
+                                                 gint sort_by);
+void page_set_page_name (Page* self,
+                         const gchar* page_name);
 static void event_page_real_on_edit_comment (MediaPage* base);
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance);
 void multi_text_entry_dialog_mediator_unref (gpointer instance);
-GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
-void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
+GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name,
+                                                         const gchar* nick,
+                                                         const gchar* blurb,
+                                                         GType object_type,
+                                                         GParamFlags flags);
+void value_set_multi_text_entry_dialog_mediator (GValue* value,
+                                                 gpointer v_object);
+void value_take_multi_text_entry_dialog_mediator (GValue* value,
+                                                  gpointer v_object);
 gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value);
 GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST;
 GType edit_comment_dialog_get_type (void) G_GNUC_CONST;
 gchar* event_source_get_comment (EventSource* self);
-EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event);
-EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event);
+EditCommentDialog* edit_comment_dialog_new (const gchar* comment,
+                                            gboolean is_event);
+EditCommentDialog* edit_comment_dialog_construct (GType object_type,
+                                                  const gchar* comment,
+                                                  gboolean is_event);
 gchar* edit_comment_dialog_execute (EditCommentDialog* self);
 GType command_get_type (void) G_GNUC_CONST;
 GType page_command_get_type (void) G_GNUC_CONST;
 GType simple_proxyable_command_get_type (void) G_GNUC_CONST;
 GType edit_event_comment_command_get_type (void) G_GNUC_CONST;
-EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment);
-EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment);
+EditEventCommentCommand* edit_event_comment_command_new (Event* event,
+                                                         const gchar* new_comment);
+EditEventCommentCommand* edit_event_comment_command_construct (GType object_type,
+                                                               Event* event,
+                                                               const gchar* new_comment);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* page_get_command_manager (Page* self);
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 GType media_source_get_type (void) G_GNUC_CONST;
-gboolean event_set_primary_source (Event* self, MediaSource* source);
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
+gboolean event_set_primary_source (Event* self,
+                                   MediaSource* source);
+DataView* view_collection_get_selected_at (ViewCollection* self,
+                                           gint index);
 DataSource* data_view_get_source (DataView* self);
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
-void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
+void library_window_rename_event_in_sidebar (LibraryWindow* self,
+                                             Event* event);
 static void event_page_finalize (GObject * obj);
 GType no_event_page_get_type (void) G_GNUC_CONST;
-enum  {
-	NO_EVENT_PAGE_DUMMY_PROPERTY
-};
-Alteration* alteration_new (const gchar* subject, const gchar* detail);
-Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail);
+Alteration* alteration_new (const gchar* subject,
+                            const gchar* detail);
+Alteration* alteration_construct (GType object_type,
+                                  const gchar* subject,
+                                  const gchar* detail);
 #define NO_EVENT_PAGE_NAME _ ("No Event")
 NoEventPage* no_event_page_new (void);
 NoEventPage* no_event_page_construct (GType object_type);
 gpointer view_manager_ref (gpointer instance);
 void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_view_manager (GValue* value,
+                             gpointer v_object);
+void value_take_view_manager (GValue* value,
+                              gpointer v_object);
 gpointer value_get_view_manager (const GValue* value);
 GType view_manager_get_type (void) G_GNUC_CONST;
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page);
-static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page);
+static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type,
+                                                                              NoEventPage* page);
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
 static GType no_event_page_no_event_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer view_collection_monitor_ref (gpointer instance);
 void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+                                        gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+                                         gpointer v_object);
 gpointer view_collection_value_get_monitor (const GValue* value);
 GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
 GType video_source_collection_get_type (void) G_GNUC_CONST;
-static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
-static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
-enum  {
-	NO_EVENT_PAGE_NO_EVENT_VIEW_MANAGER_DUMMY_PROPERTY
-};
+static void no_event_page_real_get_config_photos_sort (MediaPage* base,
+                                                gboolean* sort_order,
+                                                gint* sort_by);
+static void no_event_page_real_set_config_photos_sort (MediaPage* base,
+                                                gboolean sort_order,
+                                                gint sort_by);
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base,
+                                                                   DataSource* source);
 GType event_id_get_type (void) G_GNUC_CONST;
 EventID* event_id_dup (const EventID* self);
 void event_id_free (EventID* self);
-void media_source_get_event_id (MediaSource* self, EventID* result);
+void media_source_get_event_id (MediaSource* self,
+                                EventID* result);
 #define EVENT_ID_INVALID ((gint64) -1)
-gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
+gboolean view_manager_include_in_view (ViewManager* self,
+                                       DataSource* source);
 static void no_event_page_finalize (GObject * obj);
 
 static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}};
 
-static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender,
+                                                             GeeMap* items,
+                                                             gpointer self)
+{
 #line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_page_on_events_altered ((EventPage*) self, items);
-#line 940 "EventPage.c"
+#line 1072 "EventPage.c"
 }
 
 
-static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_page_on_make_primary ((EventPage*) self);
-#line 947 "EventPage.c"
+#line 1083 "EventPage.c"
 }
 
 
-static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action,
+                                                        GVariant* parameter,
+                                                        gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_page_on_rename ((EventPage*) self);
-#line 954 "EventPage.c"
+#line 1094 "EventPage.c"
 }
 
 
-static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	media_page_on_edit_comment ((MediaPage*) self);
-#line 961 "EventPage.c"
+#line 1105 "EventPage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 968 "EventPage.c"
+#line 1114 "EventPage.c"
 }
 
 
-static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self) {
+static DataView*
+_media_page_create_thumbnail_create_view (DataSource* source,
+                                          gpointer self)
+{
 	DataView* result;
 	result = media_page_create_thumbnail ((MediaPage*) self, source);
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 977 "EventPage.c"
+#line 1126 "EventPage.c"
 }
 
 
-EventPage* event_page_construct (GType object_type, Event* page_event) {
+EventPage*
+event_page_construct (GType object_type,
+                      Event* page_event)
+{
 	EventPage * self = NULL;
-	Event* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	Event* _tmp3_;
-	Event* _tmp4_;
-	Event* _tmp5_;
-	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	EventSourceCollection* _tmp8_;
+	Event* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	EventSourceCollection* _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_EVENT (page_event), NULL);
 #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = page_event;
-#line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
+	_tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (page_event, TYPE_DATA_OBJECT, DataObject));
 #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	self = (EventPage*) collection_page_construct (object_type, _tmp2_);
+	self = (EventPage*) collection_page_construct (object_type, _tmp1_);
 #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_g_free0 (_tmp2_);
-#line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = page_event;
+	_g_free0 (_tmp1_);
 #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp2_ = _g_object_ref0 (page_event);
 #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (self->priv->page_event);
 #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	self->priv->page_event = _tmp4_;
+	self->priv->page_event = _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_ = page_event;
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	event_mirror_photos (_tmp5_, _tmp7_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
+	event_mirror_photos (page_event, _tmp4_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp4_);
 #line 16 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventContextMenu");
 #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_ = event_global;
+	_tmp5_ = event_global;
 #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1030 "EventPage.c"
+#line 1173 "EventPage.c"
 }
 
 
-EventPage* event_page_new (Event* page_event) {
+EventPage*
+event_page_new (Event* page_event)
+{
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return event_page_construct (TYPE_EVENT_PAGE, page_event);
-#line 1037 "EventPage.c"
+#line 1182 "EventPage.c"
 }
 
 
-Event* event_page_get_event (EventPage* self) {
+Event*
+event_page_get_event (EventPage* self)
+{
 	Event* result = NULL;
 	Event* _tmp0_;
 	Event* _tmp1_;
@@ -1051,118 +1198,103 @@ Event* event_page_get_event (EventPage* self) {
 	result = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1055 "EventPage.c"
+#line 1202 "EventPage.c"
 }
 
 
-static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+event_page_real_on_app_key_pressed (Page* base,
+                                    GdkEventKey* event)
+{
 	EventPage * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
-	const gchar* _tmp2_;
-	GdkEventKey* _tmp7_;
-	gboolean _tmp8_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = event;
-#line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp0_ = event->keyval;
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (g_strcmp0 (_tmp2_, "F2") == 0) {
-#line 1079 "EventPage.c"
+	if (g_strcmp0 (_tmp1_, "F2") == 0) {
+#line 1224 "EventPage.c"
+		ViewCollection* _tmp2_;
 		ViewCollection* _tmp3_;
-		ViewCollection* _tmp4_;
-		gint _tmp5_;
-		gboolean _tmp6_;
+		gboolean _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp5_ = view_collection_get_selected_count (_tmp4_);
+		_tmp4_ = view_collection_get_selected_count (_tmp3_) != 1;
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp6_ = _tmp5_ != 1;
+		_data_collection_unref0 (_tmp3_);
 #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_data_collection_unref0 (_tmp4_);
-#line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		if (_tmp6_) {
+		if (_tmp4_) {
 #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			result = TRUE;
 #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return result;
-#line 1100 "EventPage.c"
+#line 1242 "EventPage.c"
 		}
 	}
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp7_ = event;
-#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_ = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	result = _tmp8_;
+	result = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), event);
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1111 "EventPage.c"
+#line 1249 "EventPage.c"
 }
 
 
-static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+event_page_real_init_collect_ui_filenames (Page* base,
+                                           GeeList* ui_filenames)
+{
 	EventPage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = ui_filenames;
-#line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames);
 #line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "event.ui");
-#line 1131 "EventPage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "event.ui");
+#line 1266 "EventPage.c"
 }
 
 
-static void event_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+event_page_real_add_actions (Page* base,
+                             GActionMap* map)
+{
 	EventPage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = map;
-#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map);
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = map;
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
-#line 1151 "EventPage.c"
+	g_action_map_add_action_entries (map, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+#line 1283 "EventPage.c"
 }
 
 
-static void event_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+event_page_real_remove_actions (Page* base,
+                                GActionMap* map)
+{
 	EventPage * self;
-	GActionMap* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = map;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
-#line 1166 "EventPage.c"
+	PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map);
+#line 1298 "EventPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1174,72 +1306,66 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (EVENT_PAGE_entries);
 #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENT_PAGE_entries); entry_it = entry_it + 1) {
-#line 1178 "EventPage.c"
+#line 1310 "EventPage.c"
 			GActionEntry entry = {0};
 #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			entry = entry_collection[entry_it];
-#line 1182 "EventPage.c"
+#line 1314 "EventPage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-				_tmp1_ = map;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-				_tmp2_ = entry;
+				_tmp0_ = entry;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-				_tmp3_ = _tmp2_.name;
+				_tmp1_ = _tmp0_.name;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1195 "EventPage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 1324 "EventPage.c"
 			}
 		}
 	}
 }
 
 
-static void event_page_real_init_actions (Page* base, gint selected_count, gint count) {
+static void
+event_page_real_init_actions (Page* base,
+                              gint selected_count,
+                              gint count)
+{
 	EventPage * self;
-	gint _tmp0_;
-	gint _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = selected_count;
-#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = count;
-#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 1214 "EventPage.c"
+	PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count);
+#line 1341 "EventPage.c"
 }
 
 
-static void event_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+event_page_real_update_actions (Page* base,
+                                gint selected_count,
+                                gint count)
+{
 	EventPage * self;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = selected_count;
-#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", _tmp0_ == 1);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", selected_count == 1);
 #line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
 #line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = selected_count;
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = count;
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
+	PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count);
 #line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE);
-#line 1239 "EventPage.c"
+#line 1361 "EventPage.c"
 }
 
 
-static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+event_page_real_get_config_photos_sort (MediaPage* base,
+                                        gboolean* sort_order,
+                                        gint* sort_by)
+{
 	EventPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -1265,23 +1391,25 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	if (sort_order) {
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1269 "EventPage.c"
+#line 1395 "EventPage.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1275 "EventPage.c"
+#line 1401 "EventPage.c"
 	}
 }
 
 
-static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+event_page_real_set_config_photos_sort (MediaPage* base,
+                                        gboolean sort_order,
+                                        gint sort_by)
+{
 	EventPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1289,58 +1417,52 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = sort_order;
-#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = sort_by;
-#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
+	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by);
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1300 "EventPage.c"
+#line 1424 "EventPage.c"
 }
 
 
-static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
-	GeeMap* _tmp0_;
-	Event* _tmp1_;
-	gboolean _tmp2_;
+static void
+event_page_on_events_altered (EventPage* self,
+                              GeeMap* map)
+{
+	Event* _tmp0_;
 #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
 #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = map;
-#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = self->priv->page_event;
-#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
+	_tmp0_ = self->priv->page_event;
 #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (_tmp2_) {
-#line 1320 "EventPage.c"
-		Event* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
+	if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) {
+#line 1441 "EventPage.c"
+		Event* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp3_ = self->priv->page_event;
+		_tmp1_ = self->priv->page_event;
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+		_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
+		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp3_);
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_g_free0 (_tmp5_);
-#line 1334 "EventPage.c"
+		_g_free0 (_tmp3_);
+#line 1455 "EventPage.c"
 	}
 }
 
 
-static void event_page_real_on_edit_comment (MediaPage* base) {
+static void
+event_page_real_on_edit_comment (MediaPage* base)
+{
 	EventPage * self;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 #line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1348,81 +1470,79 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (_tmp3_) {
-#line 1359 "EventPage.c"
+	if (_tmp2_) {
+#line 1479 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
-		Event* _tmp4_;
+		Event* _tmp3_;
+		gchar* _tmp4_;
 		gchar* _tmp5_;
-		gchar* _tmp6_;
+		EditCommentDialog* _tmp6_;
 		EditCommentDialog* _tmp7_;
-		EditCommentDialog* _tmp8_;
 		gchar* new_comment = NULL;
-		EditCommentDialog* _tmp9_;
-		gchar* _tmp10_;
-		const gchar* _tmp11_;
+		EditCommentDialog* _tmp8_;
+		gchar* _tmp9_;
+		const gchar* _tmp10_;
 		EditEventCommentCommand* command = NULL;
-		Event* _tmp12_;
-		const gchar* _tmp13_;
-		EditEventCommentCommand* _tmp14_;
+		Event* _tmp11_;
+		const gchar* _tmp12_;
+		EditEventCommentCommand* _tmp13_;
+		CommandManager* _tmp14_;
 		CommandManager* _tmp15_;
-		CommandManager* _tmp16_;
-		EditEventCommentCommand* _tmp17_;
+		EditEventCommentCommand* _tmp16_;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp4_ = self->priv->page_event;
+		_tmp3_ = self->priv->page_event;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource));
+		_tmp4_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT_SOURCE, EventSource));
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE);
+		_tmp6_ = edit_comment_dialog_new (_tmp5_, TRUE);
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp5_);
 #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		edit_comment_dialog = _tmp8_;
+		edit_comment_dialog = _tmp7_;
 #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp9_ = edit_comment_dialog;
+		_tmp8_ = edit_comment_dialog;
 #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp10_ = edit_comment_dialog_execute (_tmp9_);
+		_tmp9_ = edit_comment_dialog_execute (_tmp8_);
 #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		new_comment = _tmp10_;
+		new_comment = _tmp9_;
 #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp11_ = new_comment;
+		_tmp10_ = new_comment;
 #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		if (_tmp11_ == NULL) {
+		if (_tmp10_ == NULL) {
 #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_g_free0 (new_comment);
 #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return;
-#line 1407 "EventPage.c"
+#line 1527 "EventPage.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp12_ = self->priv->page_event;
+		_tmp11_ = self->priv->page_event;
 #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp13_ = new_comment;
+		_tmp12_ = new_comment;
 #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_);
+		_tmp13_ = edit_event_comment_command_new (_tmp11_, _tmp12_);
 #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		command = _tmp14_;
+		command = _tmp13_;
 #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp17_ = command;
+		_tmp16_ = command;
 #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
 #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_command_manager_unref0 (_tmp16_);
+		_command_manager_unref0 (_tmp15_);
 #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_object_unref0 (command);
 #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1431,26 +1551,27 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1435 "EventPage.c"
+#line 1555 "EventPage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	MEDIA_PAGE_CLASS (event_page_parent_class)->on_edit_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_MEDIA_PAGE, MediaPage));
-#line 1439 "EventPage.c"
+#line 1559 "EventPage.c"
 }
 
 
-static void event_page_on_make_primary (EventPage* self) {
+static void
+event_page_on_make_primary (EventPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	Event* _tmp4_;
+	gboolean _tmp2_;
+	Event* _tmp3_;
+	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
+	DataView* _tmp6_;
 	DataView* _tmp7_;
-	DataView* _tmp8_;
-	DataSource* _tmp9_;
-	MediaSource* _tmp10_;
+	DataSource* _tmp8_;
+	MediaSource* _tmp9_;
 #line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1458,44 +1579,44 @@ static void event_page_on_make_primary (EventPage* self) {
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = _tmp2_ != 1;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1471 "EventPage.c"
+#line 1590 "EventPage.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp4_ = self->priv->page_event;
+	_tmp3_ = self->priv->page_event;
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
+	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp9_ = data_view_get_source (_tmp8_);
+	_tmp8_ = data_view_get_source (_tmp7_);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource);
+	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	event_set_primary_source (_tmp4_, _tmp10_);
+	event_set_primary_source (_tmp3_, _tmp9_);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_data_collection_unref0 (_tmp6_);
-#line 1495 "EventPage.c"
+	_data_collection_unref0 (_tmp5_);
+#line 1614 "EventPage.c"
 }
 
 
-static void event_page_on_rename (EventPage* self) {
+static void
+event_page_on_rename (EventPage* self)
+{
 	LibraryWindow* _tmp0_;
 	LibraryWindow* _tmp1_;
 	Event* _tmp2_;
@@ -1511,11 +1632,13 @@ static void event_page_on_rename (EventPage* self) {
 	library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
 #line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1515 "EventPage.c"
+#line 1636 "EventPage.c"
 }
 
 
-static void event_page_class_init (EventPageClass * klass) {
+static void
+event_page_class_init (EventPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1540,18 +1663,22 @@ static void event_page_class_init (EventPageClass * klass) {
 	((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) event_page_real_on_edit_comment;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = event_page_finalize;
-#line 1544 "EventPage.c"
+#line 1667 "EventPage.c"
 }
 
 
-static void event_page_instance_init (EventPage * self) {
+static void
+event_page_instance_init (EventPage * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self->priv = EVENT_PAGE_GET_PRIVATE (self);
-#line 1551 "EventPage.c"
+#line 1676 "EventPage.c"
 }
 
 
-static void event_page_finalize (GObject * obj) {
+static void
+event_page_finalize (GObject * obj)
+{
 	EventPage * self;
 	EventSourceCollection* _tmp0_;
 	guint _tmp1_;
@@ -1577,11 +1704,13 @@ static void event_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->page_event);
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (event_page_parent_class)->finalize (obj);
-#line 1581 "EventPage.c"
+#line 1708 "EventPage.c"
 }
 
 
-GType event_page_get_type (void) {
+GType
+event_page_get_type (void)
+{
 	static volatile gsize event_page_type_id__volatile = 0;
 	if (g_once_init_enter (&event_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventPage), 0, (GInstanceInitFunc) event_page_instance_init, NULL };
@@ -1593,7 +1722,9 @@ GType event_page_get_type (void) {
 }
 
 
-NoEventPage* no_event_page_construct (GType object_type) {
+NoEventPage*
+no_event_page_construct (GType object_type)
+{
 	NoEventPage * self = NULL;
 	ViewManager* filter = NULL;
 	NoEventPageNoEventViewManager* _tmp0_;
@@ -1651,18 +1782,24 @@ NoEventPage* no_event_page_construct (GType object_type) {
 	_view_manager_unref0 (filter);
 #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1655 "EventPage.c"
+#line 1786 "EventPage.c"
 }
 
 
-NoEventPage* no_event_page_new (void) {
+NoEventPage*
+no_event_page_new (void)
+{
 #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1662 "EventPage.c"
+#line 1795 "EventPage.c"
 }
 
 
-static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+no_event_page_real_get_config_photos_sort (MediaPage* base,
+                                           gboolean* sort_order,
+                                           gint* sort_by)
+{
 	NoEventPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -1688,23 +1825,25 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	if (sort_order) {
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1692 "EventPage.c"
+#line 1829 "EventPage.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1698 "EventPage.c"
+#line 1835 "EventPage.c"
 	}
 }
 
 
-static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+no_event_page_real_set_config_photos_sort (MediaPage* base,
+                                           gboolean sort_order,
+                                           gint sort_by)
+{
 	NoEventPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1712,94 +1851,92 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_ = sort_order;
-#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = sort_by;
-#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
+	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by);
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1723 "EventPage.c"
+#line 1858 "EventPage.c"
 }
 
 
-static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
+static NoEventPageNoEventViewManager*
+no_event_page_no_event_view_manager_construct (GType object_type,
+                                               NoEventPage* page)
+{
 	NoEventPageNoEventViewManager* self = NULL;
-	NoEventPage* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
 #line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = page;
-#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
+	self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1738 "EventPage.c"
+#line 1873 "EventPage.c"
 }
 
 
-static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
+static NoEventPageNoEventViewManager*
+no_event_page_no_event_view_manager_new (NoEventPage* page)
+{
 #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_no_event_view_manager_construct (NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, page);
-#line 1745 "EventPage.c"
+#line 1882 "EventPage.c"
 }
 
 
-static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base,
+                                                          DataSource* source)
+{
 	NoEventPageNoEventViewManager * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSource* _tmp1_;
-	EventID _tmp2_ = {0};
-	gint64 _tmp3_;
+	EventID _tmp1_ = {0};
+	gint64 _tmp2_;
 #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager);
 #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = source;
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_);
+	media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_);
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = _tmp2_.id;
+	_tmp2_ = _tmp1_.id;
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (_tmp3_ != EVENT_ID_INVALID) {
+	if (_tmp2_ != EVENT_ID_INVALID) {
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = FALSE;
-#line 1770 "EventPage.c"
+#line 1907 "EventPage.c"
 	} else {
-		DataSource* _tmp4_;
-		gboolean _tmp5_;
 #line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp4_ = source;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp5_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		_tmp0_ = _tmp5_;
-#line 1780 "EventPage.c"
+		_tmp0_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), source);
+#line 1911 "EventPage.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	result = _tmp0_;
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1786 "EventPage.c"
+#line 1917 "EventPage.c"
 }
 
 
-static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) {
+static void
+no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass)
+{
 #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
-#line 1795 "EventPage.c"
+#line 1928 "EventPage.c"
 }
 
 
-static void no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self) {
+static void
+no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self)
+{
 }
 
 
-static GType no_event_page_no_event_view_manager_get_type (void) {
+static GType
+no_event_page_no_event_view_manager_get_type (void)
+{
 	static volatile gsize no_event_page_no_event_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&no_event_page_no_event_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (NoEventPageNoEventViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_no_event_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPageNoEventViewManager), 0, (GInstanceInitFunc) no_event_page_no_event_view_manager_instance_init, NULL };
@@ -1811,7 +1948,9 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
 }
 
 
-static void no_event_page_class_init (NoEventPageClass * klass) {
+static void
+no_event_page_class_init (NoEventPageClass * klass)
+{
 	Alteration* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_parent_class = g_type_class_peek_parent (klass);
@@ -1825,25 +1964,31 @@ static void no_event_page_class_init (NoEventPageClass * klass) {
 	_tmp0_ = alteration_new ("metadata", "event");
 #line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_page_alteration = _tmp0_;
-#line 1829 "EventPage.c"
+#line 1968 "EventPage.c"
 }
 
 
-static void no_event_page_instance_init (NoEventPage * self) {
+static void
+no_event_page_instance_init (NoEventPage * self)
+{
 }
 
 
-static void no_event_page_finalize (GObject * obj) {
+static void
+no_event_page_finalize (GObject * obj)
+{
 	NoEventPage * self;
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1843 "EventPage.c"
+#line 1986 "EventPage.c"
 }
 
 
-GType no_event_page_get_type (void) {
+GType
+no_event_page_get_type (void)
+{
 	static volatile gsize no_event_page_type_id__volatile = 0;
 	if (g_once_init_enter (&no_event_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (NoEventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPage), 0, (GInstanceInitFunc) no_event_page_instance_init, NULL };