Merge branch 'feature/upstream' into develop

1 files changed, 209 insertions, 209 deletions

diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index a2794b7..c8d1841 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -297,6 +297,12 @@ typedef struct _VideoClass VideoClass;
 typedef struct _VideoView VideoView;
 typedef struct _VideoViewClass VideoViewClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
+enum  {
+	IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL,
+	IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL,
+	IMPORT_QUEUE_PAGE_LAST_SIGNAL
+};
+static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -545,29 +551,29 @@ gchar* data_object_get_name (DataObject* self);
 void single_photo_page_blank_display (SinglePhotoPage* self);
 void page_window_set_normal_cursor (PageWindow* self);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
-static void import_queue_page_finalize (GObject* obj);
+static void import_queue_page_finalize (GObject * obj);
 
 static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}};
 
 static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_stop ((ImportQueuePage*) self);
-#line 556 "ImportQueuePage.c"
+#line 562 "ImportQueuePage.c"
 }
 
 
 ImportQueuePage* import_queue_page_construct (GType object_type) {
 	ImportQueuePage * self = NULL;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp0_ = NULL;
+	GtkToolbar* _tmp0_;
 	GtkToolButton* stop_button = NULL;
-	GtkToolButton* _tmp1_ = NULL;
+	GtkToolButton* _tmp1_;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp2_ = NULL;
+	GtkSeparatorToolItem* _tmp2_;
 	GtkToolItem* progress_item = NULL;
-	GtkToolItem* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkToolItem* _tmp3_;
+	GtkProgressBar* _tmp4_;
+	GtkProgressBar* _tmp5_;
 #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE);
 #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -624,21 +630,21 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 	_g_object_unref0 (toolbar);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self;
-#line 628 "ImportQueuePage.c"
+#line 634 "ImportQueuePage.c"
 }
 
 
 ImportQueuePage* import_queue_page_new (void) {
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE);
-#line 635 "ImportQueuePage.c"
+#line 641 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	ImportQueuePage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -651,14 +657,14 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp1_ = ui_filenames;
 #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 655 "ImportQueuePage.c"
+#line 661 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
 	ImportQueuePage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp0_;
+	GActionMap* _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -671,13 +677,13 @@ static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
-#line 675 "ImportQueuePage.c"
+#line 681 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) {
 	ImportQueuePage * self;
-	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -686,7 +692,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 690 "ImportQueuePage.c"
+#line 696 "ImportQueuePage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -698,15 +704,15 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries);
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) {
-#line 702 "ImportQueuePage.c"
+#line 708 "ImportQueuePage.c"
 			GActionEntry entry = {0};
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			entry = entry_collection[entry_it];
-#line 706 "ImportQueuePage.c"
+#line 712 "ImportQueuePage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				_tmp1_ = map;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -715,7 +721,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 719 "ImportQueuePage.c"
+#line 725 "ImportQueuePage.c"
 			}
 		}
 	}
@@ -725,62 +731,62 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
 #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_starting ((ImportQueuePage*) self, _sender);
-#line 729 "ImportQueuePage.c"
+#line 735 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
 #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_preparing ((ImportQueuePage*) self);
-#line 736 "ImportQueuePage.c"
+#line 742 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
 #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes);
-#line 743 "ImportQueuePage.c"
+#line 749 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) {
 #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow);
-#line 750 "ImportQueuePage.c"
+#line 756 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll);
-#line 757 "ImportQueuePage.c"
+#line 763 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message);
-#line 764 "ImportQueuePage.c"
+#line 770 "ImportQueuePage.c"
 }
 
 
 void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) {
-	GeeArrayList* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	BatchImport* _tmp3_ = NULL;
-	BatchImport* _tmp4_ = NULL;
-	BatchImport* _tmp5_ = NULL;
-	BatchImport* _tmp6_ = NULL;
-	BatchImport* _tmp7_ = NULL;
-	BatchImport* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GeeArrayList* _tmp12_ = NULL;
-	BatchImport* _tmp13_ = NULL;
-	BatchImport* _tmp14_ = NULL;
-	GeeArrayList* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	GeeArrayList* _tmp0_;
+	BatchImport* _tmp1_;
+	gboolean _tmp2_;
+	BatchImport* _tmp3_;
+	BatchImport* _tmp4_;
+	BatchImport* _tmp5_;
+	BatchImport* _tmp6_;
+	BatchImport* _tmp7_;
+	BatchImport* _tmp8_;
+	gboolean _tmp9_;
+	GeeArrayList* _tmp12_;
+	BatchImport* _tmp13_;
+	BatchImport* _tmp14_;
+	GeeArrayList* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -821,16 +827,16 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	_tmp9_ = allow_user_cancel;
 #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp9_) {
-#line 825 "ImportQueuePage.c"
-		GeeHashSet* _tmp10_ = NULL;
-		BatchImport* _tmp11_ = NULL;
+#line 831 "ImportQueuePage.c"
+		GeeHashSet* _tmp10_;
+		BatchImport* _tmp11_;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = self->priv->cancel_unallowed;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = batch_import;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 834 "ImportQueuePage.c"
+#line 840 "ImportQueuePage.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = self->priv->queue;
@@ -841,7 +847,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
 #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit_by_name (self, "batch-added", _tmp14_);
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_);
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -850,25 +856,25 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	_tmp17_ = _tmp16_;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp17_ == 1) {
-#line 854 "ImportQueuePage.c"
-		BatchImport* _tmp18_ = NULL;
+#line 860 "ImportQueuePage.c"
+		BatchImport* _tmp18_;
 #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = batch_import;
 #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp18_);
-#line 860 "ImportQueuePage.c"
+#line 866 "ImportQueuePage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 864 "ImportQueuePage.c"
+#line 870 "ImportQueuePage.c"
 }
 
 
 gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	gint result = 0;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0);
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -881,15 +887,15 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	result = _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return result;
-#line 885 "ImportQueuePage.c"
+#line 891 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	gboolean _tmp0_ = FALSE;
-	GeeHashSet* _tmp1_ = NULL;
-	BatchImport* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	GeeHashSet* _tmp1_;
+	BatchImport* _tmp2_;
+	gboolean _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -900,10 +906,10 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp3_) {
-#line 904 "ImportQueuePage.c"
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+#line 910 "ImportQueuePage.c"
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -912,31 +918,31 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 		_tmp6_ = _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 916 "ImportQueuePage.c"
+#line 922 "ImportQueuePage.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = FALSE;
-#line 920 "ImportQueuePage.c"
+#line 926 "ImportQueuePage.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_);
-#line 924 "ImportQueuePage.c"
+#line 930 "ImportQueuePage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 931 "ImportQueuePage.c"
+#line 937 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_stop (ImportQueuePage* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	AppWindow* _tmp3_;
+	AppWindow* _tmp4_;
 #line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -951,7 +957,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	if (_tmp2_ == 0) {
 #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 955 "ImportQueuePage.c"
+#line 961 "ImportQueuePage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = app_window_get_instance ();
@@ -963,15 +969,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = TRUE;
-#line 967 "ImportQueuePage.c"
+#line 973 "ImportQueuePage.c"
 	{
 		GeeArrayList* _batch_import_list = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		GeeArrayList* _tmp6_ = NULL;
+		GeeArrayList* _tmp5_;
+		GeeArrayList* _tmp6_;
 		gint _batch_import_size = 0;
-		GeeArrayList* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		GeeArrayList* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _batch_import_index = 0;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp5_ = self->priv->queue;
@@ -991,15 +997,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 		_batch_import_index = -1;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		while (TRUE) {
-#line 995 "ImportQueuePage.c"
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
+#line 1001 "ImportQueuePage.c"
+			gint _tmp10_;
+			gint _tmp11_;
+			gint _tmp12_;
 			BatchImport* batch_import = NULL;
-			GeeArrayList* _tmp13_ = NULL;
-			gint _tmp14_ = 0;
-			gpointer _tmp15_ = NULL;
-			BatchImport* _tmp16_ = NULL;
+			GeeArrayList* _tmp13_;
+			gint _tmp14_;
+			gpointer _tmp15_;
+			BatchImport* _tmp16_;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp10_ = _batch_import_index;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1012,7 +1018,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			if (!(_tmp11_ < _tmp12_)) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				break;
-#line 1016 "ImportQueuePage.c"
+#line 1022 "ImportQueuePage.c"
 			}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp13_ = _batch_import_list;
@@ -1028,18 +1034,18 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			batch_import_user_halt (_tmp16_);
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (batch_import);
-#line 1032 "ImportQueuePage.c"
+#line 1038 "ImportQueuePage.c"
 		}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_batch_import_list);
-#line 1036 "ImportQueuePage.c"
+#line 1042 "ImportQueuePage.c"
 	}
 }
 
 
 static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) {
-	BatchImport* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
+	BatchImport* _tmp0_;
+	BatchImport* _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1054,36 +1060,33 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b
 	_g_object_unref0 (self->priv->current_batch);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = _tmp1_;
-#line 1058 "ImportQueuePage.c"
+#line 1064 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_preparing (ImportQueuePage* self) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
+	GtkProgressBar* _tmp0_;
+	GtkProgressBar* _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->progress_bar;
 #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = _ ("Preparing to import…");
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
+	gtk_progress_bar_set_text (_tmp0_, _ ("Preparing to import…"));
 #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = self->priv->progress_bar;
+	_tmp1_ = self->priv->progress_bar;
 #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_pulse (_tmp2_);
-#line 1078 "ImportQueuePage.c"
+	gtk_progress_bar_pulse (_tmp1_);
+#line 1081 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) {
 	gdouble _tmp0_ = 0.0;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
 	gdouble pct = 0.0;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkProgressBar* _tmp5_;
 #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1092,20 +1095,20 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	_tmp2_ = total_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ <= _tmp2_) {
-#line 1096 "ImportQueuePage.c"
-		guint64 _tmp3_ = 0ULL;
-		guint64 _tmp4_ = 0ULL;
+#line 1099 "ImportQueuePage.c"
+		guint64 _tmp3_;
+		guint64 _tmp4_;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp3_ = completed_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = total_bytes;
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_);
-#line 1105 "ImportQueuePage.c"
+#line 1108 "ImportQueuePage.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = 0.0;
-#line 1109 "ImportQueuePage.c"
+#line 1112 "ImportQueuePage.c"
 	}
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	pct = _tmp0_;
@@ -1113,28 +1116,27 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	_tmp5_ = self->priv->progress_bar;
 #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_fraction (_tmp5_, pct);
-#line 1117 "ImportQueuePage.c"
+#line 1120 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	gint _tmp1_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	Dimensions _tmp5_ = {0};
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	ThumbnailSource* _tmp9_ = NULL;
-	GtkProgressBar* _tmp22_ = NULL;
-	GtkProgressBar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	ThumbnailSource* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
+	ThumbnailSource* _tmp9_;
+	GtkProgressBar* _tmp22_;
+	GtkProgressBar* _tmp23_;
+	ThumbnailSource* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1147,20 +1149,20 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	if (_tmp1_ > 0) {
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = TRUE;
-#line 1151 "ImportQueuePage.c"
+#line 1153 "ImportQueuePage.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = !_tmp2_;
-#line 1158 "ImportQueuePage.c"
+#line 1160 "ImportQueuePage.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp0_) {
 #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 1164 "ImportQueuePage.c"
+#line 1166 "ImportQueuePage.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = pixbuf;
@@ -1182,13 +1184,13 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	_tmp9_ = source;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) {
-#line 1186 "ImportQueuePage.c"
-		ViewCollection* _tmp10_ = NULL;
-		ViewCollection* _tmp11_ = NULL;
-		ThumbnailSource* _tmp12_ = NULL;
-		PhotoView* _tmp13_ = NULL;
-		PhotoView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+#line 1188 "ImportQueuePage.c"
+		ViewCollection* _tmp10_;
+		ViewCollection* _tmp11_;
+		ThumbnailSource* _tmp12_;
+		PhotoView* _tmp13_;
+		PhotoView* _tmp14_;
+		gboolean _tmp15_;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1207,14 +1209,14 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		_g_object_unref0 (_tmp14_);
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1211 "ImportQueuePage.c"
+#line 1213 "ImportQueuePage.c"
 	} else {
-		ViewCollection* _tmp16_ = NULL;
-		ViewCollection* _tmp17_ = NULL;
-		ThumbnailSource* _tmp18_ = NULL;
-		VideoView* _tmp19_ = NULL;
-		VideoView* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+		ViewCollection* _tmp16_;
+		ViewCollection* _tmp17_;
+		ThumbnailSource* _tmp18_;
+		VideoView* _tmp19_;
+		VideoView* _tmp20_;
+		gboolean _tmp21_;
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1233,7 +1235,7 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		_g_object_unref0 (_tmp20_);
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 1237 "ImportQueuePage.c"
+#line 1239 "ImportQueuePage.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp22_ = self->priv->progress_bar;
@@ -1242,60 +1244,58 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = self->priv->progress_bar;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp24_ = _ ("Imported %s");
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp25_ = source;
+	_tmp24_ = source;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
+	_tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp27_ = _tmp26_;
+	_tmp26_ = _tmp25_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = g_strdup_printf (_tmp24_, _tmp27_);
+	_tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp28_ = _tmp27_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_text (_tmp23_, _tmp29_);
+	gtk_progress_bar_set_text (_tmp23_, _tmp28_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp29_);
+	_g_free0 (_tmp28_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp27_);
+	_g_free0 (_tmp26_);
 #line 1263 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) {
-	BatchImport* _tmp0_ = NULL;
-	BatchImport* _tmp1_ = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GeeArrayList* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-	BatchImport* _tmp7_ = NULL;
-	BatchImport* _tmp8_ = NULL;
+	BatchImport* _tmp0_;
+	BatchImport* _tmp1_;
+	GeeArrayList* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GeeArrayList* _tmp5_;
+	gpointer _tmp6_;
+	BatchImport* _tmp7_;
+	BatchImport* _tmp8_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp9_ = NULL;
-	BatchImport* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	GeeHashSet* _tmp13_ = NULL;
-	BatchImport* _tmp14_ = NULL;
-	BatchImport* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	BatchImport* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
-	BatchImport* _tmp19_ = NULL;
-	guint _tmp20_ = 0U;
-	BatchImport* _tmp21_ = NULL;
-	guint _tmp22_ = 0U;
-	BatchImport* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
-	BatchImport* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	GeeArrayList* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	BatchImport* _tmp39_ = NULL;
+	GeeArrayList* _tmp9_;
+	BatchImport* _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	GeeHashSet* _tmp13_;
+	BatchImport* _tmp14_;
+	BatchImport* _tmp15_;
+	guint _tmp16_;
+	BatchImport* _tmp17_;
+	guint _tmp18_;
+	BatchImport* _tmp19_;
+	guint _tmp20_;
+	BatchImport* _tmp21_;
+	guint _tmp22_;
+	BatchImport* _tmp23_;
+	guint _tmp24_;
+	BatchImport* _tmp25_;
+	guint _tmp26_;
+	GeeArrayList* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	BatchImport* _tmp39_;
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1397,9 +1397,9 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp29_ > 0) {
 #line 1400 "ImportQueuePage.c"
-		GeeArrayList* _tmp30_ = NULL;
-		gpointer _tmp31_ = NULL;
-		BatchImport* _tmp32_ = NULL;
+		GeeArrayList* _tmp30_;
+		gpointer _tmp31_;
+		BatchImport* _tmp32_;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp30_ = self->priv->queue;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1412,10 +1412,10 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 		_g_object_unref0 (_tmp32_);
 #line 1414 "ImportQueuePage.c"
 	} else {
-		GtkProgressBar* _tmp33_ = NULL;
-		GtkProgressBar* _tmp34_ = NULL;
-		GtkProgressBar* _tmp35_ = NULL;
-		gboolean _tmp36_ = FALSE;
+		GtkProgressBar* _tmp33_;
+		GtkProgressBar* _tmp34_;
+		GtkProgressBar* _tmp35_;
+		gboolean _tmp36_;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp33_ = self->priv->progress_bar;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1435,8 +1435,8 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		if (_tmp36_) {
 #line 1438 "ImportQueuePage.c"
-			AppWindow* _tmp37_ = NULL;
-			AppWindow* _tmp38_ = NULL;
+			AppWindow* _tmp37_;
+			AppWindow* _tmp38_;
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp37_ = app_window_get_instance ();
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1456,13 +1456,13 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp39_ = batch_import;
 #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit_by_name (self, "batch-removed", _tmp39_);
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_);
 #line 1461 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1481,25 +1481,25 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_type_class_add_private (klass, sizeof (ImportQueuePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_queue_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) import_queue_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) import_queue_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) import_queue_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_new ("batch_added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
+	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = g_signal_new ("batch-added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_new ("batch_removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
+	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = g_signal_new ("batch-removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 1496 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_instance_init (ImportQueuePage * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
-	GtkProgressBar* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeHashSet* _tmp1_;
+	GtkProgressBar* _tmp2_;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv = IMPORT_QUEUE_PAGE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1524,7 +1524,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 }
 
 
-static void import_queue_page_finalize (GObject* obj) {
+static void import_queue_page_finalize (GObject * obj) {
 	ImportQueuePage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);