Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 40 insertions, 40 deletions

diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index 5032c53..03684ca 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -315,7 +315,7 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType last_import_page_get_type (void) G_GNUC_CONST;
-static void library_last_import_sidebar_entry_finalize (GObject* obj);
+static void library_last_import_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
@@ -327,21 +327,21 @@ static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_sou
 
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) {
 	LibraryLastImportSidebarEntry * self = NULL;
-	MediaCollectionRegistry* _tmp11_ = NULL;
-	MediaCollectionRegistry* _tmp12_ = NULL;
-	ImportID* _tmp13_ = NULL;
-	ImportID* _tmp14_ = NULL;
+	MediaCollectionRegistry* _tmp11_;
+	MediaCollectionRegistry* _tmp12_;
+	ImportID* _tmp13_;
+	ImportID* _tmp14_;
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = (LibraryLastImportSidebarEntry*) library_hideable_page_entry_construct (object_type);
 #line 337 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -363,12 +363,12 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
 #line 366 "LastImportSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -427,7 +427,7 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) {
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -443,7 +443,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -459,7 +459,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi
 static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryLastImportSidebarEntry * self;
 	Page* result = NULL;
-	LastImportPage* _tmp0_ = NULL;
+	LastImportPage* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -475,10 +475,10 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa
 
 
 static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) {
-	MediaCollectionRegistry* _tmp0_ = NULL;
-	MediaCollectionRegistry* _tmp1_ = NULL;
-	ImportID* _tmp2_ = NULL;
-	ImportID* _tmp3_ = NULL;
+	MediaCollectionRegistry* _tmp0_;
+	MediaCollectionRegistry* _tmp1_;
+	ImportID* _tmp2_;
+	ImportID* _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY (self));
 #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -503,11 +503,11 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize;
 #line 514 "LastImportSidebarEntry.c"
@@ -518,19 +518,19 @@ static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSi
 }
 
 
-static void library_last_import_sidebar_entry_finalize (GObject* obj) {
+static void library_last_import_sidebar_entry_finalize (GObject * obj) {
 	LibraryLastImportSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
 #line 526 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -552,13 +552,13 @@ static void library_last_import_sidebar_entry_finalize (GObject* obj) {
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
 #line 555 "LastImportSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			MediaSourceCollection* _tmp10_ = NULL;
-			guint _tmp11_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			guint _tmp11_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"