Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 146 insertions, 107 deletions

diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 0be13f0..712a354 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -101,6 +102,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
 typedef struct _LibraryOfflineSidebarEntry LibraryOfflineSidebarEntry;
 typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass;
 typedef struct _LibraryOfflineSidebarEntryPrivate LibraryOfflineSidebarEntryPrivate;
+enum  {
+	LIBRARY_OFFLINE_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_offline_sidebar_entry_properties[LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -284,14 +290,17 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
 GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_OFFLINE_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
@@ -299,9 +308,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+                                          gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+                                           gpointer v_object);
 gpointer value_get_media_collection_registry (const GValue* value);
 GType media_collection_registry_get_type (void) G_GNUC_CONST;
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
@@ -311,13 +326,20 @@ GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                   GeeCollection* added,
+                                                                                                                   GeeCollection* removed,
+                                                                                                                   gpointer self);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                  GeeCollection* added,
+                                                                                                                  GeeCollection* removed,
+                                                                                                                  gpointer self);
 static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
 static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define OFFLINE_PAGE_NAME _ ("Missing Files")
@@ -331,26 +353,37 @@ GType offline_page_get_type (void) G_GNUC_CONST;
 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) {
+static void
+_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                              GeeCollection* added,
+                                                                                                              GeeCollection* removed,
+                                                                                                              gpointer self)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self);
-#line 338 "OfflineSidebarEntry.c"
+#line 365 "OfflineSidebarEntry.c"
 }
 
 
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                             GeeCollection* added,
+                                                                                                             GeeCollection* removed,
+                                                                                                             gpointer self)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self);
-#line 345 "OfflineSidebarEntry.c"
+#line 377 "OfflineSidebarEntry.c"
 }
 
 
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) {
+LibraryOfflineSidebarEntry*
+library_offline_sidebar_entry_construct (GType object_type)
+{
 	LibraryOfflineSidebarEntry * self = NULL;
-	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"
+#line 387 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -379,78 +412,76 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec
 		_media_sources_it = _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 383 "OfflineSidebarEntry.c"
+#line 416 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 398 "OfflineSidebarEntry.c"
+#line 428 "OfflineSidebarEntry.c"
 			}
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 412 "OfflineSidebarEntry.c"
+#line 442 "OfflineSidebarEntry.c"
 		}
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 416 "OfflineSidebarEntry.c"
+#line 446 "OfflineSidebarEntry.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	_tmp11_ = library_offline_sidebar_entry_get_total_offline (self);
-#line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0);
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return self;
-#line 424 "OfflineSidebarEntry.c"
+#line 452 "OfflineSidebarEntry.c"
 }
 
 
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) {
+LibraryOfflineSidebarEntry*
+library_offline_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return library_offline_sidebar_entry_construct (LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY);
-#line 431 "OfflineSidebarEntry.c"
+#line 461 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) {
-	gint _tmp0_;
+static void
+library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self)
+{
 #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"
-	_tmp0_ = library_offline_sidebar_entry_get_total_offline (self);
-#line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0);
-#line 443 "OfflineSidebarEntry.c"
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0);
+#line 472 "OfflineSidebarEntry.c"
 }
 
 
-static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self) {
+static gint
+library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self)
+{
 	gint result = 0;
 	gint total = 0;
 #line 25 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	g_return_val_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self), 0);
 #line 26 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	total = 0;
-#line 454 "OfflineSidebarEntry.c"
+#line 485 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -479,67 +510,66 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 		_media_sources_it = _tmp5_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 483 "OfflineSidebarEntry.c"
+#line 514 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			gint _tmp10_;
-			MediaSourceCollection* _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			gint _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			GeeCollection* _tmp11_;
 			GeeCollection* _tmp12_;
-			GeeCollection* _tmp13_;
+			gint _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"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 503 "OfflineSidebarEntry.c"
+#line 531 "OfflineSidebarEntry.c"
 			}
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = total;
+			_tmp9_ = total;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp11_ = media_sources;
+			_tmp10_ = media_sources;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp12_ = media_source_collection_get_offline_bin_contents (_tmp11_);
+			_tmp11_ = media_source_collection_get_offline_bin_contents (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp13_ = _tmp12_;
+			_tmp12_ = _tmp11_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp14_ = gee_collection_get_size (_tmp13_);
+			_tmp13_ = gee_collection_get_size (_tmp12_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			total = _tmp10_ + _tmp15_;
+			total = _tmp9_ + _tmp14_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_g_object_unref0 (_tmp13_);
+			_g_object_unref0 (_tmp12_);
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 529 "OfflineSidebarEntry.c"
+#line 557 "OfflineSidebarEntry.c"
 		}
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 533 "OfflineSidebarEntry.c"
+#line 561 "OfflineSidebarEntry.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	result = total;
 #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 539 "OfflineSidebarEntry.c"
+#line 567 "OfflineSidebarEntry.c"
 }
 
 
-static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -551,11 +581,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple
 	result = _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 555 "OfflineSidebarEntry.c"
+#line 585 "OfflineSidebarEntry.c"
 }
 
 
-static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -567,11 +599,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 	result = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 571 "OfflineSidebarEntry.c"
+#line 603 "OfflineSidebarEntry.c"
 }
 
 
-static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	Page* result = NULL;
 	OfflinePage* _tmp0_;
@@ -585,11 +619,13 @@ static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEn
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 589 "OfflineSidebarEntry.c"
+#line 623 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass) {
+static void
+library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass)
+{
 #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"
@@ -600,19 +636,23 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry
 	((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"
+#line 640 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self) {
+static void
+library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self)
+{
 }
 
 
-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"
+#line 656 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -641,51 +681,50 @@ static void library_offline_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 645 "OfflineSidebarEntry.c"
+#line 685 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 661 "OfflineSidebarEntry.c"
+#line 698 "OfflineSidebarEntry.c"
 			}
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 677 "OfflineSidebarEntry.c"
+#line 714 "OfflineSidebarEntry.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 681 "OfflineSidebarEntry.c"
+#line 718 "OfflineSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (library_offline_sidebar_entry_parent_class)->finalize (obj);
-#line 685 "OfflineSidebarEntry.c"
+#line 722 "OfflineSidebarEntry.c"
 }
 
 
-GType library_offline_sidebar_entry_get_type (void) {
+GType
+library_offline_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_offline_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_offline_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryOfflineSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_offline_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryOfflineSidebarEntry), 0, (GInstanceInitFunc) library_offline_sidebar_entry_instance_init, NULL };