Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

6 files changed, 150 insertions, 153 deletions

diff --git a/src/events/Branch.c b/src/events/Branch.c
index dba14ee..193a8ee 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2140,13 +2140,13 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 2152 "Branch.c"
 }
@@ -2173,35 +2173,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2207 "Branch.c"
 }
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index 4ee60a9..f63d633 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.34.2, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.32.1, the Vala compiler
  * generated from EventDirectoryItem.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index e5a8d6a..04ee3ff 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.34.2, the Vala compiler
+/* EventPage.c generated by valac 0.32.1, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/Events.c b/src/events/Events.c
index d1d1ee2..d99ab32 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.34.2, the Vala compiler
+/* Events.c generated by valac 0.32.1, the Vala compiler
  * generated from Events.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index ca566b4..bf6b264 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.2, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.32.1, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1000,7 +1000,7 @@ static void events_directory_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 GVariant* _variant_new10 (gboolean value);
+static GVariant* _variant_new14 (gboolean value);
 static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count);
 void page_init_actions (Page* self, gint selected_count, gint count);
 static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -1500,8 +1500,8 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 }
 
 
-static GVariant* _variant_new10 (gboolean value) {
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+static GVariant* _variant_new14 (gboolean value) {
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 1507 "EventsDirectoryPage.c"
 }
@@ -1511,12 +1511,13 @@ static void events_directory_page_real_add_actions (Page* base) {
 	EventsDirectoryPage * self;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	gboolean display_comments = FALSE;
+	ConfigFacade* _tmp2_ = NULL;
+	ConfigFacade* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	GAction* _tmp6_ = NULL;
+	GAction* _tmp7_ = NULL;
 	GVariant* _tmp8_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
@@ -1531,34 +1532,30 @@ static void events_directory_page_real_add_actions (Page* base) {
 #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if (_tmp3_ == NULL) {
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 1542 "EventsDirectoryPage.c"
-	}
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp4_ = _tmp3_;
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_ = config_facade_get_instance ();
+	_tmp2_ = config_facade_get_instance ();
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp7_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_ = _variant_new10 (_tmp7_);
+	_tmp5_ = _tmp4_;
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp8_);
+	_g_object_unref0 (_tmp3_);
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	display_comments = _tmp5_;
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp6_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7_ = _tmp6_;
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp8_ = _variant_new14 (display_comments);
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_action_change_state (_tmp7_, _tmp8_);
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp6_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1562 "EventsDirectoryPage.c"
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_object_unref0 (_tmp7_);
+#line 1559 "EventsDirectoryPage.c"
 }
 
 
@@ -1585,7 +1582,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	if (_tmp3_ == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1589 "EventsDirectoryPage.c"
+#line 1586 "EventsDirectoryPage.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp3_;
@@ -1595,7 +1592,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0);
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
-#line 1599 "EventsDirectoryPage.c"
+#line 1596 "EventsDirectoryPage.c"
 }
 
 
@@ -1628,7 +1625,7 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 	_tmp4_ = count;
 #line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_);
-#line 1632 "EventsDirectoryPage.c"
+#line 1629 "EventsDirectoryPage.c"
 }
 
 
@@ -1647,7 +1644,7 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
 	result = _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1651 "EventsDirectoryPage.c"
+#line 1648 "EventsDirectoryPage.c"
 }
 
 
@@ -1666,14 +1663,14 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1670 "EventsDirectoryPage.c"
+#line 1667 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1677 "EventsDirectoryPage.c"
+#line 1674 "EventsDirectoryPage.c"
 }
 
 
@@ -1709,7 +1706,7 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	_g_object_unref0 (_tmp3_);
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1713 "EventsDirectoryPage.c"
+#line 1710 "EventsDirectoryPage.c"
 }
 
 
@@ -1764,7 +1761,7 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	_tmp9_ = value;
 #line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1768 "EventsDirectoryPage.c"
+#line 1765 "EventsDirectoryPage.c"
 }
 
 
@@ -1813,7 +1810,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1817 "EventsDirectoryPage.c"
+#line 1814 "EventsDirectoryPage.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1861,7 +1858,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1865 "EventsDirectoryPage.c"
+#line 1862 "EventsDirectoryPage.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -1891,7 +1888,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
 #line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1895 "EventsDirectoryPage.c"
+#line 1892 "EventsDirectoryPage.c"
 }
 
 
@@ -1940,7 +1937,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1944 "EventsDirectoryPage.c"
+#line 1941 "EventsDirectoryPage.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1988,7 +1985,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1992 "EventsDirectoryPage.c"
+#line 1989 "EventsDirectoryPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -2018,7 +2015,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2022 "EventsDirectoryPage.c"
+#line 2019 "EventsDirectoryPage.c"
 }
 
 
@@ -2053,7 +2050,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2057 "EventsDirectoryPage.c"
+#line 2054 "EventsDirectoryPage.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2085,7 +2082,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2089 "EventsDirectoryPage.c"
+#line 2086 "EventsDirectoryPage.c"
 }
 
 
@@ -2123,14 +2120,14 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	_tmp5_ = value;
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2127 "EventsDirectoryPage.c"
+#line 2124 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2134 "EventsDirectoryPage.c"
+#line 2131 "EventsDirectoryPage.c"
 }
 
 
@@ -2149,7 +2146,7 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	result = _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2153 "EventsDirectoryPage.c"
+#line 2150 "EventsDirectoryPage.c"
 }
 
 
@@ -2170,7 +2167,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2174 "EventsDirectoryPage.c"
+#line 2171 "EventsDirectoryPage.c"
 }
 
 
@@ -2180,14 +2177,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
 	self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2184 "EventsDirectoryPage.c"
+#line 2181 "EventsDirectoryPage.c"
 }
 
 
 EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2191 "EventsDirectoryPage.c"
+#line 2188 "EventsDirectoryPage.c"
 }
 
 
@@ -2196,7 +2193,7 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 	events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->create_view = events_directory_page_event_directory_manager_real_create_view;
-#line 2200 "EventsDirectoryPage.c"
+#line 2197 "EventsDirectoryPage.c"
 }
 
 
@@ -2225,7 +2222,7 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
 	result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
 #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2229 "EventsDirectoryPage.c"
+#line 2226 "EventsDirectoryPage.c"
 }
 
 
@@ -2233,19 +2230,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2249 "EventsDirectoryPage.c"
+#line 2246 "EventsDirectoryPage.c"
 }
 
 
@@ -2291,7 +2288,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		result = TRUE;
 #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2295 "EventsDirectoryPage.c"
+#line 2292 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2317,11 +2314,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		_g_object_unref0 (source);
 #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2321 "EventsDirectoryPage.c"
+#line 2318 "EventsDirectoryPage.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2325 "EventsDirectoryPage.c"
+#line 2322 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2333,11 +2330,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		word_collection_length1 = _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2337 "EventsDirectoryPage.c"
+#line 2334 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2341 "EventsDirectoryPage.c"
+#line 2338 "EventsDirectoryPage.c"
 			{
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -2356,7 +2353,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 					_g_object_unref0 (source);
 #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 					return result;
-#line 2360 "EventsDirectoryPage.c"
+#line 2357 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2367,7 +2364,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 	_g_object_unref0 (source);
 #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2371 "EventsDirectoryPage.c"
+#line 2368 "EventsDirectoryPage.c"
 }
 
 
@@ -2377,14 +2374,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
 	self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2381 "EventsDirectoryPage.c"
+#line 2378 "EventsDirectoryPage.c"
 }
 
 
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2388 "EventsDirectoryPage.c"
+#line 2385 "EventsDirectoryPage.c"
 }
 
 
@@ -2395,7 +2392,7 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 	((SearchViewFilterClass *) klass)->get_criteria = events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewFilterClass *) klass)->predicate = events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2399 "EventsDirectoryPage.c"
+#line 2396 "EventsDirectoryPage.c"
 }
 
 
@@ -2438,7 +2435,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 	((CheckerboardPageClass *) klass)->get_search_view_filter = events_directory_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
-#line 2442 "EventsDirectoryPage.c"
+#line 2439 "EventsDirectoryPage.c"
 }
 
 
@@ -2450,7 +2447,7 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) {
 	_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 2454 "EventsDirectoryPage.c"
+#line 2451 "EventsDirectoryPage.c"
 }
 
 
@@ -2472,7 +2469,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	if (_tmp1_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2476 "EventsDirectoryPage.c"
+#line 2473 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2494,7 +2491,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2498 "EventsDirectoryPage.c"
+#line 2495 "EventsDirectoryPage.c"
 }
 
 
@@ -2535,21 +2532,21 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	_view_manager_unref0 (_tmp1_);
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2539 "EventsDirectoryPage.c"
+#line 2536 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2546 "EventsDirectoryPage.c"
+#line 2543 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
 #line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2553 "EventsDirectoryPage.c"
+#line 2550 "EventsDirectoryPage.c"
 }
 
 
@@ -2593,37 +2590,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2627 "EventsDirectoryPage.c"
+#line 2624 "EventsDirectoryPage.c"
 }
 
 
@@ -2642,7 +2639,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_tmp0_ = type;
 #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2646 "EventsDirectoryPage.c"
+#line 2643 "EventsDirectoryPage.c"
 		gchar* _tmp1_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
@@ -2650,7 +2647,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2654 "EventsDirectoryPage.c"
+#line 2651 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
@@ -2661,11 +2658,11 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2665 "EventsDirectoryPage.c"
+#line 2662 "EventsDirectoryPage.c"
 		} else {
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2669 "EventsDirectoryPage.c"
+#line 2666 "EventsDirectoryPage.c"
 		}
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
@@ -2673,7 +2670,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2677 "EventsDirectoryPage.c"
+#line 2674 "EventsDirectoryPage.c"
 	}
 #line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
@@ -2693,14 +2690,14 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_g_free0 (page_name);
 #line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2697 "EventsDirectoryPage.c"
+#line 2694 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2704 "EventsDirectoryPage.c"
+#line 2701 "EventsDirectoryPage.c"
 }
 
 
@@ -2718,7 +2715,7 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2722 "EventsDirectoryPage.c"
+#line 2719 "EventsDirectoryPage.c"
 }
 
 
@@ -2736,7 +2733,7 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2740 "EventsDirectoryPage.c"
+#line 2737 "EventsDirectoryPage.c"
 }
 
 
@@ -2754,7 +2751,7 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	result = _tmp1_;
 #line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2758 "EventsDirectoryPage.c"
+#line 2755 "EventsDirectoryPage.c"
 }
 
 
@@ -2772,7 +2769,7 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	_tmp0_ = type;
 #line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2776 "EventsDirectoryPage.c"
+#line 2773 "EventsDirectoryPage.c"
 		struct tm _tmp1_ = {0};
 		gint _tmp2_ = 0;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2781,7 +2778,7 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 		_tmp2_ = _tmp1_.tm_mon;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2785 "EventsDirectoryPage.c"
+#line 2782 "EventsDirectoryPage.c"
 	}
 #line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
@@ -2795,29 +2792,29 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	self->priv->year = _tmp5_;
 #line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2799 "EventsDirectoryPage.c"
+#line 2796 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 2806 "EventsDirectoryPage.c"
+#line 2803 "EventsDirectoryPage.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
-#line 2821 "EventsDirectoryPage.c"
+#line 2818 "EventsDirectoryPage.c"
 }
 
 
@@ -2850,7 +2847,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		result = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2854 "EventsDirectoryPage.c"
+#line 2851 "EventsDirectoryPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
@@ -2874,13 +2871,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_tmp9_ = self->priv->year;
 #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2878 "EventsDirectoryPage.c"
+#line 2875 "EventsDirectoryPage.c"
 		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2884 "EventsDirectoryPage.c"
+#line 2881 "EventsDirectoryPage.c"
 			struct tm _tmp11_ = {0};
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -2896,7 +2893,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 			_g_object_unref0 (event);
 #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2900 "EventsDirectoryPage.c"
+#line 2897 "EventsDirectoryPage.c"
 		}
 #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
@@ -2904,7 +2901,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		_g_object_unref0 (event);
 #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2908 "EventsDirectoryPage.c"
+#line 2905 "EventsDirectoryPage.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
@@ -2912,7 +2909,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_g_object_unref0 (event);
 #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2916 "EventsDirectoryPage.c"
+#line 2913 "EventsDirectoryPage.c"
 }
 
 
@@ -2927,7 +2924,7 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub
 	result = _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2931 "EventsDirectoryPage.c"
+#line 2928 "EventsDirectoryPage.c"
 }
 
 
@@ -2942,7 +2939,7 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE
 	result = _tmp0_;
 #line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2946 "EventsDirectoryPage.c"
+#line 2943 "EventsDirectoryPage.c"
 }
 
 
@@ -2957,7 +2954,7 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d
 	result = _tmp0_;
 #line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2961 "EventsDirectoryPage.c"
+#line 2958 "EventsDirectoryPage.c"
 }
 
 
@@ -2970,7 +2967,7 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
 #line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 2974 "EventsDirectoryPage.c"
+#line 2971 "EventsDirectoryPage.c"
 }
 
 
@@ -2981,7 +2978,7 @@ static void sub_events_directory_page_sub_event_directory_manager_instance_init
 	self->priv->month = 0;
 #line 240 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 2985 "EventsDirectoryPage.c"
+#line 2982 "EventsDirectoryPage.c"
 }
 
 
@@ -2991,7 +2988,7 @@ static void sub_events_directory_page_sub_event_directory_manager_finalize (View
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 2995 "EventsDirectoryPage.c"
+#line 2992 "EventsDirectoryPage.c"
 }
 
 
@@ -3010,7 +3007,7 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
 static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
 #line 227 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3014 "EventsDirectoryPage.c"
+#line 3011 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 46fabe3..af20d99 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -118,8 +118,8 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         base.add_actions ();
         AppWindow.get_instance ().add_action_entries (entries, this);
 
-        (get_action ("ViewComment") as GLib.SimpleAction).set_state
-            (Config.Facade.get_instance().get_display_event_comments());
+        var display_comments = Config.Facade.get_instance().get_display_event_comments();
+        get_action ("ViewComment").change_state (display_comments);
     }
 
     protected override void init_actions(int selected_count, int count) {