Merge branch 'feature/upstream' into develop

1 files changed, 350 insertions, 356 deletions

diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 7617f27..897a401 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.7, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1091,7 +1091,7 @@ GType indexable_get_type (void) G_GNUC_CONST;
 const gchar* indexable_get_indexable_keywords (Indexable* self);
 gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
 SearchViewFilter* search_view_filter_construct (GType object_type);
-static void events_directory_page_finalize (GObject* obj);
+static void events_directory_page_finalize (GObject * obj);
 GType master_events_directory_page_get_type (void) G_GNUC_CONST;
 enum  {
 	MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY
@@ -1125,7 +1125,7 @@ enum  {
 };
 static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source);
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj);
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj);
 
 static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}};
 
@@ -1189,37 +1189,37 @@ static gpointer _view_manager_ref0 (gpointer self) {
 
 EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) {
 	EventsDirectoryPage * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	ConfigFacade* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	Comparator _tmp8_ = NULL;
-	Comparator _tmp9_ = NULL;
-	void* _tmp9__target = NULL;
-	GDestroyNotify _tmp9__target_destroy_notify = NULL;
-	ViewCollection* _tmp10_ = NULL;
-	ViewCollection* _tmp11_ = NULL;
-	EventSourceCollection* _tmp12_ = NULL;
-	ViewManager* _tmp13_ = NULL;
-	GeeCollection* _tmp14_ = NULL;
-	ViewCollectionMonitor* _tmp15_ = NULL;
-	ViewCollectionMonitor* _tmp16_ = NULL;
-	ViewCollection* _tmp17_ = NULL;
-	ViewCollection* _tmp18_ = NULL;
-	ConfigFacade* _tmp19_ = NULL;
-	ConfigFacade* _tmp20_ = NULL;
-	gboolean _tmp21_ = FALSE;
+	const gchar* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	gboolean _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	Comparator _tmp8_;
+	Comparator _tmp9_;
+	void* _tmp9__target;
+	GDestroyNotify _tmp9__target_destroy_notify;
+	ViewCollection* _tmp10_;
+	ViewCollection* _tmp11_;
+	EventSourceCollection* _tmp12_;
+	ViewManager* _tmp13_;
+	GeeCollection* _tmp14_;
+	ViewCollectionMonitor* _tmp15_;
+	ViewCollectionMonitor* _tmp16_;
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	ConfigFacade* _tmp19_;
+	ConfigFacade* _tmp20_;
+	gboolean _tmp21_;
 	GValue _tmp22_ = {0};
-	ViewManager* _tmp23_ = NULL;
-	ViewManager* _tmp24_ = NULL;
+	ViewManager* _tmp23_;
+	ViewManager* _tmp24_;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp25_ = NULL;
+	GtkToolbar* _tmp25_;
 	GtkToolButton* merge_button = NULL;
-	GtkToolButton* _tmp26_ = NULL;
+	GtkToolButton* _tmp26_;
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1344,8 +1344,8 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 
 static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	EventsDirectoryPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1364,8 +1364,8 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
 
 gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1385,13 +1385,13 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
 static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	time_t start_a = 0;
-	void* _tmp0_ = NULL;
-	Event* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
+	void* _tmp0_;
+	Event* _tmp1_;
+	time_t _tmp2_;
 	time_t start_b = 0;
-	void* _tmp3_ = NULL;
-	Event* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	void* _tmp3_;
+	Event* _tmp4_;
+	time_t _tmp5_;
 #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = a;
 #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1418,9 +1418,9 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
 
 static gint64 events_directory_page_event_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = b;
 #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1455,15 +1455,15 @@ static gint64 _events_directory_page_event_descending_comparator_comparator (voi
 
 static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) {
 	Comparator result = NULL;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = ascending;
 #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_) {
 #line 1464 "EventsDirectoryPage.c"
-		Comparator _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
-		GDestroyNotify _tmp1__target_destroy_notify = NULL;
+		Comparator _tmp1_;
+		void* _tmp1__target;
+		GDestroyNotify _tmp1__target_destroy_notify;
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = _events_directory_page_event_ascending_comparator_comparator;
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1480,9 +1480,9 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 		return result;
 #line 1482 "EventsDirectoryPage.c"
 	} else {
-		Comparator _tmp2_ = NULL;
-		void* _tmp2__target = NULL;
-		GDestroyNotify _tmp2__target_destroy_notify = NULL;
+		Comparator _tmp2_;
+		void* _tmp2__target;
+		GDestroyNotify _tmp2__target_destroy_notify;
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _events_directory_page_event_descending_comparator_comparator;
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1511,16 +1511,16 @@ static GVariant* _variant_new14 (gboolean value) {
 
 static void events_directory_page_real_add_actions (Page* base, GActionMap* map) {
 	EventsDirectoryPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 	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;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	GAction* _tmp6_;
+	GAction* _tmp7_;
+	GVariant* _tmp8_;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1563,7 +1563,7 @@ static void events_directory_page_real_add_actions (Page* base, GActionMap* map)
 
 static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) {
 	EventsDirectoryPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1590,9 +1590,9 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 			entry = entry_collection[entry_it];
 #line 1592 "EventsDirectoryPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 				_tmp1_ = map;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1610,11 +1610,11 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 
 static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	EventsDirectoryPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	GSimpleAction* action = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
+	GAction* _tmp2_;
+	GSimpleAction* _tmp3_;
 #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1647,11 +1647,11 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 
 static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	EventsDirectoryPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 #line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1681,56 +1681,50 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = _ ("No events");
+	_tmp0_ = g_strdup (_ ("No events"));
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1697 "EventsDirectoryPage.c"
+#line 1694 "EventsDirectoryPage.c"
 }
 
 
 static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = _ ("No events found");
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("No events found"));
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1716 "EventsDirectoryPage.c"
+#line 1710 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1723 "EventsDirectoryPage.c"
+#line 1717 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
 	EventsDirectoryPage * self;
 	EventDirectoryItem* event = NULL;
-	CheckerboardItem* _tmp0_ = NULL;
-	EventDirectoryItem* _tmp1_ = NULL;
-	LibraryWindow* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
-	Event* _tmp4_ = NULL;
+	CheckerboardItem* _tmp0_;
+	EventDirectoryItem* _tmp1_;
+	LibraryWindow* _tmp2_;
+	LibraryWindow* _tmp3_;
+	Event* _tmp4_;
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1755,23 +1749,23 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	_g_object_unref0 (_tmp3_);
 #line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1759 "EventsDirectoryPage.c"
+#line 1753 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GVariant* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	void* _tmp4_ = NULL;
-	GDestroyNotify _tmp5_ = NULL;
-	Comparator _tmp6_ = NULL;
-	Comparator _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
-	GDestroyNotify _tmp7__target_destroy_notify = NULL;
-	GSimpleAction* _tmp8_ = NULL;
-	GVariant* _tmp9_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GVariant* _tmp2_;
+	const gchar* _tmp3_;
+	void* _tmp4_;
+	GDestroyNotify _tmp5_;
+	Comparator _tmp6_;
+	Comparator _tmp7_;
+	void* _tmp7__target;
+	GDestroyNotify _tmp7__target_destroy_notify;
+	GSimpleAction* _tmp8_;
+	GVariant* _tmp9_;
 #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1810,39 +1804,39 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	_tmp9_ = value;
 #line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1814 "EventsDirectoryPage.c"
+#line 1808 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_rename (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	EventDirectoryItem* item = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	EventDirectoryItem* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	EventDirectoryItem* _tmp7_;
 	EventRenameDialog* rename_dialog = NULL;
-	EventDirectoryItem* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	EventRenameDialog* _tmp12_ = NULL;
-	EventRenameDialog* _tmp13_ = NULL;
+	EventDirectoryItem* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	EventRenameDialog* _tmp12_;
+	EventRenameDialog* _tmp13_;
 	gchar* new_name = NULL;
-	EventRenameDialog* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	EventRenameDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 	RenameEventCommand* command = NULL;
-	EventDirectoryItem* _tmp17_ = NULL;
-	Event* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	RenameEventCommand* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	CommandManager* _tmp22_ = NULL;
-	RenameEventCommand* _tmp23_ = NULL;
+	EventDirectoryItem* _tmp17_;
+	Event* _tmp18_;
+	const gchar* _tmp19_;
+	RenameEventCommand* _tmp20_;
+	CommandManager* _tmp21_;
+	CommandManager* _tmp22_;
+	RenameEventCommand* _tmp23_;
 #line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1859,7 +1853,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1863 "EventsDirectoryPage.c"
+#line 1857 "EventsDirectoryPage.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1907,7 +1901,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1911 "EventsDirectoryPage.c"
+#line 1905 "EventsDirectoryPage.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -1937,39 +1931,39 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
 #line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1941 "EventsDirectoryPage.c"
+#line 1935 "EventsDirectoryPage.c"
 }
 
 
 void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	EventDirectoryItem* item = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	DataView* _tmp6_ = NULL;
-	EventDirectoryItem* _tmp7_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	DataView* _tmp6_;
+	EventDirectoryItem* _tmp7_;
 	EditCommentDialog* edit_comment_dialog = NULL;
-	EventDirectoryItem* _tmp8_ = NULL;
-	Event* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	EditCommentDialog* _tmp12_ = NULL;
-	EditCommentDialog* _tmp13_ = NULL;
+	EventDirectoryItem* _tmp8_;
+	Event* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	EditCommentDialog* _tmp12_;
+	EditCommentDialog* _tmp13_;
 	gchar* new_comment = NULL;
-	EditCommentDialog* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
+	EditCommentDialog* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
 	EditEventCommentCommand* command = NULL;
-	EventDirectoryItem* _tmp17_ = NULL;
-	Event* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	EditEventCommentCommand* _tmp20_ = NULL;
-	CommandManager* _tmp21_ = NULL;
-	CommandManager* _tmp22_ = NULL;
-	EditEventCommentCommand* _tmp23_ = NULL;
+	EventDirectoryItem* _tmp17_;
+	Event* _tmp18_;
+	const gchar* _tmp19_;
+	EditEventCommentCommand* _tmp20_;
+	CommandManager* _tmp21_;
+	CommandManager* _tmp22_;
+	EditEventCommentCommand* _tmp23_;
 #line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1986,7 +1980,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1990 "EventsDirectoryPage.c"
+#line 1984 "EventsDirectoryPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2034,7 +2028,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2038 "EventsDirectoryPage.c"
+#line 2032 "EventsDirectoryPage.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -2064,25 +2058,25 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2068 "EventsDirectoryPage.c"
+#line 2062 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_merge (EventsDirectoryPage* self) {
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	MergeEventsCommand* command = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	ViewCollection* _tmp5_ = NULL;
-	GeeList* _tmp6_ = NULL;
-	GeeList* _tmp7_ = NULL;
-	MergeEventsCommand* _tmp8_ = NULL;
-	MergeEventsCommand* _tmp9_ = NULL;
-	CommandManager* _tmp10_ = NULL;
-	CommandManager* _tmp11_ = NULL;
-	MergeEventsCommand* _tmp12_ = NULL;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
+	GeeList* _tmp6_;
+	GeeList* _tmp7_;
+	MergeEventsCommand* _tmp8_;
+	MergeEventsCommand* _tmp9_;
+	CommandManager* _tmp10_;
+	CommandManager* _tmp11_;
+	MergeEventsCommand* _tmp12_;
 #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2099,7 +2093,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2103 "EventsDirectoryPage.c"
+#line 2097 "EventsDirectoryPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2131,18 +2125,18 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2135 "EventsDirectoryPage.c"
+#line 2129 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GVariant* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp0_;
+	gboolean _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GSimpleAction* _tmp4_;
+	GVariant* _tmp5_;
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2169,22 +2163,22 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	_tmp5_ = value;
 #line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2173 "EventsDirectoryPage.c"
+#line 2167 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2180 "EventsDirectoryPage.c"
+#line 2174 "EventsDirectoryPage.c"
 }
 
 
 static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) {
 	EventsDirectoryPage * self;
 	SearchViewFilter* result = NULL;
-	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2195,15 +2189,15 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	result = _tmp1_;
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2199 "EventsDirectoryPage.c"
+#line 2193 "EventsDirectoryPage.c"
 }
 
 
 static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) {
 	EventsDirectoryPageEventDirectoryManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	EventDirectoryItem* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	EventDirectoryItem* _tmp1_;
 #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager);
 #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2216,7 +2210,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 2220 "EventsDirectoryPage.c"
+#line 2214 "EventsDirectoryPage.c"
 }
 
 
@@ -2226,14 +2220,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 2230 "EventsDirectoryPage.c"
+#line 2224 "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 2237 "EventsDirectoryPage.c"
+#line 2231 "EventsDirectoryPage.c"
 }
 
 
@@ -2241,8 +2235,8 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	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 = (DataView* (*)(ViewManager*, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
-#line 2246 "EventsDirectoryPage.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
+#line 2240 "EventsDirectoryPage.c"
 }
 
 
@@ -2271,48 +2265,48 @@ 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 2275 "EventsDirectoryPage.c"
+#line 2269 "EventsDirectoryPage.c"
 }
 
 
 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"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/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 1403 "/usr/share/vala-0.36/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 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2295 "EventsDirectoryPage.c"
+#line 2289 "EventsDirectoryPage.c"
 }
 
 
 static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) {
 	EventsDirectoryPageEventsDirectorySearchViewFilter * self;
 	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	DataView* _tmp0_;
+	DataSource* _tmp1_;
+	DataSource* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 	Event* source = NULL;
-	DataView* _tmp5_ = NULL;
-	DataSource* _tmp6_ = NULL;
+	DataView* _tmp5_;
+	DataSource* _tmp6_;
 	const gchar* event_keywords = NULL;
-	Event* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gint _tmp11_ = 0;
-	gchar** _tmp12_ = NULL;
+	Event* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
+	gint _tmp11_;
+	gchar** _tmp12_;
 #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER, EventsDirectoryPageEventsDirectorySearchViewFilter);
 #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2337,7 +2331,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 2341 "EventsDirectoryPage.c"
+#line 2335 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2363,11 +2357,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 2367 "EventsDirectoryPage.c"
+#line 2361 "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 2371 "EventsDirectoryPage.c"
+#line 2365 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2379,15 +2373,15 @@ 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 2383 "EventsDirectoryPage.c"
+#line 2377 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2387 "EventsDirectoryPage.c"
+#line 2381 "EventsDirectoryPage.c"
 			{
-				const gchar* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				const gchar* _tmp13_;
+				const gchar* _tmp14_;
+				gboolean _tmp15_;
 #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 				_tmp13_ = event_keywords;
 #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2402,7 +2396,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 2406 "EventsDirectoryPage.c"
+#line 2400 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2413,7 +2407,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 2417 "EventsDirectoryPage.c"
+#line 2411 "EventsDirectoryPage.c"
 }
 
 
@@ -2423,14 +2417,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 2427 "EventsDirectoryPage.c"
+#line 2421 "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 2434 "EventsDirectoryPage.c"
+#line 2428 "EventsDirectoryPage.c"
 }
 
 
@@ -2438,10 +2432,10 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2445 "EventsDirectoryPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
+#line 2439 "EventsDirectoryPage.c"
 }
 
 
@@ -2467,49 +2461,49 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (EventsDirectoryPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_view_empty_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_filter_no_match_message;
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_filter_no_match_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) events_directory_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 2490 "EventsDirectoryPage.c"
+#line 2484 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_instance_init (EventsDirectoryPage * self) {
-	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
+	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self);
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_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 2502 "EventsDirectoryPage.c"
+#line 2496 "EventsDirectoryPage.c"
 }
 
 
-static void events_directory_page_finalize (GObject* obj) {
+static void events_directory_page_finalize (GObject * obj) {
 	EventsDirectoryPage * self;
 	GSimpleAction* action = NULL;
-	GAction* _tmp0_ = NULL;
-	GSimpleAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	GAction* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	GSimpleAction* _tmp3_;
+	guint _tmp4_;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2520,7 +2514,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 2524 "EventsDirectoryPage.c"
+#line 2518 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2542,7 +2536,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 2546 "EventsDirectoryPage.c"
+#line 2540 "EventsDirectoryPage.c"
 }
 
 
@@ -2560,11 +2554,11 @@ GType events_directory_page_get_type (void) {
 
 MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) {
 	MasterEventsDirectoryPage * self = NULL;
-	EventsDirectoryPageEventDirectoryManager* _tmp0_ = NULL;
-	EventsDirectoryPageEventDirectoryManager* _tmp1_ = NULL;
-	EventSourceCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	EventsDirectoryPageEventDirectoryManager* _tmp0_;
+	EventsDirectoryPageEventDirectoryManager* _tmp1_;
+	EventSourceCollection* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
 #line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_event_directory_manager_new ();
 #line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2583,21 +2577,21 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	_view_manager_unref0 (_tmp1_);
 #line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2587 "EventsDirectoryPage.c"
+#line 2581 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
 #line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2594 "EventsDirectoryPage.c"
+#line 2588 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
 #line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2601 "EventsDirectoryPage.c"
+#line 2595 "EventsDirectoryPage.c"
 }
 
 
@@ -2632,88 +2626,88 @@ GType sub_events_directory_page_directory_type_get_type (void) {
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/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 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2675 "EventsDirectoryPage.c"
+#line 2669 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 	SubEventsDirectoryPage * self = NULL;
 	gchar* page_name = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-	const gchar* _tmp5_ = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp6_ = 0;
-	struct tm _tmp7_ = {0};
-	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
-	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
+	const gchar* _tmp5_;
+	SubEventsDirectoryPageDirectoryType _tmp6_;
+	struct tm _tmp7_;
+	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_;
+	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_;
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
 #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
 #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2694 "EventsDirectoryPage.c"
-		gchar* _tmp1_ = NULL;
+#line 2688 "EventsDirectoryPage.c"
+		gchar* _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
 #line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2702 "EventsDirectoryPage.c"
+#line 2696 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
+		SubEventsDirectoryPageDirectoryType _tmp3_;
+		gchar* _tmp4_;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp3_ = type;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2713 "EventsDirectoryPage.c"
+#line 2707 "EventsDirectoryPage.c"
 		} else {
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2717 "EventsDirectoryPage.c"
+#line 2711 "EventsDirectoryPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
@@ -2721,7 +2715,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2725 "EventsDirectoryPage.c"
+#line 2719 "EventsDirectoryPage.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
@@ -2741,21 +2735,21 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_g_free0 (page_name);
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2745 "EventsDirectoryPage.c"
+#line 2739 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2752 "EventsDirectoryPage.c"
+#line 2746 "EventsDirectoryPage.c"
 }
 
 
 gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	gint result = 0;
-	ViewManager* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	gint _tmp1_;
 #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2766,14 +2760,14 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2770 "EventsDirectoryPage.c"
+#line 2764 "EventsDirectoryPage.c"
 }
 
 
 gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	gint result = 0;
-	ViewManager* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	gint _tmp1_;
 #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2784,14 +2778,14 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2788 "EventsDirectoryPage.c"
+#line 2782 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
-	ViewManager* _tmp0_ = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
+	ViewManager* _tmp0_;
+	SubEventsDirectoryPageDirectoryType _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
 #line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2802,16 +2796,16 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	result = _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2806 "EventsDirectoryPage.c"
+#line 2800 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 	SubEventsDirectoryPageSubEventDirectoryManager* self = NULL;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-	SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
-	struct tm _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
+	SubEventsDirectoryPageDirectoryType _tmp3_;
+	struct tm _tmp4_;
+	gint _tmp5_;
 #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
 #line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2820,16 +2814,16 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	_tmp0_ = type;
 #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2824 "EventsDirectoryPage.c"
-		struct tm _tmp1_ = {0};
-		gint _tmp2_ = 0;
+#line 2818 "EventsDirectoryPage.c"
+		struct tm _tmp1_;
+		gint _tmp2_;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = *time;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _tmp1_.tm_mon;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2833 "EventsDirectoryPage.c"
+#line 2827 "EventsDirectoryPage.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
@@ -2843,47 +2837,47 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	self->priv->year = _tmp5_;
 #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2847 "EventsDirectoryPage.c"
+#line 2841 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 250 "/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 2854 "EventsDirectoryPage.c"
+#line 2848 "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 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 2869 "EventsDirectoryPage.c"
+#line 2863 "EventsDirectoryPage.c"
 }
 
 
 static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	DataSource* _tmp0_;
+	gboolean _tmp1_;
 	EventSource* event = NULL;
-	DataSource* _tmp2_ = NULL;
-	EventSource* _tmp3_ = NULL;
+	DataSource* _tmp2_;
+	EventSource* _tmp3_;
 	struct tm event_time = {0};
-	EventSource* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	EventSource* _tmp4_;
+	time_t _tmp5_;
 	struct tm _tmp6_ = {0};
-	struct tm _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	struct tm _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2898,7 +2892,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		result = FALSE;
 #line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2902 "EventsDirectoryPage.c"
+#line 2896 "EventsDirectoryPage.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
@@ -2922,16 +2916,16 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_tmp9_ = self->priv->year;
 #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2926 "EventsDirectoryPage.c"
-		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
+#line 2920 "EventsDirectoryPage.c"
+		SubEventsDirectoryPageDirectoryType _tmp10_;
 #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
 #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2932 "EventsDirectoryPage.c"
-			struct tm _tmp11_ = {0};
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+#line 2926 "EventsDirectoryPage.c"
+			struct tm _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp11_ = event_time;
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2944,7 +2938,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 			_g_object_unref0 (event);
 #line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2948 "EventsDirectoryPage.c"
+#line 2942 "EventsDirectoryPage.c"
 		}
 #line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
@@ -2952,7 +2946,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		_g_object_unref0 (event);
 #line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2956 "EventsDirectoryPage.c"
+#line 2950 "EventsDirectoryPage.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
@@ -2960,13 +2954,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_g_object_unref0 (event);
 #line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2964 "EventsDirectoryPage.c"
+#line 2958 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2975,13 +2969,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub
 	result = _tmp0_;
 #line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2979 "EventsDirectoryPage.c"
+#line 2973 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2990,13 +2984,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE
 	result = _tmp0_;
 #line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2994 "EventsDirectoryPage.c"
+#line 2988 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
-	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
+	SubEventsDirectoryPageDirectoryType _tmp0_;
 #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -3005,7 +2999,7 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d
 	result = _tmp0_;
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3009 "EventsDirectoryPage.c"
+#line 3003 "EventsDirectoryPage.c"
 }
 
 
@@ -3017,8 +3011,8 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 3022 "EventsDirectoryPage.c"
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
+#line 3016 "EventsDirectoryPage.c"
 }
 
 
@@ -3029,17 +3023,17 @@ static void sub_events_directory_page_sub_event_directory_manager_instance_init
 	self->priv->month = 0;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 3033 "EventsDirectoryPage.c"
+#line 3027 "EventsDirectoryPage.c"
 }
 
 
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 3043 "EventsDirectoryPage.c"
+#line 3037 "EventsDirectoryPage.c"
 }
 
 
@@ -3058,7 +3052,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 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3062 "EventsDirectoryPage.c"
+#line 3056 "EventsDirectoryPage.c"
 }