Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 292 insertions, 241 deletions

diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 04ee3ff..7d16d2a 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.32.1, the Vala compiler
+/* EventPage.c generated by valac 0.34.4, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -305,16 +305,6 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
 #define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
@@ -417,6 +407,16 @@ typedef struct _CommandManagerClass CommandManagerClass;
 typedef struct _MediaSource MediaSource;
 typedef struct _MediaSourceClass MediaSourceClass;
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
 #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -536,7 +536,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
-	void (*add_actions) (Page* self);
+	void (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -829,10 +830,10 @@ 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);
-void page_add_actions (Page* self);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
+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);
@@ -879,6 +880,7 @@ 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);
 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);
@@ -935,35 +937,35 @@ static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_o
 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 939 "EventPage.c"
+#line 941 "EventPage.c"
 }
 
 
 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 946 "EventPage.c"
+#line 948 "EventPage.c"
 }
 
 
 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 953 "EventPage.c"
+#line 955 "EventPage.c"
 }
 
 
 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 960 "EventPage.c"
+#line 962 "EventPage.c"
 }
 
 
 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 967 "EventPage.c"
+#line 969 "EventPage.c"
 }
 
 
@@ -972,7 +974,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
 	result = media_page_create_thumbnail ((MediaPage*) self, source);
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 976 "EventPage.c"
+#line 978 "EventPage.c"
 }
 
 
@@ -1018,21 +1020,21 @@ EventPage* event_page_construct (GType object_type, Event* page_event) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp7_);
 #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");
+	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;
 #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);
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1029 "EventPage.c"
+#line 1031 "EventPage.c"
 }
 
 
 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 1036 "EventPage.c"
+#line 1038 "EventPage.c"
 }
 
 
@@ -1050,7 +1052,7 @@ Event* event_page_get_event (EventPage* self) {
 	result = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1054 "EventPage.c"
+#line 1056 "EventPage.c"
 }
 
 
@@ -1074,7 +1076,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (g_strcmp0 (_tmp2_, "F2") == 0) {
-#line 1078 "EventPage.c"
+#line 1080 "EventPage.c"
 		ViewCollection* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -1095,7 +1097,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 			result = TRUE;
 #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return result;
-#line 1099 "EventPage.c"
+#line 1101 "EventPage.c"
 		}
 	}
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1106,7 +1108,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	result = _tmp8_;
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1110 "EventPage.c"
+#line 1112 "EventPage.c"
 }
 
 
@@ -1126,27 +1128,74 @@ static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = 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 1130 "EventPage.c"
+#line 1132 "EventPage.c"
 }
 
 
-static void event_page_real_add_actions (Page* base) {
+static void event_page_real_add_actions (Page* base, GActionMap* map) {
 	EventPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #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"
-	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));
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = _tmp0_;
+	_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_);
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+	_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 1150 "EventPage.c"
+	g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+#line 1152 "EventPage.c"
+}
+
+
+static void event_page_real_remove_actions (Page* base, GActionMap* map) {
+	EventPage * self;
+	GActionMap* _tmp0_ = NULL;
+#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 1167 "EventPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+		entry_collection = EVENT_PAGE_entries;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+		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 1179 "EventPage.c"
+			GActionEntry entry = {0};
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+			entry = entry_collection[entry_it];
+#line 1183 "EventPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp1_ = map;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp2_ = entry;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1196 "EventPage.c"
+			}
+		}
+	}
 }
 
 
@@ -1154,15 +1203,15 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 	EventPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 1166 "EventPage.c"
+#line 1215 "EventPage.c"
 }
 
 
@@ -1171,23 +1220,23 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 66 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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);
-#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = selected_count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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_);
-#line 76 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 1191 "EventPage.c"
+#line 1240 "EventPage.c"
 }
 
 
@@ -1199,31 +1248,31 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1221 "EventPage.c"
+#line 1270 "EventPage.c"
 	}
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1227 "EventPage.c"
+#line 1276 "EventPage.c"
 	}
 }
 
@@ -1234,21 +1283,21 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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_);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1252 "EventPage.c"
+#line 1301 "EventPage.c"
 }
 
 
@@ -1256,33 +1305,33 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 	GeeMap* _tmp0_ = NULL;
 	Event* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = map;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = self->priv->page_event;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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));
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp2_) {
-#line 1272 "EventPage.c"
+#line 1321 "EventPage.c"
 		Event* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp3_ = self->priv->page_event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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));
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp5_);
-#line 1286 "EventPage.c"
+#line 1335 "EventPage.c"
 	}
 }
 
@@ -1293,21 +1342,21 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 1311 "EventPage.c"
+#line 1360 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
 		Event* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1325,69 +1374,69 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 		CommandManager* _tmp15_ = NULL;
 		CommandManager* _tmp16_ = NULL;
 		EditEventCommentCommand* _tmp17_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = self->priv->page_event;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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));
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp6_ = _tmp5_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp8_ = _tmp7_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp6_);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		edit_comment_dialog = _tmp8_;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp9_ = edit_comment_dialog;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp10_ = edit_comment_dialog_execute (_tmp9_);
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		new_comment = _tmp10_;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp11_ = new_comment;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		if (_tmp11_ == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_g_free0 (new_comment);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return;
-#line 1359 "EventPage.c"
+#line 1408 "EventPage.c"
 		}
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp12_ = self->priv->page_event;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp13_ = new_comment;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_);
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command = _tmp14_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp16_ = _tmp15_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp17_ = command;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_command_manager_unref0 (_tmp16_);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_object_unref0 (command);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (new_comment);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1387 "EventPage.c"
+#line 1436 "EventPage.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 1391 "EventPage.c"
+#line 1440 "EventPage.c"
 }
 
 
@@ -1403,47 +1452,47 @@ static void event_page_on_make_primary (EventPage* self) {
 	DataView* _tmp8_ = NULL;
 	DataSource* _tmp9_ = NULL;
 	MediaSource* _tmp10_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1423 "EventPage.c"
+#line 1472 "EventPage.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = self->priv->page_event;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = data_view_get_source (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_set_primary_source (_tmp4_, _tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1447 "EventPage.c"
+#line 1496 "EventPage.c"
 }
 
 
@@ -1451,19 +1500,19 @@ static void event_page_on_rename (EventPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	Event* _tmp2_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 122 "/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"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = self->priv->page_event;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1467 "EventPage.c"
+#line 1516 "EventPage.c"
 }
 
 
@@ -1479,6 +1528,8 @@ static void event_page_class_init (EventPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->add_actions = event_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	((PageClass *) klass)->remove_actions = event_page_real_remove_actions;
+#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->init_actions = event_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->update_actions = event_page_real_update_actions;
@@ -1490,14 +1541,14 @@ static void event_page_class_init (EventPageClass * klass) {
 	((MediaPageClass *) klass)->on_edit_comment = 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 1494 "EventPage.c"
+#line 1545 "EventPage.c"
 }
 
 
 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 1501 "EventPage.c"
+#line 1552 "EventPage.c"
 }
 
 
@@ -1527,7 +1578,7 @@ 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 1531 "EventPage.c"
+#line 1582 "EventPage.c"
 }
 
 
@@ -1559,56 +1610,56 @@ NoEventPage* no_event_page_construct (GType object_type) {
 	Alteration* _tmp10_ = NULL;
 	ViewCollectionMonitor* _tmp11_ = NULL;
 	ViewCollectionMonitor* _tmp12_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = no_event_page_no_event_view_manager_new (self);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	filter = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = _tmp1_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = library_photo_global;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = no_event_page_no_event_page_alteration;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp5_ = view_collection_monitor_source_collection (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp4_, NULL, NULL, NULL);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp6_);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = video_global;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = no_event_page_no_event_page_alteration;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp11_ = view_collection_monitor_source_collection (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp10_, NULL, NULL, NULL);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp12_ = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp12_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_manager_unref0 (filter);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1605 "EventPage.c"
+#line 1656 "EventPage.c"
 }
 
 
 NoEventPage* no_event_page_new (void) {
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1612 "EventPage.c"
+#line 1663 "EventPage.c"
 }
 
 
@@ -1620,31 +1671,31 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1642 "EventPage.c"
+#line 1693 "EventPage.c"
 	}
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1648 "EventPage.c"
+#line 1699 "EventPage.c"
 	}
 }
 
@@ -1655,43 +1706,43 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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_);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1673 "EventPage.c"
+#line 1724 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
 	NoEventPageNoEventViewManager* self = NULL;
 	NoEventPage* _tmp0_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page;
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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));
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1688 "EventPage.c"
+#line 1739 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 1695 "EventPage.c"
+#line 1746 "EventPage.c"
 }
 
 
@@ -1702,46 +1753,46 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 	DataSource* _tmp1_ = NULL;
 	EventID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
-#line 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = source;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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_);
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_.id;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_ != EVENT_ID_INVALID) {
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = FALSE;
-#line 1720 "EventPage.c"
+#line 1771 "EventPage.c"
 	} else {
 		DataSource* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = source;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1730 "EventPage.c"
+#line 1781 "EventPage.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	result = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1736 "EventPage.c"
+#line 1787 "EventPage.c"
 }
 
 
 static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) {
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#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 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = no_event_page_no_event_view_manager_real_include_in_view;
-#line 1745 "EventPage.c"
+#line 1796 "EventPage.c"
 }
 
 
@@ -1763,19 +1814,19 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
 
 static void no_event_page_class_init (NoEventPageClass * klass) {
 	Alteration* _tmp0_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_parent_class = g_type_class_peek_parent (klass);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = no_event_page_real_get_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = no_event_page_real_set_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = alteration_new ("metadata", "event");
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_page_alteration = _tmp0_;
-#line 1779 "EventPage.c"
+#line 1830 "EventPage.c"
 }
 
 
@@ -1785,11 +1836,11 @@ static void no_event_page_instance_init (NoEventPage * self) {
 
 static void no_event_page_finalize (GObject* obj) {
 	NoEventPage * self;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1793 "EventPage.c"
+#line 1844 "EventPage.c"
 }