New upstream version 0.25.3upstream/0.25.3

1 files changed, 31 insertions, 30 deletions

diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 16cef0f..09dafd0 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.32.1, the Vala compiler
+/* FlaggedPage.c generated by valac 0.34.4, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -427,7 +427,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
-	void (*add_actions) (Page* self);
+	void (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -822,7 +823,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 826 "FlaggedPage.c"
+#line 827 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp1_ = NULL;
@@ -851,7 +852,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 		_sources_it = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
-#line 855 "FlaggedPage.c"
+#line 856 "FlaggedPage.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -872,7 +873,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 			if (!_tmp8_) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 				break;
-#line 876 "FlaggedPage.c"
+#line 877 "FlaggedPage.c"
 			}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp9_ = _sources_it;
@@ -900,22 +901,22 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 			_data_collection_unref0 (_tmp12_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_data_collection_unref0 (sources);
-#line 904 "FlaggedPage.c"
+#line 905 "FlaggedPage.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 908 "FlaggedPage.c"
+#line 909 "FlaggedPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 912 "FlaggedPage.c"
+#line 913 "FlaggedPage.c"
 }
 
 
 FlaggedPage* flagged_page_new (void) {
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_construct (TYPE_FLAGGED_PAGE);
-#line 919 "FlaggedPage.c"
+#line 920 "FlaggedPage.c"
 }
 
 
@@ -945,13 +946,13 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_order = _vala_sort_order;
-#line 949 "FlaggedPage.c"
+#line 950 "FlaggedPage.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (sort_by) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_by = _vala_sort_by;
-#line 955 "FlaggedPage.c"
+#line 956 "FlaggedPage.c"
 	}
 }
 
@@ -976,14 +977,14 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 980 "FlaggedPage.c"
+#line 981 "FlaggedPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 987 "FlaggedPage.c"
+#line 988 "FlaggedPage.c"
 }
 
 
@@ -1002,7 +1003,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1006 "FlaggedPage.c"
+#line 1007 "FlaggedPage.c"
 }
 
 
@@ -1017,21 +1018,21 @@ static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construc
 	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1021 "FlaggedPage.c"
+#line 1022 "FlaggedPage.c"
 }
 
 
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) {
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner);
-#line 1028 "FlaggedPage.c"
+#line 1029 "FlaggedPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1035 "FlaggedPage.c"
+#line 1036 "FlaggedPage.c"
 }
 
 
@@ -1057,7 +1058,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	_tmp3_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1061 "FlaggedPage.c"
+#line 1062 "FlaggedPage.c"
 		Flaggable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1066,11 +1067,11 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 		_tmp5_ = flaggable_is_flagged (_tmp4_);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp2_ = _tmp5_;
-#line 1070 "FlaggedPage.c"
+#line 1071 "FlaggedPage.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp2_ = FALSE;
-#line 1074 "FlaggedPage.c"
+#line 1075 "FlaggedPage.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	result = _tmp2_;
@@ -1078,7 +1079,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	_g_object_unref0 (flaggable);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1082 "FlaggedPage.c"
+#line 1083 "FlaggedPage.c"
 }
 
 
@@ -1087,7 +1088,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = flagged_page_flagged_view_manager_real_include_in_view;
-#line 1091 "FlaggedPage.c"
+#line 1092 "FlaggedPage.c"
 }
 
 
@@ -1116,7 +1117,7 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1120 "FlaggedPage.c"
+#line 1121 "FlaggedPage.c"
 }
 
 
@@ -1126,14 +1127,14 @@ static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filt
 	self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1130 "FlaggedPage.c"
+#line 1131 "FlaggedPage.c"
 }
 
 
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER);
-#line 1137 "FlaggedPage.c"
+#line 1138 "FlaggedPage.c"
 }
 
 
@@ -1142,7 +1143,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = flagged_page_flagged_search_view_filter_real_get_criteria;
-#line 1146 "FlaggedPage.c"
+#line 1147 "FlaggedPage.c"
 }
 
 
@@ -1175,7 +1176,7 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
-#line 1179 "FlaggedPage.c"
+#line 1180 "FlaggedPage.c"
 }
 
 
@@ -1192,7 +1193,7 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 	_tmp1_ = flagged_page_flagged_search_view_filter_new ();
 #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->search_filter = _tmp1_;
-#line 1196 "FlaggedPage.c"
+#line 1197 "FlaggedPage.c"
 }
 
 
@@ -1208,7 +1209,7 @@ static void flagged_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj);
-#line 1212 "FlaggedPage.c"
+#line 1213 "FlaggedPage.c"
 }