Merge branch 'feature/upstream' into develop

1 files changed, 110 insertions, 110 deletions

diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 9e100e1..659af71 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -220,7 +220,7 @@ static void transaction_controller_real_begin_impl (TransactionController* self,
 void transaction_controller_commit (TransactionController* self);
 void transaction_controller_commit_impl (TransactionController* self, GError** error);
 static void transaction_controller_real_commit_impl (TransactionController* self, GError** error);
-static void transaction_controller_finalize (TransactionController* obj);
+static void transaction_controller_finalize (TransactionController * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -260,14 +260,14 @@ void transaction_controller_begin (TransactionController* self) {
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 262 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 269 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -276,7 +276,7 @@ void transaction_controller_begin (TransactionController* self) {
 			if (_tmp1_ != 0) {
 #line 278 "MediaInterfaces.c"
 				{
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp2_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -293,15 +293,15 @@ void transaction_controller_begin (TransactionController* self) {
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "MediaInterfaces.c"
-					goto __catch572_g_error;
+					goto __catch574_g_error;
 				}
 			}
-			goto __finally572;
-			__catch572_g_error:
+			goto __finally574;
+			__catch574_g_error:
 			{
 				GError* err = NULL;
-				gint _tmp3_ = 0;
-				GError* _tmp4_ = NULL;
+				gint _tmp3_;
+				GError* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				err = _inner_error_;
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -315,17 +315,17 @@ void transaction_controller_begin (TransactionController* self) {
 #line 74 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp4_->domain == DATABASE_ERROR) {
 #line 318 "MediaInterfaces.c"
-					GError* _tmp5_ = NULL;
+					GError* _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp5_ = err;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp5_);
 #line 324 "MediaInterfaces.c"
 				} else {
-					GError* _tmp6_ = NULL;
-					const gchar* _tmp7_ = NULL;
-					gchar* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
+					GError* _tmp6_;
+					const gchar* _tmp7_;
+					gchar* _tmp8_;
+					gchar* _tmp9_;
 #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp6_ = err;
 #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -344,12 +344,12 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally572:
+			__finally574:
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 351 "MediaInterfaces.c"
 				{
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp10_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -365,9 +365,9 @@ void transaction_controller_begin (TransactionController* self) {
 #line 366 "MediaInterfaces.c"
 			}
 		}
-		__finally571:
+		__finally573:
 		{
-			gint _tmp11_ = 0;
+			gint _tmp11_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp11_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -412,16 +412,16 @@ void transaction_controller_commit (TransactionController* self) {
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 414 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 421 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
+			gint _tmp1_;
+			gint _tmp2_;
+			gint _tmp3_;
 #line 87 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 87 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -436,7 +436,7 @@ void transaction_controller_commit (TransactionController* self) {
 			if (_tmp3_ != 0) {
 #line 438 "MediaInterfaces.c"
 				{
-					gint _tmp4_ = 0;
+					gint _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp4_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,14 +453,14 @@ void transaction_controller_commit (TransactionController* self) {
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "MediaInterfaces.c"
-					goto __catch574_g_error;
+					goto __catch576_g_error;
 				}
 			}
-			goto __finally574;
-			__catch574_g_error:
+			goto __finally576;
+			__catch576_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp5_ = NULL;
+				GError* _tmp5_;
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				err = _inner_error_;
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -470,17 +470,17 @@ void transaction_controller_commit (TransactionController* self) {
 #line 95 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp5_->domain == DATABASE_ERROR) {
 #line 473 "MediaInterfaces.c"
-					GError* _tmp6_ = NULL;
+					GError* _tmp6_;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp6_ = err;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp6_);
 #line 479 "MediaInterfaces.c"
 				} else {
-					GError* _tmp7_ = NULL;
-					const gchar* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
-					gchar* _tmp10_ = NULL;
+					GError* _tmp7_;
+					const gchar* _tmp8_;
+					gchar* _tmp9_;
+					gchar* _tmp10_;
 #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp7_ = err;
 #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -499,12 +499,12 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally574:
+			__finally576:
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "MediaInterfaces.c"
 				{
-					gint _tmp11_ = 0;
+					gint _tmp11_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp11_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -520,9 +520,9 @@ void transaction_controller_commit (TransactionController* self) {
 #line 521 "MediaInterfaces.c"
 			}
 		}
-		__finally573:
+		__finally575:
 		{
-			gint _tmp12_ = 0;
+			gint _tmp12_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp12_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -603,7 +603,7 @@ static gchar* value_transaction_controller_collect_value (GValue* value, guint n
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (collect_values[0].v_pointer) {
 #line 606 "MediaInterfaces.c"
-		TransactionController* object;
+		TransactionController * object;
 		object = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -630,7 +630,7 @@ static gchar* value_transaction_controller_collect_value (GValue* value, guint n
 
 
 static gchar* value_transaction_controller_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TransactionController** object_p;
+	TransactionController ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!object_p) {
@@ -682,7 +682,7 @@ gpointer value_get_transaction_controller (const GValue* value) {
 
 
 void value_set_transaction_controller (GValue* value, gpointer v_object) {
-	TransactionController* old;
+	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -713,7 +713,7 @@ void value_set_transaction_controller (GValue* value, gpointer v_object) {
 
 
 void value_take_transaction_controller (GValue* value, gpointer v_object) {
-	TransactionController* old;
+	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -749,9 +749,9 @@ static void transaction_controller_class_init (TransactionControllerClass * klas
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (TransactionControllerPrivate));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	((TransactionControllerClass *) klass)->begin_impl = (void (*)(TransactionController*, GError**)) transaction_controller_real_begin_impl;
+	((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_begin_impl;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) transaction_controller_real_commit_impl;
+	((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_commit_impl;
 #line 756 "MediaInterfaces.c"
 }
 
@@ -769,7 +769,7 @@ static void transaction_controller_instance_init (TransactionController * self)
 }
 
 
-static void transaction_controller_finalize (TransactionController* obj) {
+static void transaction_controller_finalize (TransactionController * obj) {
 	TransactionController * self;
 	GError * _inner_error_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -778,23 +778,23 @@ static void transaction_controller_finalize (TransactionController* obj) {
 	g_signal_handlers_destroy (self);
 #line 780 "MediaInterfaces.c"
 	{
-		gint _tmp0_ = 0;
+		gint _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
 #line 787 "MediaInterfaces.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_vala_assert (_tmp1_ == 0, "count == 0");
 #line 794 "MediaInterfaces.c"
 		}
-		__finally570:
+		__finally572:
 		{
-			gint _tmp2_ = 0;
+			gint _tmp2_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -831,7 +831,7 @@ GType transaction_controller_get_type (void) {
 
 
 gpointer transaction_controller_ref (gpointer instance) {
-	TransactionController* self;
+	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -842,7 +842,7 @@ gpointer transaction_controller_ref (gpointer instance) {
 
 
 void transaction_controller_unref (gpointer instance) {
-	TransactionController* self;
+	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -883,10 +883,10 @@ void flaggable_mark_unflagged (Flaggable* self) {
 
 
 void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	TransactionController* _tmp17_ = NULL;
+	TransactionController* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp9_;
+	TransactionController* _tmp17_;
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((flag == NULL) || GEE_IS_COLLECTION (flag));
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -904,8 +904,8 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 905 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeCollection* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = flag;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -915,12 +915,12 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 918 "MediaInterfaces.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
-				Flaggable* _tmp8_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
+				Flaggable* _tmp8_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp4_ = _flaggable_it;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -957,8 +957,8 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 958 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeCollection* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp10_ = unflag;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -968,12 +968,12 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 971 "MediaInterfaces.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				Flaggable* _tmp16_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				Flaggable* _tmp16_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp12_ = _flaggable_it;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1064,10 +1064,10 @@ void monitorable_mark_offline (Monitorable* self) {
 
 
 void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	TransactionController* _tmp17_ = NULL;
+	TransactionController* _tmp0_;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp9_;
+	TransactionController* _tmp17_;
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((online == NULL) || GEE_IS_COLLECTION (online));
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1085,8 +1085,8 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 1086 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp2_ = NULL;
-			GeeIterator* _tmp3_ = NULL;
+			GeeCollection* _tmp2_;
+			GeeIterator* _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp2_ = online;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1096,12 +1096,12 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 1099 "MediaInterfaces.c"
-				GeeIterator* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
+				GeeIterator* _tmp4_;
+				gboolean _tmp5_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp6_ = NULL;
-				gpointer _tmp7_ = NULL;
-				Monitorable* _tmp8_ = NULL;
+				GeeIterator* _tmp6_;
+				gpointer _tmp7_;
+				Monitorable* _tmp8_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp4_ = _monitorable_it;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1138,8 +1138,8 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 1139 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp10_ = NULL;
-			GeeIterator* _tmp11_ = NULL;
+			GeeCollection* _tmp10_;
+			GeeIterator* _tmp11_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp10_ = offline;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1149,12 +1149,12 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
 #line 1152 "MediaInterfaces.c"
-				GeeIterator* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
+				GeeIterator* _tmp12_;
+				gboolean _tmp13_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp14_ = NULL;
-				gpointer _tmp15_ = NULL;
-				Monitorable* _tmp16_ = NULL;
+				GeeIterator* _tmp14_;
+				gpointer _tmp15_;
+				Monitorable* _tmp16_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_tmp12_ = _monitorable_it;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1202,11 +1202,11 @@ void monitorable_set_master_file (Monitorable* self, GFile* file) {
 
 
 void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
+	TransactionController* _tmp0_;
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_ = NULL;
-	GeeMapIterator* _tmp2_ = NULL;
-	TransactionController* _tmp11_ = NULL;
+	GeeMap* _tmp1_;
+	GeeMapIterator* _tmp2_;
+	TransactionController* _tmp11_;
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1224,14 +1224,14 @@ void monitorable_set_many_master_file (GeeMap* map, TransactionController* contr
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
 #line 1227 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		GeeMapIterator* _tmp5_ = NULL;
-		gpointer _tmp6_ = NULL;
-		Monitorable* _tmp7_ = NULL;
-		GeeMapIterator* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		GeeMapIterator* _tmp3_;
+		gboolean _tmp4_;
+		GeeMapIterator* _tmp5_;
+		gpointer _tmp6_;
+		Monitorable* _tmp7_;
+		GeeMapIterator* _tmp8_;
+		gpointer _tmp9_;
+		GFile* _tmp10_;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp3_ = map_iter;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1282,11 +1282,11 @@ void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info) {
 
 
 void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_ = NULL;
+	TransactionController* _tmp0_;
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_ = NULL;
-	GeeMapIterator* _tmp2_ = NULL;
-	TransactionController* _tmp11_ = NULL;
+	GeeMap* _tmp1_;
+	GeeMapIterator* _tmp2_;
+	TransactionController* _tmp11_;
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1304,14 +1304,14 @@ void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController*
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
 #line 1307 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-		GeeMapIterator* _tmp5_ = NULL;
-		gpointer _tmp6_ = NULL;
-		Monitorable* _tmp7_ = NULL;
-		GeeMapIterator* _tmp8_ = NULL;
-		gpointer _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
+		GeeMapIterator* _tmp3_;
+		gboolean _tmp4_;
+		GeeMapIterator* _tmp5_;
+		gpointer _tmp6_;
+		Monitorable* _tmp7_;
+		GeeMapIterator* _tmp8_;
+		gpointer _tmp9_;
+		GFileInfo* _tmp10_;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp3_ = map_iter;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"