Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 69 insertions, 69 deletions

diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 2f44fd0..92f433b 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.34.7, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.36.6, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -690,7 +690,7 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 gboolean saved_search_predicate (SavedSearch* self, MediaSource* source);
-static void saved_search_manager_finalize (ViewManager* obj);
+static void saved_search_manager_finalize (ViewManager * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
@@ -821,7 +821,7 @@ void saved_search_dialog_show (SavedSearchDialog* self);
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_update_actions (Page* self, gint selected_count, gint count);
-static void saved_search_page_finalize (GObject* obj);
+static void saved_search_page_finalize (GObject * obj);
 
 static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}};
 
@@ -834,9 +834,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search) {
 	SavedSearchManager* self = NULL;
-	SavedSearchPage* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
+	SavedSearchPage* _tmp0_;
+	SavedSearch* _tmp1_;
+	SavedSearch* _tmp2_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_PAGE (owner), NULL);
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -869,9 +869,9 @@ SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearc
 static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source) {
 	SavedSearchManager * self;
 	gboolean result = FALSE;
-	SavedSearch* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	SavedSearch* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -898,7 +898,7 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) saved_search_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view;
 #line 903 "SavedSearchPage.c"
 }
 
@@ -910,7 +910,7 @@ static void saved_search_manager_instance_init (SavedSearchManager * self) {
 }
 
 
-static void saved_search_manager_finalize (ViewManager* obj) {
+static void saved_search_manager_finalize (ViewManager * obj) {
 	SavedSearchManager * self;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
@@ -957,11 +957,11 @@ static void _saved_search_page_on_delete_search_gsimple_action_activate_callback
 
 SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) {
 	SavedSearchPage * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	SavedSearch* _tmp3_;
+	SavedSearch* _tmp4_;
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -985,12 +985,12 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 #line 986 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp5_ = NULL;
-		MediaCollectionRegistry* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
-		GeeCollection* _tmp8_ = NULL;
-		GeeIterator* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
+		MediaCollectionRegistry* _tmp5_;
+		MediaCollectionRegistry* _tmp6_;
+		GeeCollection* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeIterator* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp5_ = media_collection_registry_get_instance ();
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1012,19 +1012,19 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		while (TRUE) {
 #line 1015 "SavedSearchPage.c"
-			GeeIterator* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GeeIterator* _tmp11_;
+			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp13_ = NULL;
-			gpointer _tmp14_ = NULL;
-			ViewCollection* _tmp15_ = NULL;
-			ViewCollection* _tmp16_ = NULL;
-			MediaSourceCollection* _tmp17_ = NULL;
-			SavedSearch* _tmp18_ = NULL;
-			SavedSearchManager* _tmp19_ = NULL;
-			SavedSearchManager* _tmp20_ = NULL;
-			ViewCollectionMonitor* _tmp21_ = NULL;
-			ViewCollectionMonitor* _tmp22_ = NULL;
+			GeeIterator* _tmp13_;
+			gpointer _tmp14_;
+			ViewCollection* _tmp15_;
+			ViewCollection* _tmp16_;
+			MediaSourceCollection* _tmp17_;
+			SavedSearch* _tmp18_;
+			SavedSearchManager* _tmp19_;
+			SavedSearchManager* _tmp20_;
+			ViewCollectionMonitor* _tmp21_;
+			ViewCollectionMonitor* _tmp22_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp11_ = _sources_it;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1090,8 +1090,8 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 	SavedSearchPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1125,10 +1125,10 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 
 static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	SavedSearchPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1149,8 +1149,8 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 
 static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	SavedSearchPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1169,8 +1169,8 @@ static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeLis
 
 static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 	SavedSearchPage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1189,7 +1189,7 @@ static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) {
 	SavedSearchPage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1216,9 +1216,9 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 			entry = entry_collection[entry_it];
 #line 1218 "SavedSearchPage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				_tmp1_ = map;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1235,8 +1235,8 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 
 
 static void saved_search_page_on_delete_search (SavedSearchPage* self) {
-	SavedSearch* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearch* _tmp0_;
+	gboolean _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1246,11 +1246,11 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
 #line 1249 "SavedSearchPage.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		SavedSearch* _tmp4_ = NULL;
-		DeleteSavedSearchCommand* _tmp5_ = NULL;
-		DeleteSavedSearchCommand* _tmp6_ = NULL;
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		SavedSearch* _tmp4_;
+		DeleteSavedSearchCommand* _tmp5_;
+		DeleteSavedSearchCommand* _tmp6_;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1273,9 +1273,9 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 
 
 static void saved_search_page_on_rename_search (SavedSearchPage* self) {
-	LibraryWindow* _tmp0_ = NULL;
-	LibraryWindow* _tmp1_ = NULL;
-	SavedSearch* _tmp2_ = NULL;
+	LibraryWindow* _tmp0_;
+	LibraryWindow* _tmp1_;
+	SavedSearch* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1294,8 +1294,8 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 
 static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	SavedSearchDialog* ssd = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearchDialog* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearchDialog* _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1314,8 +1314,8 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	SavedSearchPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1340,17 +1340,17 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchPagePrivate));
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) saved_search_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) saved_search_page_real_set_config_photos_sort;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) saved_search_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) saved_search_page_real_init_collect_ui_filenames;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_add_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_remove_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) saved_search_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) saved_search_page_real_update_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize;
 #line 1357 "SavedSearchPage.c"
@@ -1364,7 +1364,7 @@ static void saved_search_page_instance_init (SavedSearchPage * self) {
 }
 
 
-static void saved_search_page_finalize (GObject* obj) {
+static void saved_search_page_finalize (GObject * obj) {
 	SavedSearchPage * self;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);