Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 38 insertions, 37 deletions

diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index fbec432..bfaa3ed 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.32.1, the Vala compiler
+/* LastImportPage.c generated by valac 0.34.4, the Vala compiler
  * generated from LastImportPage.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>
 
 
@@ -385,7 +385,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);
@@ -708,7 +709,7 @@ static void last_import_page_finalize (GObject* obj);
 static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered ((LastImportPage*) self);
-#line 712 "LastImportPage.c"
+#line 713 "LastImportPage.c"
 }
 
 
@@ -716,7 +717,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 	LastImportPage * self = NULL;
 #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME);
-#line 720 "LastImportPage.c"
+#line 721 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -745,7 +746,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 		_col_it = _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 749 "LastImportPage.c"
+#line 750 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -760,7 +761,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 			if (!_tmp7_) {
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 764 "LastImportPage.c"
+#line 765 "LastImportPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -774,24 +775,24 @@ LastImportPage* last_import_page_construct (GType object_type) {
 			g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 778 "LastImportPage.c"
+#line 779 "LastImportPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 782 "LastImportPage.c"
+#line 783 "LastImportPage.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered (self);
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 788 "LastImportPage.c"
+#line 789 "LastImportPage.c"
 }
 
 
 LastImportPage* last_import_page_new (void) {
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_construct (TYPE_LAST_IMPORT_PAGE);
-#line 795 "LastImportPage.c"
+#line 796 "LastImportPage.c"
 }
 
 
@@ -829,7 +830,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	_tmp4_ = current_last_import_id;
 #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (_tmp4_ == NULL) {
-#line 833 "LastImportPage.c"
+#line 834 "LastImportPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -854,7 +855,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 858 "LastImportPage.c"
+#line 859 "LastImportPage.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp9_ = current_last_import_id;
@@ -870,7 +871,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 874 "LastImportPage.c"
+#line 875 "LastImportPage.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp13_ = current_last_import_id;
@@ -892,7 +893,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
 #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 896 "LastImportPage.c"
+#line 897 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp18_ = NULL;
@@ -921,7 +922,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_col_it = _tmp23_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 925 "LastImportPage.c"
+#line 926 "LastImportPage.c"
 			GeeIterator* _tmp24_ = NULL;
 			gboolean _tmp25_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -944,7 +945,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 			if (!_tmp25_) {
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 948 "LastImportPage.c"
+#line 949 "LastImportPage.c"
 			}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp26_ = _col_it;
@@ -978,15 +979,15 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 			_data_collection_unref0 (_tmp29_);
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 982 "LastImportPage.c"
+#line 983 "LastImportPage.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 986 "LastImportPage.c"
+#line 987 "LastImportPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_import_id_free0 (current_last_import_id);
-#line 990 "LastImportPage.c"
+#line 991 "LastImportPage.c"
 }
 
 
@@ -1016,13 +1017,13 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool
 	if (sort_order) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1020 "LastImportPage.c"
+#line 1021 "LastImportPage.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (sort_by) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1026 "LastImportPage.c"
+#line 1027 "LastImportPage.c"
 	}
 }
 
@@ -1047,7 +1048,7 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1051 "LastImportPage.c"
+#line 1052 "LastImportPage.c"
 }
 
 
@@ -1069,14 +1070,14 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma
 	self->priv->import_id = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 1073 "LastImportPage.c"
+#line 1074 "LastImportPage.c"
 }
 
 
 static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) {
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id);
-#line 1080 "LastImportPage.c"
+#line 1081 "LastImportPage.c"
 }
 
 
@@ -1106,7 +1107,7 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view (
 	result = _tmp2_ == _tmp4_;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return result;
-#line 1110 "LastImportPage.c"
+#line 1111 "LastImportPage.c"
 }
 
 
@@ -1119,14 +1120,14 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage
 	g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate));
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = last_import_page_last_import_view_manager_real_include_in_view;
-#line 1123 "LastImportPage.c"
+#line 1124 "LastImportPage.c"
 }
 
 
 static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) {
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1130 "LastImportPage.c"
+#line 1131 "LastImportPage.c"
 }
 
 
@@ -1136,7 +1137,7 @@ static void last_import_page_last_import_view_manager_finalize (ViewManager* obj
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj);
-#line 1140 "LastImportPage.c"
+#line 1141 "LastImportPage.c"
 }
 
 
@@ -1163,7 +1164,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 	((MediaPageClass *) klass)->set_config_photos_sort = last_import_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize;
-#line 1167 "LastImportPage.c"
+#line 1168 "LastImportPage.c"
 }
 
 
@@ -1177,7 +1178,7 @@ static void last_import_page_instance_init (LastImportPage * self) {
 	_tmp0_ = alteration_new ("metadata", "import-id");
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv->last_import_alteration = _tmp0_;
-#line 1181 "LastImportPage.c"
+#line 1182 "LastImportPage.c"
 }
 
 
@@ -1185,7 +1186,7 @@ static void last_import_page_finalize (GObject* obj) {
 	LastImportPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage);
-#line 1189 "LastImportPage.c"
+#line 1190 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -1214,7 +1215,7 @@ static void last_import_page_finalize (GObject* obj) {
 		_col_it = _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 1218 "LastImportPage.c"
+#line 1219 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -1230,7 +1231,7 @@ static void last_import_page_finalize (GObject* obj) {
 			if (!_tmp7_) {
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 1234 "LastImportPage.c"
+#line 1235 "LastImportPage.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -1246,17 +1247,17 @@ static void last_import_page_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 1250 "LastImportPage.c"
+#line 1251 "LastImportPage.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 1254 "LastImportPage.c"
+#line 1255 "LastImportPage.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_alteration_unref0 (self->priv->last_import_alteration);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj);
-#line 1260 "LastImportPage.c"
+#line 1261 "LastImportPage.c"
 }