Merge branch 'feature/upstream' into develop

1 files changed, 61 insertions, 64 deletions

diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 4955bbd..df6975c 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.34.7, the Vala compiler
+/* Slideshow.c generated by valac 0.36.6, the Vala compiler
  * generated from Slideshow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,16 +18,16 @@
 
 
 void slideshow_init (GError** error);
-static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add42 (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_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point"
 void transition_effects_manager_init (void);
@@ -37,7 +37,7 @@ 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_add33 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -54,7 +54,7 @@ static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -71,7 +71,7 @@ static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -88,7 +88,7 @@ static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -105,7 +105,7 @@ static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -122,7 +122,7 @@ static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -139,7 +139,7 @@ static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -156,7 +156,7 @@ static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -173,7 +173,7 @@ static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -190,7 +190,7 @@ static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -209,42 +209,41 @@ static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* va
 
 void slideshow_init (GError** error) {
 	gchar** core_ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint core_ids_length1 = 0;
-	gint _core_ids_size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gchar* _tmp10_ = NULL;
-	gchar** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gchar* _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	gchar* _tmp14_ = NULL;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar* _tmp16_ = NULL;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gchar** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
+	gchar** _tmp0_;
+	gint core_ids_length1;
+	gint _core_ids_size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	gchar* _tmp10_;
+	gchar** _tmp11_;
+	gint _tmp11__length1;
+	gchar* _tmp12_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	gchar* _tmp14_;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar* _tmp16_;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gchar* _tmp18_;
+	gchar** _tmp19_;
+	gint _tmp19__length1;
+	gchar* _tmp20_;
+	gchar** _tmp21_;
+	gint _tmp21__length1;
 #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -334,25 +333,23 @@ void slideshow_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_vala_array_add42 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp20_);
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp21_ = _ ("Slideshow Transitions");
+	_tmp21_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp22_ = core_ids;
+	_tmp21__length1 = core_ids_length1;
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_tmp22__length1 = core_ids_length1;
-#line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _tmp21_, RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp22_, _tmp22__length1);
+	plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _ ("Slideshow Transitions"), RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp21_, _tmp21__length1);
 #line 24 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	transition_effects_manager_init ();
 #line 9 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 349 "Slideshow.c"
+#line 346 "Slideshow.c"
 }
 
 
 void slideshow_terminate (void) {
 #line 28 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	transition_effects_manager_terminate ();
-#line 356 "Slideshow.c"
+#line 353 "Slideshow.c"
 }