Merge branch 'feature/upstream' into develop

1 files changed, 42 insertions, 42 deletions

diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index d3b92c0..fa81657 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.34.7, the Vala compiler
+/* Resources.c generated by valac 0.36.6, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -47,9 +47,9 @@
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 #define RESOURCES_TRANSLATORS _ ("translator-credits")
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
-static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* 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);
 
@@ -61,7 +61,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -81,9 +81,9 @@ static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPix
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	GdkPixbuf** result = NULL;
 	GdkPixbuf* icon = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf** _tmp16_;
+	gint _tmp16__length1;
 	GError * _inner_error_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL);
@@ -92,12 +92,12 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 #line 72 "Resources.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		GFile* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp1_ = icon_file;
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -133,9 +133,9 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	__catch4_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		err = _inner_error_;
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -173,15 +173,15 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	if (_tmp10_ != NULL) {
 #line 154 "Resources.c"
 		GdkPixbuf** icon_pixbuf_set = NULL;
-		GdkPixbuf** _tmp11_ = NULL;
-		gint icon_pixbuf_set_length1 = 0;
-		gint _icon_pixbuf_set_size_ = 0;
-		GdkPixbuf** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf** _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
+		GdkPixbuf** _tmp11_;
+		gint icon_pixbuf_set_length1;
+		gint _icon_pixbuf_set_size_;
+		GdkPixbuf** _tmp12_;
+		gint _tmp12__length1;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf** _tmp15_;
+		gint _tmp15__length1;
 #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp11_ = g_new0 (GdkPixbuf*, 0 + 1);
 #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -238,7 +238,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 }
 
 
-static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -258,9 +258,9 @@ static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPix
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) {
 	GdkPixbuf** result = NULL;
 	GdkPixbuf* icon = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf** _tmp11_;
+	gint _tmp11__length1;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
@@ -269,9 +269,9 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 #line 249 "Resources.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		const gchar* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+		const gchar* _tmp1_;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp1_ = resource_path;
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -299,7 +299,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 	__catch5_g_error:
 	{
 		GError* _error_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_error_ = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -331,15 +331,15 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 	if (_tmp5_ != NULL) {
 #line 312 "Resources.c"
 		GdkPixbuf** icon_pixbuf_set = NULL;
-		GdkPixbuf** _tmp6_ = NULL;
-		gint icon_pixbuf_set_length1 = 0;
-		gint _icon_pixbuf_set_size_ = 0;
-		GdkPixbuf** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf** _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
+		GdkPixbuf** _tmp6_;
+		gint icon_pixbuf_set_length1;
+		gint _icon_pixbuf_set_size_;
+		GdkPixbuf** _tmp7_;
+		gint _tmp7__length1;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf** _tmp10_;
+		gint _tmp10__length1;
 #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp6_ = g_new0 (GdkPixbuf*, 0 + 1);
 #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"