Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 50 insertions, 50 deletions

diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 215616d..0be13f0 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -328,7 +328,7 @@ OfflinePage* offline_page_new (void);
 OfflinePage* offline_page_construct (GType object_type);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType offline_page_get_type (void) G_GNUC_CONST;
-static void library_offline_sidebar_entry_finalize (GObject* obj);
+static void library_offline_sidebar_entry_finalize (GObject * obj);
 
 
 static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
@@ -347,18 +347,18 @@ static void _library_offline_sidebar_entry_on_offline_contents_altered_media_sou
 
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) {
 	LibraryOfflineSidebarEntry * self = NULL;
-	gint _tmp11_ = 0;
+	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = (LibraryOfflineSidebarEntry*) library_hideable_page_entry_construct (object_type);
 #line 354 "OfflineSidebarEntry.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 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -380,12 +380,12 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 383 "OfflineSidebarEntry.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 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -432,7 +432,7 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) {
 
 
 static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self));
 #line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -453,12 +453,12 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 #line 454 "OfflineSidebarEntry.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 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -480,17 +480,17 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 483 "OfflineSidebarEntry.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			MediaSourceCollection* _tmp11_ = NULL;
-			GeeCollection* _tmp12_ = NULL;
-			GeeCollection* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gint _tmp10_;
+			MediaSourceCollection* _tmp11_;
+			GeeCollection* _tmp12_;
+			GeeCollection* _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -542,7 +542,7 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -558,7 +558,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple
 static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -574,7 +574,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryOfflineSidebarEntry * self;
 	Page* result = NULL;
-	OfflinePage* _tmp0_ = NULL;
+	OfflinePage* _tmp0_;
 #line 41 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -593,11 +593,11 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize;
 #line 604 "OfflineSidebarEntry.c"
@@ -608,19 +608,19 @@ static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEn
 }
 
 
-static void library_offline_sidebar_entry_finalize (GObject* obj) {
+static void library_offline_sidebar_entry_finalize (GObject * obj) {
 	LibraryOfflineSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
 #line 616 "OfflineSidebarEntry.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 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -642,13 +642,13 @@ static void library_offline_sidebar_entry_finalize (GObject* obj) {
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
 #line 645 "OfflineSidebarEntry.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 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"