Merge branch 'feature/upstream' into develop

1 files changed, 44 insertions, 15 deletions

diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 47b2e0a..e7ae485 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.36.6, the Vala compiler
+/* DataImports.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -26,32 +27,50 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value);
-void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
+static void _vala_array_add71 (gchar** * array,
+                        int* length,
+                        int* size,
+                        gchar* value);
+void plugins_register_extension_point (GType type,
+                                       const gchar* name,
+                                       const gchar* icon_name,
+                                       gchar** core_ids,
+                                       int core_ids_length1);
 #define RESOURCES_IMPORT "import"
 void data_imports_terminate (void);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
+
+
+static void
+_vala_array_add71 (gchar** * array,
+                   int* length,
+                   int* size,
+                   gchar* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 45 "DataImports.c"
+#line 62 "DataImports.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	(*array)[(*length)++] = value;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	(*array)[*length] = NULL;
-#line 51 "DataImports.c"
+#line 68 "DataImports.c"
 }
 
 
-void data_imports_init (GError** error) {
+void
+data_imports_init (GError** error)
+{
 	gchar** core_ids = NULL;
 	gchar** _tmp0_;
 	gint core_ids_length1;
@@ -85,15 +104,21 @@ void data_imports_init (GError** error) {
 	plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 89 "DataImports.c"
+#line 108 "DataImports.c"
 }
 
 
-void data_imports_terminate (void) {
+void
+data_imports_terminate (void)
+{
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -105,7 +130,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }