New upstream version 0.26.4upstream/0.26.4

1 files changed, 42 insertions, 42 deletions

diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 849e784..16a31da 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.34.7, the Vala compiler
+/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -809,12 +809,12 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type);
-static void flagged_page_finalize (GObject* obj);
+static void flagged_page_finalize (GObject * obj);
 
 
 FlaggedPage* flagged_page_construct (GType object_type) {
 	FlaggedPage * self = NULL;
-	FlaggedPageFlaggedViewManager* _tmp0_ = NULL;
+	FlaggedPageFlaggedViewManager* _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = (FlaggedPage*) collection_page_construct (object_type, FLAGGED_PAGE_NAME);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -826,12 +826,12 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 #line 827 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		MediaCollectionRegistry* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		MediaCollectionRegistry* _tmp1_;
+		MediaCollectionRegistry* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp1_ = media_collection_registry_get_instance ();
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -853,18 +853,18 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
 #line 856 "FlaggedPage.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-			ViewCollection* _tmp11_ = NULL;
-			ViewCollection* _tmp12_ = NULL;
-			MediaSourceCollection* _tmp13_ = NULL;
-			ViewManager* _tmp14_ = NULL;
-			Alteration* _tmp15_ = NULL;
-			ViewCollectionMonitor* _tmp16_ = NULL;
-			ViewCollectionMonitor* _tmp17_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			ViewCollection* _tmp11_;
+			ViewCollection* _tmp12_;
+			MediaSourceCollection* _tmp13_;
+			ViewManager* _tmp14_;
+			Alteration* _tmp15_;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp7_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -924,8 +924,8 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	FlaggedPage * 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 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -959,10 +959,10 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 
 static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	FlaggedPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -991,8 +991,8 @@ static gpointer _view_filter_ref0 (gpointer self) {
 static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) {
 	FlaggedPage * self;
 	SearchViewFilter* result = NULL;
-	FlaggedPageFlaggedSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	FlaggedPageFlaggedSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 50 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1009,7 +1009,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) {
 	FlaggedPageFlaggedViewManager* self = NULL;
-	FlaggedPage* _tmp0_ = NULL;
+	FlaggedPage* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1040,10 +1040,10 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	FlaggedPageFlaggedViewManager * self;
 	gboolean result = FALSE;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp0_ = NULL;
-	Flaggable* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	Flaggable* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	Flaggable* _tmp3_ = NULL;
+	Flaggable* _tmp3_;
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager);
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1059,8 +1059,8 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (_tmp3_ != NULL) {
 #line 1062 "FlaggedPage.c"
-		Flaggable* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		Flaggable* _tmp4_;
+		gboolean _tmp5_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp4_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1087,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	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 = (gboolean (*)(ViewManager*, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
 #line 1092 "FlaggedPage.c"
 }
 
@@ -1142,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	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 = (guint (*)(SearchViewFilter*)) flagged_page_flagged_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria;
 #line 1147 "FlaggedPage.c"
 }
 
@@ -1169,11 +1169,11 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_type_class_add_private (klass, sizeof (FlaggedPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) flagged_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) flagged_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) flagged_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) flagged_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) flagged_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 1180 "FlaggedPage.c"
@@ -1181,8 +1181,8 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 
 
 static void flagged_page_instance_init (FlaggedPage * self) {
-	Alteration* _tmp0_ = NULL;
-	FlaggedPageFlaggedSearchViewFilter* _tmp1_ = NULL;
+	Alteration* _tmp0_;
+	FlaggedPageFlaggedSearchViewFilter* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv = FLAGGED_PAGE_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1197,7 +1197,7 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 }
 
 
-static void flagged_page_finalize (GObject* obj) {
+static void flagged_page_finalize (GObject * obj) {
 	FlaggedPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage);