Merge branch 'feature/upstream' into develop

1 files changed, 111 insertions, 77 deletions

diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index 03684ca..8640578 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from LastImportSidebarEntry.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 _LibraryLastImportSidebarEntry LibraryLastImportSidebarEntry;
 typedef struct _LibraryLastImportSidebarEntryClass LibraryLastImportSidebarEntryClass;
 typedef struct _LibraryLastImportSidebarEntryPrivate LibraryLastImportSidebarEntryPrivate;
+enum  {
+	LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_last_import_sidebar_entry_properties[LIBRARY_LAST_IMPORT_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))
@@ -272,14 +278,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_last_import_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_LAST_IMPORT_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;
@@ -287,15 +296,22 @@ 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);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self);
-static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self);
+static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                                             gpointer self);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
@@ -303,7 +319,8 @@ GType import_id_get_type (void) G_GNUC_CONST;
 ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
 ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define LAST_IMPORT_PAGE_NAME _ ("Last Import")
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -318,22 +335,27 @@ 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_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
+static void
+_library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                                        gpointer self)
+{
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_on_import_rolls_altered ((LibraryLastImportSidebarEntry*) self);
-#line 325 "LastImportSidebarEntry.c"
+#line 345 "LastImportSidebarEntry.c"
 }
 
 
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) {
+LibraryLastImportSidebarEntry*
+library_last_import_sidebar_entry_construct (GType object_type)
+{
 	LibraryLastImportSidebarEntry * self = NULL;
+	MediaCollectionRegistry* _tmp10_;
 	MediaCollectionRegistry* _tmp11_;
-	MediaCollectionRegistry* _tmp12_;
+	ImportID* _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"
+#line 359 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -362,69 +384,70 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp
 		_media_sources_it = _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
-#line 366 "LastImportSidebarEntry.c"
+#line 388 "LastImportSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 				break;
-#line 381 "LastImportSidebarEntry.c"
+#line 400 "LastImportSidebarEntry.c"
 			}
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 395 "LastImportSidebarEntry.c"
+#line 414 "LastImportSidebarEntry.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 399 "LastImportSidebarEntry.c"
+#line 418 "LastImportSidebarEntry.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp11_ = media_collection_registry_get_instance ();
+	_tmp10_ = media_collection_registry_get_instance ();
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp13_ = media_collection_registry_get_last_import_id (_tmp12_);
+	_tmp12_ = media_collection_registry_get_last_import_id (_tmp11_);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp14_ != NULL);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp13_ != NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_import_id_free0 (_tmp14_);
+	_import_id_free0 (_tmp13_);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_media_collection_registry_unref0 (_tmp12_);
+	_media_collection_registry_unref0 (_tmp11_);
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return self;
-#line 417 "LastImportSidebarEntry.c"
+#line 436 "LastImportSidebarEntry.c"
 }
 
 
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) {
+LibraryLastImportSidebarEntry*
+library_last_import_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return library_last_import_sidebar_entry_construct (LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY);
-#line 424 "LastImportSidebarEntry.c"
+#line 445 "LastImportSidebarEntry.c"
 }
 
 
-static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -436,11 +459,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 440 "LastImportSidebarEntry.c"
+#line 463 "LastImportSidebarEntry.c"
 }
 
 
-static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -452,11 +477,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi
 	result = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 456 "LastImportSidebarEntry.c"
+#line 481 "LastImportSidebarEntry.c"
 }
 
 
-static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	Page* result = NULL;
 	LastImportPage* _tmp0_;
@@ -470,11 +497,13 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 474 "LastImportSidebarEntry.c"
+#line 501 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) {
+static void
+library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self)
+{
 	MediaCollectionRegistry* _tmp0_;
 	MediaCollectionRegistry* _tmp1_;
 	ImportID* _tmp2_;
@@ -495,11 +524,13 @@ static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLa
 	_import_id_free0 (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	_media_collection_registry_unref0 (_tmp1_);
-#line 499 "LastImportSidebarEntry.c"
+#line 528 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass) {
+static void
+library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass)
+{
 #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"
@@ -510,19 +541,23 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb
 	((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"
+#line 545 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self) {
+static void
+library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self)
+{
 }
 
 
-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"
+#line 561 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -551,51 +586,50 @@ static void library_last_import_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
-#line 555 "LastImportSidebarEntry.c"
+#line 590 "LastImportSidebarEntry.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 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 				break;
-#line 571 "LastImportSidebarEntry.c"
+#line 603 "LastImportSidebarEntry.c"
 			}
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_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_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 587 "LastImportSidebarEntry.c"
+#line 619 "LastImportSidebarEntry.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 591 "LastImportSidebarEntry.c"
+#line 623 "LastImportSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (library_last_import_sidebar_entry_parent_class)->finalize (obj);
-#line 595 "LastImportSidebarEntry.c"
+#line 627 "LastImportSidebarEntry.c"
 }
 
 
-GType library_last_import_sidebar_entry_get_type (void) {
+GType
+library_last_import_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_last_import_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_last_import_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryLastImportSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_last_import_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryLastImportSidebarEntry), 0, (GInstanceInitFunc) library_last_import_sidebar_entry_instance_init, NULL };