Merge branch 'feature/upstream' into develop

1 files changed, 511 insertions, 215 deletions

diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index 49b2b48..eb06253 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.36.6, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImportsInterfaces.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>
@@ -299,7 +300,8 @@ GQuark spit_data_imports_data_import_error_quark (void);
 GType spit_pluggable_info_get_type (void) G_GNUC_CONST;
 SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self);
 void spit_pluggable_info_free (SpitPluggableInfo* self);
-void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest);
+void spit_pluggable_info_copy (const SpitPluggableInfo* self,
+                               SpitPluggableInfo* dest);
 void spit_pluggable_info_destroy (SpitPluggableInfo* self);
 GType spit_pluggable_get_type (void) G_GNUC_CONST;
 GType spit_host_interface_get_type (void) G_GNUC_CONST;
@@ -318,8 +320,10 @@ SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImp
 void spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self);
 gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self);
 void spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self);
-void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, SpitDataImportsImportableLibrary* library);
-void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, GFile* file);
+void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self,
+                                                          SpitDataImportsImportableLibrary* library);
+void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self,
+                                                       GFile* file);
 void spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self);
 static void spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self);
 void spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self);
@@ -337,7 +341,8 @@ static void spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataI
 void spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self);
 static void spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self);
 gchar* spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self);
-SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, int* result_length1);
+SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self,
+                                                                                 int* result_length1);
 SpitDataImportsImportableEvent* spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self);
 SpitDataImportsImportableRating* spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self);
 gchar* spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self);
@@ -370,18 +375,39 @@ void spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self);
 static void spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self);
 void spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self);
 static void spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self);
-void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, GError* err);
-void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, const gchar* msg);
+void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self,
+                                               GError* err);
+void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self,
+                                                       const gchar* msg);
 void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self);
 void spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self);
 SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self);
-void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode mode);
-void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, const gchar* message, SpitDataImportsPluginHostButtonMode mode);
-void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, const gchar* message);
-void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, gdouble progress, const gchar* progress_message);
-void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
-void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
+void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self,
+                                                        SpitDataImportsDialogPane* pane,
+                                                        SpitDataImportsPluginHostButtonMode mode);
+void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self,
+                                                                const gchar* message,
+                                                                SpitDataImportsPluginHostButtonMode mode);
+void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self,
+                                                                   const gchar* welcome_message,
+                                                                   SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                   int discovered_libraries_length1,
+                                                                   const gchar* file_select_label);
+void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self,
+                                                                 const gchar* message);
+void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self,
+                                                                gdouble progress,
+                                                                const gchar* progress_message);
+void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self,
+                                                                   SpitDataImportsImportableMediaItem** items,
+                                                                   int items_length1,
+                                                                   gdouble progress,
+                                                                   gdouble host_progress_delta,
+                                                                   const gchar* progress_message);
+void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self,
+                                                    SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                                    void* report_imported_items_count_target,
+                                                    const gchar* finalize_message);
 void spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self);
 static void spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self);
 void spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self);
@@ -398,7 +424,8 @@ void spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self);
 static void spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self);
 void spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self);
 static void spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self);
-SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, SpitDataImportsPluginHost* host);
+SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self,
+                                                                             SpitDataImportsPluginHost* host);
 void spit_data_imports_service_reserved0 (SpitDataImportsService* self);
 static void spit_data_imports_service_real_reserved0 (SpitDataImportsService* self);
 void spit_data_imports_service_reserved1 (SpitDataImportsService* self);
@@ -417,7 +444,9 @@ void spit_data_imports_service_reserved7 (SpitDataImportsService* self);
 static void spit_data_imports_service_real_reserved7 (SpitDataImportsService* self);
 
 
-GQuark spit_data_imports_data_import_error_quark (void) {
+GQuark
+spit_data_imports_data_import_error_quark (void)
+{
 	return g_quark_from_static_string ("spit_data_imports_data_import_error-quark");
 }
 
@@ -425,12 +454,14 @@ GQuark spit_data_imports_data_import_error_quark (void) {
 /**
      * Returns a {@link Service} object describing the service to which this connects.
      */
-SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImportsDataImporter* self) {
+SpitDataImportsService*
+spit_data_imports_data_importer_get_service (SpitDataImportsDataImporter* self)
+{
 #line 53 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self), NULL);
 #line 53 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->get_service (self);
-#line 434 "DataImportsInterfaces.c"
+#line 465 "DataImportsInterfaces.c"
 }
 
 
@@ -439,24 +470,28 @@ SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImp
      * to the shared services provided by the {@link PluginHost}. Through the host’s interface,
      * this data importer can install user interface panes and query configuration information.
      */
-void spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self)
+{
 #line 60 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 60 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->start (self);
-#line 448 "DataImportsInterfaces.c"
+#line 481 "DataImportsInterfaces.c"
 }
 
 
 /**
      * Returns true if this data importer is in the running state; false otherwise.
      */
-gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self) {
+gboolean
+spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self)
+{
 #line 65 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self), FALSE);
 #line 65 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->is_running (self);
-#line 460 "DataImportsInterfaces.c"
+#line 495 "DataImportsInterfaces.c"
 }
 
 
@@ -464,144 +499,186 @@ gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter
      * Causes this data importer to enter a non-running state. This data importer should stop all
      * data access operations and cease use of the shared services provided by the {@link PluginHost}.
      */
-void spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self)
+{
 #line 71 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 71 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->stop (self);
-#line 473 "DataImportsInterfaces.c"
+#line 510 "DataImportsInterfaces.c"
 }
 
 
 /**
      * Causes this data importer to enter start the import of a library.
      */
-void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, SpitDataImportsImportableLibrary* library) {
+void
+spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self,
+                                                     SpitDataImportsImportableLibrary* library)
+{
 #line 76 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 76 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->on_library_selected (self, library);
-#line 485 "DataImportsInterfaces.c"
+#line 525 "DataImportsInterfaces.c"
 }
 
 
 /**
      * Causes this data importer to enter start the import of a library file.
      */
-void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, GFile* file) {
+void
+spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self,
+                                                  GFile* file)
+{
 #line 81 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 81 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->on_file_selected (self, file);
-#line 497 "DataImportsInterfaces.c"
+#line 540 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self)
+{
 #line 86 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 86 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved0 (self);
-#line 510 "DataImportsInterfaces.c"
+#line 557 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved1 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved1 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self)
+{
 #line 87 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 87 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved1 (self);
-#line 523 "DataImportsInterfaces.c"
+#line 574 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved2 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved2 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved2 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved2 (SpitDataImportsDataImporter* self)
+{
 #line 88 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 88 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved2 (self);
-#line 536 "DataImportsInterfaces.c"
+#line 591 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved3 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved3 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved3 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved3 (SpitDataImportsDataImporter* self)
+{
 #line 89 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 89 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved3 (self);
-#line 549 "DataImportsInterfaces.c"
+#line 608 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved4 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved4 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved4 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved4 (SpitDataImportsDataImporter* self)
+{
 #line 90 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 90 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved4 (self);
-#line 562 "DataImportsInterfaces.c"
+#line 625 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved5 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved5 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved5 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved5 (SpitDataImportsDataImporter* self)
+{
 #line 91 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 91 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved5 (self);
-#line 575 "DataImportsInterfaces.c"
+#line 642 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved6 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved6 (SpitDataImportsDataImporter* self)
+{
 #line 92 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 92 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved6 (self);
-#line 588 "DataImportsInterfaces.c"
+#line 659 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self) {
+static void
+spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self)
+{
 }
 
 
-void spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self) {
+void
+spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self)
+{
 #line 93 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self));
 #line 93 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved7 (self);
-#line 601 "DataImportsInterfaces.c"
+#line 676 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImporterIface * iface) {
+static void
+spit_data_imports_data_importer_base_init (SpitDataImportsDataImporterIface * iface)
+{
 #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
@@ -624,7 +701,7 @@ static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImport
 		iface->reserved6 = spit_data_imports_data_importer_real_reserved6;
 #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		iface->reserved7 = spit_data_imports_data_importer_real_reserved7;
-#line 628 "DataImportsInterfaces.c"
+#line 705 "DataImportsInterfaces.c"
 	}
 }
 
@@ -639,7 +716,9 @@ static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImport
  * a non-running state and do not begin running until start( ) is invoked. Data importers
  * run until stop( ) is invoked.
  */
-GType spit_data_imports_data_importer_get_type (void) {
+GType
+spit_data_imports_data_importer_get_type (void)
+{
 	static volatile gsize spit_data_imports_data_importer_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_data_importer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDataImporterIface), (GBaseInitFunc) spit_data_imports_data_importer_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -652,23 +731,27 @@ GType spit_data_imports_data_importer_get_type (void) {
 }
 
 
-gchar* spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self) {
+gchar*
+spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self)
+{
 #line 102 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_LIBRARY (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_LIBRARY_GET_INTERFACE (self)->get_display_name (self);
-#line 661 "DataImportsInterfaces.c"
+#line 742 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_importable_library_base_init (SpitDataImportsImportableLibraryIface * iface) {
+static void
+spit_data_imports_importable_library_base_init (SpitDataImportsImportableLibraryIface * iface)
+{
 #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	if (!initialized) {
 #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		initialized = TRUE;
-#line 672 "DataImportsInterfaces.c"
+#line 755 "DataImportsInterfaces.c"
 	}
 }
 
@@ -678,7 +761,9 @@ static void spit_data_imports_importable_library_base_init (SpitDataImportsImpor
  *
  * Developers of data import plugins provide a class that implements this interface.
  */
-GType spit_data_imports_importable_library_get_type (void) {
+GType
+spit_data_imports_importable_library_get_type (void)
+{
 	static volatile gsize spit_data_imports_importable_library_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_importable_library_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableLibraryIface), (GBaseInitFunc) spit_data_imports_importable_library_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -691,77 +776,94 @@ GType spit_data_imports_importable_library_get_type (void) {
 }
 
 
-SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, int* result_length1) {
+SpitDataImportsImportableTag**
+spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self,
+                                                  int* result_length1)
+{
 #line 111 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 111 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_tags (self, result_length1);
-#line 700 "DataImportsInterfaces.c"
+#line 788 "DataImportsInterfaces.c"
 }
 
 
-SpitDataImportsImportableEvent* spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self) {
+SpitDataImportsImportableEvent*
+spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self)
+{
 #line 113 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 113 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_event (self);
-#line 709 "DataImportsInterfaces.c"
+#line 799 "DataImportsInterfaces.c"
 }
 
 
-SpitDataImportsImportableRating* spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self) {
+SpitDataImportsImportableRating*
+spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self)
+{
 #line 115 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 115 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_rating (self);
-#line 718 "DataImportsInterfaces.c"
+#line 810 "DataImportsInterfaces.c"
 }
 
 
-gchar* spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self) {
+gchar*
+spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self)
+{
 #line 117 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 117 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_title (self);
-#line 727 "DataImportsInterfaces.c"
+#line 821 "DataImportsInterfaces.c"
 }
 
 
-gchar* spit_data_imports_importable_media_item_get_folder_path (SpitDataImportsImportableMediaItem* self) {
+gchar*
+spit_data_imports_importable_media_item_get_folder_path (SpitDataImportsImportableMediaItem* self)
+{
 #line 119 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 119 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_folder_path (self);
-#line 736 "DataImportsInterfaces.c"
+#line 832 "DataImportsInterfaces.c"
 }
 
 
-gchar* spit_data_imports_importable_media_item_get_filename (SpitDataImportsImportableMediaItem* self) {
+gchar*
+spit_data_imports_importable_media_item_get_filename (SpitDataImportsImportableMediaItem* self)
+{
 #line 121 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 121 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_filename (self);
-#line 745 "DataImportsInterfaces.c"
+#line 843 "DataImportsInterfaces.c"
 }
 
 
-time_t* spit_data_imports_importable_media_item_get_exposure_time (SpitDataImportsImportableMediaItem* self) {
+time_t*
+spit_data_imports_importable_media_item_get_exposure_time (SpitDataImportsImportableMediaItem* self)
+{
 #line 123 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL);
 #line 123 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_exposure_time (self);
-#line 754 "DataImportsInterfaces.c"
+#line 854 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_importable_media_item_base_init (SpitDataImportsImportableMediaItemIface * iface) {
+static void
+spit_data_imports_importable_media_item_base_init (SpitDataImportsImportableMediaItemIface * iface)
+{
 #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	if (!initialized) {
 #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		initialized = TRUE;
-#line 765 "DataImportsInterfaces.c"
+#line 867 "DataImportsInterfaces.c"
 	}
 }
 
@@ -771,7 +873,9 @@ static void spit_data_imports_importable_media_item_base_init (SpitDataImportsIm
  *
  * Developers of data import plugins provide a class that implements this interface.
  */
-GType spit_data_imports_importable_media_item_get_type (void) {
+GType
+spit_data_imports_importable_media_item_get_type (void)
+{
 	static volatile gsize spit_data_imports_importable_media_item_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_importable_media_item_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableMediaItemIface), (GBaseInitFunc) spit_data_imports_importable_media_item_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -784,32 +888,38 @@ GType spit_data_imports_importable_media_item_get_type (void) {
 }
 
 
-gchar* spit_data_imports_importable_tag_get_name (SpitDataImportsImportableTag* self) {
+gchar*
+spit_data_imports_importable_tag_get_name (SpitDataImportsImportableTag* self)
+{
 #line 132 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (self), NULL);
 #line 132 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_TAG_GET_INTERFACE (self)->get_name (self);
-#line 793 "DataImportsInterfaces.c"
+#line 899 "DataImportsInterfaces.c"
 }
 
 
-SpitDataImportsImportableTag* spit_data_imports_importable_tag_get_parent (SpitDataImportsImportableTag* self) {
+SpitDataImportsImportableTag*
+spit_data_imports_importable_tag_get_parent (SpitDataImportsImportableTag* self)
+{
 #line 134 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (self), NULL);
 #line 134 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_TAG_GET_INTERFACE (self)->get_parent (self);
-#line 802 "DataImportsInterfaces.c"
+#line 910 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_importable_tag_base_init (SpitDataImportsImportableTagIface * iface) {
+static void
+spit_data_imports_importable_tag_base_init (SpitDataImportsImportableTagIface * iface)
+{
 #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	if (!initialized) {
 #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		initialized = TRUE;
-#line 813 "DataImportsInterfaces.c"
+#line 923 "DataImportsInterfaces.c"
 	}
 }
 
@@ -819,7 +929,9 @@ static void spit_data_imports_importable_tag_base_init (SpitDataImportsImportabl
  *
  * Developers of data import plugins provide a class that implements this interface.
  */
-GType spit_data_imports_importable_tag_get_type (void) {
+GType
+spit_data_imports_importable_tag_get_type (void)
+{
 	static volatile gsize spit_data_imports_importable_tag_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_importable_tag_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableTagIface), (GBaseInitFunc) spit_data_imports_importable_tag_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -832,23 +944,27 @@ GType spit_data_imports_importable_tag_get_type (void) {
 }
 
 
-gchar* spit_data_imports_importable_event_get_name (SpitDataImportsImportableEvent* self) {
+gchar*
+spit_data_imports_importable_event_get_name (SpitDataImportsImportableEvent* self)
+{
 #line 143 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_EVENT (self), NULL);
 #line 143 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_EVENT_GET_INTERFACE (self)->get_name (self);
-#line 841 "DataImportsInterfaces.c"
+#line 955 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_importable_event_base_init (SpitDataImportsImportableEventIface * iface) {
+static void
+spit_data_imports_importable_event_base_init (SpitDataImportsImportableEventIface * iface)
+{
 #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	if (!initialized) {
 #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		initialized = TRUE;
-#line 852 "DataImportsInterfaces.c"
+#line 968 "DataImportsInterfaces.c"
 	}
 }
 
@@ -858,7 +974,9 @@ static void spit_data_imports_importable_event_base_init (SpitDataImportsImporta
  *
  * Developers of data import plugins provide a class that implements this interface.
  */
-GType spit_data_imports_importable_event_get_type (void) {
+GType
+spit_data_imports_importable_event_get_type (void)
+{
 	static volatile gsize spit_data_imports_importable_event_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_importable_event_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableEventIface), (GBaseInitFunc) spit_data_imports_importable_event_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -871,41 +989,49 @@ GType spit_data_imports_importable_event_get_type (void) {
 }
 
 
-gboolean spit_data_imports_importable_rating_is_unrated (SpitDataImportsImportableRating* self) {
+gboolean
+spit_data_imports_importable_rating_is_unrated (SpitDataImportsImportableRating* self)
+{
 #line 155 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), FALSE);
 #line 155 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->is_unrated (self);
-#line 880 "DataImportsInterfaces.c"
+#line 1000 "DataImportsInterfaces.c"
 }
 
 
-gboolean spit_data_imports_importable_rating_is_rejected (SpitDataImportsImportableRating* self) {
+gboolean
+spit_data_imports_importable_rating_is_rejected (SpitDataImportsImportableRating* self)
+{
 #line 157 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), FALSE);
 #line 157 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->is_rejected (self);
-#line 889 "DataImportsInterfaces.c"
+#line 1011 "DataImportsInterfaces.c"
 }
 
 
-gint spit_data_imports_importable_rating_get_value (SpitDataImportsImportableRating* self) {
+gint
+spit_data_imports_importable_rating_get_value (SpitDataImportsImportableRating* self)
+{
 #line 159 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), 0);
 #line 159 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->get_value (self);
-#line 898 "DataImportsInterfaces.c"
+#line 1022 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_importable_rating_base_init (SpitDataImportsImportableRatingIface * iface) {
+static void
+spit_data_imports_importable_rating_base_init (SpitDataImportsImportableRatingIface * iface)
+{
 #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	if (!initialized) {
 #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		initialized = TRUE;
-#line 909 "DataImportsInterfaces.c"
+#line 1035 "DataImportsInterfaces.c"
 	}
 }
 
@@ -918,7 +1044,9 @@ static void spit_data_imports_importable_rating_base_init (SpitDataImportsImport
  * 1 and 5, unless the rating object is unrated or rejected, in which case the
  * value is unspecified.
  */
-GType spit_data_imports_importable_rating_get_type (void) {
+GType
+spit_data_imports_importable_rating_get_type (void)
+{
 	static volatile gsize spit_data_imports_importable_rating_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_importable_rating_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableRatingIface), (GBaseInitFunc) spit_data_imports_importable_rating_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -935,7 +1063,9 @@ GType spit_data_imports_importable_rating_get_type (void) {
      * Describes how the on-screen publishing dialog box should look and behave when an associated
      * pane is installed in the on-screen publishing dialog box.
      */
-GType spit_data_imports_dialog_pane_geometry_options_get_type (void) {
+GType
+spit_data_imports_dialog_pane_geometry_options_get_type (void)
+{
 	static volatile gsize spit_data_imports_dialog_pane_geometry_options_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_dialog_pane_geometry_options_type_id__volatile)) {
 		static const GEnumValue values[] = {{SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE", "none"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE", "extended-size"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE", "resizable"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE", "colossal-size"}, {0, NULL, NULL}};
@@ -950,12 +1080,14 @@ GType spit_data_imports_dialog_pane_geometry_options_get_type (void) {
 /**
      * Returns the Gtk.Widget that is this pane's on-screen representation.
      */
-GtkWidget* spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane* self) {
+GtkWidget*
+spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane* self)
+{
 #line 204 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self), NULL);
 #line 204 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self);
-#line 959 "DataImportsInterfaces.c"
+#line 1091 "DataImportsInterfaces.c"
 }
 
 
@@ -963,12 +1095,14 @@ GtkWidget* spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane*
      * Returns a {@link GeometryOptions} bitfield describing how the on-screen publishing dialog
      * box should look and behave when this pane is installed.
      */
-SpitDataImportsDialogPaneGeometryOptions spit_data_imports_dialog_pane_get_preferred_geometry (SpitDataImportsDialogPane* self) {
+SpitDataImportsDialogPaneGeometryOptions
+spit_data_imports_dialog_pane_get_preferred_geometry (SpitDataImportsDialogPane* self)
+{
 #line 210 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self), 0);
 #line 210 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self);
-#line 972 "DataImportsInterfaces.c"
+#line 1106 "DataImportsInterfaces.c"
 }
 
 
@@ -976,12 +1110,14 @@ SpitDataImportsDialogPaneGeometryOptions spit_data_imports_dialog_pane_get_prefe
      * Invoked automatically by Shotwell when this pane has been installed into the on-screen
      * publishing dialog box and become visible to the user.
      */
-void spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane* self)
+{
 #line 216 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 216 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self);
-#line 985 "DataImportsInterfaces.c"
+#line 1121 "DataImportsInterfaces.c"
 }
 
 
@@ -989,120 +1125,156 @@ void spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane*
      * Invoked automatically by Shotwell when this pane has been removed from the on-screen
      * publishing dialog box and is no longer visible to the user.
      */
-void spit_data_imports_dialog_pane_on_pane_uninstalled (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_on_pane_uninstalled (SpitDataImportsDialogPane* self)
+{
 #line 222 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 222 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self);
-#line 998 "DataImportsInterfaces.c"
+#line 1136 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved0 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved0 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved0 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved0 (SpitDataImportsDialogPane* self)
+{
 #line 227 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 227 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self);
-#line 1011 "DataImportsInterfaces.c"
+#line 1153 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved1 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved1 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved1 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved1 (SpitDataImportsDialogPane* self)
+{
 #line 228 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 228 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self);
-#line 1024 "DataImportsInterfaces.c"
+#line 1170 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved2 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved2 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved2 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved2 (SpitDataImportsDialogPane* self)
+{
 #line 229 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 229 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self);
-#line 1037 "DataImportsInterfaces.c"
+#line 1187 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved3 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved3 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved3 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved3 (SpitDataImportsDialogPane* self)
+{
 #line 230 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 230 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self);
-#line 1050 "DataImportsInterfaces.c"
+#line 1204 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved4 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved4 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved4 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved4 (SpitDataImportsDialogPane* self)
+{
 #line 231 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 231 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self);
-#line 1063 "DataImportsInterfaces.c"
+#line 1221 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved5 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved5 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved5 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved5 (SpitDataImportsDialogPane* self)
+{
 #line 232 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 232 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self);
-#line 1076 "DataImportsInterfaces.c"
+#line 1238 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self)
+{
 #line 233 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 233 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self);
-#line 1089 "DataImportsInterfaces.c"
+#line 1255 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self) {
+static void
+spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self)
+{
 }
 
 
-void spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self) {
+void
+spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self)
+{
 #line 234 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self));
 #line 234 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self);
-#line 1102 "DataImportsInterfaces.c"
+#line 1272 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIface * iface) {
+static void
+spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIface * iface)
+{
 #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
@@ -1125,7 +1297,7 @@ static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIf
 		iface->reserved6 = spit_data_imports_dialog_pane_real_reserved6;
 #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		iface->reserved7 = spit_data_imports_dialog_pane_real_reserved7;
-#line 1129 "DataImportsInterfaces.c"
+#line 1301 "DataImportsInterfaces.c"
 	}
 }
 
@@ -1135,7 +1307,9 @@ static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIf
  * communicate status to and to get information from the user.
  *
  */
-GType spit_data_imports_dialog_pane_get_type (void) {
+GType
+spit_data_imports_dialog_pane_get_type (void)
+{
 	static volatile gsize spit_data_imports_dialog_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_dialog_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDialogPaneIface), (GBaseInitFunc) spit_data_imports_dialog_pane_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -1152,7 +1326,9 @@ GType spit_data_imports_dialog_pane_get_type (void) {
      * Specifies the label text on the push button control that appears in the
      * lower-right-hand corner of the on-screen publishing dialog box.
      */
-GType spit_data_imports_plugin_host_button_mode_get_type (void) {
+GType
+spit_data_imports_plugin_host_button_mode_get_type (void)
+{
 	static volatile gsize spit_data_imports_plugin_host_button_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_plugin_host_button_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE, "SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE", "close"}, {SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL, "SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL", "cancel"}, {0, NULL, NULL}};
@@ -1170,12 +1346,15 @@ GType spit_data_imports_plugin_host_button_mode_get_type (void) {
      *
      * @param err An error object that describes the kind of error that occurred.
      */
-void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, GError* err) {
+void
+spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self,
+                                          GError* err)
+{
 #line 271 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 271 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err);
-#line 1179 "DataImportsInterfaces.c"
+#line 1358 "DataImportsInterfaces.c"
 }
 
 
@@ -1185,12 +1364,15 @@ void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self,
      *
      * @param msg A message that describes the kind of error that occurred.
      */
-void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, const gchar* msg) {
+void
+spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self,
+                                                  const gchar* msg)
+{
 #line 279 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 279 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->post_error_message (self, msg);
-#line 1194 "DataImportsInterfaces.c"
+#line 1376 "DataImportsInterfaces.c"
 }
 
 
@@ -1199,12 +1381,14 @@ void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost
      *
      * Calling this method starts the import activity for this host.
      */
-void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self)
+{
 #line 286 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 286 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->start_importing (self);
-#line 1208 "DataImportsInterfaces.c"
+#line 1392 "DataImportsInterfaces.c"
 }
 
 
@@ -1214,24 +1398,28 @@ void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* s
      * Calling this method stops all import activity and hides the on-screen import
      * dialog box.
      */
-void spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self)
+{
 #line 294 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 294 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->stop_importing (self);
-#line 1223 "DataImportsInterfaces.c"
+#line 1409 "DataImportsInterfaces.c"
 }
 
 
 /**
      * Returns a reference to the {@link DataImporter} object that this is currently hosting.
      */
-SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self) {
+SpitDataImportsDataImporter*
+spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self)
+{
 #line 299 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self), NULL);
 #line 299 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->get_data_importer (self);
-#line 1235 "DataImportsInterfaces.c"
+#line 1423 "DataImportsInterfaces.c"
 }
 
 
@@ -1253,12 +1441,16 @@ SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (Sp
      * should be ButtonMode.CLOSE, because all cancellable actions have already
      * occurred.
      */
-void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode mode) {
+void
+spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self,
+                                                   SpitDataImportsDialogPane* pane,
+                                                   SpitDataImportsPluginHostButtonMode mode)
+{
 #line 319 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 319 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode);
-#line 1262 "DataImportsInterfaces.c"
+#line 1454 "DataImportsInterfaces.c"
 }
 
 
@@ -1288,12 +1480,16 @@ void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHos
      * should be ButtonMode.CLOSE, because all cancellable actions have already
      * occurred.
      */
-void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, const gchar* message, SpitDataImportsPluginHostButtonMode mode) {
+void
+spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self,
+                                                           const gchar* message,
+                                                           SpitDataImportsPluginHostButtonMode mode)
+{
 #line 348 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 348 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode);
-#line 1297 "DataImportsInterfaces.c"
+#line 1493 "DataImportsInterfaces.c"
 }
 
 
@@ -1317,12 +1513,18 @@ void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsP
      * option. If this label is null, the
      * user will not be presented with a file selection option.
      */
-void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
+void
+spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self,
+                                                              const gchar* welcome_message,
+                                                              SpitDataImportsImportableLibrary** discovered_libraries,
+                                                              int discovered_libraries_length1,
+                                                              const gchar* file_select_label)
+{
 #line 371 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 371 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_library_selection_pane (self, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
-#line 1326 "DataImportsInterfaces.c"
+#line 1528 "DataImportsInterfaces.c"
 }
 
 
@@ -1334,12 +1536,15 @@ void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImpor
      *
      * @param message the text to be displayed above the progress bar.
      */
-void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, const gchar* message) {
+void
+spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self,
+                                                            const gchar* message)
+{
 #line 385 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 385 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_import_progress_pane (self, message);
-#line 1343 "DataImportsInterfaces.c"
+#line 1548 "DataImportsInterfaces.c"
 }
 
 
@@ -1354,12 +1559,16 @@ void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImports
      * @param progress_label the text to be displayed below the progress bar. If that
      * parameter is null, the message will be left unchanged.
      */
-void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, gdouble progress, const gchar* progress_message) {
+void
+spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self,
+                                                           gdouble progress,
+                                                           const gchar* progress_message)
+{
 #line 400 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 400 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->update_import_progress_pane (self, progress, progress_message);
-#line 1363 "DataImportsInterfaces.c"
+#line 1572 "DataImportsInterfaces.c"
 }
 
 
@@ -1382,12 +1591,19 @@ void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsP
      * @param progress_message the text to be displayed below the progress bar. If that
      * parameter is null, the message will be left unchanged.
      */
-void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
+void
+spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self,
+                                                              SpitDataImportsImportableMediaItem** items,
+                                                              int items_length1,
+                                                              gdouble progress,
+                                                              gdouble host_progress_delta,
+                                                              const gchar* progress_message)
+{
 #line 424 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 424 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->prepare_media_items_for_import (self, items, items_length1, progress, host_progress_delta, progress_message);
-#line 1391 "DataImportsInterfaces.c"
+#line 1607 "DataImportsInterfaces.c"
 }
 
 
@@ -1407,120 +1623,159 @@ void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImpor
      * @param finalize_message the text to be displayed below the progress bar. If that
      * parameter is null, the message will be left unchanged.
      */
-void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
+void
+spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self,
+                                               SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                               void* report_imported_items_count_target,
+                                               const gchar* finalize_message)
+{
 #line 447 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 447 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->finalize_import (self, report_imported_items_count, report_imported_items_count_target, finalize_message);
-#line 1416 "DataImportsInterfaces.c"
+#line 1637 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self)
+{
 #line 455 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 455 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self);
-#line 1429 "DataImportsInterfaces.c"
+#line 1654 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved1 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved1 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self)
+{
 #line 456 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 456 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self);
-#line 1442 "DataImportsInterfaces.c"
+#line 1671 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved2 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved2 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved2 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved2 (SpitDataImportsPluginHost* self)
+{
 #line 457 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 457 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self);
-#line 1455 "DataImportsInterfaces.c"
+#line 1688 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved3 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved3 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved3 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved3 (SpitDataImportsPluginHost* self)
+{
 #line 458 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 458 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self);
-#line 1468 "DataImportsInterfaces.c"
+#line 1705 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved4 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved4 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved4 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved4 (SpitDataImportsPluginHost* self)
+{
 #line 459 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 459 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self);
-#line 1481 "DataImportsInterfaces.c"
+#line 1722 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved5 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved5 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved5 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved5 (SpitDataImportsPluginHost* self)
+{
 #line 460 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 460 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self);
-#line 1494 "DataImportsInterfaces.c"
+#line 1739 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self)
+{
 #line 461 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 461 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self);
-#line 1507 "DataImportsInterfaces.c"
+#line 1756 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self) {
+static void
+spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self)
+{
 }
 
 
-void spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self) {
+void
+spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self)
+{
 #line 462 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self));
 #line 462 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self);
-#line 1520 "DataImportsInterfaces.c"
+#line 1773 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIface * iface) {
+static void
+spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIface * iface)
+{
 #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
@@ -1543,7 +1798,7 @@ static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIf
 		iface->reserved6 = spit_data_imports_plugin_host_real_reserved6;
 #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		iface->reserved7 = spit_data_imports_plugin_host_real_reserved7;
-#line 1547 "DataImportsInterfaces.c"
+#line 1802 "DataImportsInterfaces.c"
 	}
 }
 
@@ -1557,7 +1812,9 @@ static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIf
  * {@link DataImporter} is in the running state. This ensures that non-running data importers
  * don’t destructively interfere with the actively running importer.
  */
-GType spit_data_imports_plugin_host_get_type (void) {
+GType
+spit_data_imports_plugin_host_get_type (void)
+{
 	static volatile gsize spit_data_imports_plugin_host_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_plugin_host_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsPluginHostIface), (GBaseInitFunc) spit_data_imports_plugin_host_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -1575,120 +1832,157 @@ GType spit_data_imports_plugin_host_get_type (void) {
      * A factory method that instantiates and returns a new {@link DataImporter} object
      * that this Service describes.
      */
-SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, SpitDataImportsPluginHost* host) {
+SpitDataImportsDataImporter*
+spit_data_imports_service_create_data_importer (SpitDataImportsService* self,
+                                                SpitDataImportsPluginHost* host)
+{
 #line 475 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self), NULL);
 #line 475 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	return SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->create_data_importer (self, host);
-#line 1584 "DataImportsInterfaces.c"
+#line 1844 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved0 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved0 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved0 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved0 (SpitDataImportsService* self)
+{
 #line 480 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 480 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved0 (self);
-#line 1597 "DataImportsInterfaces.c"
+#line 1861 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved1 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved1 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved1 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved1 (SpitDataImportsService* self)
+{
 #line 481 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 481 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved1 (self);
-#line 1610 "DataImportsInterfaces.c"
+#line 1878 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved2 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved2 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved2 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved2 (SpitDataImportsService* self)
+{
 #line 482 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 482 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved2 (self);
-#line 1623 "DataImportsInterfaces.c"
+#line 1895 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved3 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved3 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved3 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved3 (SpitDataImportsService* self)
+{
 #line 483 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 483 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved3 (self);
-#line 1636 "DataImportsInterfaces.c"
+#line 1912 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved4 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved4 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved4 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved4 (SpitDataImportsService* self)
+{
 #line 484 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 484 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved4 (self);
-#line 1649 "DataImportsInterfaces.c"
+#line 1929 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved5 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved5 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved5 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved5 (SpitDataImportsService* self)
+{
 #line 485 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 485 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved5 (self);
-#line 1662 "DataImportsInterfaces.c"
+#line 1946 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved6 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved6 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved6 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved6 (SpitDataImportsService* self)
+{
 #line 486 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 486 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved6 (self);
-#line 1675 "DataImportsInterfaces.c"
+#line 1963 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_real_reserved7 (SpitDataImportsService* self) {
+static void
+spit_data_imports_service_real_reserved7 (SpitDataImportsService* self)
+{
 }
 
 
-void spit_data_imports_service_reserved7 (SpitDataImportsService* self) {
+void
+spit_data_imports_service_reserved7 (SpitDataImportsService* self)
+{
 #line 487 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self));
 #line 487 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved7 (self);
-#line 1688 "DataImportsInterfaces.c"
+#line 1980 "DataImportsInterfaces.c"
 }
 
 
-static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * iface) {
+static void
+spit_data_imports_service_base_init (SpitDataImportsServiceIface * iface)
+{
 #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
@@ -1711,7 +2005,7 @@ static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * i
 		iface->reserved6 = spit_data_imports_service_real_reserved6;
 #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala"
 		iface->reserved7 = spit_data_imports_service_real_reserved7;
-#line 1715 "DataImportsInterfaces.c"
+#line 2009 "DataImportsInterfaces.c"
 	}
 }
 
@@ -1721,7 +2015,9 @@ static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * i
  *
  * Developers of data import plugins provide a class that implements this interface.
  */
-GType spit_data_imports_service_get_type (void) {
+GType
+spit_data_imports_service_get_type (void)
+{
 	static volatile gsize spit_data_imports_service_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsServiceIface), (GBaseInitFunc) spit_data_imports_service_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };