Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 150 insertions, 150 deletions

diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index ec2098d..04da15d 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.7, the Vala compiler
+/* APIGlue.c generated by valac 0.36.6, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,7 +269,7 @@ static gpointer publishing_glue_media_source_publishable_wrapper_parent_class =
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker;
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker = 0;
 extern TagSourceCollection* tag_global;
-static SpitPublishingPublishableIface* publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
+static SpitPublishingPublishableIface * publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
 
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -312,7 +312,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 gchar* data_object_get_name (DataObject* self);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 GFile* media_source_get_file (MediaSource* self);
 void video_export (Video* self, GFile* dest_file, GError** error);
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base);
@@ -331,13 +331,13 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
 GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo);
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value);
 static gchar** _vala_array_dup22 (gchar** self, int length);
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base);
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base);
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base);
 time_t media_source_get_exposure_time (MediaSource* self);
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj);
+static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj);
 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);
 
@@ -351,8 +351,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap) {
 	PublishingGlueMediaSourcePublishableWrapper * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (to_wrap), NULL);
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -381,10 +381,10 @@ PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publis
 
 
 void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 20 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
@@ -408,7 +408,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	_g_free0 (_tmp3_);
 #line 410 "APIGlue.c"
 	{
-		GFile* _tmp4_ = NULL;
+		GFile* _tmp4_;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp4_ = self->priv->serialized_file;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -423,9 +423,9 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	__catch39_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		err = _inner_error_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -464,22 +464,22 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 
 
 static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GeeMap* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GeeMap* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GeeMap* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	MediaSource* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	Event* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeMap* _tmp0_;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GeeMap* _tmp4_;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GeeMap* _tmp8_;
+	MediaSource* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	MediaSource* _tmp12_;
+	Event* _tmp13_;
+	Event* _tmp14_;
+	gboolean _tmp15_;
 #line 35 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
 #line 36 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -531,12 +531,12 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 #line 40 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15_) {
 #line 534 "APIGlue.c"
-		GeeMap* _tmp16_ = NULL;
-		MediaSource* _tmp17_ = NULL;
-		Event* _tmp18_ = NULL;
-		Event* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		GeeMap* _tmp16_;
+		MediaSource* _tmp17_;
+		Event* _tmp18_;
+		Event* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = self->priv->param_string;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -557,7 +557,7 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 		_g_object_unref0 (_tmp19_);
 #line 559 "APIGlue.c"
 	} else {
-		GeeMap* _tmp22_ = NULL;
+		GeeMap* _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp22_ = self->priv->param_string;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -569,9 +569,9 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error) {
 	GFile* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	GFile* _tmp63_ = NULL;
-	GFile* _tmp64_ = NULL;
+	MediaSource* _tmp0_;
+	GFile* _tmp63_;
+	GFile* _tmp64_;
 	GError * _inner_error_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self), NULL);
@@ -581,24 +581,24 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO)) {
 #line 583 "APIGlue.c"
 		LibraryPhoto* photo = NULL;
-		MediaSource* _tmp1_ = NULL;
-		LibraryPhoto* _tmp2_ = NULL;
+		MediaSource* _tmp1_;
+		LibraryPhoto* _tmp2_;
 		GFile* to_file = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GFile* _tmp30_ = NULL;
-		GFile* _tmp31_ = NULL;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		gint _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GFile* _tmp30_;
+		GFile* _tmp31_;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -649,18 +649,18 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 649 "APIGlue.c"
 		{
 			Scaling _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			gint _tmp17_;
 			Scaling scaling = {0};
-			LibraryPhoto* _tmp21_ = NULL;
-			GFile* _tmp22_ = NULL;
-			Scaling _tmp23_ = {0};
-			gboolean _tmp24_ = FALSE;
+			LibraryPhoto* _tmp21_;
+			GFile* _tmp22_;
+			Scaling _tmp23_;
+			gboolean _tmp24_;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp17_ = content_major_axis;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (_tmp17_ > 0) {
 #line 662 "APIGlue.c"
-				gint _tmp18_ = 0;
+				gint _tmp18_;
 				Scaling _tmp19_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp18_ = content_major_axis;
@@ -699,11 +699,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		__catch40_g_error:
 		{
 			GError* err = NULL;
-			LibraryPhoto* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			GError* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			LibraryPhoto* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			GError* _tmp28_;
+			GError* _tmp29_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			err = _inner_error_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -769,39 +769,39 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		_g_object_unref0 (photo);
 #line 770 "APIGlue.c"
 	} else {
-		MediaSource* _tmp32_ = NULL;
+		MediaSource* _tmp32_;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp32_ = self->priv->wrapped;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
 #line 777 "APIGlue.c"
 			Video* video = NULL;
-			MediaSource* _tmp33_ = NULL;
-			Video* _tmp34_ = NULL;
+			MediaSource* _tmp33_;
+			Video* _tmp34_;
 			gchar* basename = NULL;
 			gchar* extension = NULL;
-			Video* _tmp35_ = NULL;
-			GFile* _tmp36_ = NULL;
-			GFile* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+			Video* _tmp35_;
+			GFile* _tmp36_;
+			GFile* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 			gchar* _tmp40_ = NULL;
 			gchar* _tmp41_ = NULL;
 			GFile* to_file = NULL;
-			gint _tmp42_ = 0;
-			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-			GFile* _tmp46_ = NULL;
-			GFile* _tmp47_ = NULL;
-			Video* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-			gchar* _tmp50_ = NULL;
-			GFile* _tmp51_ = NULL;
-			gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-			GFile* _tmp61_ = NULL;
-			GFile* _tmp62_ = NULL;
+			gint _tmp42_;
+			const gchar* _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
+			GFile* _tmp46_;
+			GFile* _tmp47_;
+			Video* _tmp48_;
+			gchar* _tmp49_;
+			gchar* _tmp50_;
+			GFile* _tmp51_;
+			gchar* _tmp52_;
+			gchar* _tmp53_;
+			GFile* _tmp61_;
+			GFile* _tmp62_;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp33_ = self->priv->wrapped;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -871,8 +871,8 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			_g_free0 (_tmp50_);
 #line 871 "APIGlue.c"
 			{
-				Video* _tmp54_ = NULL;
-				GFile* _tmp55_ = NULL;
+				Video* _tmp54_;
+				GFile* _tmp55_;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp54_ = video;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -889,11 +889,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			__catch41_g_error:
 			{
 				GError* err = NULL;
-				Video* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				GError* _tmp59_ = NULL;
-				GError* _tmp60_ = NULL;
+				Video* _tmp56_;
+				gchar* _tmp57_;
+				gchar* _tmp58_;
+				GError* _tmp59_;
+				GError* _tmp60_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				err = _inner_error_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -993,10 +993,10 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 94 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1012,8 +1012,8 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp4_) {
 #line 1012 "APIGlue.c"
-		MediaSource* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		MediaSource* _tmp5_;
+		gchar* _tmp6_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp5_ = self->priv->wrapped;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1024,7 +1024,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 		_tmp0_ = _tmp6_;
 #line 1023 "APIGlue.c"
 	} else {
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp7_ = g_strdup ("");
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1044,9 +1044,9 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1065,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st
 }
 
 
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if ((*length) == (*size)) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1090,7 +1090,7 @@ static gchar** _vala_array_dup22 (gchar** self, int length) {
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	for (i = 0; i < length; i++) {
 #line 1090 "APIGlue.c"
-		gchar* _tmp0_ = NULL;
+		gchar* _tmp0_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1107,23 +1107,23 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar** result = NULL;
 	gchar** _result_ = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
+	gchar** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
 	GeeCollection* tagset = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	GeeSortedSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	TagSourceCollection* _tmp1_;
+	MediaSource* _tmp2_;
+	GeeSortedSet* _tmp3_;
+	GeeCollection* _tmp4_;
 	gchar** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
 	gint __tmp14__size_ = 0;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gchar** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gchar** _tmp18_;
+	gint _tmp18__length1;
 #line 102 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 103 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1149,8 +1149,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 1147 "APIGlue.c"
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeCollection* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
+			GeeCollection* _tmp5_;
+			GeeIterator* _tmp6_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp5_ = tagset;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1160,15 +1160,15 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			while (TRUE) {
 #line 1160 "APIGlue.c"
-				GeeIterator* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+				GeeIterator* _tmp7_;
+				gboolean _tmp8_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
-				gchar** _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				Tag* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				gchar** _tmp11_;
+				gint _tmp11__length1;
+				Tag* _tmp12_;
+				gchar* _tmp13_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp7_ = _tag_it;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1211,8 +1211,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15__length1 > 0) {
 #line 1211 "APIGlue.c"
-		gchar** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = _result_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1262,7 +1262,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	SpitPublishingPublisherMediaType result = 0;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 116 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1275,7 +1275,7 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 		return result;
 #line 1274 "APIGlue.c"
 	} else {
-		MediaSource* _tmp1_ = NULL;
+		MediaSource* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1299,8 +1299,8 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 125 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1318,9 +1318,9 @@ static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serializ
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GDateTime* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	GDateTime* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	time_t _tmp1_;
+	GDateTime* _tmp2_;
 #line 128 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1352,23 +1352,23 @@ static void publishing_glue_media_source_publishable_wrapper_spit_publishing_pub
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_name = (gchar* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
+	iface->get_publishing_name = (gchar* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_param_string = (gchar* (*)(SpitPublishingPublishable*, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
+	iface->get_param_string = (gchar* (*) (SpitPublishingPublishable *, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_keywords = (gchar** (*)(SpitPublishingPublishable*, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
+	iface->get_publishing_keywords = (gchar** (*) (SpitPublishingPublishable *, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
+	iface->get_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_serialized_file = (GFile* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
+	iface->get_serialized_file = (GFile* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_exposure_date_time = (GDateTime* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
+	iface->get_exposure_date_time = (GDateTime* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
 #line 1364 "APIGlue.c"
 }
 
 
 static void publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self->priv = PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1381,7 +1381,7 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ
 }
 
 
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj) {
+static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);