Merge branch 'feature/upstream' into develop

1 files changed, 293 insertions, 293 deletions

diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 6ceefd9..b309c95 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.34.7, the Vala compiler
+/* ManifestWidget.c generated by valac 0.36.6, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -135,13 +135,13 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi
 gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1);
 gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info);
 gboolean is_string_empty (const gchar* s);
-static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value);
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
 #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
 #define RESOURCES_DEFAULT_ICON_SCALE 24
 gchar* plugins_get_pluggable_name (const gchar* id);
 GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self);
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj);
+static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj);
 #define PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListViewPrivate))
 enum  {
 	PLUGINS_MANIFEST_LIST_VIEW_DUMMY_PROPERTY
@@ -169,12 +169,12 @@ gint plugins_compare_pluggable_names (void* a, void* b);
 static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled);
 static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter);
-static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value);
 static void _gtk_tree_path_free0_ (gpointer var);
 static void _g_list_free__gtk_tree_path_free0_ (GList* self);
 static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled);
-static void plugins_manifest_list_view_finalize (GObject* obj);
+static void plugins_manifest_list_view_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);
 static gint _vala_array_length (gpointer array);
@@ -196,13 +196,13 @@ static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_sele
 
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type) {
 	PluginsManifestWidgetMediator* self = NULL;
-	GtkScrolledWindow* _tmp0_ = NULL;
-	GtkScrolledWindow* _tmp1_ = NULL;
-	PluginsManifestListView* _tmp2_ = NULL;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	PluginsManifestListView* _tmp5_ = NULL;
-	GtkTreeSelection* _tmp6_ = NULL;
+	GtkScrolledWindow* _tmp0_;
+	GtkScrolledWindow* _tmp1_;
+	PluginsManifestListView* _tmp2_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
+	PluginsManifestListView* _tmp5_;
+	GtkTreeSelection* _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = (PluginsManifestWidgetMediator*) g_type_create_instance (object_type);
 #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -243,27 +243,27 @@ PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 263 "ManifestWidget.c"
 }
 
 
-static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) {
 #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
 #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -289,67 +289,67 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self) {
 	gchar** ids = NULL;
-	PluginsManifestListView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	PluginsManifestListView* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint ids_length1;
+	gint _ids_size_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 	gchar* id = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	SpitPluggableInfo info = {0};
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	const gchar* _tmp7_;
+	gboolean _tmp8_;
 	gchar** authors = NULL;
-	gint authors_length1 = 0;
-	gint _authors_size_ = 0;
-	SpitPluggableInfo _tmp10_ = {0};
-	const gchar* _tmp11_ = NULL;
+	gint authors_length1;
+	gint _authors_size_;
+	SpitPluggableInfo _tmp10_;
+	const gchar* _tmp11_;
 	GtkAboutDialog* about_dialog = NULL;
-	GtkAboutDialog* _tmp31_ = NULL;
-	GtkAboutDialog* _tmp32_ = NULL;
-	gchar** _tmp33_ = NULL;
-	gint _tmp33__length1 = 0;
-	GtkAboutDialog* _tmp34_ = NULL;
-	SpitPluggableInfo _tmp35_ = {0};
-	const gchar* _tmp36_ = NULL;
-	GtkAboutDialog* _tmp37_ = NULL;
-	SpitPluggableInfo _tmp38_ = {0};
-	const gchar* _tmp39_ = NULL;
-	GtkAboutDialog* _tmp40_ = NULL;
-	SpitPluggableInfo _tmp41_ = {0};
-	const gchar* _tmp42_ = NULL;
-	GtkAboutDialog* _tmp43_ = NULL;
-	SpitPluggableInfo _tmp44_ = {0};
-	gboolean _tmp45_ = FALSE;
+	GtkAboutDialog* _tmp31_;
+	GtkAboutDialog* _tmp32_;
+	gchar** _tmp33_;
+	gint _tmp33__length1;
+	GtkAboutDialog* _tmp34_;
+	SpitPluggableInfo _tmp35_;
+	const gchar* _tmp36_;
+	GtkAboutDialog* _tmp37_;
+	SpitPluggableInfo _tmp38_;
+	const gchar* _tmp39_;
+	GtkAboutDialog* _tmp40_;
+	SpitPluggableInfo _tmp41_;
+	const gchar* _tmp42_;
+	GtkAboutDialog* _tmp43_;
+	SpitPluggableInfo _tmp44_;
+	gboolean _tmp45_;
 	GdkPixbuf* _tmp46_ = NULL;
 	gboolean _tmp47_ = FALSE;
-	SpitPluggableInfo _tmp48_ = {0};
-	GdkPixbuf** _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	GtkAboutDialog* _tmp57_ = NULL;
-	GtkAboutDialog* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	GtkAboutDialog* _tmp62_ = NULL;
-	SpitPluggableInfo _tmp63_ = {0};
-	const gchar* _tmp64_ = NULL;
-	GtkAboutDialog* _tmp65_ = NULL;
-	SpitPluggableInfo _tmp66_ = {0};
-	const gchar* _tmp67_ = NULL;
-	GtkAboutDialog* _tmp68_ = NULL;
-	SpitPluggableInfo _tmp69_ = {0};
-	const gchar* _tmp70_ = NULL;
-	GtkAboutDialog* _tmp71_ = NULL;
-	SpitPluggableInfo _tmp72_ = {0};
-	const gchar* _tmp73_ = NULL;
-	GtkAboutDialog* _tmp74_ = NULL;
-	GtkAboutDialog* _tmp75_ = NULL;
+	SpitPluggableInfo _tmp48_;
+	GdkPixbuf** _tmp49_;
+	gint _tmp49__length1;
+	GtkAboutDialog* _tmp57_;
+	GtkAboutDialog* _tmp58_;
+	const gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	GtkAboutDialog* _tmp62_;
+	SpitPluggableInfo _tmp63_;
+	const gchar* _tmp64_;
+	GtkAboutDialog* _tmp65_;
+	SpitPluggableInfo _tmp66_;
+	const gchar* _tmp67_;
+	GtkAboutDialog* _tmp68_;
+	SpitPluggableInfo _tmp69_;
+	const gchar* _tmp70_;
+	GtkAboutDialog* _tmp71_;
+	SpitPluggableInfo _tmp72_;
+	const gchar* _tmp73_;
+	GtkAboutDialog* _tmp74_;
+	GtkAboutDialog* _tmp75_;
 #line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
 #line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -393,7 +393,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
 #line 396 "ManifestWidget.c"
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp9_ = id;
 #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -422,12 +422,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 	if (_tmp11_ != NULL) {
 #line 424 "ManifestWidget.c"
 		gchar** split = NULL;
-		SpitPluggableInfo _tmp12_ = {0};
-		const gchar* _tmp13_ = NULL;
-		gchar** _tmp14_ = NULL;
-		gchar** _tmp15_ = NULL;
-		gint split_length1 = 0;
-		gint _split_size_ = 0;
+		SpitPluggableInfo _tmp12_;
+		const gchar* _tmp13_;
+		gchar** _tmp14_;
+		gchar** _tmp15_;
+		gint split_length1;
+		gint _split_size_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = info;
 #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -453,21 +453,21 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
 #line 456 "ManifestWidget.c"
-					gint _tmp18_ = 0;
-					gchar** _tmp19_ = NULL;
-					gint _tmp19__length1 = 0;
+					gint _tmp18_;
+					gchar** _tmp19_;
+					gint _tmp19__length1;
 					gchar* stripped = NULL;
-					gchar** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
-					gint _tmp21_ = 0;
-					const gchar* _tmp22_ = NULL;
-					gchar* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
+					gchar** _tmp20_;
+					gint _tmp20__length1;
+					gint _tmp21_;
+					const gchar* _tmp22_;
+					gchar* _tmp23_;
+					const gchar* _tmp24_;
+					gboolean _tmp25_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp16_) {
 #line 470 "ManifestWidget.c"
-						gint _tmp17_ = 0;
+						gint _tmp17_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp17_ = ctr;
 #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -507,12 +507,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp25_) {
 #line 510 "ManifestWidget.c"
-						gchar** _tmp26_ = NULL;
-						gint _tmp26__length1 = 0;
-						gchar** _tmp28_ = NULL;
-						gint _tmp28__length1 = 0;
-						const gchar* _tmp29_ = NULL;
-						gchar* _tmp30_ = NULL;
+						gchar** _tmp26_;
+						gint _tmp26__length1;
+						gchar** _tmp28_;
+						gint _tmp28__length1;
+						const gchar* _tmp29_;
+						gchar* _tmp30_;
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp26_ = authors;
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -520,7 +520,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (_tmp26_ == NULL) {
 #line 523 "ManifestWidget.c"
-							gchar** _tmp27_ = NULL;
+							gchar** _tmp27_;
 #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							_tmp27_ = g_new0 (gchar*, 0 + 1);
 #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -610,9 +610,9 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp49_ != NULL) {
 #line 613 "ManifestWidget.c"
-		SpitPluggableInfo _tmp50_ = {0};
-		GdkPixbuf** _tmp51_ = NULL;
-		gint _tmp51__length1 = 0;
+		SpitPluggableInfo _tmp50_;
+		GdkPixbuf** _tmp51_;
+		gint _tmp51__length1;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp50_ = info;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -630,11 +630,11 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp47_) {
 #line 633 "ManifestWidget.c"
-		SpitPluggableInfo _tmp52_ = {0};
-		GdkPixbuf** _tmp53_ = NULL;
-		gint _tmp53__length1 = 0;
-		GdkPixbuf* _tmp54_ = NULL;
-		GdkPixbuf* _tmp55_ = NULL;
+		SpitPluggableInfo _tmp52_;
+		GdkPixbuf** _tmp53_;
+		gint _tmp53__length1;
+		GdkPixbuf* _tmp54_;
+		GdkPixbuf* _tmp55_;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp52_ = info;
 #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -651,7 +651,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 		_tmp46_ = _tmp55_;
 #line 653 "ManifestWidget.c"
 	} else {
-		GdkPixbuf* _tmp56_ = NULL;
+		GdkPixbuf* _tmp56_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp56_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -743,13 +743,13 @@ static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManife
 
 static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self) {
 	gchar** ids = NULL;
-	PluginsManifestListView* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	GtkButton* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
+	PluginsManifestListView* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint ids_length1;
+	gint _ids_size_;
+	GtkButton* _tmp3_;
+	GtkButton* _tmp4_;
 #line 98 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
 #line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -776,8 +776,8 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi
 
 GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self) {
 	GtkWidget* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -794,8 +794,8 @@ GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMed
 
 static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsManifestWidgetMediator* self) {
 	GtkButton* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -812,8 +812,8 @@ static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsMani
 
 static GtkScrolledWindow* plugins_manifest_widget_mediator_get_list_bin (PluginsManifestWidgetMediator* self) {
 	GtkScrolledWindow* result;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
 #line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -870,7 +870,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (collect_values[0].v_pointer) {
 #line 873 "ManifestWidget.c"
-		PluginsManifestWidgetMediator* object;
+		PluginsManifestWidgetMediator * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -897,7 +897,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu
 
 
 static gchar* plugins_value_manifest_widget_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsManifestWidgetMediator** object_p;
+	PluginsManifestWidgetMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!object_p) {
@@ -949,7 +949,7 @@ gpointer plugins_value_get_manifest_widget_mediator (const GValue* value) {
 
 
 void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator* old;
+	PluginsManifestWidgetMediator * old;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -980,7 +980,7 @@ void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_objec
 
 
 void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator* old;
+	PluginsManifestWidgetMediator * old;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1020,8 +1020,8 @@ static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMe
 
 
 static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) {
-	GtkBuilder* _tmp0_ = NULL;
-	PluginsManifestListView* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	PluginsManifestListView* _tmp1_;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE (self);
 #line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1040,14 +1040,14 @@ static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidge
 }
 
 
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj) {
+static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj) {
 	PluginsManifestWidgetMediator * self;
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	PluginsManifestListView* _tmp3_ = NULL;
-	GtkTreeSelection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
+	guint _tmp2_;
+	PluginsManifestListView* _tmp3_;
+	GtkTreeSelection* _tmp4_;
+	guint _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator);
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1091,7 +1091,7 @@ GType plugins_manifest_widget_mediator_get_type (void) {
 
 
 gpointer plugins_manifest_widget_mediator_ref (gpointer instance) {
-	PluginsManifestWidgetMediator* self;
+	PluginsManifestWidgetMediator * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1102,7 +1102,7 @@ gpointer plugins_manifest_widget_mediator_ref (gpointer instance) {
 
 
 void plugins_manifest_widget_mediator_unref (gpointer instance) {
-	PluginsManifestWidgetMediator* self;
+	PluginsManifestWidgetMediator * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1147,39 +1147,39 @@ static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a
 
 PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type) {
 	PluginsManifestListView * self = NULL;
-	GtkTreeStore* _tmp0_ = NULL;
+	GtkTreeStore* _tmp0_;
 	GtkCellRendererToggle* checkbox_renderer = NULL;
-	GtkCellRendererToggle* _tmp1_ = NULL;
-	GtkCellRendererToggle* _tmp2_ = NULL;
-	GtkCellRendererToggle* _tmp3_ = NULL;
+	GtkCellRendererToggle* _tmp1_;
+	GtkCellRendererToggle* _tmp2_;
+	GtkCellRendererToggle* _tmp3_;
 	GtkCellRendererPixbuf* icon_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp4_ = NULL;
-	GtkCellRendererPixbuf* _tmp5_ = NULL;
-	GtkCellRendererPixbuf* _tmp6_ = NULL;
-	GtkCellRendererPixbuf* _tmp7_ = NULL;
+	GtkCellRendererPixbuf* _tmp4_;
+	GtkCellRendererPixbuf* _tmp5_;
+	GtkCellRendererPixbuf* _tmp6_;
+	GtkCellRendererPixbuf* _tmp7_;
 	GtkCellRendererText* text_renderer = NULL;
-	GtkCellRendererText* _tmp8_ = NULL;
+	GtkCellRendererText* _tmp8_;
 	GtkTreeViewColumn* column = NULL;
-	GtkTreeViewColumn* _tmp9_ = NULL;
-	GtkTreeViewColumn* _tmp10_ = NULL;
-	GtkTreeViewColumn* _tmp11_ = NULL;
-	GtkCellRendererToggle* _tmp12_ = NULL;
-	GtkTreeViewColumn* _tmp13_ = NULL;
-	GtkCellRendererPixbuf* _tmp14_ = NULL;
-	GtkTreeViewColumn* _tmp15_ = NULL;
-	GtkCellRendererText* _tmp16_ = NULL;
-	GtkTreeViewColumn* _tmp17_ = NULL;
-	GtkCellRendererToggle* _tmp18_ = NULL;
-	GtkTreeViewColumn* _tmp19_ = NULL;
-	GtkCellRendererToggle* _tmp20_ = NULL;
-	GtkTreeViewColumn* _tmp21_ = NULL;
-	GtkCellRendererPixbuf* _tmp22_ = NULL;
-	GtkTreeViewColumn* _tmp23_ = NULL;
-	GtkCellRendererText* _tmp24_ = NULL;
-	GtkTreeViewColumn* _tmp25_ = NULL;
-	GtkTreeSelection* _tmp26_ = NULL;
+	GtkTreeViewColumn* _tmp9_;
+	GtkTreeViewColumn* _tmp10_;
+	GtkTreeViewColumn* _tmp11_;
+	GtkCellRendererToggle* _tmp12_;
+	GtkTreeViewColumn* _tmp13_;
+	GtkCellRendererPixbuf* _tmp14_;
+	GtkTreeViewColumn* _tmp15_;
+	GtkCellRendererText* _tmp16_;
+	GtkTreeViewColumn* _tmp17_;
+	GtkCellRendererToggle* _tmp18_;
+	GtkTreeViewColumn* _tmp19_;
+	GtkCellRendererToggle* _tmp20_;
+	GtkTreeViewColumn* _tmp21_;
+	GtkCellRendererPixbuf* _tmp22_;
+	GtkTreeViewColumn* _tmp23_;
+	GtkCellRendererText* _tmp24_;
+	GtkTreeViewColumn* _tmp25_;
+	GtkTreeSelection* _tmp26_;
 	GtkIconTheme* icon_theme = NULL;
-	GtkIconTheme* _tmp27_ = NULL;
+	GtkIconTheme* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = (PluginsManifestListView*) g_object_new (object_type, NULL);
@@ -1304,10 +1304,10 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1305 "ManifestWidget.c"
 	{
 		GeeIterator* _extension_point_it = NULL;
-		GeeCollection* _tmp28_ = NULL;
-		GeeCollection* _tmp29_ = NULL;
-		GeeIterator* _tmp30_ = NULL;
-		GeeIterator* _tmp31_ = NULL;
+		GeeCollection* _tmp28_;
+		GeeCollection* _tmp29_;
+		GeeIterator* _tmp30_;
+		GeeIterator* _tmp31_;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp28_ = plugins_get_extension_points (_plugins_compare_extension_point_names_gcompare_data_func, NULL, NULL);
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1323,29 +1323,29 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		while (TRUE) {
 #line 1326 "ManifestWidget.c"
-			GeeIterator* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+			GeeIterator* _tmp32_;
+			gboolean _tmp33_;
 			PluginsExtensionPoint* extension_point = NULL;
-			GeeIterator* _tmp34_ = NULL;
-			gpointer _tmp35_ = NULL;
+			GeeIterator* _tmp34_;
+			gpointer _tmp35_;
 			GtkTreeIter category_iter = {0};
-			GtkTreeStore* _tmp36_ = NULL;
+			GtkTreeStore* _tmp36_;
 			GtkTreeIter _tmp37_ = {0};
 			GdkPixbuf* icon = NULL;
-			PluginsExtensionPoint* _tmp38_ = NULL;
-			const gchar* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			GtkTreeStore* _tmp59_ = NULL;
-			GtkTreeIter _tmp60_ = {0};
-			PluginsExtensionPoint* _tmp61_ = NULL;
-			const gchar* _tmp62_ = NULL;
-			const gchar* _tmp63_ = NULL;
-			GdkPixbuf* _tmp64_ = NULL;
+			PluginsExtensionPoint* _tmp38_;
+			const gchar* _tmp39_;
+			const gchar* _tmp40_;
+			GtkTreeStore* _tmp59_;
+			GtkTreeIter _tmp60_;
+			PluginsExtensionPoint* _tmp61_;
+			const gchar* _tmp62_;
+			const gchar* _tmp63_;
+			GdkPixbuf* _tmp64_;
 			GeeCollection* pluggables = NULL;
-			PluginsExtensionPoint* _tmp65_ = NULL;
-			GType _tmp66_ = 0UL;
-			GType _tmp67_ = 0UL;
-			GeeCollection* _tmp68_ = NULL;
+			PluginsExtensionPoint* _tmp65_;
+			GType _tmp66_;
+			GType _tmp67_;
+			GeeCollection* _tmp68_;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp32_ = _extension_point_it;
 #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1380,15 +1380,15 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 			if (_tmp40_ != NULL) {
 #line 1382 "ManifestWidget.c"
 				GtkIconInfo* icon_info = NULL;
-				GtkIconTheme* _tmp41_ = NULL;
-				PluginsExtensionPoint* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				GThemedIcon* _tmp45_ = NULL;
-				GThemedIcon* _tmp46_ = NULL;
-				GtkIconInfo* _tmp47_ = NULL;
-				GtkIconInfo* _tmp48_ = NULL;
-				GtkIconInfo* _tmp49_ = NULL;
+				GtkIconTheme* _tmp41_;
+				PluginsExtensionPoint* _tmp42_;
+				const gchar* _tmp43_;
+				const gchar* _tmp44_;
+				GThemedIcon* _tmp45_;
+				GThemedIcon* _tmp46_;
+				GtkIconInfo* _tmp47_;
+				GtkIconInfo* _tmp48_;
+				GtkIconInfo* _tmp49_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp41_ = icon_theme;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1416,9 +1416,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1417 "ManifestWidget.c"
 					{
 						GdkPixbuf* _tmp50_ = NULL;
-						GtkIconInfo* _tmp51_ = NULL;
-						GdkPixbuf* _tmp52_ = NULL;
-						GdkPixbuf* _tmp53_ = NULL;
+						GtkIconInfo* _tmp51_;
+						GdkPixbuf* _tmp52_;
+						GdkPixbuf* _tmp53_;
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp51_ = icon_info;
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1446,11 +1446,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 					__catch37_g_error:
 					{
 						GError* err = NULL;
-						PluginsExtensionPoint* _tmp54_ = NULL;
-						const gchar* _tmp55_ = NULL;
-						const gchar* _tmp56_ = NULL;
-						GError* _tmp57_ = NULL;
-						const gchar* _tmp58_ = NULL;
+						PluginsExtensionPoint* _tmp54_;
+						const gchar* _tmp55_;
+						const gchar* _tmp56_;
+						GError* _tmp57_;
+						const gchar* _tmp58_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						err = _inner_error_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1532,8 +1532,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 1533 "ManifestWidget.c"
 			{
 				GeeIterator* _pluggable_it = NULL;
-				GeeCollection* _tmp69_ = NULL;
-				GeeIterator* _tmp70_ = NULL;
+				GeeCollection* _tmp69_;
+				GeeIterator* _tmp70_;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp69_ = pluggables;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1543,36 +1543,36 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
 #line 1546 "ManifestWidget.c"
-					GeeIterator* _tmp71_ = NULL;
-					gboolean _tmp72_ = FALSE;
+					GeeIterator* _tmp71_;
+					gboolean _tmp72_;
 					SpitPluggable* pluggable = NULL;
-					GeeIterator* _tmp73_ = NULL;
-					gpointer _tmp74_ = NULL;
+					GeeIterator* _tmp73_;
+					gpointer _tmp74_;
 					gboolean enabled = FALSE;
-					SpitPluggable* _tmp75_ = NULL;
-					const gchar* _tmp76_ = NULL;
+					SpitPluggable* _tmp75_;
+					const gchar* _tmp76_;
 					gboolean _tmp77_ = FALSE;
-					gboolean _tmp78_ = FALSE;
+					gboolean _tmp78_;
 					SpitPluggableInfo info = {0};
-					SpitPluggable* _tmp79_ = NULL;
+					SpitPluggable* _tmp79_;
 					GdkPixbuf* _tmp80_ = NULL;
 					gboolean _tmp81_ = FALSE;
-					SpitPluggableInfo _tmp82_ = {0};
-					GdkPixbuf** _tmp83_ = NULL;
-					gint _tmp83__length1 = 0;
-					GdkPixbuf* _tmp91_ = NULL;
+					SpitPluggableInfo _tmp82_;
+					GdkPixbuf** _tmp83_;
+					gint _tmp83__length1;
+					GdkPixbuf* _tmp91_;
 					GtkTreeIter plugin_iter = {0};
-					GtkTreeStore* _tmp92_ = NULL;
-					GtkTreeIter _tmp93_ = {0};
+					GtkTreeStore* _tmp92_;
+					GtkTreeIter _tmp93_;
 					GtkTreeIter _tmp94_ = {0};
-					GtkTreeStore* _tmp95_ = NULL;
-					GtkTreeIter _tmp96_ = {0};
-					gboolean _tmp97_ = FALSE;
-					SpitPluggable* _tmp98_ = NULL;
-					const gchar* _tmp99_ = NULL;
-					SpitPluggable* _tmp100_ = NULL;
-					const gchar* _tmp101_ = NULL;
-					GdkPixbuf* _tmp102_ = NULL;
+					GtkTreeStore* _tmp95_;
+					GtkTreeIter _tmp96_;
+					gboolean _tmp97_;
+					SpitPluggable* _tmp98_;
+					const gchar* _tmp99_;
+					SpitPluggable* _tmp100_;
+					const gchar* _tmp101_;
+					GdkPixbuf* _tmp102_;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp71_ = _pluggable_it;
 #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1620,9 +1620,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp83_ != NULL) {
 #line 1623 "ManifestWidget.c"
-						SpitPluggableInfo _tmp84_ = {0};
-						GdkPixbuf** _tmp85_ = NULL;
-						gint _tmp85__length1 = 0;
+						SpitPluggableInfo _tmp84_;
+						GdkPixbuf** _tmp85_;
+						gint _tmp85__length1;
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp84_ = info;
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1640,11 +1640,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp81_) {
 #line 1643 "ManifestWidget.c"
-						SpitPluggableInfo _tmp86_ = {0};
-						GdkPixbuf** _tmp87_ = NULL;
-						gint _tmp87__length1 = 0;
-						GdkPixbuf* _tmp88_ = NULL;
-						GdkPixbuf* _tmp89_ = NULL;
+						SpitPluggableInfo _tmp86_;
+						GdkPixbuf** _tmp87_;
+						gint _tmp87__length1;
+						GdkPixbuf* _tmp88_;
+						GdkPixbuf* _tmp89_;
 #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp86_ = info;
 #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1661,7 +1661,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_tmp80_ = _tmp89_;
 #line 1663 "ManifestWidget.c"
 					} else {
-						GdkPixbuf* _tmp90_ = NULL;
+						GdkPixbuf* _tmp90_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE);
 #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1758,7 +1758,7 @@ static gpointer _gtk_tree_path_copy0 (gpointer self) {
 }
 
 
-static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value) {
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1794,15 +1794,15 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
 gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1) {
 	gchar** result = NULL;
 	gchar** ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	gchar** _tmp0_;
+	gint ids_length1;
+	gint _ids_size_;
 	GList* selected = NULL;
-	GtkTreeSelection* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	GList* _tmp3_ = NULL;
-	gchar** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
+	GtkTreeSelection* _tmp1_;
+	GList* _tmp2_;
+	GList* _tmp3_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
 #line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
 #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1830,7 +1830,7 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		for (path_it = path_collection; path_it != NULL; path_it = path_it->next) {
 #line 1833 "ManifestWidget.c"
-			GtkTreePath* _tmp4_ = NULL;
+			GtkTreePath* _tmp4_;
 			GtkTreePath* path = NULL;
 #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data);
@@ -1840,10 +1840,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 			{
 				GtkTreeIter iter = {0};
 				gchar* id = NULL;
-				GtkTreePath* _tmp5_ = NULL;
+				GtkTreePath* _tmp5_;
 				GtkTreeIter _tmp6_ = {0};
-				gchar* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+				gchar* _tmp7_;
+				const gchar* _tmp8_;
 #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp5_ = path;
 #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1857,10 +1857,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp8_ != NULL) {
 #line 1860 "ManifestWidget.c"
-					gchar** _tmp9_ = NULL;
-					gint _tmp9__length1 = 0;
-					const gchar* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
+					gchar** _tmp9_;
+					gint _tmp9__length1;
+					const gchar* _tmp10_;
+					gchar* _tmp11_;
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9_ = ids;
 #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1904,15 +1904,15 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter) {
 	GtkTreeIter _vala_iter = {0};
 	gchar* result = NULL;
-	GtkTreeStore* _tmp0_ = NULL;
-	GtkTreePath* _tmp1_ = NULL;
+	GtkTreeStore* _tmp0_;
+	GtkTreePath* _tmp1_;
 	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp3_;
 	const gchar* id = NULL;
-	GtkTreeStore* _tmp4_ = NULL;
-	GtkTreeIter _tmp5_ = {0};
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	GtkTreeStore* _tmp4_;
+	GtkTreeIter _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
 #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1970,34 +1970,34 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 	GtkTreeViewColumn* col = NULL;
 	gint cellx = 0;
 	gint celly = 0;
-	GdkEventButton* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	GdkEventButton* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
+	GdkEventButton* _tmp0_;
+	gdouble _tmp1_;
+	GdkEventButton* _tmp2_;
+	gdouble _tmp3_;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreeViewColumn* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-	gboolean _tmp8_ = FALSE;
-	GtkTreeViewColumn* _tmp9_ = NULL;
+	gboolean _tmp8_;
+	GtkTreeViewColumn* _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
+	gint _tmp13_;
 	GtkTreeIter iter = {0};
 	gchar* id = NULL;
-	GtkTreePath* _tmp17_ = NULL;
+	GtkTreePath* _tmp17_;
 	GtkTreeIter _tmp18_ = {0};
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
 	gboolean enabled = FALSE;
-	const gchar* _tmp23_ = NULL;
+	const gchar* _tmp23_;
 	gboolean _tmp24_ = FALSE;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	const gchar* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GtkTreeStore* _tmp31_ = NULL;
-	GtkTreeIter _tmp32_ = {0};
-	gboolean _tmp33_ = FALSE;
+	gboolean _tmp25_;
+	gboolean _tmp28_;
+	const gchar* _tmp29_;
+	gboolean _tmp30_;
+	GtkTreeStore* _tmp31_;
+	GtkTreeIter _tmp32_;
+	gboolean _tmp33_;
 #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
 #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2029,8 +2029,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
 #line 2032 "ManifestWidget.c"
-		GdkEventButton* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GdkEventButton* _tmp10_;
+		gboolean _tmp11_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp10_ = event;
 #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2053,7 +2053,7 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 		_tmp12_ = TRUE;
 #line 2055 "ManifestWidget.c"
 	} else {
-		gint _tmp14_ = 0;
+		gint _tmp14_;
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp14_ = cellx;
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2063,8 +2063,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp12_) {
 #line 2066 "ManifestWidget.c"
-		GdkEventButton* _tmp15_ = NULL;
-		gboolean _tmp16_ = FALSE;
+		GdkEventButton* _tmp15_;
+		gboolean _tmp16_;
 #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp15_ = event;
 #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2092,8 +2092,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp20_ == NULL) {
 #line 2095 "ManifestWidget.c"
-		GdkEventButton* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
+		GdkEventButton* _tmp21_;
+		gboolean _tmp22_;
 #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp21_ = event;
 #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2119,8 +2119,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 #line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp25_) {
 #line 2122 "ManifestWidget.c"
-		GdkEventButton* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		GdkEventButton* _tmp26_;
+		gboolean _tmp27_;
 #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp26_ = event;
 #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2175,7 +2175,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_type_class_add_private (klass, sizeof (PluginsManifestListViewPrivate));
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize;
 #line 2182 "ManifestWidget.c"
@@ -2183,7 +2183,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass
 
 
 static void plugins_manifest_list_view_instance_init (PluginsManifestListView * self) {
-	GtkTreeStore* _tmp0_ = NULL;
+	GtkTreeStore* _tmp0_;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2194,7 +2194,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 }
 
 
-static void plugins_manifest_list_view_finalize (GObject* obj) {
+static void plugins_manifest_list_view_finalize (GObject * obj) {
 	PluginsManifestListView * self;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);